From f944a767c46e3d887e070d67958f4a9866c3d1f1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 13:57:16 +0100
Subject: [PATCH 001/436] Update dependency json-ld to v3.3.1 (#28229)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 037fe145d2..602df6a222 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -382,15 +382,15 @@ GEM
       reline (>= 0.3.8)
     jmespath (1.6.2)
     json (2.7.0)
-    json-canonicalization (0.3.2)
+    json-canonicalization (1.0.0)
     json-jwt (1.15.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
       httpclient
-    json-ld (3.3.0)
+    json-ld (3.3.1)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3, >= 0.3.2)
+      json-canonicalization (~> 1.0)
       link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.15)
       rack (>= 2.2, < 4)

From 2d2e23c68dde6ac6fa14fe8fbeb0efac02ad9803 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:59:31 +0000
Subject: [PATCH 002/436] Update dependency brakeman to v6.1.0 (#28231)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 602df6a222..9308a41c8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,7 +175,7 @@ GEM
     blurhash (0.1.7)
     bootsnap (1.17.0)
       msgpack (~> 1.2)
-    brakeman (6.0.1)
+    brakeman (6.1.0)
     browser (5.3.1)
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)

From d0a5ebf914f7ad74a69beb15d9c011e44e84c0dc Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathandejong02@gmail.com>
Date: Tue, 5 Dec 2023 14:59:15 +0100
Subject: [PATCH 003/436] Fix error when encountering malformed Tag objects
 from Kbin (#28235)

---
 app/services/activitypub/process_status_update_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index 2db0e80e7c..fb2b33114e 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -170,9 +170,9 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
     as_array(@json['tag']).each do |tag|
       if equals_or_includes?(tag['type'], 'Hashtag')
-        @raw_tags << tag['name']
+        @raw_tags << tag['name'] if tag['name'].present?
       elsif equals_or_includes?(tag['type'], 'Mention')
-        @raw_mentions << tag['href']
+        @raw_mentions << tag['href'] if tag['href'].present?
       elsif equals_or_includes?(tag['type'], 'Emoji')
         @raw_emojis << tag
       end

From 4238ec844d61774a02daa4a677a69099ff494388 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:07:53 +0100
Subject: [PATCH 004/436] New Crowdin Translations (automated) (#28120)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/mastodon/locales/an.json    |   1 +
 app/javascript/mastodon/locales/ca.json    |   1 +
 app/javascript/mastodon/locales/es-MX.json |   2 +-
 app/javascript/mastodon/locales/fa.json    |   7 +-
 app/javascript/mastodon/locales/fil.json   |   1 +
 app/javascript/mastodon/locales/ko.json    |   4 +-
 app/javascript/mastodon/locales/lt.json    |  74 ++++++++++++++
 app/javascript/mastodon/locales/ne.json    |   1 +
 app/javascript/mastodon/locales/ry.json    |   1 +
 app/javascript/mastodon/locales/sc.json    |  36 +++++++
 app/javascript/mastodon/locales/sk.json    |  10 ++
 app/javascript/mastodon/locales/sq.json    |   1 +
 app/javascript/mastodon/locales/th.json    |  14 +--
 app/javascript/mastodon/locales/tlh.json   |   1 +
 app/javascript/mastodon/locales/zh-TW.json |   2 +-
 config/i18n-tasks.yml                      |   1 +
 config/locales/activerecord.fil.yml        |   1 +
 config/locales/activerecord.ne.yml         |   1 +
 config/locales/activerecord.ry.yml         |   1 +
 config/locales/activerecord.tlh.yml        |   1 +
 config/locales/devise.fil.yml              |   1 +
 config/locales/devise.ne.yml               |   1 +
 config/locales/devise.ry.yml               |   1 +
 config/locales/devise.tlh.yml              |   1 +
 config/locales/doorkeeper.fil.yml          |   1 +
 config/locales/doorkeeper.ne.yml           |   1 +
 config/locales/doorkeeper.ry.yml           |   1 +
 config/locales/doorkeeper.sc.yml           |  15 +++
 config/locales/doorkeeper.tlh.yml          |   1 +
 config/locales/fil.yml                     |   1 +
 config/locales/fr-QC.yml                   |   1 +
 config/locales/fr.yml                      |   1 +
 config/locales/lt.yml                      |  26 ++++-
 config/locales/ne.yml                      |   1 +
 config/locales/ry.yml                      |   1 +
 config/locales/sc.yml                      | 113 +++++++++++++++++++++
 config/locales/simple_form.fil.yml         |   1 +
 config/locales/simple_form.lt.yml          |  35 ++++++-
 config/locales/simple_form.ne.yml          |   1 +
 config/locales/simple_form.ry.yml          |   1 +
 config/locales/simple_form.sc.yml          |  17 ++++
 config/locales/simple_form.tlh.yml         |   1 +
 config/locales/tlh.yml                     |   1 +
 43 files changed, 366 insertions(+), 19 deletions(-)
 create mode 100644 app/javascript/mastodon/locales/fil.json
 create mode 100644 app/javascript/mastodon/locales/ne.json
 create mode 100644 app/javascript/mastodon/locales/ry.json
 create mode 100644 app/javascript/mastodon/locales/tlh.json
 create mode 100644 config/locales/activerecord.fil.yml
 create mode 100644 config/locales/activerecord.ne.yml
 create mode 100644 config/locales/activerecord.ry.yml
 create mode 100644 config/locales/activerecord.tlh.yml
 create mode 100644 config/locales/devise.fil.yml
 create mode 100644 config/locales/devise.ne.yml
 create mode 100644 config/locales/devise.ry.yml
 create mode 100644 config/locales/devise.tlh.yml
 create mode 100644 config/locales/doorkeeper.fil.yml
 create mode 100644 config/locales/doorkeeper.ne.yml
 create mode 100644 config/locales/doorkeeper.ry.yml
 create mode 100644 config/locales/doorkeeper.tlh.yml
 create mode 100644 config/locales/fil.yml
 create mode 100644 config/locales/ne.yml
 create mode 100644 config/locales/ry.yml
 create mode 100644 config/locales/simple_form.fil.yml
 create mode 100644 config/locales/simple_form.ne.yml
 create mode 100644 config/locales/simple_form.ry.yml
 create mode 100644 config/locales/simple_form.tlh.yml
 create mode 100644 config/locales/tlh.yml

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index a652272fad..b2134551bf 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -499,6 +499,7 @@
   "report_notification.open": "Ubrir informe",
   "search.placeholder": "Buscar",
   "search.search_or_paste": "Buscar u apegar URL",
+  "search_popout.full_text_search_logged_out_message": "Nomás disponible iniciando la sesión.",
   "search_results.all": "Totz",
   "search_results.hashtags": "Etiquetas",
   "search_results.nothing_found": "No se podió trobar cosa pa estes termins de busqueda",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 87121b7c52..5ae49325f6 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -482,6 +482,7 @@
   "onboarding.follows.lead": "La teva línia de temps inici només està a les teves mans. Com més gent segueixis, més activa i interessant serà. Aquests perfils poden ser un bon punt d'inici—sempre pots acabar deixant de seguir-los!:",
   "onboarding.follows.title": "Personalitza la pantalla d'inci",
   "onboarding.profile.discoverable": "Fes el meu perfil descobrible",
+  "onboarding.profile.discoverable_hint": "En acceptar d'ésser descobert a Mastodon els teus missatges poden aparèixer dins les tendències i els resultats de cerques, i el teu perfil es pot suggerir a qui tingui interessos semblants als teus.",
   "onboarding.profile.display_name": "Nom que es mostrarà",
   "onboarding.profile.display_name_hint": "El teu nom complet o el teu malnom…",
   "onboarding.profile.lead": "Sempre ho pots completar més endavant a la configuració, on hi ha encara més opcions disponibles.",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index f7cd1b3305..0d26afef23 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -606,7 +606,7 @@
   "search.quick_action.status_search": "Publicaciones que coinciden con {x}",
   "search.search_or_paste": "Buscar o pegar URL",
   "search_popout.full_text_search_disabled_message": "No disponible en {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Solo disponible si inicias sesión.",
+  "search_popout.full_text_search_logged_out_message": "Sólo disponible al iniciar sesión.",
   "search_popout.language_code": "Código de idioma ISO",
   "search_popout.options": "Opciones de búsqueda",
   "search_popout.quick_actions": "Acciones rápidas",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6951d5cb0b..8e8930bfea 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "کارسازهای نظارت شده",
   "about.contact": "تماس:",
-  "about.disclaimer": "ماستودون نرم‌افزار آزاد و یک شرکت غیر انتفاعی آلمانی با مسئولیت محدود است.",
+  "about.disclaimer": "ماستودون نرم‌افزار آزاد و نشان تجاری یک شرکت غیر انتفاعی با مسئولیت محدود آلمانی است.",
   "about.domain_blocks.no_reason_available": "دلیلی موجود نیست",
   "about.domain_blocks.preamble": "ماستودون عموماً می‌گذارد محتوا را از از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.",
   "about.domain_blocks.silenced.explanation": "عموماً نمایه‌ها و محتوا از این کارساز را نمی‌بینید، مگر این که به طور خاص دنبالشان گشته یا با پی گیری، داوطلب دیدنشان شوید.",
@@ -21,6 +21,7 @@
   "account.blocked": "مسدود",
   "account.browse_more_on_origin_server": "مرور بیش‌تر روی نمایهٔ اصلی",
   "account.cancel_follow_request": "رد کردن درخواست پی‌گیری",
+  "account.copy": "رونوشت از پیوند به نمایه",
   "account.direct": "اشارهٔ خصوصی به ‪@{name}‬",
   "account.disable_notifications": "آگاه کردن من هنگام فرسته‌های ‎@{name} را متوقّف کن",
   "account.domain_blocked": "دامنه مسدود شد",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
   "conversation.with": "با {names}",
+  "copy_icon_button.copied": "در بریده‌دان رونوشت شد",
   "copypaste.copied": "رونوشت شد",
   "copypaste.copy_to_clipboard": "رونوشت به تخته‌گیره",
   "directory.federated": "از کارسازهای شناخته‌شده",
@@ -486,6 +488,8 @@
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
   "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
   "onboarding.profile.title": "تنظیم نمایه",
+  "onboarding.profile.upload_avatar": "بازگذاری تصویر نمایه",
+  "onboarding.profile.upload_header": "بارگذاری تصویر سردر نمایه",
   "onboarding.share.lead": "بگذارید افراد بدانند چگونه می‌توانند در ماستادون بیابندتان!",
   "onboarding.share.message": "من {username} روی #ماستودون هستم! مرا در {url} پی‌بگیرید",
   "onboarding.share.next_steps": "گام‌های ممکن بعدی:",
@@ -600,6 +604,7 @@
   "search.quick_action.status_search": "فرسته‌های جور با {x}",
   "search.search_or_paste": "جست‌وجو یا جایگذاری نشانی",
   "search_popout.full_text_search_disabled_message": "روی {domain} موجود نیست.",
+  "search_popout.full_text_search_logged_out_message": "تنها زمانی که وارد شده‌اید دردسترس است.",
   "search_popout.language_code": "کد زبان ایزو",
   "search_popout.options": "گزینه‌های جست‌وجو",
   "search_popout.quick_actions": "کنش‌های سریع",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/app/javascript/mastodon/locales/fil.json
@@ -0,0 +1 @@
+{}
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 46caf32b07..5b76cd67c5 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -302,8 +302,8 @@
   "hashtag.counter_by_accounts": "{count, plural, other {{counter} 명의 참여자}}",
   "hashtag.counter_by_uses": "{count, plural, other {{counter} 개의 게시물}}",
   "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
-  "hashtag.follow": "해시태그 팔로우",
-  "hashtag.unfollow": "해시태그 팔로우 해제",
+  "hashtag.follow": "팔로우",
+  "hashtag.unfollow": "팔로우 해제",
   "hashtags.and_other": "…그리고 {count, plural,other {#개 더}}",
   "home.actions.go_to_explore": "무엇이 유행인지 보기",
   "home.actions.go_to_suggestions": "팔로우할 사람 찾기",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index a976d5907f..e588b85385 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -180,29 +180,71 @@
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
   "confirmations.mute.explanation": "Tai paslėps jų įrašus ir įrašus, kuriuose jie menėmi, tačiau jie vis tiek galės matyti tavo įrašus ir sekti.",
+  "confirmations.mute.message": "Ar tikrai norite nutildyti {name}?",
+  "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
   "confirmations.reply.confirm": "Atsakyti",
   "confirmations.reply.message": "Atsakant dabar, bus perrašyta metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.unfollow.confirm": "Nebesekti",
+  "confirmations.unfollow.message": "Ar tikrai norite atsisakyti sekimo {name}?",
+  "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
   "conversation.with": "Su {names}",
   "copy_icon_button.copied": "Nukopijuota į iškarpinę",
   "copypaste.copied": "Nukopijuota",
   "copypaste.copy_to_clipboard": "Kopijuoti į iškarpinę",
+  "directory.local": "Iš {domain} tik",
+  "directory.new_arrivals": "Naujos prekės",
+  "directory.recently_active": "Neseniai aktyvus",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
+  "disabled_account_banner.text": "Jūsų paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "dismissable_banner.dismiss": "Atmesti",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
+  "dismissable_banner.explore_statuses": "Tai įrašai iš viso socialinio tinklo, kurie šiandien sulaukia vis daugiau dėmesio. Naujesni įrašai, turintys daugiau boosts ir mėgstamiausių įrašų, yra vertinami aukščiau.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Štai kaip tai atrodys:",
+  "emoji_button.activity": "Veikla",
+  "emoji_button.clear": "Išvalyti",
+  "emoji_button.custom": "Pasirinktinis",
+  "emoji_button.flags": "Vėliavos",
+  "emoji_button.food": "Maistas ir Gėrimai",
+  "emoji_button.label": "Įterpti veidelius",
+  "emoji_button.nature": "Gamta",
+  "emoji_button.not_found": "Nerasta jokių tinkamų jaustukų",
   "emoji_button.objects": "Objektai",
+  "emoji_button.people": "Žmonės",
+  "emoji_button.recent": "Dažniausiai naudojama",
   "emoji_button.search": "Paieška...",
+  "emoji_button.search_results": "Paieškos rezultatai",
+  "emoji_button.symbols": "Simboliai",
+  "emoji_button.travel": "Kelionės ir Vietos",
   "empty_column.account_hides_collections": "Šis naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą",
+  "empty_column.account_suspended": "Paskyra sustabdyta",
   "empty_column.account_timeline": "No toots here!",
+  "empty_column.account_unavailable": "Profilis neprieinamas",
+  "empty_column.blocks": "Dar neužblokavote nė vieno naudotojo.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "Vietinė laiko juosta yra tuščia. Parašykite ką nors viešai, kad pradėtumėte veikti!",
+  "empty_column.direct": "Dar neturite jokių privačių paminėjimų. Kai išsiųsite arba gausite tokį pranešimą, jis bus rodomas čia.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.favourited_statuses": "Dar neturite mėgstamiausių įrašų. Kai vieną iš jų pamėgsite, jis bus rodomas čia.",
+  "empty_column.follow_requests": "Dar neturite jokių sekimo užklausų. Kai gausite tokį prašymą, jis bus rodomas čia.",
+  "empty_column.followed_tags": "Dar nesekėte jokių grotažymių. Kai tai padarysite, jie bus rodomi čia.",
   "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "Dar neturite jokių sąrašų. Kai jį sukursite, jis bus rodomas čia.",
+  "empty_column.mutes": "Dar nesate nutildę nė vieno naudotojo.",
+  "empty_column.notifications": "Dar neturite jokių pranešimų. Kai kiti žmonės su jumis bendraus, matysite tai čia.",
+  "empty_column.public": "Čia nieko nėra! Parašykite ką nors viešai arba rankiniu būdu sekite naudotojus iš kitų serverių, kad jį užpildytumėte",
+  "error.unexpected_crash.explanation": "Dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos šis puslapis negalėjo būti rodomas teisingai.",
+  "error.unexpected_crash.explanation_addons": "Šį puslapį nepavyko teisingai parodyti. Šią klaidą greičiausiai sukėlė naršyklės priedas arba automatinio vertimo įrankiai.",
+  "error.unexpected_crash.next_steps": "Pabandykite atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
+  "error.unexpected_crash.next_steps_addons": "Pabandykite juos išjungti ir atnaujinti puslapį. Jei tai nepadeda, galbūt vis dar galėsite naudotis \"Mastodon\" naudodami kitą naršyklę arba vietinę programėlę.",
+  "errors.unexpected_crash.report_issue": "Pranešti apie triktį",
+  "explore.search_results": "Paieškos rezultatai",
+  "explore.suggested_follows": "Žmonės",
   "explore.title": "Naršyti",
   "explore.trending_links": "Naujienos",
   "explore.trending_statuses": "Įrašai",
@@ -304,7 +346,13 @@
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
   "mute_modal.duration": "Trukmė",
   "mute_modal.hide_notifications": "Slėpti šio naudotojo pranešimus?",
+  "mute_modal.indefinite": "Neribotas",
+  "navigation_bar.about": "Apie",
+  "navigation_bar.advanced_interface": "Atidarykite išplėstinę žiniatinklio sąsają",
+  "navigation_bar.blocks": "Užblokuoti naudotojai",
+  "navigation_bar.bookmarks": "Žymės",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Redaguoti profilį",
@@ -372,6 +420,7 @@
   "notifications.permission_required": "Darbalaukio pranešimai nepasiekiami, nes nesuteiktas reikiamas leidimas.",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
   "notifications_permission_banner.how_to_control": "Jei norite gauti pranešimus, kai \"Mastodon\" nėra atidarytas, įjunkite darbalaukio pranešimus. Įjungę darbalaukio pranešimus, galite tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudodamiesi pirmiau esančiu mygtuku {icon}.",
+  "notifications_permission_banner.title": "Niekada nieko nepraleiskite",
   "onboarding.action.back": "Gražinkite mane atgal",
   "onboarding.actions.back": "Gražinkite mane atgal",
   "onboarding.actions.go_to_explore": "See what's trending",
@@ -394,8 +443,10 @@
   "onboarding.share.lead": "Praneškite žmonėms, kaip jus rasti \"Mastodon\"!",
   "onboarding.share.message": "Aš {username} #Mastodon! Ateik sekti manęs adresu {url}",
   "onboarding.share.next_steps": "Galimi kiti žingsniai:",
+  "onboarding.share.title": "Bendrinkite savo profilį",
   "onboarding.start.lead": "Dabar esi Mastodon dalis – unikalios decentralizuotos socialinės žiniasklaidos platformos, kurioje tu, o ne algoritmas, pats nustatai savo patirtį. Pradėkime tavo kelionę šioje naujoje socialinėje erdvėje:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Jums pavyko!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
@@ -404,23 +455,46 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "picture_in_picture.restore": "Padėkite jį atgal",
+  "poll.closed": "Uždaryti",
+  "poll.refresh": "Atnaujinti",
+  "poll.reveal": "Peržiūrėti rezultatus",
   "poll.vote": "Balsuoti",
   "poll.voted": "Tu balsavai už šį atsakymą",
   "poll.votes": "{votes, plural, one {# balsas} few {# balsai} many {# balso} other {# balsų}}",
+  "poll_button.add_poll": "Pridėti apklausą",
+  "poll_button.remove_poll": "Šalinti apklausą",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Post to followers only",
   "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visiems matomas",
+  "privacy.public.short": "Viešas",
   "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
   "privacy.unlisted.short": "Neįtrauktas į sąrašą",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
+  "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
+  "refresh": "Atnaujinti",
+  "regeneration_indicator.label": "Kraunasi…",
+  "relative_time.full.just_now": "ką tik",
   "relative_time.hours": "{number} val.",
   "relative_time.just_now": "dabar",
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "reply_indicator.cancel": "Atšaukti",
+  "report.block": "Blokuoti",
+  "report.categories.legal": "Legalus",
+  "report.categories.other": "Kita",
+  "report.categories.spam": "Šlamštas",
+  "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
+  "report.category.subtitle": "Pasirinkite tinkamiausią variantą",
+  "report.category.title_account": "profilis",
+  "report.category.title_status": "įrašas",
+  "report.close": "Atlikta",
+  "report.comment.title": "Ar yra dar kas nors, ką, jūsų manymu, turėtume žinoti?",
   "report.mute_explanation": "Jų įrašų nematysi. Jie vis tiek gali tave sekti ir matyti įrašus, bet nežinos, kad jie nutildyti.",
   "report.next": "Tęsti",
   "report.placeholder": "Papildomi komentarai",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/app/javascript/mastodon/locales/ne.json
@@ -0,0 +1 @@
+{}
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/app/javascript/mastodon/locales/ry.json
@@ -0,0 +1 @@
+{}
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 59c834b950..7f29525e73 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -14,6 +14,7 @@
   "account.badges.group": "Grupu",
   "account.block": "Bloca @{name}",
   "account.block_domain": "Bloca su domìniu {domain}",
+  "account.block_short": "Bloca",
   "account.blocked": "Blocadu",
   "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
   "account.cancel_follow_request": "Withdraw follow request",
@@ -31,17 +32,20 @@
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
   "account.follows_you": "Ti sighit",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
+  "account.in_memoriam": "In memoriam.",
   "account.joined_short": "At aderidu",
   "account.link_verified_on": "Sa propiedade de custu ligòngiu est istada controllada su {date}",
   "account.locked_info": "S'istadu de riservadesa de custu contu est istadu cunfiguradu comente blocadu. Sa persone chi tenet sa propiedade revisionat a manu chie dda podet sighire.",
   "account.media": "Cuntenutu multimediale",
   "account.mention": "Mèntova a @{name}",
   "account.mute": "Pone a @{name} a sa muda",
+  "account.mute_short": "A sa muda",
   "account.muted": "A sa muda",
   "account.posts": "Publicatziones",
   "account.posts_with_replies": "Publicatziones e rispostas",
   "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.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
@@ -106,6 +110,7 @@
   "compose_form.publish": "Pùblica",
   "compose_form.publish_form": "Publish",
   "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Sarva is modìficas",
   "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
   "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
   "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
@@ -122,6 +127,7 @@
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
   "confirmations.domain_block.confirm": "Bloca totu su domìniu",
   "confirmations.domain_block.message": "Boles de seguru, ma a beru a beru, blocare {domain}? In sa parte manna de is casos, pagos blocos o silentziamentos de persones sunt sufitzientes e preferìbiles. No as a bìdere cuntenutos dae custu domìniu in peruna lìnia de tempus pùblica o in is notìficas tuas. Sa gente chi ti sighit dae cussu domìniu at a èssere bogada.",
+  "confirmations.edit.confirm": "Modìfica",
   "confirmations.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
   "confirmations.mute.confirm": "A sa muda",
@@ -140,6 +146,7 @@
   "directory.local": "Isceti dae {domain}",
   "directory.new_arrivals": "Arribos noos",
   "directory.recently_active": "Cun atividade dae pagu",
+  "disabled_account_banner.account_settings": "Cunfiguratziones de su contu",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.",
@@ -180,13 +187,19 @@
   "errors.unexpected_crash.copy_stacktrace": "Còpia stacktrace in punta de billete",
   "errors.unexpected_crash.report_issue": "Sinnala unu problema",
   "explore.search_results": "Resurtados de sa chirca",
+  "explore.suggested_follows": "Gente",
+  "explore.trending_statuses": "Publicatziones",
+  "explore.trending_tags": "Etichetas",
   "filter_modal.select_filter.expired": "iscadidu",
+  "firehose.all": "Totus",
   "follow_request.authorize": "Autoriza",
   "follow_request.reject": "Refuda",
   "follow_requests.unlocked_explanation": "Fintzas si su contu tuo no est blocadu, su personale de {domain} at pensadu chi forsis bolias revisionare a manu is rechestas de custos contos.",
   "footer.about": "Informatziones",
   "footer.invite": "Invita gente",
+  "footer.keyboard_shortcuts": "Incurtzaduras de tecladu",
   "footer.privacy_policy": "Polìtica de riservadesa",
+  "footer.status": "Istadu",
   "generic.saved": "Sarvadu",
   "getting_started.heading": "Comente cumintzare",
   "hashtag.column_header.tag_mode.all": "e {additional}",
@@ -263,6 +276,7 @@
   "lists.search": "Chirca intre sa gente chi ses sighende",
   "lists.subheading": "Is listas tuas",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
+  "loading_indicator.label": "Carrighende…",
   "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Boles cuare is notìficas de custa persone?",
@@ -288,6 +302,7 @@
   "navigation_bar.search": "Chirca",
   "navigation_bar.security": "Seguresa",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.favourite": "{name} at marcadu comente a preferidu s'istadu tuo",
   "notification.follow": "{name} ti sighit",
   "notification.follow_request": "{name} at dimandadu de ti sighire",
   "notification.mention": "{name} t'at mentovadu",
@@ -328,6 +343,8 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Nòmine visìbile",
+  "onboarding.profile.note": "Biografia",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
@@ -344,6 +361,7 @@
   "poll.total_votes": "{count, plural, one {# votu} other {# votos}}",
   "poll.vote": "Vota",
   "poll.voted": "As votadu custa risposta",
+  "poll.votes": "{votes, plural, one {# votu} other {# votos}}",
   "poll_button.add_poll": "Agiunghe unu sondàgiu",
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
@@ -353,25 +371,41 @@
   "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pùblicu",
   "privacy.unlisted.short": "Esclùidu de sa lista",
+  "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
   "regeneration_indicator.sublabel": "Preparende sa lìnia de tempus printzipale tua.",
   "relative_time.days": "{number} dies a oe",
+  "relative_time.full.just_now": "immoe etotu",
   "relative_time.hours": "{number} oras a immoe",
   "relative_time.just_now": "immoe",
   "relative_time.minutes": "{number} minutos a immoe",
   "relative_time.seconds": "{number} segundos a immoe",
   "relative_time.today": "oe",
   "reply_indicator.cancel": "Annulla",
+  "report.block": "Bloca",
+  "report.categories.other": "Àteru",
+  "report.category.title_account": "profilu",
+  "report.category.title_status": "publicatzione",
+  "report.close": "Fatu",
   "report.forward": "Torra a imbiare a {target}",
   "report.forward_hint": "Custu contu est de un'àteru serbidore. Ddi boles imbiare puru una còpia anònima de custu informe?",
+  "report.mute": "A sa muda",
+  "report.next": "Imbeniente",
   "report.placeholder": "Cummentos additzionales",
   "report.submit": "Imbia",
   "report.target": "Informende de {target}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.categories.other": "Àteru",
   "search.placeholder": "Chirca",
+  "search_popout.user": "utente",
+  "search_results.accounts": "Profilos",
+  "search_results.all": "Totus",
   "search_results.hashtags": "Etichetas",
   "search_results.statuses": "Publicatziones",
+  "server_banner.administered_by": "Amministradu dae:",
+  "server_banner.learn_more": "Àteras informatziones",
+  "server_banner.server_stats": "Istatìsticas de su serbidore:",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_account": "Aberi s'interfache de moderatzione pro @{name}",
   "status.admin_status": "Aberi custa publicatzione in s'interfache de moderatzione",
@@ -382,6 +416,7 @@
   "status.copy": "Còpia su ligòngiu a sa publicatzione tua",
   "status.delete": "Cantzella",
   "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
+  "status.edit": "Modìfica",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Afissa",
   "status.filtered": "Filtradu",
@@ -413,6 +448,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
   "status.unpin": "Boga dae pitzu de su profilu",
+  "subscribed_languages.save": "Sarva is modìficas",
   "tabs_bar.home": "Printzipale",
   "tabs_bar.notifications": "Notìficas",
   "time_remaining.days": "{number, plural, one {abarrat # die} other {abarrant # dies}}",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 9115695d87..c4ce6f8cfd 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -391,6 +391,7 @@
   "lists.search": "Vyhľadávaj medzi užívateľmi, ktorých sleduješ",
   "lists.subheading": "Tvoje zoznamy",
   "load_pending": "{count, plural, one {# nová položka} other {# nových položiek}}",
+  "loading_indicator.label": "Načítam…",
   "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
   "moved_to_account_banner.text": "Vaše konto {disabledAccount} je momentálne zablokované, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.duration": "Trvanie",
@@ -480,6 +481,14 @@
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "Urob môj profil objaviteľný",
+  "onboarding.profile.display_name": "Zobrazované meno",
+  "onboarding.profile.display_name_hint": "Tvoje plné meno, alebo tvoje zábavné meno…",
+  "onboarding.profile.lead": "Toto môžeš vždy dokončiť neskôr v nastaveniach, kde je dostupných ešte viac volieb na prispôsobenie.",
+  "onboarding.profile.note": "O tebe",
+  "onboarding.profile.note_hint": "Môžeš @spomenúť iných ľudí, alebo #haštagy…",
+  "onboarding.profile.save_and_continue": "Ulož a pokračuj",
+  "onboarding.profile.upload_avatar": "Nahraj profilový obrázok",
+  "onboarding.profile.upload_header": "Nahraj profilové záhlavie",
   "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
   "onboarding.share.message": "Na Mastodone som {username}. Príď ma nasledovať na {url}",
   "onboarding.share.next_steps": "Ďalšie možné kroky:",
@@ -594,6 +603,7 @@
   "search.quick_action.status_search": "Príspevky zodpovedajúce {x}",
   "search.search_or_paste": "Hľadaj, alebo vlož URL adresu",
   "search_popout.full_text_search_disabled_message": "Nie je k dispozícii v doméne {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dostupné iba keď si prihlásený/á.",
   "search_popout.language_code": "ISO kód jazyka",
   "search_popout.options": "Možnosti vyhľadávania",
   "search_popout.quick_actions": "Rýchle akcie",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 86042a91e5..710224e1cb 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -606,6 +606,7 @@
   "search.quick_action.status_search": "Postime me përputhje me {x}",
   "search.search_or_paste": "Kërkoni, ose hidhni një URL",
   "search_popout.full_text_search_disabled_message": "Jo i passhëm në {domain}.",
+  "search_popout.full_text_search_logged_out_message": "E përdorshme vetëm kur keni bërë hyrjen në llogari.",
   "search_popout.language_code": "Kod ISO gjuhe",
   "search_popout.options": "Mundësi kërkimi",
   "search_popout.quick_actions": "Veprime të shpejta",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index c020dc3625..0be9bf6d7a 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -60,7 +60,7 @@
   "account.report": "รายงาน @{name}",
   "account.requested": "กำลังรอการอนุมัติ คลิกเพื่อยกเลิกคำขอติดตาม",
   "account.requested_follow": "{name} ได้ขอติดตามคุณ",
-  "account.share": "แบ่งปันโปรไฟล์ของ @{name}",
+  "account.share": "แชร์โปรไฟล์ของ @{name}",
   "account.show_reblogs": "แสดงการดันจาก @{name}",
   "account.statuses_counter": "{count, plural, other {{counter} โพสต์}}",
   "account.unblock": "เลิกปิดกั้น @{name}",
@@ -319,7 +319,7 @@
   "home.show_announcements": "แสดงประกาศ",
   "interaction_modal.description.favourite": "ด้วยบัญชีใน Mastodon คุณสามารถชื่นชอบโพสต์นี้เพื่อแจ้งให้ผู้สร้างทราบว่าคุณชื่นชมโพสต์และบันทึกโพสต์ไว้สำหรับภายหลัง",
   "interaction_modal.description.follow": "ด้วยบัญชีใน Mastodon คุณสามารถติดตาม {name} เพื่อรับโพสต์ของเขาในฟีดหน้าแรกของคุณ",
-  "interaction_modal.description.reblog": "ด้วยบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแบ่งปันโพสต์กับผู้ติดตามของคุณเอง",
+  "interaction_modal.description.reblog": "ด้วยบัญชีใน Mastodon คุณสามารถดันโพสต์นี้เพื่อแชร์โพสต์กับผู้ติดตามของคุณเอง",
   "interaction_modal.description.reply": "ด้วยบัญชีใน Mastodon คุณสามารถตอบกลับโพสต์นี้",
   "interaction_modal.login.action": "นำฉันกลับบ้าน",
   "interaction_modal.login.prompt": "โดเมนของเซิร์ฟเวอร์บ้านของคุณ เช่น mastodon.social",
@@ -495,7 +495,7 @@
   "onboarding.share.lead": "แจ้งให้ผู้คนทราบวิธีที่เขาสามารถค้นหาคุณใน Mastodon!",
   "onboarding.share.message": "ฉันคือ {username} ใน #Mastodon! มาติดตามฉันที่ {url}",
   "onboarding.share.next_steps": "ขั้นตอนถัดไปที่เป็นไปได้:",
-  "onboarding.share.title": "แบ่งปันโปรไฟล์ของคุณ",
+  "onboarding.share.title": "แชร์โปรไฟล์ของคุณ",
   "onboarding.start.lead": "ตอนนี้คุณเป็นส่วนหนึ่งของ Mastodon แพลตฟอร์มสื่อสังคมที่มีเอกลักษณ์เฉพาะตัว กระจายศูนย์ ที่ซึ่งคุณ—ไม่ใช่อัลกอริทึม—เรียบเรียงประสบการณ์ของคุณเอง มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:",
   "onboarding.start.skip": "ไม่ต้องการความช่วยเหลือในการเริ่มต้นใช้งาน?",
   "onboarding.start.title": "คุณทำสำเร็จแล้ว!",
@@ -506,7 +506,7 @@
   "onboarding.steps.setup_profile.body": "เพิ่มการโต้ตอบของคุณโดยการมีโปรไฟล์ที่ครอบคลุม",
   "onboarding.steps.setup_profile.title": "ปรับแต่งโปรไฟล์ของคุณ",
   "onboarding.steps.share_profile.body": "แจ้งให้เพื่อน ๆ ของคุณทราบวิธีค้นหาคุณใน Mastodon",
-  "onboarding.steps.share_profile.title": "แบ่งปันโปรไฟล์ Mastodon ของคุณ",
+  "onboarding.steps.share_profile.title": "แชร์โปรไฟล์ Mastodon ของคุณ",
   "onboarding.tips.2fa": "<strong>คุณทราบหรือไม่?</strong> คุณสามารถรักษาความปลอดภัยบัญชีของคุณได้โดยตั้งค่าการรับรองความถูกต้องด้วยสองปัจจัยในการตั้งค่าบัญชีของคุณ การรับรองความถูกต้องด้วยสองปัจจัยทำงานร่วมกับแอป TOTP ใด ๆ ที่คุณเลือก ไม่จำเป็นต้องมีหมายเลขโทรศัพท์!",
   "onboarding.tips.accounts_from_other_servers": "<strong>คุณทราบหรือไม่?</strong> เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ โปรไฟล์บางส่วนที่คุณเจอจะได้รับการโฮสต์ในเซิร์ฟเวอร์อื่น ๆ ที่ไม่ใช่ของคุณ และคุณยังสามารถโต้ตอบกับเขาได้อย่างไร้รอยต่อ! เซิร์ฟเวอร์ของเขาอยู่ในครึ่งหลังของชื่อผู้ใช้ของเขา!",
   "onboarding.tips.migration": "<strong>คุณทราบหรือไม่?</strong> หากคุณรู้สึกว่า {domain} ไม่ใช่ตัวเลือกเซิร์ฟเวอร์ที่ยอดเยี่ยมสำหรับคุณในอนาคต คุณสามารถย้ายไปยังเซิร์ฟเวอร์ Mastodon อื่นได้โดยไม่สูญเสียผู้ติดตามของคุณ คุณยังสามารถโฮสต์เซิร์ฟเวอร์ของคุณเอง!",
@@ -558,7 +558,7 @@
   "report.categories.spam": "สแปม",
   "report.categories.violation": "เนื้อหาละเมิดกฎของเซิร์ฟเวอร์จำนวนหนึ่งหรือมากกว่า",
   "report.category.subtitle": "เลือกที่ตรงกันที่สุด",
-  "report.category.title": "บอกเราถึงสิ่งที่กำลังเกิดขึ้นกับ {type} นี้",
+  "report.category.title": "บอกเราถึงสิ่งที่กำลังเกิดขึ้นกับ{type}นี้",
   "report.category.title_account": "โปรไฟล์",
   "report.category.title_status": "โพสต์",
   "report.close": "เสร็จสิ้น",
@@ -629,7 +629,7 @@
   "sign_in_banner.create_account": "สร้างบัญชี",
   "sign_in_banner.sign_in": "เข้าสู่ระบบ",
   "sign_in_banner.sso_redirect": "เข้าสู่ระบบหรือลงทะเบียน",
-  "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แบ่งปัน และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
+  "sign_in_banner.text": "เข้าสู่ระบบเพื่อติดตามโปรไฟล์หรือแฮชแท็ก ชื่นชอบ แชร์ และตอบกลับโพสต์ คุณยังสามารถโต้ตอบจากบัญชีของคุณในเซิร์ฟเวอร์อื่น",
   "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
   "status.admin_domain": "เปิดส่วนติดต่อการควบคุมสำหรับ {domain}",
   "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
@@ -675,7 +675,7 @@
   "status.replyAll": "ตอบกลับกระทู้",
   "status.report": "รายงาน @{name}",
   "status.sensitive_warning": "เนื้อหาที่ละเอียดอ่อน",
-  "status.share": "แบ่งปัน",
+  "status.share": "แชร์",
   "status.show_filter_reason": "แสดงต่อไป",
   "status.show_less": "แสดงน้อยลง",
   "status.show_less_all": "แสดงน้อยลงทั้งหมด",
diff --git a/app/javascript/mastodon/locales/tlh.json b/app/javascript/mastodon/locales/tlh.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/app/javascript/mastodon/locales/tlh.json
@@ -0,0 +1 @@
+{}
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 7ba66ae8c3..e6dd008bf2 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -376,7 +376,7 @@
   "lightbox.previous": "上一步",
   "limited_account_hint.action": "一律顯示個人檔案",
   "limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
-  "link_preview.author": "由 {name} 提供",
+  "link_preview.author": "來自 {name}",
   "lists.account.add": "新增至列表",
   "lists.account.remove": "自列表中移除",
   "lists.delete": "刪除列表",
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index e2ea4153c9..8463d4297d 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -70,6 +70,7 @@ ignore_unused:
   - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
   - 'mail_subscriptions.unsubscribe.emails.*'
   - 'preferences.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
+  - 'edit_profile.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
 
 ignore_inconsistent_interpolations:
   - '*.one'
diff --git a/config/locales/activerecord.fil.yml b/config/locales/activerecord.fil.yml
new file mode 100644
index 0000000000..4084bf2f90
--- /dev/null
+++ b/config/locales/activerecord.fil.yml
@@ -0,0 +1 @@
+fil:
diff --git a/config/locales/activerecord.ne.yml b/config/locales/activerecord.ne.yml
new file mode 100644
index 0000000000..db03c5186b
--- /dev/null
+++ b/config/locales/activerecord.ne.yml
@@ -0,0 +1 @@
+ne:
diff --git a/config/locales/activerecord.ry.yml b/config/locales/activerecord.ry.yml
new file mode 100644
index 0000000000..6fe57b65cd
--- /dev/null
+++ b/config/locales/activerecord.ry.yml
@@ -0,0 +1 @@
+ry:
diff --git a/config/locales/activerecord.tlh.yml b/config/locales/activerecord.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/config/locales/activerecord.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/config/locales/devise.fil.yml b/config/locales/devise.fil.yml
new file mode 100644
index 0000000000..4084bf2f90
--- /dev/null
+++ b/config/locales/devise.fil.yml
@@ -0,0 +1 @@
+fil:
diff --git a/config/locales/devise.ne.yml b/config/locales/devise.ne.yml
new file mode 100644
index 0000000000..db03c5186b
--- /dev/null
+++ b/config/locales/devise.ne.yml
@@ -0,0 +1 @@
+ne:
diff --git a/config/locales/devise.ry.yml b/config/locales/devise.ry.yml
new file mode 100644
index 0000000000..6fe57b65cd
--- /dev/null
+++ b/config/locales/devise.ry.yml
@@ -0,0 +1 @@
+ry:
diff --git a/config/locales/devise.tlh.yml b/config/locales/devise.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/config/locales/devise.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/config/locales/doorkeeper.fil.yml b/config/locales/doorkeeper.fil.yml
new file mode 100644
index 0000000000..4084bf2f90
--- /dev/null
+++ b/config/locales/doorkeeper.fil.yml
@@ -0,0 +1 @@
+fil:
diff --git a/config/locales/doorkeeper.ne.yml b/config/locales/doorkeeper.ne.yml
new file mode 100644
index 0000000000..db03c5186b
--- /dev/null
+++ b/config/locales/doorkeeper.ne.yml
@@ -0,0 +1 @@
+ne:
diff --git a/config/locales/doorkeeper.ry.yml b/config/locales/doorkeeper.ry.yml
new file mode 100644
index 0000000000..6fe57b65cd
--- /dev/null
+++ b/config/locales/doorkeeper.ry.yml
@@ -0,0 +1 @@
+ry:
diff --git a/config/locales/doorkeeper.sc.yml b/config/locales/doorkeeper.sc.yml
index 1f1d38f3a9..297d6bd8f0 100644
--- a/config/locales/doorkeeper.sc.yml
+++ b/config/locales/doorkeeper.sc.yml
@@ -69,6 +69,7 @@ sc:
       confirmations:
         revoke: Seguru?
       index:
+        scopes: Permissos
         title: Is aplicatziones autorizadas tuas
     errors:
       messages:
@@ -104,6 +105,20 @@ sc:
       authorized_applications:
         destroy:
           notice: Aplicatzione revocada.
+    grouped_scopes:
+      title:
+        accounts: Contos
+        bookmarks: Sinnalibros
+        conversations: Arresonadas
+        filters: Filtros
+        follows: Sighende
+        lists: Listas
+        media: Allegados multimediales
+        notifications: Notìficas
+        push: Notìficas push
+        reports: Informes
+        search: Chirca
+        statuses: Publicatziones
     layouts:
       admin:
         nav:
diff --git a/config/locales/doorkeeper.tlh.yml b/config/locales/doorkeeper.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/config/locales/doorkeeper.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/config/locales/fil.yml b/config/locales/fil.yml
new file mode 100644
index 0000000000..4084bf2f90
--- /dev/null
+++ b/config/locales/fil.yml
@@ -0,0 +1 @@
+fil:
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
index 3aba8713f6..00a59463cd 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@@ -611,6 +611,7 @@ fr-QC:
       created_at: Signalé
       delete_and_resolve: Supprimer les messages
       forwarded: Transféré
+      forwarded_replies_explanation: Ce rapport provient d'un utilisateur sur une autre instance et concerne du contenu non-local. Il vous a été transmis car le contenu signalé est en réponse à l'un de vos utilisateurs.
       forwarded_to: Transféré à %{domain}
       mark_as_resolved: Marquer comme résolu
       mark_as_sensitive: Marquer comme sensible
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a69a5b535d..0a6601bbc1 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -611,6 +611,7 @@ fr:
       created_at: Signalé
       delete_and_resolve: Supprimer les messages
       forwarded: Transféré
+      forwarded_replies_explanation: Ce rapport provient d'un utilisateur sur une autre instance et concerne du contenu non-local. Il vous a été transmis car le contenu signalé est en réponse à l'un de vos utilisateurs.
       forwarded_to: Transféré à %{domain}
       mark_as_resolved: Marquer comme résolu
       mark_as_sensitive: Marquer comme sensible
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1111277494..b1d8772b6b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -37,10 +37,12 @@ lt:
     accounts:
       add_email_domain_block: Blokuoti el. pašto domeną
       approve: Patvirtinti
+      approved_msg: Sėkmingai patvirtinta %{username} registracijos paraiška
       are_you_sure: Ar esi įsitikinęs (-usi)?
       avatar: Avataras
       by_domain: Domenas
       change_email:
+        changed_msg: El. paštas sėkmingai pakeistas!
         current_email: Dabartinis el paštas
         label: Pakeisti el pašto adresą
         new_email: Naujas el pašto adresas
@@ -466,6 +468,8 @@ lt:
     prev: Ankstesnis
   preferences:
     other: Kita
+  privacy:
+    hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
   remote_follow:
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
   scheduled_statuses:
@@ -515,6 +519,11 @@ lt:
       public_long: Visi gali matyti
       unlisted: Neįtrauktas į sąrašus
       unlisted_long: Matyti gali visi, tačiau nėra įtraukti į viešąsias laiko skales
+  statuses_cleanup:
+    enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
+    keep_polls_hint: Neištrina jokių tavo apklausų
+    keep_self_bookmark: Laikyti įrašus, kuriuos pažymėjai
+    keep_self_bookmark_hint: Neištrina tavo pačių įrašų, jei esi juos pažymėjęs (-usi)
   stream_entries:
     sensitive_content: Jautrus turinys
   themes:
@@ -551,22 +560,31 @@ lt:
       explanation: Štai keletas patarimų, kaip pradėti
       final_action: Pradėti kelti įrašus
       final_step: 'Pradėk skelbti! Net jei ir neturi sekėjų, tavo viešus įrašus gali matyti kiti, pavyzdžiui, vietinėje laiko skalėje arba saitažodžiuose. Galbūt norėsi prisistatyti saitažodyje #introductions.'
-      full_handle: Jūsų pilnas slapyvardis
-      full_handle_hint: Štai ką jūs sakytumėte savo draugams, kad jie galėtų jums siųsti žinutes arba just sekti iš kitų serverių.
+      full_handle: Tavo pilnas slapyvardis
+      full_handle_hint: Štai ką pasakytum savo draugams, kad jie galėtų parašyti arba sekti tave iš kito serverio.
       subject: Sveiki atvykę į Mastodon
       title: Sveiki atvykę, %{name}!
   users:
-    follow_limit_reached: Negalite sekti daugiau nei %{limit} žmonių
+    follow_limit_reached: Negali sekti daugiau nei %{limit} žmonių
+    go_to_sso_account_settings: Eik į savo tapatybės teikėjo paskyros nustatymus
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
     otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
-    seamless_external_login: Jūs esate prisijungę per išorini įrenginį, todėl slaptąžodis ir el pašto nustatymai neprieinami.
+    seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
+    extra_instructions_html: <strong>Patarimas:</strong> nuoroda tavo svetainėje gali būti nematoma. Svarbi dalis – tai, kas <code>rel="me"</code> neleidžia apsimesti interneto svetainėse, kuriose yra naudotojų sukurto turinio. Vietoj to gali naudoti net <code>nuorodą</code> puslapio antraštėje esančią žymę <code>a</code>, tačiau HTML turi būti pasiekiamas nevykdant JavaScript.
     hint_html: "<strong>Savo tapatybės patvirtinimas Mastodon skirtas visiems.</strong> Remiantis atviraisiais žiniatinklio standartais, dabar ir visam laikui nemokamas. Viskas, ko tau reikia, yra asmeninė svetainė, pagal kurią žmonės tave atpažįsta. Kai iš savo profilio pateiksi nuorodą į šią svetainę, patikrinsime, ar svetainėje yra nuoroda į tavo profilį, ir parodysime vizualinį indikatorių."
+    instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke „Redaguoti profilį“ įrašyk savo svetainės adresą ir išsaugok pakeitimus.
     verification: Patvirtinimas
     verified_links: Tavo patikrintos nuorodos
   webauthn_credentials:
     create:
       error: Kilo problema pridedant saugumo raktą. Bandyk dar kartą.
+      success: Tavo saugumo raktas buvo sėkmingai pridėtas.
+    delete_confirmation: Ar tikrai nori ištrinti šį saugumo raktą?
+    description_html: Jei įjungsi <strong>saugumo rakto tapatybės nustatymą</strong>, prisijungiant reikės naudoti vieną iš savo saugumo raktų.
+    destroy:
+      error: Kilo problema ištrinant saugumo raktą. Bandyk dar kartą.
+      success: Tavo saugumo raktas buvo sėkmingai ištrintas.
     nickname_hint: Įvesk naujojo saugumo rakto slapyvardį
     not_enabled: Dar neįjungei WebAuthn
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
new file mode 100644
index 0000000000..db03c5186b
--- /dev/null
+++ b/config/locales/ne.yml
@@ -0,0 +1 @@
+ne:
diff --git a/config/locales/ry.yml b/config/locales/ry.yml
new file mode 100644
index 0000000000..6fe57b65cd
--- /dev/null
+++ b/config/locales/ry.yml
@@ -0,0 +1 @@
+ry:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index fa7603f2b1..d92b64783a 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -5,6 +5,7 @@ sc:
     contact_missing: No cunfiguradu
     contact_unavailable: No a disponimentu
     hosted_on: Mastodon allogiadu in %{domain}
+    title: Informatziones
   accounts:
     follow: Sighi
     followers:
@@ -45,6 +46,7 @@ sc:
       confirm: Cunfirma
       confirmed: Cunfirmadu
       confirming: Cunfirmende
+      custom: Personalizadu
       delete: Cantzella datos
       deleted: Cantzelladu
       demote: Degrada
@@ -81,7 +83,9 @@ sc:
       moderation:
         active: Ativu
         all: Totus
+        disabled: Disativadu
         pending: De imbiare
+        silenced: Limitadu
         suspended: Suspèndidu
         title: Moderatzione
       moderation_notes: Notas de moderatzione
@@ -112,6 +116,7 @@ sc:
       search: Chirca
       search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
       search_same_ip: Àteras persones cun sa pròpiu IP
+      security: Seguresa
       sensitive: Sensìbile
       sensitized: marcadu comente a sensìbile
       shared_inbox_url: URL de intrada cumpartzida
@@ -122,6 +127,7 @@ sc:
       silenced: Limitadas
       statuses: Tuts
       subscribe: Sutascrie·ti
+      suspend: Suspensione
       suspended: Suspèndidu
       suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversìbile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
       suspension_reversible_hint_html: Su contu est istadu suspèndidu, e is datos ant a èssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fàghere inoghe in bassu.
@@ -274,6 +280,7 @@ sc:
       updated_msg: Emoji atualizadu
       upload: Càrriga
     dashboard:
+      media_storage: Immagasinamentu
       software: Programmas
       space: Impreu de ispàtziu
       title: Pannellu
@@ -281,21 +288,28 @@ sc:
       add_new: Permite sa federatzione cun domìniu
       created_msg: Sa federatzione cun su domìniu est istada permìtida
       destroyed_msg: Sa federatzione cun su domìniu no est istada permìtida
+      import: Importatzione
       undo: Non permitas sa federatzione cun su domìniu
     domain_blocks:
       add_new: Agiunghe blocu de domìniu nou
+      confirm_suspension:
+        cancel: Annulla
+        confirm: Suspensione
       created_msg: Protzessende su blocu de domìniu
       destroyed_msg: Su blocu de domìniu est istadu iscontzadu
       domain: Domìniu
       edit: Modìfica su blocu de su domìniu
       existing_domain_block_html: As giai impostu lìmites prus astrintos a %{name}, ddu dias dèpere <a href="%{unblock_url}">isblocare</a> prima.
+      import: Importatzione
       new:
         create: Crea unu blocu
         hint: Su blocu de domìniu no at a impedire sa creatzione de contos noos in sa base de datos, ma ant a èssere aplicados in manera retroativa mètodos de moderatzione ispetzìficos subra custos contos.
         severity:
           noop: Perunu
+          silence: A sa muda
           suspend: Suspensione
         title: Blocu de domìniu nou
+      not_permitted: Non tenes su permissu de fàghere custa atzione
       obfuscate: Cua su nòmine de domìniu
       obfuscate_hint: Cua una parte de su nòmine de domìniu in sa lista si sa visualizatzione de sa lista de domìnios limitados est ativa
       private_comment: Cummentu privadu
@@ -326,9 +340,24 @@ sc:
       title: Cussìgios de sighidura
       unsuppress: Recùpera su cussìgiu de sighidura
     instances:
+      back_to_all: Totus
+      back_to_limited: Limitadu
+      back_to_warning: Atentzione
       by_domain: Domìniu
+      content_policies:
+        policies:
+          reject_reports: Refuda informes
+          silence: A sa muda
+          suspend: Suspensione
+      dashboard:
+        instance_reports_measure: informes a subra de àtere
+      delivery:
+        all: Totus
       delivery_available: Sa cunsigna est a disponimentu
       empty: Perunu domìniu agatadu.
+      known_accounts:
+        one: "%{count} contu connòschidu"
+        other: "%{count} contos connòschidos"
       moderation:
         all: Totus
         limited: Limitadas
@@ -390,18 +419,23 @@ sc:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
+      action_log: Registru de controllu
       action_taken_by: Mesuras adotadas dae
       are_you_sure: Seguru?
       assign_to_self: Assigna a mie
       assigned: Moderatzione assignada
       by_target_domain: Domìniu de su contu signaladu
+      cancel: Annulla
       comment:
         none: Perunu
+      confirm: Cunfirma
       created_at: Sinnaladu
       forwarded: Torradu a imbiare
       forwarded_to: Torradu a imbiare a %{domain}
       mark_as_resolved: Marca comente a isòrvidu
+      mark_as_sensitive: Signala comente a sensìbile
       mark_as_unresolved: Marcare comente a non isòrvidu
+      no_one_assigned: Nemos
       notes:
         create: Agiunghe una nota
         create_and_resolve: Isorve cun una nota
@@ -419,6 +453,15 @@ sc:
       unassign: Boga s'assignatzione
       unresolved: No isòrvidu
       updated_at: Atualizadu
+      view_profile: Visualiza profilu
+    roles:
+      categories:
+        administration: Amministratzione
+        invites: Invitos
+        moderation: Moderatzione
+      delete: Cantzella
+      privileges:
+        administrator: Amministratzione
     rules:
       add_new: Agiunghe règula
       delete: Cantzella
@@ -427,10 +470,26 @@ sc:
       empty: Peruna règula de serbidore definida ancora.
       title: Règulas de su serbidore
     settings:
+      about:
+        manage_rules: Gesti is règulas de su serbidore
+        title: Informatziones
+      appearance:
+        title: Aspetu
+      default_noindex:
+        desc_html: Ìmplicat a totu is utentes chi no apant modificadu custa cunfiguratzione
+        title: Esclude in manera predefinida is utentes dae s'inditzamentu de is motores de chirca
+      discovery:
+        follow_recommendations: Cussìgios de sighidura
+        profile_directory: Diretòriu de profilos
+        public_timelines: Lìnias de tempos pùblicas
+        title: Iscoberta
+        trends: Tendèntzias
       domain_blocks:
         all: Pro totus
         disabled: Pro nemos
         users: Pro utentes locales in lìnia
+      registrations:
+        title: Registros
       registrations_mode:
         modes:
           approved: Aprovatzione rechesta pro si registrare
@@ -439,7 +498,10 @@ sc:
     site_uploads:
       delete: Cantzella s'archìviu carrigadu
       destroyed_msg: Càrriga de su situ cantzellada.
+    software_updates:
+      documentation_link: Àteras informatziones
     statuses:
+      application: Aplicatzione
       back_to_account: Torra a sa pàgina de su contu
       deleted: Cantzelladu
       media:
@@ -447,6 +509,10 @@ sc:
       no_status_selected: Perunu istadu est istadu mudadu dae chi non nd'as seletzionadu
       title: Istados de su contu
       with_media: Cun elementos multimediales
+    strikes:
+      actions:
+        none: "%{name} at imbiadu un'avisu a %{target}"
+        suspend: "%{name} at suspèndidu su contu de %{target}"
     system_checks:
       database_schema_check:
         message_html: Ddoe at tràmudas de base de datos in suspesu. Pone·ddas in esecutzione pro ti assegurare chi s'aplicatzione funtzionet comente si tocat
@@ -459,12 +525,24 @@ sc:
       review: Revisiona s'istadu
       updated_msg: Cunfiguratzione de etichetas atualizada
     title: Amministratzione
+    trends:
+      pending_review: De revisionare
+      tags:
+        title: Etichetas de tendèntzia
+      title: Tendèntzias
     warning_presets:
       add_new: Agiunghe noa
       delete: Cantzella
       edit_preset: Modìfica s'avisu predefinidu
       empty: No as cunfiguradu ancora perunu avisu predefinidu.
       title: Gesti is cunfiguratziones predefinidas de is avisos
+    webhooks:
+      delete: Cantzella
+      disable: Disativa
+      disabled: Disativadu
+      enable: Ativa
+      enabled: Ativu
+      status: Istadu
   admin_mailer:
     new_pending_account:
       body: Is detàllios de su contu nou sunt a suta. Podes aprovare o refudare custa rechesta.
@@ -473,6 +551,9 @@ sc:
       body: "%{reporter} at sinnaladu %{target}"
       body_remote: Una persone de su domìniu %{domain} at sinnaladu %{target}
       subject: Informe nou pro %{instance} (#%{id})
+    new_trends:
+      new_trending_tags:
+        title: Etichetas de tendèntzia
   aliases:
     add_new: Crea unu nomìngiu
     created_msg: Nomìngiu creadu. Immoe podes cumintzare a tramudare dae su contu betzu.
@@ -495,17 +576,21 @@ sc:
     notification_preferences: Muda is preferèntzias de posta
     salutation: "%{name},"
     settings: 'Muda is preferèntzias de posta: %{link}'
+    unsubscribe: Annulla sa sutiscritzione
     view: 'Visualizatzione:'
     view_profile: Visualiza profilu
     view_status: Ammustra s'istadu
   applications:
     created: Aplicatzione creada
     destroyed: Aplicatzione cantzellada
+    logout: Essi
     regenerate_token: Torra a generare s'identificadore de atzessu
     token_regenerated: Identificadore de atzessu generadu
     warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos!
     your_token: S'identificadore tuo de atzessu
   auth:
+    confirmations:
+      login_link: intra
     delete_account: Cantzella su contu
     delete_account_html: Si boles cantzellare su contu, ddu podes <a href="%{path}">fàghere inoghe</a>. T'amus a dimandare una cunfirmatzione.
     description:
@@ -528,11 +613,14 @@ sc:
     register: Registru
     registration_closed: "%{instance} no atzetat àteras persones"
     reset_password: Reseta sa crae
+    rules:
+      back: A coa
     security: Seguresa
     set_new_password: Cunfigura una crae noa
     status:
       account_status: Istadu de su contu
       confirming: Isetende chi sa posta eletrònica siat cumpletada.
+      functional: Su contu tuo est operativu.
       pending: Sa dimanda tua est in protzessu de revisione dae su personale nostru. Podet serbire unu pagu de tempus. As a retzire unu messàgiu eletrònicu si sa dimanda est aprovada.
       redirecting_to: Su contu tuo est inativu pro ite in die de oe est torrende a indiritzare a %{acct}.
     too_fast: Formulàriu imbiadu tropu a lestru, torra a proare.
@@ -581,8 +669,14 @@ sc:
       more_details_html: Pro àteros detàllios, bide sa <a href="%{terms_path}">normativa de riservadesa</a>.
       username_available: Su nòmine de utente tuo at a torrare a èssere a disponimentu
       username_unavailable: Su nòmine de utente tuo no at a abarrare a disponimentu
+  disputes:
+    strikes:
+      title_actions:
+        none: Atentzione
   domain_validator:
     invalid_domain: no est unu nòmine de domìniu vàlidu
+  edit_profile:
+    other: Àteru
   errors:
     '400': Sa dimanda chi as imbiadu non fiat vàlida o non fiat curreta.
     '403': Non tenes permissu pro bìdere custa pàgina.
@@ -638,11 +732,15 @@ sc:
       title: Agiunghe unu filtru nou
   generic:
     all: Totus
+    cancel: Annulla
     changes_saved_msg: Modìficas sarvadas.
+    confirm: Cunfirma
     copy: Còpia
     delete: Cantzella
+    none: Perunu
     order_by: Òrdina pro
     save_changes: Sarva is modìficas
+    today: oe
     validation_errors:
       one: Calicuna cosa ancora no est andende. Bide sa faddina in bàsciu
       other: Calicuna cosa ancora no est andende. Bide is %{count} faddinas in bàsciu
@@ -655,12 +753,15 @@ sc:
       overwrite: Subrascrie
       overwrite_long: Sostitui is registros atuales cun cussos noos
     preface: Podes importare datos chi as esportadu dae unu àteru serbidore, che a sa lista de sa gente chi ses sighende o blochende.
+    status: Istadu
     success: Datos carrigados; ant a èssere protzessados luego
+    type: Casta de importatzione
     types:
       blocking: Lista de blocos
       bookmarks: Sinnalibros
       domain_blocking: Lista domìnios blocados
       following: Lista de sighiduras
+      lists: Listas
       muting: Lista gente a sa muda
     upload: Càrriga
   invites:
@@ -685,6 +786,13 @@ sc:
       expires_at: Iscadit
       uses: Impreos
     title: Invita gente
+  login_activities:
+    authentication_methods:
+      password: crae
+      webauthn: craes de seguresa
+  mail_subscriptions:
+    unsubscribe:
+      title: Annulla sa sutiscritzione
   media_attachments:
     validations:
       images_and_video: Non si podet allegare unu vìdeu in una publicatzione chi cuntenet giai immàgines
@@ -797,6 +905,8 @@ sc:
     other: Àteru
     posting_defaults: Valores predefinidos de publicatzione
     public_timelines: Lìnias de tempos pùblicas
+  privacy:
+    search: Chirca
   reactions:
     errors:
       limit_reached: Lìmite de reatziones diferentes cròmpidu
@@ -850,6 +960,7 @@ sc:
     platforms:
       adobe_air: Adobe Air
       android: Android
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux
@@ -934,6 +1045,7 @@ sc:
       '2629746': 1 mese
       '31556952': 1 annu
       '5259492': 2 meses
+      '604800': 1 chida
       '63113904': 2 annos
       '7889238': 3 meses
   stream_entries:
@@ -969,6 +1081,7 @@ sc:
       subject: S'archìviu tuo est prontu pro èssere iscarrigadu
       title: Collida dae s'archìviu
     warning:
+      reason: 'Resone:'
       subject:
         disable: Su contu tuo %{acct} est istadu cungeladu
         none: Avisu pro %{acct}
diff --git a/config/locales/simple_form.fil.yml b/config/locales/simple_form.fil.yml
new file mode 100644
index 0000000000..4084bf2f90
--- /dev/null
+++ b/config/locales/simple_form.fil.yml
@@ -0,0 +1 @@
+fil:
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 39caaf6baf..d53b7105ef 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -27,14 +27,33 @@ lt:
           none: Naudok šią parinktį norėdamas (-a) išsiųsti įspėjimą naudotojui, nesukeldamas (-a) jokio kito veiksmo.
           sensitive: Priversk visus šio naudotojo medijos priedus pažymėti kaip jautrius.
           silence: Neleisk naudotojui skelbti viešai matomų įrašų, paslėpk jų įrašus ir pranešimus nuo žmonių, kurie neseka jo. Uždaro visus su šia paskyra susijusius ataskaitas.
+          suspend: Neleisk jokios sąveikos iš šios paskyros arba į ją ir ištrink jos turinį. Sugrąžinama per 30 dienų. Uždaro visas su šia paskyra susijusias ataskaitas.
+        warning_preset_id: Pasirinktinai. Gali pridėti pasirinktinį tekstą iš anksto nustatyto rinkinio pabaigoje
+      announcement:
+        all_day: Jei pažymėta, bus rodomos tik laikotarpio datos
+        ends_at: Pasirinktinai. Skelbimas šiuo laiku bus automatiškai panaikintas
+        scheduled_at: Palik tuščią, kad skelbimas būtų paskelbtas iš karto
+        starts_at: Pasirinktinai. Jei skelbimas susietas su tam tikru laiko tarpu
+        text: Gali naudoti įrašo sintaksę. Būk dėmesingas (-a), kiek vietos naudotojo ekrane užims skelbimas
+      appeal:
+        text: Gali pateikti apeliaciją dėl streiko tik vieną kartą
       defaults:
+        autofollow: Žmonės, kurie užsiregistruos per kvietimą, automatiškai seks tave
         avatar: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
-        header: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions}tšk.
+        bot: Signalizuoti kitiems, kad paskyroje daugiausia atliekami automatiniai veiksmai ir kad ji gali būti nestebima
+        context: Vienas arba keli kontekstai, kuriems turėtų būti taikomas filtras
+        current_password: Saugumo sumetimais įvesk dabartinės paskyros slaptažodį
+        current_username: Kad patvirtintum, įvesk dabartinės paskyros naudotojo vardą
+        digest: Siunčiama tik po ilgo neaktyvumo laikotarpio ir tik tuo atveju, jei negavai jokių asmeninių žinučių
+        email: Tau bus išsiųstas patvirtinimo el. laiškas
+        header: PNG, GIF arba JPG. Ne daugiau kaip %{size}. Bus sumažintas iki %{dimensions} tšk.
         inbox_url: Nukopijuok URL adresą iš pradinio puslapio perdavėjo, kurį nori naudoti
         irreversible: Filtruoti įrašai išnyks negrįžtamai, net jei vėliau filtras bus pašalintas
         locale: Naudotojo sąsajos kalba, el. laiškai ir stumiamieji pranešimai
         password: Naudok bent 8 simbolius
-        phrase: Bus suderinta, neatsižvelgiant į teksto korpusą arba įrašo turinio įspėjimą
+        phrase: Bus suderinta, neatsižvelgiant į teksto lygį arba įrašo turinio įspėjimą
+        scopes: Prie kurių API programai bus leidžiama pasiekti. Pasirinkus aukščiausio lygio sritį, atskirų sričių pasirinkti nereikia.
+        setting_aggregate_reblogs: Nerodyti naujų pakėlimų įrašams, kurie neseniai buvo pakelti (taikoma tik naujai gautiems pakėlimams)
         setting_always_send_emails: Paprastai pranešimai el. paštu nebus siunčiami, kai aktyviai naudoji Mastodon
         setting_default_sensitive: Jautrioji medija pagal numatytuosius nustatymus yra paslėpta ir gali būti atskleista paspaudus
         setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
@@ -42,16 +61,26 @@ lt:
         setting_display_media_show_all: Visada rodyti mediją
         setting_use_blurhash: Gradientai pagrįsti paslėptų vaizdų spalvomis, tačiau užgožia bet kokias detales
         setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio kanalo slinkimo
+        username: Gali naudoti raides, skaičius ir pabraukimus
+        whole_word: Kai raktažodis ar frazė yra tik raidinis ir skaitmeninis, jis bus taikomas tik tada, jei atitiks visą žodį
       featured_tag:
         name: 'Štai keletas pastaruoju metu dažniausiai saitažodžių, kurių tu naudojai:'
+      filters:
+        action: Pasirink, kokį veiksmą atlikti, kai įrašas atitinka filtrą
+        actions:
+          hide: Visiškai paslėpti filtruotą turinį ir elgtis taip, tarsi jo neegzistuotų
+          warn: Slėpti filtruojamą turinį po įspėjimu, paminint filtro pavadinimą
       form_admin_settings:
+        activity_api_enabled: Vietinių paskelbtų įrašų, aktyvių naudotojų ir naujų registracijų skaičiai kas savaitę
+        backups_retention_period: Laikyti sukurtus naudotojų archyvus nurodytą dienų skaičių.
         peers_api_enabled: Domenų pavadinimų sąrašas, su kuriais šis serveris susidūrė fediverse. Čia nėra duomenų apie tai, ar tu bendrauji su tam tikru serveriu, tik apie tai, kad tavo serveris apie jį žino. Tai naudojama tarnybose, kurios renka federacijos statistiką bendrąja prasme.
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
         site_extended_description: Bet kokia papildoma informacija, kuri gali būti naudinga lankytojams ir naudotojams. Gali būti struktūrizuota naudojant Markdown sintaksę.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
       sessions:
-        webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paliesk.
+        otp: 'Įvesk telefono programėlėje sugeneruotą dviejų tapatybės kodą arba naudok vieną iš atkūrimo kodų:'
+        webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
       settings:
         indexable: Tavo profilio puslapis gali būti rodomas paieškos rezultatuose Google, Bing ir kituose.
     labels:
diff --git a/config/locales/simple_form.ne.yml b/config/locales/simple_form.ne.yml
new file mode 100644
index 0000000000..db03c5186b
--- /dev/null
+++ b/config/locales/simple_form.ne.yml
@@ -0,0 +1 @@
+ne:
diff --git a/config/locales/simple_form.ry.yml b/config/locales/simple_form.ry.yml
new file mode 100644
index 0000000000..6fe57b65cd
--- /dev/null
+++ b/config/locales/simple_form.ry.yml
@@ -0,0 +1 @@
+ry:
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index 2c47259961..5f5d633079 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -53,6 +53,8 @@ sc:
         domain: Custu domìniu at a pòdere recuperare datos dae custu serbidore e is datos in intrada dae cue ant a èssere protzessados e archiviados
       email_domain_block:
         with_dns_records: S'at a fàghere unu tentativu de risòlvere is registros DNS de su domìniu e fintzas is risultados ant a èssere blocados
+      form_admin_settings:
+        activity_api_enabled: Nùmeru de tuts publicados in locale, utentes ativos e registros noos in perìodos chidajolos
       form_challenge:
         current_password: Ses intrende in un'àrea segura
       imports:
@@ -155,6 +157,7 @@ sc:
         setting_use_pending_items: Modalidade lenta
         severity: Severidade
         sign_in_token_attempt: Còdighe de seguresa
+        title: Tìtulu
         type: Casta de importatzione
         username: Nòmine utente
         username_or_email: Nòmine utente o indiritzu de posta eletrònica
@@ -163,6 +166,16 @@ sc:
         with_dns_records: Include registros MX e indiritzos IP de su domìniu
       featured_tag:
         name: Eticheta
+      form_admin_settings:
+        activity_api_enabled: Pùblica istatìsticas agregadas subra s'atividade de s'utente
+        custom_css: CSS personalizadu
+        peers_api_enabled: Pùblica sa lista de serbidores iscobertos in s'API
+        profile_directory: Ativa diretòriu de profilos
+        show_domain_blocks: Ammustra blocos de domìniu
+        site_contact_username: Nòmine de utente de su cuntatu
+        site_short_description: Descritzione de su serbidore
+        site_title: Nòmine de su serbidore
+        thumbnail: Miniadura de su serbidore
       interactions:
         must_be_follower: Bloca is notìficas dae chie non ti sighit
         must_be_following: Bloca is notìficas dae gente chi non sighis
@@ -186,6 +199,7 @@ sc:
         mention: Una persone t'at mentovadu
         pending_account: Unu contu nou tenet bisòngiu de una revisione
         reblog: Una persone at cumpartzidu s'istadu tuo
+        report: Imbiu de un'informe nou
       rule:
         text: Règula
       tag:
@@ -193,6 +207,9 @@ sc:
         name: Eticheta
         trendable: Permite a custa eticheta de apàrrere in is tendèntzias
         usable: Permite a is tuts de impreare custa eticheta
+      user_role:
+        name: Nòmine
+        permissions_as_keys: Permissos
     'no': Nono
     recommended: Cussigiadu
     required:
diff --git a/config/locales/simple_form.tlh.yml b/config/locales/simple_form.tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/config/locales/simple_form.tlh.yml
@@ -0,0 +1 @@
+tlh:
diff --git a/config/locales/tlh.yml b/config/locales/tlh.yml
new file mode 100644
index 0000000000..884714fb71
--- /dev/null
+++ b/config/locales/tlh.yml
@@ -0,0 +1 @@
+tlh:

From 996c13a24d941e02458fa21d30e8334d04bdb2b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:33:11 +0100
Subject: [PATCH 005/436] Update dependency core-js to v3.34.0 (#28241)

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

diff --git a/yarn.lock b/yarn.lock
index 4226fcc0fd..9e16226809 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5960,9 +5960,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.33.3
-  resolution: "core-js@npm:3.33.3"
-  checksum: 08abdc9470c8228b9d09f61e62ab312738681202c4c34e9638889125b304b235f34c4fe22e9d41c20906ac0fcc807dca57c5ff7d6b90021bf64e8fe23461d9ab
+  version: 3.34.0
+  resolution: "core-js@npm:3.34.0"
+  checksum: 408a77898abe03bf3e5dec2a451c36f4745081cca9022f8bdf9b817d57bb6d3a534d555f47a4b95e1daa5e21dbc79122eac2402e25720d425f5925127e55dcd8
   languageName: node
   linkType: hard
 

From 3b710b96cf4a7ff743313f20b054c6220da3dd6b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:33:27 +0100
Subject: [PATCH 006/436] Update dependency irb to v1.10.1 (#28240)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9308a41c8b..4a409a0ad6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -377,7 +377,7 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
     io-console (0.6.0)
-    irb (1.10.0)
+    irb (1.10.1)
       rdoc
       reline (>= 0.3.8)
     jmespath (1.6.2)
@@ -608,7 +608,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.6.1)
       rdf (~> 3.2)
-    rdoc (6.6.0)
+    rdoc (6.6.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)

From faffd81976092fc5a95fb359ec5844c2af76101d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 03:44:07 -0500
Subject: [PATCH 007/436] Remove double subject call in
 `services/unsuspend_account_service` spec (#28215)

---
 .../unsuspend_account_service_spec.rb         | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index c555b661ec..2f737c6215 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -45,14 +45,19 @@ RSpec.describe UnsuspendAccountService, type: :service do
         remote_follower.follow!(account)
       end
 
-      it "merges back into local followers' feeds" do
+      it 'merges back into feeds of local followers and sends update' do
         subject
+
+        expect_feeds_merged
+        expect_updates_sent
+      end
+
+      def expect_feeds_merged
         expect(FeedManager.instance).to have_received(:merge_into_home).with(account, local_follower)
         expect(FeedManager.instance).to have_received(:merge_into_list).with(account, list)
       end
 
-      it 'sends an update actor to followers and reporters' do
-        subject
+      def expect_updates_sent
         expect(a_request(:post, remote_follower.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
         expect(a_request(:post, remote_reporter.inbox_url).with { |req| match_update_actor_request(req, account) }).to have_been_made.once
       end
@@ -73,19 +78,20 @@ RSpec.describe UnsuspendAccountService, type: :service do
           allow(resolve_account_service).to receive(:call).with(account).and_return(account)
         end
 
-        it 're-fetches the account' do
-          subject
+        it 're-fetches the account, merges feeds, and preserves suspended' do
+          expect { subject }
+            .to_not change_suspended_flag
+          expect_feeds_merged
           expect(resolve_account_service).to have_received(:call).with(account)
         end
 
-        it "merges back into local followers' feeds" do
-          subject
+        def expect_feeds_merged
           expect(FeedManager.instance).to have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to have_received(:merge_into_list).with(account, list)
         end
 
-        it 'does not change the “suspended” flag' do
-          expect { subject }.to_not change(account, :suspended?)
+        def change_suspended_flag
+          change(account, :suspended?)
         end
       end
 
@@ -97,19 +103,20 @@ RSpec.describe UnsuspendAccountService, type: :service do
           end
         end
 
-        it 're-fetches the account' do
-          subject
+        it 're-fetches the account, does not merge feeds, marks suspended' do
+          expect { subject }
+            .to change_suspended_to_true
           expect(resolve_account_service).to have_received(:call).with(account)
+          expect_feeds_not_merged
         end
 
-        it "does not merge back into local followers' feeds" do
-          subject
+        def expect_feeds_not_merged
           expect(FeedManager.instance).to_not have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to_not have_received(:merge_into_list).with(account, list)
         end
 
-        it 'marks account as suspended' do
-          expect { subject }.to change(account, :suspended?).from(false).to(true)
+        def change_suspended_to_true
+          change(account, :suspended?).from(false).to(true)
         end
       end
 
@@ -118,13 +125,14 @@ RSpec.describe UnsuspendAccountService, type: :service do
           allow(resolve_account_service).to receive(:call).with(account).and_return(nil)
         end
 
-        it 're-fetches the account' do
+        it 're-fetches the account and does not merge feeds' do
           subject
+
           expect(resolve_account_service).to have_received(:call).with(account)
+          expect_feeds_not_merged
         end
 
-        it "does not merge back into local followers' feeds" do
-          subject
+        def expect_feeds_not_merged
           expect(FeedManager.instance).to_not have_received(:merge_into_home).with(account, local_follower)
           expect(FeedManager.instance).to_not have_received(:merge_into_list).with(account, list)
         end

From 5517df61de1e867afa531268755ee893ffca3c99 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 03:44:51 -0500
Subject: [PATCH 008/436] Remove double subject call in
 `services/activitypub/process_account_service` spec (#28214)

---
 .../process_account_service_spec.rb           | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index c02a0800a3..09eb5ddee3 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -129,12 +129,10 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       stub_const 'ActivityPub::ProcessAccountService::SUBDOMAINS_RATELIMIT', 5
     end
 
-    it 'creates at least some accounts' do
-      expect { subject }.to change { Account.remote.count }.by_at_least(2)
-    end
-
-    it 'creates no more account than the limit allows' do
-      expect { subject }.to change { Account.remote.count }.by_at_most(5)
+    it 'creates accounts without exceeding rate limit' do
+      expect { subject }
+        .to create_some_remote_accounts
+        .and create_fewer_than_rate_limit_accounts
     end
   end
 
@@ -195,12 +193,20 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       end
     end
 
-    it 'creates at least some accounts' do
-      expect { subject.call('user1', 'foo.test', payload) }.to change { Account.remote.count }.by_at_least(2)
-    end
-
-    it 'creates no more account than the limit allows' do
-      expect { subject.call('user1', 'foo.test', payload) }.to change { Account.remote.count }.by_at_most(5)
+    it 'creates accounts without exceeding rate limit' do
+      expect { subject.call('user1', 'foo.test', payload) }
+        .to create_some_remote_accounts
+        .and create_fewer_than_rate_limit_accounts
     end
   end
+
+  private
+
+  def create_some_remote_accounts
+    change(Account.remote, :count).by_at_least(2)
+  end
+
+  def create_fewer_than_rate_limit_accounts
+    change(Account.remote, :count).by_at_most(5)
+  end
 end

From be6bb1a10d6f1f23151198c6487f44145a0692ee Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 03:45:19 -0500
Subject: [PATCH 009/436] Remove double subject call in
 `services/suspend_account_service` spec (#28213)

---
 spec/services/suspend_account_service_spec.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index edb7050083..c258995b7e 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -18,14 +18,15 @@ RSpec.describe SuspendAccountService, type: :service do
       account.suspend!
     end
 
-    it "unmerges from local followers' feeds" do
-      subject
+    it 'unmerges from feeds of local followers and preserves suspended flag' do
+      expect { subject }
+        .to_not change_suspended_flag
       expect(FeedManager.instance).to have_received(:unmerge_from_home).with(account, local_follower)
       expect(FeedManager.instance).to have_received(:unmerge_from_list).with(account, list)
     end
 
-    it 'does not change the “suspended” flag' do
-      expect { subject }.to_not change(account, :suspended?)
+    def change_suspended_flag
+      change(account, :suspended?)
     end
   end
 

From ed7b5c091b62d63e695d2f1ff946e021fb37fa18 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 03:51:09 -0500
Subject: [PATCH 010/436] Remove double subject call in
 `services/delete_account_service` spec (#28212)

---
 spec/services/delete_account_service_spec.rb | 25 +++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index 68ab491e4e..8a19d3cf74 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -27,8 +27,15 @@ RSpec.describe DeleteAccountService, type: :service do
 
     let!(:account_note) { Fabricate(:account_note, account: account) }
 
-    it 'deletes associated owned records' do
-      expect { subject }.to change {
+    it 'deletes associated owned and target records and target notifications' do
+      expect { subject }
+        .to delete_associated_owned_records
+        .and delete_associated_target_records
+        .and delete_associated_target_notifications
+    end
+
+    def delete_associated_owned_records
+      change do
         [
           account.statuses,
           account.media_attachments,
@@ -39,23 +46,23 @@ RSpec.describe DeleteAccountService, type: :service do
           account.polls,
           account.account_notes,
         ].map(&:count)
-      }.from([2, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
+      end.from([2, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
     end
 
-    it 'deletes associated target records' do
-      expect { subject }.to change {
+    def delete_associated_target_records
+      change do
         [
           AccountPin.where(target_account: account),
         ].map(&:count)
-      }.from([1]).to([0])
+      end.from([1]).to([0])
     end
 
-    it 'deletes associated target notifications' do
-      expect { subject }.to change {
+    def delete_associated_target_notifications
+      change do
         %w(
           poll favourite status mention follow
         ).map { |type| Notification.where(type: type).count }
-      }.from([1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0])
+      end.from([1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0])
     end
   end
 

From 0e8ba19113182f74a0adde0ac75a35694833316c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 03:52:30 -0500
Subject: [PATCH 011/436] Add spec coverage for `CLI::Emoji` class (#28182)

---
 spec/fixtures/files/elite-assets.tar.gz | Bin 0 -> 17590 bytes
 spec/lib/mastodon/cli/emoji_spec.rb     |  54 ++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 spec/fixtures/files/elite-assets.tar.gz

diff --git a/spec/fixtures/files/elite-assets.tar.gz b/spec/fixtures/files/elite-assets.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7b4f4425705c62fe4b538fa52148937e51a69552
GIT binary patch
literal 17590
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

literal 0
HcmV?d00001

diff --git a/spec/lib/mastodon/cli/emoji_spec.rb b/spec/lib/mastodon/cli/emoji_spec.rb
index 5d109eb524..530da91e74 100644
--- a/spec/lib/mastodon/cli/emoji_spec.rb
+++ b/spec/lib/mastodon/cli/emoji_spec.rb
@@ -4,5 +4,59 @@ require 'rails_helper'
 require 'mastodon/cli/emoji'
 
 describe Mastodon::CLI::Emoji do
+  subject { cli.invoke(action, args, options) }
+
+  let(:cli) { described_class.new }
+  let(:args) { [] }
+  let(:options) { {} }
+
   it_behaves_like 'CLI Command'
+
+  describe '#purge' do
+    let(:action) { :purge }
+
+    context 'with existing custom emoji' do
+      before { Fabricate(:custom_emoji) }
+
+      it 'reports a successful purge' do
+        expect { subject }
+          .to output_results('OK')
+      end
+    end
+  end
+
+  describe '#import' do
+    context 'with existing custom emoji' do
+      let(:import_path) { Rails.root.join('spec', 'fixtures', 'files', 'elite-assets.tar.gz') }
+      let(:action) { :import }
+      let(:args) { [import_path] }
+
+      it 'reports about imported emoji' do
+        expect { subject }
+          .to output_results('Imported 1')
+          .and change(CustomEmoji, :count).by(1)
+      end
+    end
+  end
+
+  describe '#export' do
+    context 'with existing custom emoji' do
+      before { Fabricate(:custom_emoji) }
+      after { File.delete(export_path) }
+
+      let(:export_path) { Rails.root.join('tmp', 'export.tar.gz') }
+      let(:args) { [Rails.root.join('tmp')] }
+      let(:action) { :export }
+
+      it 'reports about exported emoji' do
+        expect { subject }
+          .to output_results('Exported 1')
+          .and change { File.exist?(export_path) }.from(false).to(true)
+      end
+    end
+  end
+
+  def output_results(string)
+    output(a_string_including(string)).to_stdout
+  end
 end

From 954169966b23214a044fa8deda16be4b903526d5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 08:52:55 +0000
Subject: [PATCH 012/436] New Crowdin Translations (automated) (#28245)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lt.json | 26 +++----
 config/locales/simple_form.lt.yml       | 91 ++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index e588b85385..58c80e4117 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -40,7 +40,7 @@
   "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
   "account.follows_you": "Seka tave",
   "account.go_to_profile": "Eiti į profilį",
-  "account.hide_reblogs": "Slėpti \"boosts\" iš @{name}",
+  "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
@@ -49,19 +49,19 @@
   "account.media": "Medija",
   "account.mention": "Paminėti @{name}",
   "account.moved_to": "{name} nurodė, kad dabar jų nauja paskyra yra:",
-  "account.mute": "Užtildyti @{name}",
+  "account.mute": "Nutildyti @{name}",
   "account.mute_notifications_short": "Nutildyti pranešimus",
   "account.mute_short": "Nutildyti",
-  "account.muted": "Užtildytas",
+  "account.muted": "Nutildytas",
   "account.no_bio": "Nėra pateikto aprašymo.",
-  "account.open_original_page": "Atidaryti originalinį tinklalapį",
+  "account.open_original_page": "Atidaryti originalinį puslapį",
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.report": "Pranešti @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą.",
+  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
-  "account.show_reblogs": "Rodyti \"boosts\" iš @{name}",
+  "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "account.unblock": "Atblokuoti @{name}",
   "account.unblock_domain": "Atblokuoti domeną {domain}",
@@ -73,7 +73,7 @@
   "account.unmute_short": "Atitildyti",
   "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
   "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
-  "admin.dashboard.monthly_retention": "Vartotojų išbuvimo rodiklis pagal mėnesį po registracijos",
+  "admin.dashboard.monthly_retention": "Naudotojų išlaikymo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
   "admin.dashboard.retention.cohort": "Registravimo mėnuo",
   "admin.dashboard.retention.cohort_size": "Nauji naudotojai",
@@ -117,9 +117,9 @@
   "column.favourites": "Mėgstamiausi",
   "column.firehose": "Tiesioginiai padavimai",
   "column.follow_requests": "Sekti prašymus",
-  "column.home": "Pradžia",
+  "column.home": "Pagrindinis",
   "column.lists": "Sąrašai",
-  "column.mutes": "Užtildyti naudotojai",
+  "column.mutes": "Nutildyti naudotojai",
   "column.notifications": "Pranešimai",
   "column.pins": "Prisegti įrašai",
   "column.public": "Federacinė laiko skalė",
@@ -141,13 +141,13 @@
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Jūsų paskyra nėra {locked}. Kiekvienas gali jus sekti ir peržiūrėti tik sekėjams skirtus įrašus.",
+  "compose_form.hashtag_warning": "Šis įrašas nebus įtraukta į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
+  "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
   "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
-  "compose_form.poll.option_placeholder": "Pasirinkimas {number}",
+  "compose_form.poll.option_placeholder": "{number} pasirinkimas",
   "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
@@ -528,6 +528,8 @@
   "search_results.hashtags": "Saitažodžiai",
   "search_results.nothing_found": "Nepavyko rasti nieko pagal šiuos paieškos terminus.",
   "search_results.statuses": "Toots",
+  "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
+  "server_banner.active_users": "aktyvūs naudotojai",
   "sign_in_banner.sign_in": "Prisijungimas",
   "sign_in_banner.text": "Prisijunk, kad galėtum sekti profilius arba saitažodžius, mėgsti, bendrinti ir atsakyti į įrašus. Taip pat gali bendrauti iš savo paskyros kitame serveryje.",
   "status.admin_status": "Open this status in the moderation interface",
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index d53b7105ef..6eb90340dc 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -63,6 +63,8 @@ lt:
         setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio kanalo slinkimo
         username: Gali naudoti raides, skaičius ir pabraukimus
         whole_word: Kai raktažodis ar frazė yra tik raidinis ir skaitmeninis, jis bus taikomas tik tada, jei atitiks visą žodį
+      email_domain_block:
+        with_dns_records: Bus bandoma išspręsti nurodyto domeno DNS įrašus, o rezultatai taip pat bus blokuojami
       featured_tag:
         name: 'Štai keletas pastaruoju metu dažniausiai saitažodžių, kurių tu naudojai:'
       filters:
@@ -77,15 +79,98 @@ lt:
         site_contact_email: Kaip žmonės gali su tavimi susisiekti teisiniais ar pagalbos užklausimais.
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
         site_extended_description: Bet kokia papildoma informacija, kuri gali būti naudinga lankytojams ir naudotojams. Gali būti struktūrizuota naudojant Markdown sintaksę.
+        thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
+        timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
       sessions:
         otp: 'Įvesk telefono programėlėje sugeneruotą dviejų tapatybės kodą arba naudok vieną iš atkūrimo kodų:'
         webauthn: Jei tai USB raktas, būtinai jį įkišk ir, jei reikia, paspausk.
       settings:
         indexable: Tavo profilio puslapis gali būti rodomas paieškos rezultatuose Google, Bing ir kituose.
+      user:
+        chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis
+        role: Vaidmuo valdo, kokius leidimus naudotojas (-a) turi
     labels:
+      account:
+        indexable: Įtraukti viešus įrašus į paieškos rezultatus
+        show_collections: Rodyti sekimus ir sekėjus profilyje
+        unlocked: Automatiškai priimti naujus sekėjus
+      account_warning_preset:
+        title: Pavadinimas
+      admin_account_action:
+        include_statuses: Įtraukti praneštus įrašus į el. laišką
+      defaults:
+        avatar: Profilio nuotrauka
+        bot: Tai automatinė paskyra
+        chosen_languages: Filtruoti kalbas
+        display_name: Rodomas vardas
+        email: El. pašto adresas
+        expires_in: Nustoja galioti po
+        fields: Papildomi laukai
+        irreversible: Mesti vietoj slėpti
+        locale: Sąsajos kalba
+        max_uses: Maksimalus naudojimo skaičius
+        new_password: Naujas slaptažodis
+        note: Biografija
+        password: Slaptažodis
+        phrase: Raktažodis arba frazė
+        setting_auto_play_gif: Automatiškai leisti animuotų GIF
+        setting_boost_modal: Rodyti patvirtinimo dialogą prieš pakėliant įrašą
+        setting_default_language: Skelbimo kalba
+        setting_default_privacy: Skelbimo privatumas
+        setting_default_sensitive: Visada žymėti mediją kaip jautrią
+        setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
+        setting_display_media: Medijos rodymas
+        setting_display_media_hide_all: Slėpti viską
+        setting_display_media_show_all: Rodyti viską
+        setting_expand_spoilers: Visada išplėsti įrašus, pažymėtus turinio įspėjimais
+        setting_hide_network: Slėpti savo socialinę diagramą
+        setting_system_font_ui: Naudoti numatytąjį sistemos šriftą
+        setting_theme: Svetainės tema
+        setting_use_pending_items: Lėtas režimas
+        title: Pavadinimas
+        type: Importo tipas
+        username: Naudotojo vardas
+        username_or_email: Naudotojo vardas arba el. paštas
+        whole_word: Visas žodis
+      email_domain_block:
+        with_dns_records: Įtraukti MX įrašus ir domeno IP adresus
       featured_tag:
         name: Saitažodis
+      filters:
+        actions:
+          hide: Slėpti visiškai
+          warn: Slėpti su įspėjimu
+      form_admin_settings:
+        activity_api_enabled: Skelbti suvestinį statistiką apie naudotojų veiklą per API
+        bootstrap_timeline_accounts: Visada rekomenduoti šias paskyras naujiems naudotojams
+        content_cache_retention_period: Turinio talpyklos išlaikymo laikotarpis
+        custom_css: Pasirinktinis CSS
+        mascot: Pasirinktinis talismanas (pasenęs)
+        registrations_mode: Kas gali užsiregistruoti
+        show_domain_blocks_rationale: Rodyti, kodėl domenai buvo užblokuoti
+        site_extended_description: Išplėstas aprašymas
+        site_short_description: Serverio aprašymas
+        site_terms: Privatumo politika
+        site_title: Serverio pavadinimas
+        theme: Numatytoji tema
+        thumbnail: Serverio miniatūra
+      invite_request:
+        text: Kodėl nori prisijungti?
+      notification_emails:
+        favourite: Kažkas pamėgo tavo įrašą
+        follow: Kažkas seka tave
+        follow_request: Kažkas paprašė sekti tave
+        mention: Kažkas paminėjo tave
+        pending_account: Reikia peržiūros naujam paskyrui
+        reblog: Kažkas pakėlė tavo įrašą
+        software_updates:
+          label: Yra nauja Mastodon versija
+          patch: Pranešti apie klaidų ištaisymo atnaujinimus
+      rule:
+        text: Taisyklė
+      settings:
+        show_application: Rodyti, iš kurios programėles išsiuntei įrašą
       tag:
         listable: Leisti šį saitažodį rodyti paieškose ir pasiūlymuose
         name: Saitažodis
@@ -93,11 +178,15 @@ lt:
         usable: Leisti įrašams naudoti šį saitažodį
       user:
         role: Vaidmuo
+        time_zone: Laiko juosta
       user_role:
+        color: Ženklelio spalva
+        highlighted: Rodyti vaidmenį kaip ženklelį naudotojo profiliuose
+        name: Pavadinimas
         permissions_as_keys: Leidimai
         position: Prioritetas
       webhook:
-        events: Įgalinti įvykiai
+        events: Įjungti įvykiai
         template: Naudingosios apkrovos šablonas
         url: Galutinio taško URL
     'no': Ne

From 42afd303246abe1cf61752ab53cca466ea3cefdf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 05:19:24 -0500
Subject: [PATCH 013/436] Replace Sprockets with Propshaft (#28239)

---
 .github/renovate.json5             |  1 -
 Gemfile                            |  3 +--
 Gemfile.lock                       | 15 ++++++---------
 config/application.rb              |  1 -
 config/environments/development.rb | 11 -----------
 config/initializers/assets.rb      | 16 ----------------
 6 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 config/initializers/assets.rb

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 895dbfbad2..a7998ddfdc 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -50,7 +50,6 @@
       matchManagers: ['bundler'],
       matchPackageNames: [
         'rack', // Needs to be synced with Rails version
-        'sprockets', // Requires manual upgrade https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x
         'strong_migrations', // Requires manual upgrade
         'sidekiq', // Requires manual upgrade
         'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version
diff --git a/Gemfile b/Gemfile
index e3fb39e169..cfcbcc0d3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '>= 3.0.0'
 
 gem 'puma', '~> 6.3'
 gem 'rails', '~> 7.1.1'
-gem 'sprockets', '~> 3.7.2'
+gem 'propshaft'
 gem 'thor', '~> 1.2'
 gem 'rack', '~> 2.2.7'
 
@@ -89,7 +89,6 @@ gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
-gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
 gem 'stoplight', '~> 3.0.1'
 gem 'strong_migrations', '1.6.4'
 gem 'tty-prompt', '~> 0.23', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a409a0ad6..738562116f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -534,6 +534,11 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
+    propshaft (0.8.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     psych (5.1.1.1)
       stringio
     public_suffix (5.0.4)
@@ -736,13 +741,6 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
     stackprof (0.2.25)
     statsd-ruby (1.5.0)
     stoplight (3.0.2)
@@ -911,6 +909,7 @@ DEPENDENCIES
   posix-spawn
   premailer-rails
   private_address_check (~> 0.5)
+  propshaft
   public_suffix (~> 5.0)
   puma (~> 6.3)
   pundit (~> 2.3)
@@ -949,8 +948,6 @@ DEPENDENCIES
   simple_form (~> 5.2)
   simplecov (~> 0.22)
   simplecov-lcov (~> 0.8)
-  sprockets (~> 3.7.2)
-  sprockets-rails (~> 3.4)
   stackprof
   stoplight (~> 3.0.1)
   strong_migrations (= 1.6.4)
diff --git a/config/application.rb b/config/application.rb
index 99ee4ffd76..b6426516ee 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,7 +14,6 @@ require 'active_job/railtie'
 # require 'action_mailbox/engine'
 # require 'action_text/engine'
 # require 'rails/test_unit/railtie'
-require 'sprockets/railtie'
 
 # Used to be implicitly required in action_mailbox/engine
 require 'mail'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e601fc014c..3c13ada380 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -71,17 +71,6 @@ Rails.application.configure do
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  config.assets.debug = true
-
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
deleted file mode 100644
index e1fd5f8ced..0000000000
--- a/config/initializers/assets.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
-
-# Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )
-
-Rails.application.config.assets.initialize_on_precompile = true

From ee83d5c7600b2cdc96db78c5ec40d8747853ba30 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 08:42:12 -0500
Subject: [PATCH 014/436] Enable the eslint `react/no-unknown-property` rule
 (#28217)

---
 .eslintrc.js                                                | 1 -
 .../mastodon/features/interaction_modal/index.jsx           | 6 +++---
 .../mastodon/features/ui/components/navigation_panel.jsx    | 2 +-
 app/javascript/mastodon/features/video/index.jsx            | 1 -
 package.json                                                | 2 +-
 yarn.lock                                                   | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 176879034b..e2d16a54a8 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -120,7 +120,6 @@ module.exports = defineConfig({
     'react/jsx-uses-react': 'off', // not needed with new JSX transform
     'react/jsx-wrap-multilines': 'error',
     'react/no-deprecated': 'off',
-    'react/no-unknown-property': 'off',
     'react/react-in-jsx-scope': 'off', // not needed with new JSX transform
     'react/self-closing-comp': 'error',
 
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 4f145f9ed2..216c63a7e6 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -298,9 +298,9 @@ class LoginForm extends React.PureComponent {
             onFocus={this.handleFocus}
             onBlur={this.handleBlur}
             onKeyDown={this.handleKeyDown}
-            autocomplete='off'
-            autocapitalize='off'
-            spellcheck='false'
+            autoComplete='off'
+            autoCapitalize='off'
+            spellCheck='false'
           />
 
           <Button onClick={this.handleSubmit} disabled={isSubmitting || error}><FormattedMessage id='interaction_modal.login.action' defaultMessage='Take me home' /></Button>
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 4b0e03a0fd..d1b2a0910b 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -82,7 +82,7 @@ class NavigationPanel extends Component {
         </div>
 
         {banner &&
-          <div class='navigation-panel__banner'>
+          <div className='navigation-panel__banner'>
             {banner}
           </div>
         }
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index bef14ea276..9ff6d3589e 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -612,7 +612,6 @@ class Video extends PureComponent {
             aria-label={alt}
             title={alt}
             lang={lang}
-            volume={volume}
             onClick={this.togglePlay}
             onKeyDown={this.handleVideoKeyDown}
             onPlay={this.handlePlay}
diff --git a/package.json b/package.json
index 543af8a4b8..500d6d2cde 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "eslint-plugin-jsx-a11y": "~6.8.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
-    "eslint-plugin-react": "~7.33.0",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
diff --git a/yarn.lock b/yarn.lock
index 9e16226809..774eefec8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2371,7 +2371,7 @@ __metadata:
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
     eslint-plugin-prettier: "npm:^5.0.0"
     eslint-plugin-promise: "npm:~6.1.1"
-    eslint-plugin-react: "npm:~7.33.0"
+    eslint-plugin-react: "npm:^7.33.2"
     eslint-plugin-react-hooks: "npm:^4.6.0"
     file-loader: "npm:^6.2.0"
     font-awesome: "npm:^4.7.0"
@@ -7501,7 +7501,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:~7.33.0":
+"eslint-plugin-react@npm:^7.33.2":
   version: 7.33.2
   resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:

From 23b16aaab0f475d8584e948d2f4ce6d64a68cac3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:50:59 +0100
Subject: [PATCH 015/436] Update dependency selenium-webdriver to v4.16.0
 (#28246)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 738562116f..cd04f2782a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -707,7 +707,7 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.15.0)
+    selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)

From af66d3d836b89286423d4ba9fe1518bb6317b499 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 6 Dec 2023 09:15:54 -0500
Subject: [PATCH 016/436] Use `following` and `followers` scopes in CLI
 (#28154)

---
 lib/mastodon/cli/accounts.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 33520df25d..4146753035 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -472,15 +472,13 @@ module Mastodon::CLI
       end
 
       total     = 0
-      total    += Account.where(id: ::Follow.where(account: account).select(:target_account_id)).count if options[:follows]
-      total    += Account.where(id: ::Follow.where(target_account: account).select(:account_id)).count if options[:followers]
+      total    += account.following.reorder(nil).count if options[:follows]
+      total    += account.followers.reorder(nil).count if options[:followers]
       progress  = create_progress_bar(total)
       processed = 0
 
       if options[:follows]
-        scope = Account.where(id: ::Follow.where(account: account).select(:target_account_id))
-
-        scope.find_each do |target_account|
+        account.following.reorder(nil).find_each do |target_account|
           UnfollowService.new.call(account, target_account)
         rescue => e
           progress.log pastel.red("Error processing #{target_account.id}: #{e}")
@@ -493,9 +491,7 @@ module Mastodon::CLI
       end
 
       if options[:followers]
-        scope = Account.where(id: ::Follow.where(target_account: account).select(:account_id))
-
-        scope.find_each do |target_account|
+        account.followers.reorder(nil).find_each do |target_account|
           UnfollowService.new.call(target_account, account)
         rescue => e
           progress.log pastel.red("Error processing #{target_account.id}: #{e}")

From 658ad7a6cabe0c8b6b3ae11db1a4cc8434152ec4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 6 Dec 2023 23:22:25 +0100
Subject: [PATCH 017/436] Fix flaky tests related to file creation (#28248)

---
 .../post_deployment_migration_generator_spec.rb    |  2 +-
 spec/lib/mastodon/cli/emoji_spec.rb                | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/spec/generators/post_deployment_migration_generator_spec.rb b/spec/generators/post_deployment_migration_generator_spec.rb
index d770a78e97..55e70a7917 100644
--- a/spec/generators/post_deployment_migration_generator_spec.rb
+++ b/spec/generators/post_deployment_migration_generator_spec.rb
@@ -12,7 +12,7 @@ describe PostDeploymentMigrationGenerator, type: :generator do
   include FileUtils
 
   tests described_class
-  destination File.expand_path('../../tmp', __dir__)
+  destination Rails.root.join('tmp', 'generator-test')
   before { prepare_destination }
   after { rm_rf(destination_root) }
 
diff --git a/spec/lib/mastodon/cli/emoji_spec.rb b/spec/lib/mastodon/cli/emoji_spec.rb
index 530da91e74..3441413b90 100644
--- a/spec/lib/mastodon/cli/emoji_spec.rb
+++ b/spec/lib/mastodon/cli/emoji_spec.rb
@@ -41,11 +41,17 @@ describe Mastodon::CLI::Emoji do
 
   describe '#export' do
     context 'with existing custom emoji' do
-      before { Fabricate(:custom_emoji) }
-      after { File.delete(export_path) }
+      before do
+        FileUtils.rm_rf(export_path.dirname)
+        FileUtils.mkdir_p(export_path.dirname)
 
-      let(:export_path) { Rails.root.join('tmp', 'export.tar.gz') }
-      let(:args) { [Rails.root.join('tmp')] }
+        Fabricate(:custom_emoji)
+      end
+
+      after { FileUtils.rm_rf(export_path.dirname) }
+
+      let(:export_path) { Rails.root.join('tmp', 'cli-tests', 'export.tar.gz') }
+      let(:args) { [export_path.dirname.to_s] }
       let(:action) { :export }
 
       it 'reports about exported emoji' do

From 5e8a38e2540e4c067fe8756bb78a1cc854943db6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 09:42:47 +0100
Subject: [PATCH 018/436] Update dependency oj to v3.16.2 (#28263)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cd04f2782a..45ad605580 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -484,7 +484,8 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.1)
+    oj (3.16.2)
+      bigdecimal (~> 3.1)
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)

From 54db2006a96639a51d42353bef8c18b5f55b1c3c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 08:44:16 +0000
Subject: [PATCH 019/436] Update dependency sass-loader to v10.5.0 (#28254)

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

diff --git a/yarn.lock b/yarn.lock
index 774eefec8d..45f58eaadc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14663,8 +14663,8 @@ __metadata:
   linkType: hard
 
 "sass-loader@npm:^10.2.0":
-  version: 10.4.1
-  resolution: "sass-loader@npm:10.4.1"
+  version: 10.5.0
+  resolution: "sass-loader@npm:10.5.0"
   dependencies:
     klona: "npm:^2.0.4"
     loader-utils: "npm:^2.0.0"
@@ -14673,7 +14673,7 @@ __metadata:
     semver: "npm:^7.3.2"
   peerDependencies:
     fibers: ">= 3.1.0"
-    node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
+    node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     sass: ^1.3.0
     webpack: ^4.36.0 || ^5.0.0
   peerDependenciesMeta:
@@ -14683,7 +14683,7 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: bf04a440fe471928f3cf884bc12c6b70bc391795b35510b1b9021e8a2cca3b8f966aef9518f4171e87e9cb78193a774f695921e6b61881a1580ae0a3c7b1b5e4
+  checksum: be5da7784fd21c4f526cc3afaa1a765ba44cdc2f9798ecbac87b296ab44184ac5ba9bbda68a7a86f8cdcb6130acceefeb8912260fca14bdfc97f9dad02658400
   languageName: node
   linkType: hard
 

From 336d6260ba8ace929bfb5482cc72740d013dd1a0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 09:44:45 +0100
Subject: [PATCH 020/436] Update dependency chewy to v7.3.5 (#28253)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 45ad605580..7a7fdb01c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.3.4)
+    chewy (7.3.5)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl

From 7593465c23d4b0c4d44304712f7957aa1d9ce9d7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 7 Dec 2023 10:05:08 +0100
Subject: [PATCH 021/436] Fix error when processing link preview with an array
 as `inLanguage` (#28252)

---
 app/lib/link_details_extractor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index a96612cab0..bb031986d6 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -37,6 +37,7 @@ class LinkDetailsExtractor
 
     def language
       lang = json['inLanguage']
+      lang = lang.first if lang.is_a?(Array)
       lang.is_a?(Hash) ? (lang['alternateName'] || lang['name']) : lang
     end
 

From e0dacf6b4ce090cf6a30f8b1f37283b174b32c40 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 10:38:44 +0100
Subject: [PATCH 022/436] New Crowdin Translations (automated) (#28264)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/hu.json | 54 ++++++++++++-------------
 config/locales/activerecord.hu.yml      |  2 +-
 config/locales/devise.hu.yml            |  8 ++--
 config/locales/hu.yml                   | 28 ++++++-------
 config/locales/simple_form.hu.yml       |  8 ++--
 config/locales/simple_form.hy.yml       |  2 +-
 6 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 9bef814178..d890e4188a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -13,7 +13,7 @@
   "about.rules": "Kiszolgáló szabályai",
   "account.account_note_header": "Feljegyzés",
   "account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listákról",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatizált",
   "account.badges.group": "Csoport",
   "account.block": "@{name} letiltása",
   "account.block_domain": "Domain blokkolása: {domain}",
@@ -63,8 +63,8 @@
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
   "account.statuses_counter": "{count, plural, one {{counter} Bejegyzés} other {{counter} Bejegyzés}}",
-  "account.unblock": "@{name} tiltásának feloldása",
-  "account.unblock_domain": "{domain} domain tiltás feloldása",
+  "account.unblock": "@{name} letiltásának feloldása",
+  "account.unblock_domain": "{domain} domain tiltásának feloldása",
   "account.unblock_short": "Tiltás feloldása",
   "account.unendorse": "Ne jelenjen meg a profilodon",
   "account.unfollow": "Követés megszüntetése",
@@ -138,21 +138,21 @@
   "compose.language.search": "Nyelv keresése...",
   "compose.published.body": "A bejegyzés publikálásra került.",
   "compose.published.open": "Megnyitás",
-  "compose.saved.body": "A bejegyzés mentésre került.",
+  "compose.saved.body": "A bejegyzés mentve.",
   "compose_form.direct_message_warning_learn_more": "Tudj meg többet",
-  "compose_form.encryption_warning": "A bejegyzések Mastodonon nem használnak végpontok közötti titkosítást. Ne ossz meg semmilyen érzékeny információt Mastodonon.",
+  "compose_form.encryption_warning": "A bejegyzések a Mastodonon nem használnak végpontok közti titkosítást. Ne ossz meg semmilyen érzékeny információt a Mastodonon.",
   "compose_form.hashtag_warning": "Ez a bejegyzésed nem fog megjelenni semmilyen hashtag alatt, mivel nem nyilvános. Csak a nyilvános bejegyzések kereshetők hashtaggel.",
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
-  "compose_form.lock_disclaimer.lock": "lezárva",
+  "compose_form.lock_disclaimer.lock": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
   "compose_form.poll.add_option": "Lehetőség hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
   "compose_form.poll.option_placeholder": "{number}. lehetőség",
-  "compose_form.poll.remove_option": "Lehetőség törlése",
+  "compose_form.poll.remove_option": "Lehetőség eltávolítása",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
   "compose_form.publish": "Közzététel",
-  "compose_form.publish_form": "Közzététel",
+  "compose_form.publish_form": "Új bejegyzés",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Módosítások mentése",
   "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
@@ -195,13 +195,13 @@
   "copy_icon_button.copied": "A szöveg a vágólapra másolva",
   "copypaste.copied": "Másolva",
   "copypaste.copy_to_clipboard": "Másolás vágólapra",
-  "directory.federated": "Az ismert fediverzumból",
+  "directory.federated": "Az ismert födiverzumból",
   "directory.local": "Csak {domain} tartományból",
   "directory.new_arrivals": "Új csatlakozók",
   "directory.recently_active": "Nemrég aktív",
   "disabled_account_banner.account_settings": "Fiókbeállítások",
   "disabled_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva.",
-  "dismissable_banner.community_timeline": "Ezek a legfrissebb nyilvános bejegyzések, amelyeket {domain} tartományban levő kiszolgáló fiókjait használó emberek tettek közzé.",
+  "dismissable_banner.community_timeline": "Ezek a legfrissebb nyilvános bejegyzések, amelyeket a(z) {domain} kiszolgáló fiókjait használó emberek tették közzé.",
   "dismissable_banner.dismiss": "Elvetés",
   "dismissable_banner.explore_links": "Jelenleg ezekről a hírekről beszélgetnek az ezen és a központosítás nélküli hálózat többi kiszolgálóján lévő emberek.",
   "dismissable_banner.explore_statuses": "Ezek jelenleg népszerűvé váló bejegyzések a háló különböző szegleteiből. Az újabb vagy több megtolással rendelkező bejegyzéseket, illetve a kedvencnek jelöléssel rendelkezőeket rangsoroljuk előrébb.",
@@ -216,14 +216,14 @@
   "emoji_button.food": "Étel és Ital",
   "emoji_button.label": "Emodzsi beszúrása",
   "emoji_button.nature": "Természet",
-  "emoji_button.not_found": "Nincsenek emodzsik!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Nem találhatók emodzsik",
   "emoji_button.objects": "Tárgyak",
   "emoji_button.people": "Emberek",
   "emoji_button.recent": "Gyakran használt",
   "emoji_button.search": "Keresés...",
   "emoji_button.search_results": "Keresési találatok",
   "emoji_button.symbols": "Szimbólumok",
-  "emoji_button.travel": "Utazás és Helyek",
+  "emoji_button.travel": "Utazás és helyek",
   "empty_column.account_hides_collections": "Ez a felhasználó úgy döntött, hogy nem teszi elérhetővé ezt az információt.",
   "empty_column.account_suspended": "Fiók felfüggesztve",
   "empty_column.account_timeline": "Itt nincs bejegyzés!",
@@ -245,7 +245,7 @@
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
   "empty_column.notifications": "Jelenleg még nincsenek értesítéseid. Ha mások kapcsolatba lépnek veled, ezek itt lesznek láthatóak.",
   "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más kiszolgálón levő felhasználókat, hogy megtöltsd.",
-  "error.unexpected_crash.explanation": "Egy hiba vagy böngésző inkompatibilitás miatt ez az oldal nem jeleníthető meg rendesen.",
+  "error.unexpected_crash.explanation": "Egy kód- vagy böngészőkompatibilitási hiba miatt ez az oldal nem jeleníthető meg helyesen.",
   "error.unexpected_crash.explanation_addons": "Ezt az oldalt nem lehet helyesen megjeleníteni. Ezt a hibát valószínűleg egy böngésző kiegészítő vagy egy automatikus fordító okozza.",
   "error.unexpected_crash.next_steps": "Próbáld frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.",
   "error.unexpected_crash.next_steps_addons": "Próbáld letiltani őket és frissíteni az oldalt. Ha ez nem segít, egy másik böngészőn vagy appon keresztül még mindig használhatod a Mastodont.",
@@ -278,13 +278,13 @@
   "firehose.remote": "Egyéb kiszolgálók",
   "follow_request.authorize": "Hitelesítés",
   "follow_request.reject": "Elutasítás",
-  "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni a fiók követési kéréseit.",
+  "follow_requests.unlocked_explanation": "Bár a fiókod nincs zárolva, a(z) {domain} csapata úgy gondolta, hogy talán kézzel szeretnéd ellenőrizni ezen fiókok követési kéréseit.",
   "followed_tags": "Követett hashtagek",
   "footer.about": "Névjegy",
   "footer.directory": "Profiltár",
   "footer.get_app": "Alkalmazás beszerzése",
   "footer.invite": "Emberek meghívása",
-  "footer.keyboard_shortcuts": "Billentyűparancsok",
+  "footer.keyboard_shortcuts": "Gyorsbillentyűk",
   "footer.privacy_policy": "Adatvédelmi szabályzat",
   "footer.source_code": "Forráskód megtekintése",
   "footer.status": "Állapot",
@@ -347,13 +347,13 @@
   "keyboard_shortcuts.favourite": "Bejegyzés kedvencnek jelölése",
   "keyboard_shortcuts.favourites": "Kedvencek lista megnyitása",
   "keyboard_shortcuts.federated": "Föderációs idővonal megnyitása",
-  "keyboard_shortcuts.heading": "Billentyűparancsok",
+  "keyboard_shortcuts.heading": "Gyorsbillentyűk",
   "keyboard_shortcuts.home": "Saját idővonal megnyitása",
   "keyboard_shortcuts.hotkey": "Gyorsbillentyű",
   "keyboard_shortcuts.legend": "jelmagyarázat megjelenítése",
-  "keyboard_shortcuts.local": "helyi idővonal megnyitása",
+  "keyboard_shortcuts.local": "Helyi idővonal megnyitása",
   "keyboard_shortcuts.mention": "Szerző megemlítése",
-  "keyboard_shortcuts.muted": "némított felhasználók listájának megnyitása",
+  "keyboard_shortcuts.muted": "Némított felhasználók listájának megnyitása",
   "keyboard_shortcuts.my_profile": "Saját profil megnyitása",
   "keyboard_shortcuts.notifications": "Értesítések oszlop megnyitása",
   "keyboard_shortcuts.open_media": "Média megnyitása",
@@ -389,7 +389,7 @@
   "lists.replies_policy.list": "A lista tagjai",
   "lists.replies_policy.none": "Senki",
   "lists.replies_policy.title": "Nekik mutassuk a válaszokat:",
-  "lists.search": "Keresés a követett személyek között",
+  "lists.search": "Keresés a követett emberek között",
   "lists.subheading": "Saját listák",
   "load_pending": "{count, plural, one {# új elem} other {# új elem}}",
   "loading_indicator.label": "Betöltés…",
@@ -399,7 +399,7 @@
   "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
   "mute_modal.indefinite": "Határozatlan",
   "navigation_bar.about": "Névjegy",
-  "navigation_bar.advanced_interface": "Haladó webes felület engedélyezése",
+  "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
   "navigation_bar.bookmarks": "Könyvjelzők",
   "navigation_bar.community_timeline": "Helyi idővonal",
@@ -411,9 +411,9 @@
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
-  "navigation_bar.follow_requests": "Követési kérelmek",
+  "navigation_bar.follow_requests": "Követési kérések",
   "navigation_bar.followed_tags": "Követett hashtagek",
-  "navigation_bar.follows_and_followers": "Követettek és követők",
+  "navigation_bar.follows_and_followers": "Követések és követők",
   "navigation_bar.lists": "Listák",
   "navigation_bar.logout": "Kijelentkezés",
   "navigation_bar.mutes": "Némított felhasználók",
@@ -449,7 +449,7 @@
   "notifications.column_settings.follow_request": "Új követési kérelmek:",
   "notifications.column_settings.mention": "Megemlítések:",
   "notifications.column_settings.poll": "Szavazási eredmények:",
-  "notifications.column_settings.push": "Push értesítések",
+  "notifications.column_settings.push": "Leküldéses értesítések",
   "notifications.column_settings.reblog": "Megtolások:",
   "notifications.column_settings.show": "Megjelenítés az oszlopban",
   "notifications.column_settings.sound": "Hang lejátszása",
@@ -480,7 +480,7 @@
   "onboarding.compose.template": "Üdvözlet, #Mastodon!",
   "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.",
   "onboarding.follows.lead": "A saját hírfolyamod az elsődleges tapasztalás a Mastodonon. Minél több embert követsz, annál aktívabb és érdekesebb a dolog. Az induláshoz itt van néhány javaslat:",
-  "onboarding.follows.title": "Népszerű a Mastodonon",
+  "onboarding.follows.title": "Szabd személyre a kezdőlapodat",
   "onboarding.profile.discoverable": "Saját profil beállítása felfedezhetőként",
   "onboarding.profile.discoverable_hint": "A Mastodonon a felfedezhetőség választása esetén a saját bejegyzéseid megjelenhetnek a keresési eredmények és a felkapott tartalmak között, valamint a profilod a hozzád hasonló érdeklődési körrel rendelkező embereknél is ajánlásra kerülhet.",
   "onboarding.profile.display_name": "Megjelenített név",
@@ -499,14 +499,14 @@
   "onboarding.start.lead": "Az új Mastodon-fiók használatra kész. Így hozhatod ki belőle a legtöbbet:",
   "onboarding.start.skip": "Szeretnél előreugrani?",
   "onboarding.start.title": "Ez sikerült!",
-  "onboarding.steps.follow_people.body": "Te állítod össze a saját hírfolyamodat. Töltsd meg érdekes emberekkel.",
+  "onboarding.steps.follow_people.body": "A Mastodon az érdekes emberek követéséről szól.",
   "onboarding.steps.follow_people.title": "{count, plural, one {egy ember} other {# ember}} követése",
   "onboarding.steps.publish_status.body": "Üdvözöljük a világot.",
   "onboarding.steps.publish_status.title": "Az első bejegyzés létrehozása",
   "onboarding.steps.setup_profile.body": "Mások nagyobb valószínűséggel lépnek kapcsolatba veled egy kitöltött profil esetén.",
   "onboarding.steps.setup_profile.title": "Profilod testreszabása",
-  "onboarding.steps.share_profile.body": "Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon!",
-  "onboarding.steps.share_profile.title": "Profilod megosztása",
+  "onboarding.steps.share_profile.body": "Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon",
+  "onboarding.steps.share_profile.title": "Oszd meg a Mastodon profilodat",
   "onboarding.tips.2fa": "<strong>Tudtad?</strong> A fiókod biztonságossá teheted, ha a fiók beállításaiban beállítod a kétlépcsős hitelesítést. Bármilyen választott TOTP alkalmazással működik, nincs szükség telefonszámra!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Tudtad?</strong> Mivel a Mastodon decentralizált, egyes profilok, amelyekkel találkozol, más kiszolgálókon lesznek tárolva. És mégis zökkenőmentesen kommunikálhatsz velük! A kiszolgáló a felhasználónevük második felében található!",
   "onboarding.tips.migration": "<strong>Tudtad?</strong> Ha úgy érzed, hogy a {domain} már nem jó kiszolgáló a számodra, átköltözhetsz egy másik Mastodon kiszolgálóra anélkül, hogy elveszítenéd a követőidet. Akár saját kiszolgálót is üzemeltethetsz!",
diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml
index e5757ba643..f34ade0440 100644
--- a/config/locales/activerecord.hu.yml
+++ b/config/locales/activerecord.hu.yml
@@ -20,7 +20,7 @@ hu:
           attributes:
             username:
               invalid: csak betűket, számokat vagy alávonást tartalmazhat
-              reserved: fenntartott
+              reserved: foglalt
         admin/webhook:
           attributes:
             url:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index bbf6a6399b..6eb1524ed1 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -44,7 +44,7 @@ hu:
         action: Jelszó módosítása
         explanation: A fiókodhoz tartozó jelszó módosítását kezdeményezted.
         extra: Amennyiben nem te kezdeményezted a módosítást, kérjük tekintsd ezt az emailt tárgytalannak. A jelszavad változatlan marad mindaddig, amíg újat nem hozol létre a fenti linkre kattintva.
-        subject: 'Mastodon: Jelszó visszaállítási lépések'
+        subject: 'Mastodon: Jelszóvisszaállítási utasítások'
         title: Jelszó visszaállítása
       two_factor_disabled:
         explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges.
@@ -52,14 +52,14 @@ hu:
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
         explanation: A kétlépcsős hitelesítést engedélyeztük a fiókodban. A bejelentkezéshez a párosított TOTP alkalmazás által generált tokenre lesz szükség.
-        subject: Kétlépcsős azonosítás engedélyezve
+        subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
         title: Kétlépcsős hitelesítés engedélyezve
       two_factor_recovery_codes_changed:
         explanation: A korábbi helyreállítási kódok letiltásra és újragenerálásra kerültek.
-        subject: Kétlépcsős helyreállítási kódok újra létrejöttek
+        subject: 'Mastodon: Kétlépcsős helyreállítási kódok újból előállítva'
         title: A kétlépcsős kódok megváltoztak
       unlock_instructions:
-        subject: 'Mastodon: Feloldási lépések'
+        subject: 'Mastodon: Feloldási utasítások'
       webauthn_credential:
         added:
           explanation: A következő biztonsági kulcsot hozzáadtuk a fiókodhoz
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7057883e18..5da1a4e066 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -4,7 +4,7 @@ hu:
     about_mastodon_html: 'A jövő közösségi hálózata: Hirdetések és céges megfigyelés nélkül, etikus dizájnnal és decentralizációval! Legyél a saját adataid ura a Mastodonnal!'
     contact_missing: Nincs megadva
     contact_unavailable: N/A
-    hosted_on: "%{domain} Mastodon szerver"
+    hosted_on: "%{domain} Mastodon-kiszolgáló"
     title: Névjegy
   accounts:
     follow: Követés
@@ -747,7 +747,7 @@ hu:
         desc_html: Ez hCaptcha-ból származó külső scripteket használ, mely biztonsági vagy adatvédelmi résnek bizonyulhat. Ezen kívül ez <strong>a regisztrációs folyamatot jelentősen megnehezítheti bizonyos (kifejezetten különleges szükségletű) emberek számára</strong>. Emiatt fontold meg más módszerek, mint pl. jóváhagyás-alapú vagy meghívásalapú regisztráció használatát.
         title: Az új felhasználóknak egy CAPTCHA-t kell megoldaniuk, hogy megerősítsék a fiókjuk regisztrációját
       content_retention:
-        preamble: Felhasználók által generált tartalom Mastodonon való tárolásának szabályozása.
+        preamble: A felhasználók által előállított tartalom Mastodonon való tárolásának szabályozása.
         title: Tartalom megtartása
       default_noindex:
         desc_html: Azokat a felhasználókat érinti, akik nem módosították ezt a beállítást
@@ -1007,8 +1007,8 @@ hu:
     hint_html: Ha másik fiókról kívánsz átlépni erre a fiókra, itt létrehozhatsz egy aliast, amelyre szükség van, mielőtt folytathatod a követők áthelyezését a régi fiókból erre. Ez az áthelyezés önmagában <strong>ártalmatlan és visszafordítható</strong> folyamat. <strong>A fiók áttelepítése a régi fiókból indul el. </strong>
     remove: Alias szétkapcsolása
   appearance:
-    advanced_web_interface: Haladó webes felület
-    advanced_web_interface_hint: 'Ha szeretnéd, a teljes képernyőszélességet felhasználhatod. A haladó webes felülettel különböző oszlopokat állíthatsz be, hogy egyszerre annyi infót láthass, amennyit csak akarsz: Saját idővonal, értesítések, föderációs idővonal, bármennyi lista vagy hashtag.'
+    advanced_web_interface: Speciális webes felület
+    advanced_web_interface_hint: 'Ha szeretnéd, a képernyő teljes szélességét kihasználhatod. A speciális webes felülettel különböző oszlopokat állíthatsz be, hogy egyszerre annyi információt láthass, amennyit csak akarsz: Kezdőoldal, értesítések, föderációs idővonal, bármennyi lista vagy hashtag.'
     animations_and_accessibility: Animáció és akadálymentesítés
     confirmation_dialogs: Megerősítő párbeszédablakok
     discovery: Felfedezés
@@ -1052,7 +1052,7 @@ hu:
     delete_account: Felhasználói fiók törlése
     delete_account_html: Felhasználói fiókod törléséhez <a href="%{path}">kattints ide</a>. A rendszer újbóli megerősítést fog kérni.
     description:
-      prefix_invited_by_user: "@%{name} meghív téged, hogy csatlakozz ehhez a Mastodon kiszolgálóhoz."
+      prefix_invited_by_user: "@%{name} meghív téged, hogy csatlakozz ehhez a Mastodon-kiszolgálóhoz."
       prefix_sign_up: Regisztrláj még ma a Mastodonra!
       suffix: Egy fiókkal követhetsz másokat, bejegyzéseket tehetsz közzé, eszmét cserélhetsz más Mastodon szerverek felhasználóival!
     didnt_get_confirmation: Nem kaptál visszaigazoló hivatkozást?
@@ -1101,7 +1101,7 @@ hu:
       title: 'Bejelentkezés ide: %{domain}'
     sign_up:
       manual_review: A(z) %{domain} regisztrációi a moderátorok kézi felülvizsgálatán mennek át. Hogy segítsd a regisztráció feldolgozását, írj röviden magadról, és hogy miért szeretnél fiókot a(z) %{domain} oldalon.
-      preamble: Egy fiókkal ezen a Mastodon kiszolgálón követhetsz bárkit a hálózaton, függetlenül attól, hogy az illető fiókja melyik kiszolgálón található.
+      preamble: Egy fiókkal ezen a Mastodon-kiszolgálón követhetsz bárkit a hálózaton, függetlenül attól, hogy az illető fiókja melyik kiszolgálón található.
       title: Állítsuk be a fiókod a %{domain} kiszolgálón.
     status:
       account_status: Fiók állapota
@@ -1234,7 +1234,7 @@ hu:
   filters:
     contexts:
       account: Profil
-      home: Saját idővonal
+      home: Kezdőlap és listák
       notifications: Értesítések
       public: Nyilvános idővonalak
       thread: Beszélgetések
@@ -1245,7 +1245,7 @@ hu:
       statuses_hint_html: Ez a szűrő egyedi bejegyzések kiválasztására vonatkozik, függetlenül attól, hogy megfelelnek-e a lenti kulcsszavaknak. <a href="%{path}">Engedélyezze vagy távolítsa el a bejegyzéseket a szűrőből</a>.
       title: Szűrő szerkesztése
     errors:
-      deprecated_api_multiple_keywords: Ezek a paraméterek nem módosíthatóak az alkalmazásból, mert több mint egy szűrőkulcsszóra is hatással vannak. Használd az alkalmazás vagy a webes felület újabb verzióját.
+      deprecated_api_multiple_keywords: Ezek a paraméterek nem módosíthatók az alkalmazásból, mert egynél több szűrőkulcsszóra is hatással vannak. Használd az alkalmazás vagy a webes felület újabb verzióját.
       invalid_context: A megadott kontextus hamis vagy hiányzik
     index:
       contexts: 'Szűrés helye: %{contexts}'
@@ -1396,7 +1396,7 @@ hu:
     unsubscribe:
       action: Igen, leiratkozás
       complete: Leiratkozva
-      confirmation_html: Biztos vagy benne, hogy le szeretnél iratkozni arról, hogy %{type} típusú üzeneteket kapj a %{domain} Mastodon kiszolgálón a %{email} címedre? Bármikor újra feliratkozhatsz az <a href="%{settings_path}">email értesítések beállításainál</a>.
+      confirmation_html: 'Biztos, hogy leiratkozol arról, hogy %{type} típusú üzeneteket kapj a %{domain} Mastodon-kiszolgálótól erre a címedre: %{email}? Bármikor újra feliratkozhatsz az <a href="%{settings_path}">e-mail-értesítések beállításánál</a>.'
       emails:
         notification_emails:
           favourite: kedvencnek jelölésről email értesítő
@@ -1405,7 +1405,7 @@ hu:
           mention: megemlítésről email értesítő
           reblog: megtolásról email értesítő
       resubscribe_html: Ha tévedésből iratkoztál le, újra feliratkozhatsz az <a href="%{settings_path}">email értesítések beállításainál</a>.
-      success_html: Mostantól nem kapsz %{type} típusú üzeneket a %{domain} Mastodon kiszolgálón a %{email} címedre.
+      success_html: 'Mostantól nem kapsz %{type} típusú üzeneket a(z) %{domain} Mastodon-kiszolgálón erre a címedre: %{email}.'
       title: Leiratkozás
   media_attachments:
     validations:
@@ -1743,9 +1743,9 @@ hu:
   tags:
     does_not_match_previous_name: nem illeszkedik az előző névvel
   themes:
-    contrast: Mastodon (Nagy kontrasztú)
-    default: Mastodon (Sötét)
-    mastodon-light: Mastodon (Világos)
+    contrast: Mastodon (nagy kontrasztú)
+    default: Mastodon (sötét)
+    mastodon-light: Mastodon (világos)
   time:
     formats:
       default: "%Y. %b %d., %H:%M"
@@ -1782,7 +1782,7 @@ hu:
       subject: A %{date}-i fellebbezésedet visszautasították
       title: Fellebbezés visszautasítva
     backup_ready:
-      explanation: A Mastodon fiókod teljes mentését kérted. A mentés kész ás letölthető!
+      explanation: A Mastodon-fiókod teljes mentését kérted. A mentés elkészült, és letölthető.
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
     suspicious_sign_in:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 70c225e8ff..6e11f7fb93 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -81,8 +81,8 @@ hu:
         bootstrap_timeline_accounts: Ezek a fiókok ki lesznek tűzve az új felhasználók követési javaslatainak élére.
         closed_registrations_message: Akkor jelenik meg, amikor a regisztráció le van zárva
         content_cache_retention_period: A más kiszolgálókról származó bejegyzések megadott számú nap után törölve lesznek, ha pozitív értékre van állítva. Ez lehet, hogy nem fordítható vissza.
-        custom_css: A Mastodon webes verziójában használhatsz egyedi stílusokat.
-        mascot: Felülvágja a haladó webes felületen található illusztrációt.
+        custom_css: A Mastodon webes verziójában használhatsz egyéni stílusokat.
+        mascot: Felülbírálja a speciális webes felületen található illusztrációt.
         media_cache_retention_period: A letöltött médiafájlok megadott számú nap után törölve lesznek, ha pozitív értékre van állítva, és igény szerint újból le lesznek töltve.
         peers_api_enabled: Azon domainek listája, melyekkel ez a kiszolgáló találkozott a fediverzumban. Nem csatolunk adatot arról, hogy föderált kapcsolatban vagy-e az adott kiszolgálóval, csak arról, hogy a kiszolgálód tud a másikról. Ezt olyan szolgáltatások használják, melyek általában a föderációról készítenek statisztikákat.
         profile_directory: A profilok jegyzéke minden olyan felhasználót felsorol, akik engedélyezték a felfedezhetőségüket.
@@ -103,7 +103,7 @@ hu:
       form_challenge:
         current_password: Beléptél egy biztonsági térben
       imports:
-        data: Egy másik Mastodon kiszolgálóról exportált CSV-fájl
+        data: Egy másik Mastodon-kiszolgálóról exportált CSV-fájl
       invite_request:
         text: Ez segít nekünk átnézni a jelentkezésedet
       ip_block:
@@ -199,7 +199,7 @@ hu:
         otp_attempt: Kétlépcsős azonosító kód
         password: Jelszó
         phrase: Kulcsszó vagy kifejezés
-        setting_advanced_layout: Haladó webes felület engedélyezése
+        setting_advanced_layout: Speciális webes felület engedélyezése
         setting_aggregate_reblogs: Megtolások csoportosítása az idővonalakon
         setting_always_send_emails: E-mail értesítések küldése mindig
         setting_auto_play_gif: GIF-ek automatikus lejátszása
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 56aa1d66b1..9dbcd1301e 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -43,7 +43,7 @@ hy:
         setting_display_media_hide_all: Երբեք մեդիա ցոյց չտալ
         setting_display_media_show_all: Մեդիա միշտ ցոյց տալ
         setting_use_blurhash: Կտորները հիմնուում են թաքցուած վիզուալի վրայ՝ խամրեցնելով դետալները
-        setting_use_pending_items: Թաքցնել հոսքի թարմացումները կտտոի ետեւում՝ աւտօմատ թարմացուող հոսքի փոխարէն
+        setting_use_pending_items: Թաքցնել հոսքի թարմացումները կոճակի ետեւում՝ աւտօմատ թարմացուող հոսքի փոխարէն
         username: Միայն լատինատառեր, թուեր եւ տակի գծիկ
         whole_word: Եթէ բանալի բառը կամ արտայայտութիւնը պարունակում է միայն այբբենական նիշեր եւ թուեր, ապա այն կիրառուելու է ամբողջ բառի հետ համընկնելու դէպքում միայն
       domain_allow:

From 1d7b8234c94e13ad3f00455e7a5f0702e9379228 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 7 Dec 2023 04:41:00 -0500
Subject: [PATCH 023/436] Remove useless `reorder(nil)` call in `tootctl
 statuses` (#28141)

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

diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 0d6018a2b9..7acf3f9b77 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -120,7 +120,7 @@ module Mastodon::CLI
 
       say('Beginning removal of now-orphaned media attachments to free up disk space...')
 
-      scope     = MediaAttachment.reorder(nil).unattached.where('created_at < ?', options[:days].pred.days.ago)
+      scope     = MediaAttachment.unattached.where('created_at < ?', options[:days].pred.days.ago)
       processed = 0
       removed   = 0
       progress  = create_progress_bar(scope.count)

From 0b4a3a04378ce43f2f314b9446b5053f6b374c6d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 7 Dec 2023 07:15:50 -0500
Subject: [PATCH 024/436] Remove remaining
 `without_partial_double_verification` usage (#28127)

---
 spec/helpers/application_helper_spec.rb     | 24 +++++++++-----
 spec/helpers/home_helper_spec.rb            | 17 +++++++---
 spec/helpers/media_component_helper_spec.rb | 36 +++++----------------
 3 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 3cc88014cd..0a55770bad 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -29,15 +29,25 @@ describe ApplicationHelper do
 
   describe 'body_classes' do
     context 'with a body class string from a controller' do
-      before do
-        without_partial_double_verification do
-          allow(helper).to receive_messages(body_class_string: 'modal-layout compose-standalone', current_theme: 'default', current_account: Fabricate(:account))
-        end
-      end
+      before { helper.extend controller_helpers }
 
       it 'uses the controller body classes in the result' do
         expect(helper.body_classes).to match(/modal-layout compose-standalone/)
       end
+
+      private
+
+      def controller_helpers
+        Module.new do
+          def body_class_string = 'modal-layout compose-standalone'
+
+          def current_account
+            @current_account ||= Fabricate(:account)
+          end
+
+          def current_theme = 'default'
+        end
+      end
     end
   end
 
@@ -122,9 +132,7 @@ describe ApplicationHelper do
   describe 'available_sign_up_path' do
     context 'when registrations are closed' do
       before do
-        without_partial_double_verification do
-          allow(Setting).to receive(:registrations_mode).and_return('none')
-        end
+        allow(Setting).to receive(:[]).with('registrations_mode').and_return 'none'
       end
 
       it 'redirects to joinmastodon site' do
diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb
index c6baec5a1f..befc8a5c80 100644
--- a/spec/helpers/home_helper_spec.rb
+++ b/spec/helpers/home_helper_spec.rb
@@ -23,12 +23,19 @@ RSpec.describe HomeHelper do
     context 'with a valid account' do
       let(:account) { Fabricate(:account) }
 
-      it 'returns a link to the account' do
-        without_partial_double_verification do
-          allow(helper).to receive_messages(current_account: account, prefers_autoplay?: false)
-          result = helper.account_link_to(account)
+      before { helper.extend controller_helpers }
 
-          expect(result).to match "@#{account.acct}"
+      it 'returns a link to the account' do
+        result = helper.account_link_to(account)
+
+        expect(result).to match "@#{account.acct}"
+      end
+
+      private
+
+      def controller_helpers
+        Module.new do
+          def current_account = Account.last
         end
       end
     end
diff --git a/spec/helpers/media_component_helper_spec.rb b/spec/helpers/media_component_helper_spec.rb
index 149f6a83ad..af5d92769c 100644
--- a/spec/helpers/media_component_helper_spec.rb
+++ b/spec/helpers/media_component_helper_spec.rb
@@ -3,16 +3,12 @@
 require 'rails_helper'
 
 describe MediaComponentHelper do
+  before { helper.extend controller_helpers }
+
   describe 'render_video_component' do
     let(:media) { Fabricate(:media_attachment, type: :video, status: Fabricate(:status)) }
     let(:result) { helper.render_video_component(media.status) }
 
-    before do
-      without_partial_double_verification do
-        allow(helper).to receive(:current_account).and_return(media.account)
-      end
-    end
-
     it 'renders a react component for the video' do
       expect(parsed_html.div['data-component']).to eq('Video')
     end
@@ -22,12 +18,6 @@ describe MediaComponentHelper do
     let(:media) { Fabricate(:media_attachment, type: :audio, status: Fabricate(:status)) }
     let(:result) { helper.render_audio_component(media.status) }
 
-    before do
-      without_partial_double_verification do
-        allow(helper).to receive(:current_account).and_return(media.account)
-      end
-    end
-
     it 'renders a react component for the audio' do
       expect(parsed_html.div['data-component']).to eq('Audio')
     end
@@ -37,12 +27,6 @@ describe MediaComponentHelper do
     let(:media) { Fabricate(:media_attachment, type: :audio, status: Fabricate(:status)) }
     let(:result) { helper.render_media_gallery_component(media.status) }
 
-    before do
-      without_partial_double_verification do
-        allow(helper).to receive(:current_account).and_return(media.account)
-      end
-    end
-
     it 'renders a react component for the media gallery' do
       expect(parsed_html.div['data-component']).to eq('MediaGallery')
     end
@@ -54,10 +38,6 @@ describe MediaComponentHelper do
 
     before do
       PreviewCardsStatus.create(status: status, preview_card: Fabricate(:preview_card))
-
-      without_partial_double_verification do
-        allow(helper).to receive(:current_account).and_return(status.account)
-      end
     end
 
     it 'returns the correct react component markup' do
@@ -69,12 +49,6 @@ describe MediaComponentHelper do
     let(:status) { Fabricate(:status, poll: Fabricate(:poll)) }
     let(:result) { helper.render_poll_component(status) }
 
-    before do
-      without_partial_double_verification do
-        allow(helper).to receive(:current_account).and_return(status.account)
-      end
-    end
-
     it 'returns the correct react component markup' do
       expect(parsed_html.div['data-component']).to eq('Poll')
     end
@@ -85,4 +59,10 @@ describe MediaComponentHelper do
   def parsed_html
     Nokogiri::Slop(result)
   end
+
+  def controller_helpers
+    Module.new do
+      def current_account = Account.last
+    end
+  end
 end

From 5d97a897c8984d5f4fc0e2dca0799b5ab59a7c65 Mon Sep 17 00:00:00 2001
From: Ken Greeff <ken@kengreeff.com>
Date: Thu, 7 Dec 2023 23:45:55 +1100
Subject: [PATCH 025/436] Add note to install libidn on MacOS (#28259)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index beab2c3557..7b22d61b5e 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ To set up **MacOS** for native development, complete the following steps:
 - Run `brew install postgresql@14`
 - Run `brew install redis`
 - Run `brew install imagemagick`
+- Run `brew install libidn`
 - Install Foreman or a similar tool (such as [overmind](https://github.com/DarthSim/overmind)) to handle multiple process launching.
 - Navigate to Mastodon's root directory and run `brew install nvm` then `nvm use` to use the version from .nvmrc
 - Run `corepack enable && corepack prepare`

From ad34d33bfd10d3ff8078032e9f390c30892e80c1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 7 Dec 2023 08:49:14 -0500
Subject: [PATCH 026/436] Formalize some patterns in cli specs (#28255)

---
 spec/lib/mastodon/cli/accounts_spec.rb        | 431 +++++++++---------
 spec/lib/mastodon/cli/cache_spec.rb           |  29 +-
 .../cli/canonical_email_blocks_spec.rb        |  26 +-
 spec/lib/mastodon/cli/domains_spec.rb         |  14 +-
 .../mastodon/cli/email_domain_blocks_spec.rb  |  63 +--
 spec/lib/mastodon/cli/emoji_spec.rb           |  12 +-
 spec/lib/mastodon/cli/feeds_spec.rb           |  29 +-
 spec/lib/mastodon/cli/ip_blocks_spec.rb       | 113 ++---
 spec/lib/mastodon/cli/main_spec.rb            |  15 +-
 spec/lib/mastodon/cli/maintenance_spec.rb     |  24 +-
 spec/lib/mastodon/cli/media_spec.rb           |  73 ++-
 spec/lib/mastodon/cli/preview_cards_spec.rb   |  33 +-
 spec/lib/mastodon/cli/settings_spec.rb        |  39 +-
 spec/lib/mastodon/cli/statuses_spec.rb        |  17 +-
 spec/lib/mastodon/cli/upgrade_spec.rb         |  13 +-
 spec/rails_helper.rb                          |   1 +
 spec/support/command_line_helpers.rb          |   9 +
 17 files changed, 492 insertions(+), 449 deletions(-)
 create mode 100644 spec/support/command_line_helpers.rb

diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 3216d0d1bd..06860c2ff8 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -4,7 +4,11 @@ require 'rails_helper'
 require 'mastodon/cli/accounts'
 
 describe Mastodon::CLI::Accounts do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
@@ -27,15 +31,17 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#create' do
+    let(:action) { :create }
+
     shared_examples 'a new user with given email address and username' do
       it 'creates a new user with the specified email address' do
-        cli.invoke(:create, arguments, options)
+        subject
 
         expect(User.find_by(email: options[:email])).to be_present
       end
 
       it 'creates a new local account with the specified username' do
-        cli.invoke(:create, arguments, options)
+        subject
 
         expect(Account.find_local('tootctl_username')).to be_present
       end
@@ -43,9 +49,8 @@ describe Mastodon::CLI::Accounts do
       it 'returns "OK" and newly generated password' do
         allow(SecureRandom).to receive(:hex).and_return('test_password')
 
-        expect { cli.invoke(:create, arguments, options) }.to output(
-          a_string_including("OK\nNew password: test_password")
-        ).to_stdout
+        expect { subject }
+          .to output_results("OK\nNew password: test_password")
       end
     end
 
@@ -61,9 +66,8 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { email: 'invalid' } }
 
           it 'exits with an error message' do
-            expect { cli.invoke(:create, arguments, options) }.to output(
-              a_string_including('Failure/Error: email')
-            ).to_stdout
+            expect { subject }
+              .to output_results('Failure/Error: email')
               .and raise_error(SystemExit)
           end
         end
@@ -75,7 +79,7 @@ describe Mastodon::CLI::Accounts do
         it_behaves_like 'a new user with given email address and username'
 
         it 'creates a new user with confirmed status' do
-          cli.invoke(:create, arguments, options)
+          subject
 
           user = User.find_by(email: options[:email])
 
@@ -93,7 +97,7 @@ describe Mastodon::CLI::Accounts do
         it_behaves_like 'a new user with given email address and username'
 
         it 'creates a new user with approved status' do
-          cli.invoke(:create, arguments, options)
+          subject
 
           user = User.find_by(email: options[:email])
 
@@ -109,7 +113,7 @@ describe Mastodon::CLI::Accounts do
           it_behaves_like 'a new user with given email address and username'
 
           it 'creates a new user and assigns the specified role' do
-            cli.invoke(:create, arguments, options)
+            subject
 
             role = User.find_by(email: options[:email])&.role
 
@@ -121,9 +125,8 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { email: 'tootctl@example.com', role: '404' } }
 
           it 'exits with an error message indicating the role name was not found' do
-            expect { cli.invoke(:create, arguments, options) }.to output(
-              a_string_including('Cannot find user role with that name')
-            ).to_stdout
+            expect { subject }
+              .to output_results('Cannot find user role with that name')
               .and raise_error(SystemExit)
           end
         end
@@ -139,16 +142,15 @@ describe Mastodon::CLI::Accounts do
           end
 
           it 'returns an error message indicating the username is already taken' do
-            expect { cli.invoke(:create, arguments, options) }.to output(
-              a_string_including("The chosen username is currently in use\nUse --force to reattach it anyway and delete the other user")
-            ).to_stdout
+            expect { subject }
+              .to output_results("The chosen username is currently in use\nUse --force to reattach it anyway and delete the other user")
           end
 
           context 'with --force option' do
             let(:options) { { email: 'tootctl_new@example.com', reattach: true, force: true } }
 
             it 'reattaches the account to the new user and deletes the previous user' do
-              cli.invoke(:create, arguments, options)
+              subject
 
               user = Account.find_local('tootctl_username')&.user
 
@@ -173,20 +175,21 @@ describe Mastodon::CLI::Accounts do
       let(:arguments) { ['tootctl_username'] }
 
       it 'raises a required argument missing error (Thor::RequiredArgumentMissingError)' do
-        expect { cli.invoke(:create, arguments) }
+        expect { subject }
           .to raise_error(Thor::RequiredArgumentMissingError)
       end
     end
   end
 
   describe '#modify' do
+    let(:action) { :modify }
+
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
 
       it 'exits with an error message indicating the user was not found' do
-        expect { cli.invoke(:modify, arguments) }.to output(
-          a_string_including('No user with such username')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No user with such username')
           .and raise_error(SystemExit)
       end
     end
@@ -197,13 +200,12 @@ describe Mastodon::CLI::Accounts do
 
       context 'when no option is provided' do
         it 'returns a successful message' do
-          expect { cli.invoke(:modify, arguments) }.to output(
-            a_string_including('OK')
-          ).to_stdout
+          expect { subject }
+            .to output_results('OK')
         end
 
         it 'does not modify the user' do
-          cli.invoke(:modify, arguments)
+          subject
 
           expect(user).to eq(user.reload)
         end
@@ -214,9 +216,8 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { role: '404' } }
 
           it 'exits with an error message indicating the role was not found' do
-            expect { cli.invoke(:modify, arguments, options) }.to output(
-              a_string_including('Cannot find user role with that name')
-            ).to_stdout
+            expect { subject }
+              .to output_results('Cannot find user role with that name')
               .and raise_error(SystemExit)
           end
         end
@@ -226,7 +227,7 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { role: default_role.name } }
 
           it "updates the user's role to the specified role" do
-            cli.invoke(:modify, arguments, options)
+            subject
 
             role = user.reload.role
 
@@ -241,7 +242,7 @@ describe Mastodon::CLI::Accounts do
         let(:user) { Fabricate(:user, role: role) }
 
         it "removes the user's role successfully" do
-          cli.invoke(:modify, arguments, options)
+          subject
 
           role = user.reload.role
 
@@ -254,13 +255,13 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { email: 'new_email@email.com' } }
 
         it "sets the user's unconfirmed email to the provided email address" do
-          cli.invoke(:modify, arguments, options)
+          subject
 
           expect(user.reload.unconfirmed_email).to eq(options[:email])
         end
 
         it "does not update the user's original email address" do
-          cli.invoke(:modify, arguments, options)
+          subject
 
           expect(user.reload.email).to eq('old_email@email.com')
         end
@@ -270,13 +271,13 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { email: 'new_email@email.com', confirm: true } }
 
           it "updates the user's email address to the provided email" do
-            cli.invoke(:modify, arguments, options)
+            subject
 
             expect(user.reload.email).to eq(options[:email])
           end
 
           it "sets the user's email address as confirmed" do
-            cli.invoke(:modify, arguments, options)
+            subject
 
             expect(user.reload.confirmed?).to be(true)
           end
@@ -288,7 +289,7 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { confirm: true } }
 
         it "confirms the user's email address" do
-          cli.invoke(:modify, arguments, options)
+          subject
 
           expect(user.reload.confirmed?).to be(true)
         end
@@ -303,7 +304,7 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'approves the user' do
-          expect { cli.invoke(:modify, arguments, options) }.to change { user.reload.approved }.from(false).to(true)
+          expect { subject }.to change { user.reload.approved }.from(false).to(true)
         end
       end
 
@@ -312,7 +313,7 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { disable: true } }
 
         it 'disables the user' do
-          expect { cli.invoke(:modify, arguments, options) }.to change { user.reload.disabled }.from(false).to(true)
+          expect { subject }.to change { user.reload.disabled }.from(false).to(true)
         end
       end
 
@@ -321,7 +322,7 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { enable: true } }
 
         it 'enables the user' do
-          expect { cli.invoke(:modify, arguments, options) }.to change { user.reload.disabled }.from(true).to(false)
+          expect { subject }.to change { user.reload.disabled }.from(true).to(false)
         end
       end
 
@@ -331,9 +332,8 @@ describe Mastodon::CLI::Accounts do
         it 'returns a new password for the user' do
           allow(SecureRandom).to receive(:hex).and_return('new_password')
 
-          expect { cli.invoke(:modify, arguments, options) }.to output(
-            a_string_including('new_password')
-          ).to_stdout
+          expect { subject }
+            .to output_results('new_password')
         end
       end
 
@@ -342,7 +342,7 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { disable_2fa: true } }
 
         it 'disables the two-factor authentication for the user' do
-          expect { cli.invoke(:modify, arguments, options) }.to change { user.reload.otp_required_for_login }.from(true).to(false)
+          expect { subject }.to change { user.reload.otp_required_for_login }.from(true).to(false)
         end
       end
 
@@ -351,9 +351,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { email: 'invalid' } }
 
         it 'exits with an error message' do
-          expect { cli.invoke(:modify, arguments, options) }.to output(
-            a_string_including('Failure/Error: email')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Failure/Error: email')
             .and raise_error(SystemExit)
         end
       end
@@ -361,9 +360,8 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#delete' do
+    let(:action) { :delete }
     let(:account) { Fabricate(:account) }
-    let(:arguments) { [account.username] }
-    let(:options) { { email: account.user.email } }
     let(:delete_account_service) { instance_double(DeleteAccountService) }
 
     before do
@@ -372,26 +370,29 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'when both username and --email are provided' do
+      let(:arguments) { [account.username] }
+      let(:options) { { email: account.user.email } }
+
       it 'exits with an error message indicating that only one should be used' do
-        expect { cli.invoke(:delete, arguments, options) }.to output(
-          a_string_including('Use username or --email, not both')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Use username or --email, not both')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when neither username nor --email are provided' do
       it 'exits with an error message indicating that no username was provided' do
-        expect { cli.invoke(:delete) }.to output(
-          a_string_including('No username provided')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No username provided')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when username is provided' do
+      let(:arguments) { [account.username] }
+
       it 'deletes the specified user successfully' do
-        cli.invoke(:delete, arguments)
+        subject
 
         expect(delete_account_service).to have_received(:call).with(account, reserve_email: false).once
       end
@@ -400,15 +401,14 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { dry_run: true } }
 
         it 'does not delete the specified user' do
-          cli.invoke(:delete, arguments, options)
+          subject
 
           expect(delete_account_service).to_not have_received(:call).with(account, reserve_email: false)
         end
 
         it 'outputs a successful message in dry run mode' do
-          expect { cli.invoke(:delete, arguments, options) }.to output(
-            a_string_including('OK (DRY RUN)')
-          ).to_stdout
+          expect { subject }
+            .to output_results('OK (DRY RUN)')
         end
       end
 
@@ -416,17 +416,18 @@ describe Mastodon::CLI::Accounts do
         let(:arguments) { ['non_existent_username'] }
 
         it 'exits with an error message indicating that no user was found' do
-          expect { cli.invoke(:delete, arguments) }.to output(
-            a_string_including('No user with such username')
-          ).to_stdout
+          expect { subject }
+            .to output_results('No user with such username')
             .and raise_error(SystemExit)
         end
       end
     end
 
     context 'when --email is provided' do
+      let(:options) { { email: account.user.email } }
+
       it 'deletes the specified user successfully' do
-        cli.invoke(:delete, nil, options)
+        subject
 
         expect(delete_account_service).to have_received(:call).with(account, reserve_email: false).once
       end
@@ -435,15 +436,14 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { email: account.user.email, dry_run: true } }
 
         it 'does not delete the user' do
-          cli.invoke(:delete, nil, options)
+          subject
 
           expect(delete_account_service).to_not have_received(:call).with(account, reserve_email: false)
         end
 
         it 'outputs a successful message in dry run mode' do
-          expect { cli.invoke(:delete, nil, options) }.to output(
-            a_string_including('OK (DRY RUN)')
-          ).to_stdout
+          expect { subject }
+            .to output_results('OK (DRY RUN)')
         end
       end
 
@@ -451,9 +451,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { email: '404@example.com' } }
 
         it 'exits with an error message indicating that no user was found' do
-          expect { cli.invoke(:delete, nil, options) }.to output(
-            a_string_including('No user with such email')
-          ).to_stdout
+          expect { subject }
+            .to output_results('No user with such email')
             .and raise_error(SystemExit)
         end
       end
@@ -461,6 +460,7 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#approve' do
+    let(:action) { :approve }
     let(:total_users) { 4 }
 
     before do
@@ -469,8 +469,10 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'with --all option' do
+      let(:options) { { all: true } }
+
       it 'approves all pending registrations' do
-        cli.invoke(:approve, nil, all: true)
+        subject
 
         expect(User.pluck(:approved).all?(true)).to be(true)
       end
@@ -481,7 +483,7 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { number: 2 } }
 
         it 'approves the earliest n pending registrations' do
-          cli.invoke(:approve, nil, options)
+          subject
 
           n_earliest_pending_registrations = User.order(created_at: :asc).first(options[:number])
 
@@ -489,7 +491,7 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'does not approve the remaining pending registrations' do
-          cli.invoke(:approve, nil, options)
+          subject
 
           pending_registrations = User.order(created_at: :asc).last(total_users - options[:number])
 
@@ -498,10 +500,11 @@ describe Mastodon::CLI::Accounts do
       end
 
       context 'when the number is negative' do
+        let(:options) { { number: -1 } }
+
         it 'exits with an error message indicating that the number must be positive' do
-          expect { cli.invoke(:approve, nil, number: -1) }.to output(
-            a_string_including('Number must be positive')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Number must be positive')
             .and raise_error(SystemExit)
         end
       end
@@ -510,13 +513,13 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { number: total_users * 2 } }
 
         it 'approves all users' do
-          cli.invoke(:approve, nil, options)
+          subject
 
           expect(User.pluck(:approved).all?(true)).to be(true)
         end
 
         it 'does not raise any error' do
-          expect { cli.invoke(:approve, nil, options) }
+          expect { subject }
             .to_not raise_error
         end
       end
@@ -528,7 +531,7 @@ describe Mastodon::CLI::Accounts do
         let(:arguments) { [user.account.username] }
 
         it 'approves the specified user successfully' do
-          cli.invoke(:approve, arguments)
+          subject
 
           expect(user.reload.approved?).to be(true)
         end
@@ -538,9 +541,8 @@ describe Mastodon::CLI::Accounts do
         let(:arguments) { ['non_existent_username'] }
 
         it 'exits with an error message indicating that no such account was found' do
-          expect { cli.invoke(:approve, arguments) }.to output(
-            a_string_including('No such account')
-          ).to_stdout
+          expect { subject }
+            .to output_results('No such account')
             .and raise_error(SystemExit)
         end
       end
@@ -548,13 +550,14 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#follow' do
+    let(:action) { :follow }
+
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
 
       it 'exits with an error message indicating that no account with the given username was found' do
-        expect { cli.invoke(:follow, arguments) }.to output(
-          a_string_including('No such account')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No such account')
           .and raise_error(SystemExit)
       end
     end
@@ -565,6 +568,7 @@ describe Mastodon::CLI::Accounts do
       let!(:follower_rony)    { Fabricate(:account, username: 'rony') }
       let!(:follower_charles) { Fabricate(:account, username: 'charles') }
       let(:follow_service)    { instance_double(FollowService, call: nil) }
+      let(:arguments) { [target_account.username] }
 
       before do
         allow(FollowService).to receive(:new).and_return(follow_service)
@@ -572,7 +576,7 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'makes all local accounts follow the target account' do
-        cli.follow(target_account.username)
+        subject
 
         expect(follow_service).to have_received(:call).with(follower_bob, target_account, any_args).once
         expect(follow_service).to have_received(:call).with(follower_rony, target_account, any_args).once
@@ -580,21 +584,21 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'displays a successful message' do
-        expect { cli.follow(target_account.username) }.to output(
-          a_string_including("OK, followed target from #{Account.local.count} accounts")
-        ).to_stdout
+        expect { subject }
+          .to output_results("OK, followed target from #{Account.local.count} accounts")
       end
     end
   end
 
   describe '#unfollow' do
+    let(:action) { :unfollow }
+
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
 
       it 'exits with an error message indicating that no account with the given username was found' do
-        expect { cli.invoke(:unfollow, arguments) }.to output(
-          a_string_including('No such account')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No such account')
           .and raise_error(SystemExit)
       end
     end
@@ -605,6 +609,7 @@ describe Mastodon::CLI::Accounts do
       let!(:follower_rambo)  { Fabricate(:account, username: 'rambo', domain: nil) }
       let!(:follower_ana)    { Fabricate(:account, username: 'ana', domain: nil) }
       let(:unfollow_service) { instance_double(UnfollowService, call: nil) }
+      let(:arguments) { [target_account.username] }
 
       before do
         accounts = [follower_chris, follower_rambo, follower_ana]
@@ -614,7 +619,7 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'makes all local accounts unfollow the target account' do
-        cli.unfollow(target_account.username)
+        subject
 
         expect(unfollow_service).to have_received(:call).with(follower_chris, target_account).once
         expect(unfollow_service).to have_received(:call).with(follower_rambo, target_account).once
@@ -622,21 +627,21 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'displays a successful message' do
-        expect { cli.unfollow(target_account.username) }.to output(
-          a_string_including('OK, unfollowed target from 3 accounts')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK, unfollowed target from 3 accounts')
       end
     end
   end
 
   describe '#backup' do
+    let(:action) { :backup }
+
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
 
       it 'exits with an error message indicating that there is no such account' do
-        expect { cli.invoke(:backup, arguments) }.to output(
-          a_string_including('No user with such username')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No user with such username')
           .and raise_error(SystemExit)
       end
     end
@@ -647,22 +652,21 @@ describe Mastodon::CLI::Accounts do
       let(:arguments) { [account.username] }
 
       it 'creates a new backup for the specified user' do
-        expect { cli.invoke(:backup, arguments) }.to change { user.backups.count }.by(1)
+        expect { subject }.to change { user.backups.count }.by(1)
       end
 
       it 'creates a backup job' do
         allow(BackupWorker).to receive(:perform_async)
 
-        cli.invoke(:backup, arguments)
+        subject
         latest_backup = user.backups.last
 
         expect(BackupWorker).to have_received(:perform_async).with(latest_backup.id).once
       end
 
       it 'displays a successful message' do
-        expect { cli.invoke(:backup, arguments) }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
       end
     end
   end
@@ -724,9 +728,8 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'displays a successful message' do
-        expect { cli.refresh }.to output(
-          a_string_including('Refreshed 2 accounts')
-        ).to_stdout
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
       end
 
       context 'with --dry-run option' do
@@ -761,9 +764,8 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'displays a successful message with (DRY RUN)' do
-          expect { cli.refresh }.to output(
-            a_string_including('Refreshed 2 accounts (DRY RUN)')
-          ).to_stdout
+          expect { cli.refresh }
+            .to output_results('Refreshed 2 accounts (DRY RUN)')
         end
       end
     end
@@ -823,9 +825,7 @@ describe Mastodon::CLI::Accounts do
           allow(account_example_com_a).to receive(:reset_avatar!).and_raise(Mastodon::UnexpectedResponseError)
 
           expect { cli.refresh(*arguments) }
-            .to output(
-              a_string_including("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
-            ).to_stdout
+            .to output_results("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
         end
       end
 
@@ -833,9 +833,8 @@ describe Mastodon::CLI::Accounts do
         it 'exits with an error message' do
           allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
 
-          expect { cli.refresh(*arguments) }.to output(
-            a_string_including('No such account')
-          ).to_stdout
+          expect { cli.refresh(*arguments) }
+            .to output_results('No such account')
             .and raise_error(SystemExit)
         end
       end
@@ -878,7 +877,6 @@ describe Mastodon::CLI::Accounts do
         allow(cli).to receive(:parallelize_with_progress).and_yield(account_example_com_a)
                                                          .and_yield(account_example_com_b)
                                                          .and_return([2, nil])
-
         cli.options = { domain: domain }
       end
 
@@ -925,32 +923,33 @@ describe Mastodon::CLI::Accounts do
 
     context 'when neither a list of accts nor options are provided' do
       it 'exits with an error message' do
-        expect { cli.refresh }.to output(
-          a_string_including('No account(s) given')
-        ).to_stdout
+        expect { cli.refresh }
+          .to output_results('No account(s) given')
           .and raise_error(SystemExit)
       end
     end
   end
 
   describe '#rotate' do
+    let(:action) { :rotate }
+
     context 'when neither username nor --all option are given' do
       it 'exits with an error message' do
-        expect { cli.rotate }.to output(
-          a_string_including('No account(s) given')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No account(s) given')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when a username is given' do
       let(:account) { Fabricate(:account) }
+      let(:arguments) { [account.username] }
 
       it 'correctly rotates keys for the specified account' do
         old_private_key = account.private_key
         old_public_key = account.public_key
 
-        cli.rotate(account.username)
+        subject
         account.reload
 
         expect(account.private_key).to_not eq(old_private_key)
@@ -960,16 +959,17 @@ describe Mastodon::CLI::Accounts do
       it 'broadcasts the new keys for the specified account' do
         allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
 
-        cli.rotate(account.username)
+        subject
 
         expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
       end
 
       context 'when the given username is not found' do
+        let(:arguments) { ['non_existent_username'] }
+
         it 'exits with an error message when the specified username is not found' do
-          expect { cli.rotate('non_existent_username') }.to output(
-            a_string_including('No such account')
-          ).to_stdout
+          expect { subject }
+            .to output_results('No such account')
             .and raise_error(SystemExit)
         end
       end
@@ -977,17 +977,13 @@ describe Mastodon::CLI::Accounts do
 
     context 'when --all option is provided' do
       let!(:accounts) { Fabricate.times(2, :account) }
-      let(:options)   { { all: true } }
-
-      before do
-        cli.options = { all: true }
-      end
+      let(:options) { { all: true } }
 
       it 'correctly rotates keys for all local accounts' do
         old_private_keys = accounts.map(&:private_key)
         old_public_keys = accounts.map(&:public_key)
 
-        cli.rotate
+        subject
         accounts.each(&:reload)
 
         expect(accounts.map(&:private_key)).to_not eq(old_private_keys)
@@ -997,7 +993,7 @@ describe Mastodon::CLI::Accounts do
       it 'broadcasts the new keys for each account' do
         allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
 
-        cli.rotate
+        subject
 
         accounts.each do |account|
           expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
@@ -1007,11 +1003,12 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#merge' do
+    let(:action) { :merge }
+
     shared_examples 'an account not found' do |acct|
       it 'exits with an error message indicating that there is no such account' do
-        expect { cli.invoke(:merge, arguments) }.to output(
-          a_string_including("No such account (#{acct})")
-        ).to_stdout
+        expect { subject }
+          .to output_results("No such account (#{acct})")
           .and raise_error(SystemExit)
       end
     end
@@ -1061,9 +1058,8 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'exits with an error message indicating that the accounts do not have the same pub key' do
-        expect { cli.invoke(:merge, arguments) }.to output(
-          a_string_including("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
-        ).to_stdout
+        expect { subject }
+          .to output_results("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
           .and raise_error(SystemExit)
       end
 
@@ -1076,13 +1072,13 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'merges "from_account" into "to_account"' do
-          cli.invoke(:merge, arguments, options)
+          subject
 
           expect(to_account).to have_received(:merge_with!).with(from_account).once
         end
 
         it 'deletes "from_account"' do
-          cli.invoke(:merge, arguments, options)
+          subject
 
           expect(from_account).to have_received(:destroy).once
         end
@@ -1104,13 +1100,13 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'merges "from_account" into "to_account"' do
-        cli.invoke(:merge, arguments)
+        subject
 
         expect(to_account).to have_received(:merge_with!).with(from_account).once
       end
 
       it 'deletes "from_account"' do
-        cli.invoke(:merge, arguments)
+        subject
 
         expect(from_account).to have_received(:destroy)
       end
@@ -1118,6 +1114,7 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#cull' do
+    let(:action) { :cull }
     let(:delete_account_service) { instance_double(DeleteAccountService, call: nil) }
     let!(:tom)   { Fabricate(:account, updated_at: 30.days.ago, username: 'tom', uri: 'https://example.com/users/tom', domain: 'example.com', protocol: :activitypub) }
     let!(:bob)   { Fabricate(:account, updated_at: 30.days.ago, last_webfingered_at: nil, username: 'bob', uri: 'https://example.org/users/bob', domain: 'example.org', protocol: :activitypub) }
@@ -1138,14 +1135,14 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'deletes all inactive remote accounts that longer exist in the origin server' do
-        cli.cull
+        subject
 
         expect(delete_account_service).to have_received(:call).with(bob, reserve_username: false).once
         expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
       end
 
       it 'does not delete any active remote account that still exists in the origin server' do
-        cli.cull
+        subject
 
         expect(delete_account_service).to_not have_received(:call).with(tom, reserve_username: false)
         expect(delete_account_service).to_not have_received(:call).with(ana, reserve_username: false)
@@ -1153,18 +1150,17 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'touches inactive remote accounts that have not been deleted' do
-        expect { cli.cull }.to(change { tales.reload.updated_at })
+        expect { subject }.to(change { tales.reload.updated_at })
       end
 
       it 'displays the summary correctly' do
-        expect { cli.cull }.to output(
-          a_string_including('Visited 5 accounts, removed 2')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Visited 5 accounts, removed 2')
       end
     end
 
     context 'when a domain is specified' do
-      let(:domain) { 'example.net' }
+      let(:arguments) { ['example.net'] }
 
       before do
         stub_parallelize_with_progress!
@@ -1173,16 +1169,15 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'deletes inactive remote accounts that longer exist in the specified domain' do
-        cli.cull(domain)
+        subject
 
         expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
         expect(delete_account_service).to have_received(:call).with(tales, reserve_username: false).once
       end
 
       it 'displays the summary correctly' do
-        expect { cli.cull(domain) }.to output(
-          a_string_including('Visited 2 accounts, removed 2')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Visited 2 accounts, removed 2')
       end
     end
 
@@ -1195,15 +1190,14 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'skips accounts from the unavailable domain' do
-          cli.cull
+          subject
 
           expect(delete_account_service).to_not have_received(:call).with(tales, reserve_username: false)
         end
 
         it 'displays the summary correctly' do
-          expect { cli.cull }.to output(
-            a_string_including("Visited 5 accounts, removed 0\nThe following domains were not available during the check:\n    example.net")
-          ).to_stdout
+          expect { subject }
+            .to output_results("Visited 5 accounts, removed 0\nThe following domains were not available during the check:\n    example.net")
         end
       end
 
@@ -1242,25 +1236,25 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#reset_relationships' do
+    let(:action) { :reset_relationships }
     let(:target_account) { Fabricate(:account) }
     let(:arguments)      { [target_account.username] }
 
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option is required' do
-        expect { cli.invoke(:reset_relationships, arguments) }.to output(
-          a_string_including('Please specify either --follows or --followers, or both')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Please specify either --follows or --followers, or both')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
+      let(:options) { { follows: true } }
 
       it 'exits with an error message indicating that there is no such account' do
-        expect { cli.invoke(:reset_relationships, arguments, follows: true) }.to output(
-          a_string_including('No such account')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No such account')
           .and raise_error(SystemExit)
       end
     end
@@ -1277,7 +1271,7 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'resets all "following" relationships from the target account' do
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(target_account.reload.following).to be_empty
         end
@@ -1285,15 +1279,14 @@ describe Mastodon::CLI::Accounts do
         it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
           allow(BootstrapTimelineWorker).to receive(:perform_async)
 
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
 
         it 'displays a successful message' do
-          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
-            a_string_including("Processed #{total_relationships} relationships")
-          ).to_stdout
+          expect { subject }
+            .to output_results("Processed #{total_relationships} relationships")
         end
       end
 
@@ -1305,15 +1298,14 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'resets all "followers" relationships from the target account' do
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(target_account.reload.followers).to be_empty
         end
 
         it 'displays a successful message' do
-          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
-            a_string_including("Processed #{total_relationships} relationships")
-          ).to_stdout
+          expect { subject }
+            .to output_results("Processed #{total_relationships} relationships")
         end
       end
 
@@ -1326,13 +1318,13 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'resets all "followers" relationships from the target account' do
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(target_account.reload.followers).to be_empty
         end
 
         it 'resets all "following" relationships from the target account' do
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(target_account.reload.following).to be_empty
         end
@@ -1340,21 +1332,21 @@ describe Mastodon::CLI::Accounts do
         it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
           allow(BootstrapTimelineWorker).to receive(:perform_async)
 
-          cli.invoke(:reset_relationships, arguments, options)
+          subject
 
           expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
 
         it 'displays a successful message' do
-          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
-            a_string_including("Processed #{total_relationships} relationships")
-          ).to_stdout
+          expect { subject }
+            .to output_results("Processed #{total_relationships} relationships")
         end
       end
     end
   end
 
   describe '#prune' do
+    let(:action) { :prune }
     let!(:local_account)     { Fabricate(:account) }
     let!(:bot_account)       { Fabricate(:account, bot: true, domain: 'example.com') }
     let!(:group_account)     { Fabricate(:account, actor_type: 'Group', domain: 'example.com') }
@@ -1369,7 +1361,7 @@ describe Mastodon::CLI::Accounts do
     end
 
     it 'prunes all remote accounts with no interactions with local users' do
-      cli.prune
+      subject
 
       prunable_account_ids = prunable_accounts.pluck(:id)
 
@@ -1377,42 +1369,39 @@ describe Mastodon::CLI::Accounts do
     end
 
     it 'displays a successful message' do
-      expect { cli.prune }.to output(
-        a_string_including("OK, pruned #{prunable_accounts.size} accounts")
-      ).to_stdout
+      expect { subject }
+        .to output_results("OK, pruned #{prunable_accounts.size} accounts")
     end
 
     it 'does not prune local accounts' do
-      cli.prune
+      subject
 
       expect(Account.exists?(id: local_account.id)).to be(true)
     end
 
     it 'does not prune bot accounts' do
-      cli.prune
+      subject
 
       expect(Account.exists?(id: bot_account.id)).to be(true)
     end
 
     it 'does not prune group accounts' do
-      cli.prune
+      subject
 
       expect(Account.exists?(id: group_account.id)).to be(true)
     end
 
     it 'does not prune accounts that have been mentioned' do
-      cli.prune
+      subject
 
       expect(Account.exists?(id: mentioned_account.id)).to be true
     end
 
     context 'with --dry-run option' do
-      before do
-        cli.options = { dry_run: true }
-      end
+      let(:options) { { dry_run: true } }
 
       it 'does not prune any account' do
-        cli.prune
+        subject
 
         prunable_account_ids = prunable_accounts.pluck(:id)
 
@@ -1420,14 +1409,14 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'displays a successful message with (DRY RUN)' do
-        expect { cli.prune }.to output(
-          a_string_including("OK, pruned #{prunable_accounts.size} accounts (DRY RUN)")
-        ).to_stdout
+        expect { subject }
+          .to output_results("OK, pruned #{prunable_accounts.size} accounts (DRY RUN)")
       end
     end
   end
 
   describe '#migrate' do
+    let(:action) { :migrate }
     let!(:source_account)         { Fabricate(:account) }
     let!(:target_account)         { Fabricate(:account, domain: 'example.com') }
     let(:arguments)               { [source_account.username] }
@@ -1441,7 +1430,7 @@ describe Mastodon::CLI::Accounts do
 
     shared_examples 'a successful migration' do
       it 'calls the MoveService for the last migration' do
-        cli.invoke(:migrate, arguments, options)
+        subject
 
         last_migration = source_account.migrations.last
 
@@ -1449,9 +1438,8 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'displays a successful message' do
-        expect { cli.invoke(:migrate, arguments, options) }.to output(
-          a_string_including("OK, migrated #{source_account.acct} to #{target_account.acct}")
-        ).to_stdout
+        expect { subject }
+          .to output_results("OK, migrated #{source_account.acct} to #{target_account.acct}")
       end
     end
 
@@ -1459,29 +1447,27 @@ describe Mastodon::CLI::Accounts do
       let(:options) { { replay: true, target: "#{target_account.username}@example.com" } }
 
       it 'exits with an error message indicating that using both options is not possible' do
-        expect { cli.invoke(:migrate, arguments, options) }.to output(
-          a_string_including('Use --replay or --target, not both')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Use --replay or --target, not both')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when no option is given' do
       it 'exits with an error message indicating that at least one option must be used' do
-        expect { cli.invoke(:migrate, arguments, {}) }.to output(
-          a_string_including('Use either --replay or --target')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Use either --replay or --target')
           .and raise_error(SystemExit)
       end
     end
 
     context 'when the given username is not found' do
       let(:arguments) { ['non_existent_username'] }
+      let(:options) { { replay: true } }
 
       it 'exits with an error message indicating that there is no such account' do
-        expect { cli.invoke(:migrate, arguments, replay: true) }.to output(
-          a_string_including("No such account: #{arguments.first}")
-        ).to_stdout
+        expect { subject }
+          .to output_results("No such account: #{arguments.first}")
           .and raise_error(SystemExit)
       end
     end
@@ -1491,9 +1477,8 @@ describe Mastodon::CLI::Accounts do
 
       context 'when the specified account has no previous migrations' do
         it 'exits with an error message indicating that the given account has no previous migrations' do
-          expect { cli.invoke(:migrate, arguments, options) }.to output(
-            a_string_including('The specified account has not performed any migration')
-          ).to_stdout
+          expect { subject }
+            .to output_results('The specified account has not performed any migration')
             .and raise_error(SystemExit)
         end
       end
@@ -1515,9 +1500,8 @@ describe Mastodon::CLI::Accounts do
           end
 
           it 'exits with an error message' do
-            expect { cli.invoke(:migrate, arguments, options) }.to output(
-              a_string_including('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
-            ).to_stdout
+            expect { subject }
+              .to output_results('The specified account is not redirecting to its last migration target. Use --force if you want to replay the migration anyway')
               .and raise_error(SystemExit)
           end
         end
@@ -1544,9 +1528,8 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'exits with an error message indicating that there is no such account' do
-          expect { cli.invoke(:migrate, arguments, options) }.to output(
-            a_string_including("The specified target account could not be found: #{options[:target]}")
-          ).to_stdout
+          expect { subject }
+            .to output_results("The specified target account could not be found: #{options[:target]}")
             .and raise_error(SystemExit)
         end
       end
@@ -1557,7 +1540,7 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'creates a migration for the specified account with the target account' do
-          cli.invoke(:migrate, arguments, options)
+          subject
 
           last_migration = source_account.migrations.last
 
@@ -1569,9 +1552,8 @@ describe Mastodon::CLI::Accounts do
 
       context 'when the migration record is invalid' do
         it 'exits with an error indicating that the validation failed' do
-          expect { cli.invoke(:migrate, arguments, options) }.to output(
-            a_string_including('Error: Validation failed')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Error: Validation failed')
             .and raise_error(SystemExit)
         end
       end
@@ -1582,9 +1564,8 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'exits with an error message' do
-          expect { cli.invoke(:migrate, arguments, options) }.to output(
-            a_string_including('The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
-          ).to_stdout
+          expect { subject }
+            .to output_results('The specified account is redirecting to a different target account. Use --force if you want to change the migration target')
             .and raise_error(SystemExit)
         end
       end
diff --git a/spec/lib/mastodon/cli/cache_spec.rb b/spec/lib/mastodon/cli/cache_spec.rb
index c1ce04710c..b1515801eb 100644
--- a/spec/lib/mastodon/cli/cache_spec.rb
+++ b/spec/lib/mastodon/cli/cache_spec.rb
@@ -4,22 +4,29 @@ require 'rails_helper'
 require 'mastodon/cli/cache'
 
 describe Mastodon::CLI::Cache do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#clear' do
+    let(:action) { :clear }
+
     before { allow(Rails.cache).to receive(:clear) }
 
     it 'clears the Rails cache' do
-      expect { cli.invoke(:clear) }.to output(
-        a_string_including('OK')
-      ).to_stdout
+      expect { subject }
+        .to output_results('OK')
       expect(Rails.cache).to have_received(:clear)
     end
   end
 
   describe '#recount' do
+    let(:action) { :recount }
+
     context 'with the `accounts` argument' do
       let(:arguments) { ['accounts'] }
       let(:account_stat) { Fabricate(:account_stat) }
@@ -29,9 +36,8 @@ describe Mastodon::CLI::Cache do
       end
 
       it 're-calculates account records in the cache' do
-        expect { cli.invoke(:recount, arguments) }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
 
         expect(account_stat.reload.statuses_count).to be_zero
       end
@@ -46,9 +52,8 @@ describe Mastodon::CLI::Cache do
       end
 
       it 're-calculates account records in the cache' do
-        expect { cli.invoke(:recount, arguments) }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
 
         expect(status_stat.reload.replies_count).to be_zero
       end
@@ -58,9 +63,9 @@ describe Mastodon::CLI::Cache do
       let(:arguments) { ['other-type'] }
 
       it 'Exits with an error message' do
-        expect { cli.invoke(:recount, arguments) }.to output(
-          a_string_including('Unknown')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('Unknown')
+          .and raise_error(SystemExit)
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
index 6e4675748e..1745ea01bf 100644
--- a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
@@ -4,42 +4,45 @@ require 'rails_helper'
 require 'mastodon/cli/canonical_email_blocks'
 
 describe Mastodon::CLI::CanonicalEmailBlocks do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#find' do
+    let(:action) { :find }
     let(:arguments) { ['user@example.com'] }
 
     context 'when a block is present' do
       before { Fabricate(:canonical_email_block, email: 'user@example.com') }
 
       it 'announces the presence of the block' do
-        expect { cli.invoke(:find, arguments) }.to output(
-          a_string_including('user@example.com is blocked')
-        ).to_stdout
+        expect { subject }
+          .to output_results('user@example.com is blocked')
       end
     end
 
     context 'when a block is not present' do
       it 'announces the absence of the block' do
-        expect { cli.invoke(:find, arguments) }.to output(
-          a_string_including('user@example.com is not blocked')
-        ).to_stdout
+        expect { subject }
+          .to output_results('user@example.com is not blocked')
       end
     end
   end
 
   describe '#remove' do
+    let(:action) { :remove }
     let(:arguments) { ['user@example.com'] }
 
     context 'when a block is present' do
       before { Fabricate(:canonical_email_block, email: 'user@example.com') }
 
       it 'removes the block' do
-        expect { cli.invoke(:remove, arguments) }.to output(
-          a_string_including('Unblocked user@example.com')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Unblocked user@example.com')
 
         expect(CanonicalEmailBlock.matching_email('user@example.com')).to be_empty
       end
@@ -47,9 +50,8 @@ describe Mastodon::CLI::CanonicalEmailBlocks do
 
     context 'when a block is not present' do
       it 'announces the absence of the block' do
-        expect { cli.invoke(:remove, arguments) }.to output(
-          a_string_including('user@example.com is not blocked')
-        ).to_stdout
+        expect { subject }
+          .to output_results('user@example.com is not blocked')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/domains_spec.rb b/spec/lib/mastodon/cli/domains_spec.rb
index add754159c..a10907f76e 100644
--- a/spec/lib/mastodon/cli/domains_spec.rb
+++ b/spec/lib/mastodon/cli/domains_spec.rb
@@ -4,20 +4,26 @@ require 'rails_helper'
 require 'mastodon/cli/domains'
 
 describe Mastodon::CLI::Domains do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#purge' do
+    let(:action) { :purge }
+
     context 'with accounts from the domain' do
-      let(:options) { {} }
       let(:domain) { 'host.example' }
       let!(:account) { Fabricate(:account, domain: domain) }
+      let(:arguments) { [domain] }
 
       it 'removes the account' do
-        expect { cli.invoke(:purge, [domain], options) }.to output(
-          a_string_including('Removed 1 accounts')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Removed 1 accounts')
+
         expect { account.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
diff --git a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
index f5cb6c332b..13deb05b6c 100644
--- a/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/email_domain_blocks_spec.rb
@@ -4,96 +4,99 @@ require 'rails_helper'
 require 'mastodon/cli/email_domain_blocks'
 
 describe Mastodon::CLI::EmailDomainBlocks do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#list' do
+    let(:action) { :list }
+
     context 'with email domain block records' do
       let!(:parent_block) { Fabricate(:email_domain_block) }
       let!(:child_block) { Fabricate(:email_domain_block, parent: parent_block) }
-      let(:options) { {} }
 
       it 'lists the blocks' do
-        expect { cli.invoke(:list, [], options) }.to output(
-          a_string_including(parent_block.domain)
-          .and(a_string_including(child_block.domain))
-        ).to_stdout
+        expect { subject }
+          .to output_results(
+            parent_block.domain,
+            child_block.domain
+          )
       end
     end
   end
 
   describe '#add' do
-    context 'without any options' do
-      let(:options) { {} }
+    let(:action) { :add }
 
+    context 'without any options' do
       it 'warns about usage and exits' do
-        expect { cli.invoke(:add, [], options) }.to output(
-          a_string_including('No domain(s) given')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('No domain(s) given')
+          .and raise_error(SystemExit)
       end
     end
 
     context 'when blocks exist' do
       let(:options) { {} }
       let(:domain) { 'host.example' }
+      let(:arguments) { [domain] }
 
       before { Fabricate(:email_domain_block, domain: domain) }
 
       it 'does not add a new block' do
-        expect { cli.invoke(:add, [domain], options) }.to output(
-          a_string_including('is already blocked')
-        ).to_stdout
+        expect { subject }
+          .to output_results('is already blocked')
           .and(not_change(EmailDomainBlock, :count))
       end
     end
 
     context 'when no blocks exist' do
-      let(:options) { {} }
       let(:domain) { 'host.example' }
+      let(:arguments) { [domain] }
 
       it 'adds a new block' do
-        expect { cli.invoke(:add, [domain], options) }.to output(
-          a_string_including('Added 1')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Added 1')
           .and(change(EmailDomainBlock, :count).by(1))
       end
     end
   end
 
   describe '#remove' do
-    context 'without any options' do
-      let(:options) { {} }
+    let(:action) { :remove }
 
+    context 'without any options' do
       it 'warns about usage and exits' do
-        expect { cli.invoke(:remove, [], options) }.to output(
-          a_string_including('No domain(s) given')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('No domain(s) given')
+          .and raise_error(SystemExit)
       end
     end
 
     context 'when blocks exist' do
-      let(:options) { {} }
       let(:domain) { 'host.example' }
+      let(:arguments) { [domain] }
 
       before { Fabricate(:email_domain_block, domain: domain) }
 
       it 'removes the block' do
-        expect { cli.invoke(:remove, [domain], options) }.to output(
-          a_string_including('Removed 1')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Removed 1')
           .and(change(EmailDomainBlock, :count).by(-1))
       end
     end
 
     context 'when no blocks exist' do
-      let(:options) { {} }
       let(:domain) { 'host.example' }
+      let(:arguments) { [domain] }
 
       it 'does not remove a block' do
-        expect { cli.invoke(:remove, [domain], options) }.to output(
-          a_string_including('is not yet blocked')
-        ).to_stdout
+        expect { subject }
+          .to output_results('is not yet blocked')
           .and(not_change(EmailDomainBlock, :count))
       end
     end
diff --git a/spec/lib/mastodon/cli/emoji_spec.rb b/spec/lib/mastodon/cli/emoji_spec.rb
index 3441413b90..d05e972e77 100644
--- a/spec/lib/mastodon/cli/emoji_spec.rb
+++ b/spec/lib/mastodon/cli/emoji_spec.rb
@@ -4,10 +4,10 @@ require 'rails_helper'
 require 'mastodon/cli/emoji'
 
 describe Mastodon::CLI::Emoji do
-  subject { cli.invoke(action, args, options) }
+  subject { cli.invoke(action, arguments, options) }
 
   let(:cli) { described_class.new }
-  let(:args) { [] }
+  let(:arguments) { [] }
   let(:options) { {} }
 
   it_behaves_like 'CLI Command'
@@ -29,7 +29,7 @@ describe Mastodon::CLI::Emoji do
     context 'with existing custom emoji' do
       let(:import_path) { Rails.root.join('spec', 'fixtures', 'files', 'elite-assets.tar.gz') }
       let(:action) { :import }
-      let(:args) { [import_path] }
+      let(:arguments) { [import_path] }
 
       it 'reports about imported emoji' do
         expect { subject }
@@ -51,7 +51,7 @@ describe Mastodon::CLI::Emoji do
       after { FileUtils.rm_rf(export_path.dirname) }
 
       let(:export_path) { Rails.root.join('tmp', 'cli-tests', 'export.tar.gz') }
-      let(:args) { [export_path.dirname.to_s] }
+      let(:arguments) { [export_path.dirname.to_s] }
       let(:action) { :export }
 
       it 'reports about exported emoji' do
@@ -61,8 +61,4 @@ describe Mastodon::CLI::Emoji do
       end
     end
   end
-
-  def output_results(string)
-    output(a_string_including(string)).to_stdout
-  end
 end
diff --git a/spec/lib/mastodon/cli/feeds_spec.rb b/spec/lib/mastodon/cli/feeds_spec.rb
index e16113c854..1997980527 100644
--- a/spec/lib/mastodon/cli/feeds_spec.rb
+++ b/spec/lib/mastodon/cli/feeds_spec.rb
@@ -4,20 +4,25 @@ require 'rails_helper'
 require 'mastodon/cli/feeds'
 
 describe Mastodon::CLI::Feeds do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#build' do
+    let(:action) { :build }
+
     before { Fabricate(:account) }
 
     context 'with --all option' do
       let(:options) { { all: true } }
 
       it 'regenerates feeds for all accounts' do
-        expect { cli.invoke(:build, [], options) }.to output(
-          a_string_including('Regenerated feeds')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Regenerated feeds')
       end
     end
 
@@ -27,9 +32,8 @@ describe Mastodon::CLI::Feeds do
       let(:arguments) { ['alice'] }
 
       it 'regenerates feeds for the account' do
-        expect { cli.invoke(:build, arguments) }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
       end
     end
 
@@ -37,22 +41,23 @@ describe Mastodon::CLI::Feeds do
       let(:arguments) { ['invalid-username'] }
 
       it 'displays an error and exits' do
-        expect { cli.invoke(:build, arguments) }.to output(
-          a_string_including('No such account')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('No such account')
+          .and raise_error(SystemExit)
       end
     end
   end
 
   describe '#clear' do
+    let(:action) { :clear }
+
     before do
       allow(redis).to receive(:del).with(key_namespace)
     end
 
     it 'clears the redis `feed:*` namespace' do
-      expect { cli.invoke(:clear) }.to output(
-        a_string_including('OK')
-      ).to_stdout
+      expect { subject }
+        .to output_results('OK')
 
       expect(redis).to have_received(:del).with(key_namespace).once
     end
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index 684314dc7a..dc967a69c9 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -4,11 +4,16 @@ require 'rails_helper'
 require 'mastodon/cli/ip_blocks'
 
 describe Mastodon::CLI::IpBlocks do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#add' do
+    let(:action) { :add }
     let(:ip_list) do
       [
         '192.0.2.1',
@@ -25,10 +30,11 @@ describe Mastodon::CLI::IpBlocks do
       ]
     end
     let(:options) { { severity: 'no_access' } }
+    let(:arguments) { ip_list }
 
     shared_examples 'ip address blocking' do
       it 'blocks all specified IP addresses' do
-        cli.invoke(:add, ip_list, options)
+        subject
 
         blocked_ip_addresses = IpBlock.where(ip: ip_list).pluck(:ip)
         expected_ip_addresses = ip_list.map { |ip| IPAddr.new(ip) }
@@ -37,7 +43,7 @@ describe Mastodon::CLI::IpBlocks do
       end
 
       it 'sets the severity for all blocked IP addresses' do
-        cli.invoke(:add, ip_list, options)
+        subject
 
         blocked_ips_severity = IpBlock.where(ip: ip_list).pluck(:severity).all?(options[:severity])
 
@@ -45,9 +51,8 @@ describe Mastodon::CLI::IpBlocks do
       end
 
       it 'displays a success message with a summary' do
-        expect { cli.invoke(:add, ip_list, options) }.to output(
-          a_string_including("Added #{ip_list.size}, skipped 0, failed 0")
-        ).to_stdout
+        expect { subject }
+          .to output_results("Added #{ip_list.size}, skipped 0, failed 0")
       end
     end
 
@@ -57,19 +62,19 @@ describe Mastodon::CLI::IpBlocks do
 
     context 'when a specified IP address is already blocked' do
       let!(:blocked_ip) { IpBlock.create(ip: ip_list.last, severity: options[:severity]) }
+      let(:arguments) { ip_list }
 
       it 'skips the already blocked IP address' do
         allow(IpBlock).to receive(:new).and_call_original
 
-        cli.invoke(:add, ip_list, options)
+        subject
 
         expect(IpBlock).to_not have_received(:new).with(ip: ip_list.last)
       end
 
       it 'displays the correct summary' do
-        expect { cli.invoke(:add, ip_list, options) }.to output(
-          a_string_including("#{ip_list.last} is already blocked\nAdded #{ip_list.size - 1}, skipped 1, failed 0")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{ip_list.last} is already blocked\nAdded #{ip_list.size - 1}, skipped 1, failed 0")
       end
 
       context 'with --force option' do
@@ -77,7 +82,7 @@ describe Mastodon::CLI::IpBlocks do
         let(:options) { { severity: 'sign_up_requires_approval', force: true } }
 
         it 'overwrites the existing IP block record' do
-          expect { cli.invoke(:add, ip_list, options) }
+          expect { subject }
             .to change { blocked_ip.reload.severity }
             .from('no_access')
             .to('sign_up_requires_approval')
@@ -89,11 +94,11 @@ describe Mastodon::CLI::IpBlocks do
 
     context 'when a specified IP address is invalid' do
       let(:ip_list) { ['320.15.175.0', '9.5.105.255', '0.0.0.0'] }
+      let(:arguments) { ip_list }
 
       it 'displays the correct summary' do
-        expect { cli.invoke(:add, ip_list, options) }.to output(
-          a_string_including("#{ip_list.first} is invalid\nAdded #{ip_list.size - 1}, skipped 0, failed 1")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{ip_list.first} is invalid\nAdded #{ip_list.size - 1}, skipped 0, failed 1")
       end
     end
 
@@ -124,6 +129,7 @@ describe Mastodon::CLI::IpBlocks do
     context 'when a specified IP address fails to be blocked' do
       let(:ip_address) { '127.0.0.1' }
       let(:ip_block) { instance_double(IpBlock, ip: ip_address, save: false) }
+      let(:arguments) { [ip_address] }
 
       before do
         allow(IpBlock).to receive(:new).and_return(ip_block)
@@ -132,24 +138,25 @@ describe Mastodon::CLI::IpBlocks do
       end
 
       it 'displays an error message' do
-        expect { cli.invoke(:add, [ip_address], options) }
-          .to output(
-            a_string_including("#{ip_address} could not be saved")
-          ).to_stdout
+        expect { subject }
+          .to output_results("#{ip_address} could not be saved")
       end
     end
 
     context 'when no IP address is provided' do
+      let(:arguments) { [] }
+
       it 'exits with an error message' do
-        expect { cli.add }.to output(
-          a_string_including('No IP(s) given')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No IP(s) given')
           .and raise_error(SystemExit)
       end
     end
   end
 
   describe '#remove' do
+    let(:action) { :remove }
+
     context 'when removing exact matches' do
       let(:ip_list) do
         [
@@ -166,21 +173,21 @@ describe Mastodon::CLI::IpBlocks do
           '::/128',
         ]
       end
+      let(:arguments) { ip_list }
 
       before do
         ip_list.each { |ip| IpBlock.create(ip: ip, severity: :no_access) }
       end
 
       it 'removes exact IP blocks' do
-        cli.invoke(:remove, ip_list)
+        subject
 
         expect(IpBlock.where(ip: ip_list)).to_not exist
       end
 
       it 'displays success message with a summary' do
-        expect { cli.invoke(:remove, ip_list) }.to output(
-          a_string_including("Removed #{ip_list.size}, skipped 0")
-        ).to_stdout
+        expect { subject }
+          .to output_results("Removed #{ip_list.size}, skipped 0")
       end
     end
 
@@ -192,13 +199,13 @@ describe Mastodon::CLI::IpBlocks do
       let(:options) { { force: true } }
 
       it 'removes blocks for IP ranges that cover given IP(s)' do
-        cli.invoke(:remove, arguments, options)
+        subject
 
         expect(IpBlock.where(id: [first_ip_range_block.id, second_ip_range_block.id])).to_not exist
       end
 
       it 'does not remove other IP ranges' do
-        cli.invoke(:remove, arguments, options)
+        subject
 
         expect(IpBlock.where(id: third_ip_range_block.id)).to exist
       end
@@ -206,47 +213,46 @@ describe Mastodon::CLI::IpBlocks do
 
     context 'when a specified IP address is not blocked' do
       let(:unblocked_ip) { '192.0.2.1' }
+      let(:arguments) { [unblocked_ip] }
 
       it 'skips the IP address' do
-        expect { cli.invoke(:remove, [unblocked_ip]) }.to output(
-          a_string_including("#{unblocked_ip} is not yet blocked")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{unblocked_ip} is not yet blocked")
       end
 
       it 'displays the summary correctly' do
-        expect { cli.invoke(:remove, [unblocked_ip]) }.to output(
-          a_string_including('Removed 0, skipped 1')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Removed 0, skipped 1')
       end
     end
 
     context 'when a specified IP address is invalid' do
       let(:invalid_ip) { '320.15.175.0' }
+      let(:arguments) { [invalid_ip] }
 
       it 'skips the invalid IP address' do
-        expect { cli.invoke(:remove, [invalid_ip]) }.to output(
-          a_string_including("#{invalid_ip} is invalid")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{invalid_ip} is invalid")
       end
 
       it 'displays the summary correctly' do
-        expect { cli.invoke(:remove, [invalid_ip]) }.to output(
-          a_string_including('Removed 0, skipped 1')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Removed 0, skipped 1')
       end
     end
 
     context 'when no IP address is provided' do
       it 'exits with an error message' do
-        expect { cli.remove }.to output(
-          a_string_including('No IP(s) given')
-        ).to_stdout
+        expect { subject }
+          .to output_results('No IP(s) given')
           .and raise_error(SystemExit)
       end
     end
   end
 
   describe '#export' do
+    let(:action) { :export }
+
     let(:first_ip_range_block) { IpBlock.create(ip: '192.168.0.0/24', severity: :no_access) }
     let(:second_ip_range_block) { IpBlock.create(ip: '10.0.0.0/16', severity: :no_access) }
     let(:third_ip_range_block) { IpBlock.create(ip: '127.0.0.1', severity: :sign_up_block) }
@@ -255,15 +261,13 @@ describe Mastodon::CLI::IpBlocks do
       let(:options) { { format: 'plain' } }
 
       it 'exports blocked IPs with "no_access" severity in plain format' do
-        expect { cli.invoke(:export, nil, options) }.to output(
-          a_string_including("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
       end
 
       it 'does not export bloked IPs with different severities' do
-        expect { cli.invoke(:export, nil, options) }.to_not output(
-          a_string_including("#{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}")
-        ).to_stdout
+        expect { subject }
+          .to_not output_results("#{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}")
       end
     end
 
@@ -271,23 +275,20 @@ describe Mastodon::CLI::IpBlocks do
       let(:options) { { format: 'nginx' } }
 
       it 'exports blocked IPs with "no_access" severity in plain format' do
-        expect { cli.invoke(:export, nil, options) }.to output(
-          a_string_including("deny #{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};\ndeny #{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix};")
-        ).to_stdout
+        expect { subject }
+          .to output_results("deny #{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};\ndeny #{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix};")
       end
 
       it 'does not export bloked IPs with different severities' do
-        expect { cli.invoke(:export, nil, options) }.to_not output(
-          a_string_including("deny #{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};")
-        ).to_stdout
+        expect { subject }
+          .to_not output_results("deny #{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};")
       end
     end
 
     context 'when --format option is not provided' do
       it 'exports blocked IPs in plain format by default' do
-        expect { cli.export }.to output(
-          a_string_including("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
-        ).to_stdout
+        expect { subject }
+          .to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index b5b5d69062..59f1fc4784 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -4,13 +4,20 @@ require 'rails_helper'
 require 'mastodon/cli/main'
 
 describe Mastodon::CLI::Main do
+  subject { cli.invoke(action, arguments, options) }
+
+  let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
+
   it_behaves_like 'CLI Command'
 
-  describe 'version' do
+  describe '#version' do
+    let(:action) { :version }
+
     it 'returns the Mastodon version' do
-      expect { described_class.new.invoke(:version) }.to output(
-        a_string_including(Mastodon::Version.to_s)
-      ).to_stdout
+      expect { subject }
+        .to output_results(Mastodon::Version.to_s)
     end
   end
 end
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index 95e695ab55..02169b7a42 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -4,20 +4,26 @@ require 'rails_helper'
 require 'mastodon/cli/maintenance'
 
 describe Mastodon::CLI::Maintenance do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#fix_duplicates' do
+    let(:action) { :fix_duplicates }
+
     context 'when the database version is too old' do
       before do
         allow(ActiveRecord::Migrator).to receive(:current_version).and_return(2000_01_01_000000) # Earlier than minimum
       end
 
       it 'Exits with error message' do
-        expect { cli.invoke :fix_duplicates }.to output(
-          a_string_including('is too old')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('is too old')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -28,9 +34,9 @@ describe Mastodon::CLI::Maintenance do
       end
 
       it 'Exits with error message' do
-        expect { cli.invoke :fix_duplicates }.to output(
-          a_string_including('more recent')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('more recent')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -41,9 +47,9 @@ describe Mastodon::CLI::Maintenance do
       end
 
       it 'Exits with error message' do
-        expect { cli.invoke :fix_duplicates }.to output(
-          a_string_including('Sidekiq is running')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('Sidekiq is running')
+          .and raise_error(SystemExit)
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 6d510c1f5a..6bbe7e7469 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -4,18 +4,24 @@ require 'rails_helper'
 require 'mastodon/cli/media'
 
 describe Mastodon::CLI::Media do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#remove' do
+    let(:action) { :remove }
+
     context 'with --prune-profiles and --remove-headers' do
       let(:options) { { prune_profiles: true, remove_headers: true } }
 
       it 'warns about usage and exits' do
-        expect { cli.invoke(:remove, [], options) }.to output(
-          a_string_including('--prune-profiles and --remove-headers should not be specified simultaneously')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('--prune-profiles and --remove-headers should not be specified simultaneously')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -23,9 +29,9 @@ describe Mastodon::CLI::Media do
       let(:options) { { include_follows: true } }
 
       it 'warns about usage and exits' do
-        expect { cli.invoke(:remove, [], options) }.to output(
-          a_string_including('--include-follows can only be used with --prune-profiles or --remove-headers')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('--include-follows can only be used with --prune-profiles or --remove-headers')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -38,9 +44,8 @@ describe Mastodon::CLI::Media do
         let(:options) { { prune_profiles: true } }
 
         it 'removes account avatars' do
-          expect { cli.invoke(:remove, [], options) }.to output(
-            a_string_including('Visited 1')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Visited 1')
 
           expect(account.reload.avatar).to be_blank
         end
@@ -50,9 +55,8 @@ describe Mastodon::CLI::Media do
         let(:options) { { remove_headers: true } }
 
         it 'removes account header' do
-          expect { cli.invoke(:remove, [], options) }.to output(
-            a_string_including('Visited 1')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Visited 1')
 
           expect(account.reload.header).to be_blank
         end
@@ -64,9 +68,8 @@ describe Mastodon::CLI::Media do
 
       context 'without options' do
         it 'removes account avatars' do
-          expect { cli.invoke(:remove) }.to output(
-            a_string_including('Removed 1')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Removed 1')
 
           expect(media_attachment.reload.file).to be_blank
           expect(media_attachment.reload.thumbnail).to be_blank
@@ -76,25 +79,24 @@ describe Mastodon::CLI::Media do
   end
 
   describe '#usage' do
-    context 'without options' do
-      let(:options) { {} }
+    let(:action) { :usage }
 
+    context 'without options' do
       it 'reports about storage size' do
-        expect { cli.invoke(:usage, [], options) }.to output(
-          a_string_including('0 Bytes')
-        ).to_stdout
+        expect { subject }
+          .to output_results('0 Bytes')
       end
     end
   end
 
   describe '#refresh' do
-    context 'without any options' do
-      let(:options) { {} }
+    let(:action) { :refresh }
 
+    context 'without any options' do
       it 'warns about usage and exits' do
-        expect { cli.invoke(:refresh, [], options) }.to output(
-          a_string_including('Specify the source')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('Specify the source')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -108,9 +110,8 @@ describe Mastodon::CLI::Media do
       let(:status) { Fabricate(:status) }
 
       it 'redownloads the attachment file' do
-        expect { cli.invoke(:refresh, [], options) }.to output(
-          a_string_including('Downloaded 1 media')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Downloaded 1 media')
       end
     end
 
@@ -119,9 +120,9 @@ describe Mastodon::CLI::Media do
         let(:options) { { account: 'not-real-user@example.host' } }
 
         it 'warns about usage and exits' do
-          expect { cli.invoke(:refresh, [], options) }.to output(
-            a_string_including('No such account')
-          ).to_stdout.and raise_error(SystemExit)
+          expect { subject }
+            .to output_results('No such account')
+            .and raise_error(SystemExit)
         end
       end
 
@@ -135,9 +136,8 @@ describe Mastodon::CLI::Media do
         let(:account) { Fabricate(:account) }
 
         it 'redownloads the attachment file' do
-          expect { cli.invoke(:refresh, [], options) }.to output(
-            a_string_including('Downloaded 1 media')
-          ).to_stdout
+          expect { subject }
+            .to output_results('Downloaded 1 media')
         end
       end
     end
@@ -153,9 +153,8 @@ describe Mastodon::CLI::Media do
       let(:account) { Fabricate(:account, domain: domain) }
 
       it 'redownloads the attachment file' do
-        expect { cli.invoke(:refresh, [], options) }.to output(
-          a_string_including('Downloaded 1 media')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Downloaded 1 media')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/preview_cards_spec.rb b/spec/lib/mastodon/cli/preview_cards_spec.rb
index a766d250eb..951ae3758f 100644
--- a/spec/lib/mastodon/cli/preview_cards_spec.rb
+++ b/spec/lib/mastodon/cli/preview_cards_spec.rb
@@ -4,11 +4,17 @@ require 'rails_helper'
 require 'mastodon/cli/preview_cards'
 
 describe Mastodon::CLI::PreviewCards do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#remove' do
+    let(:action) { :remove }
+
     context 'with relevant preview cards' do
       before do
         Fabricate(:preview_card, updated_at: 10.years.ago, type: :link)
@@ -18,10 +24,11 @@ describe Mastodon::CLI::PreviewCards do
 
       context 'with no arguments' do
         it 'deletes thumbnails for local preview cards' do
-          expect { cli.invoke(:remove) }.to output(
-            a_string_including('Removed 2 preview cards')
-              .and(a_string_including('approx. 119 KB'))
-          ).to_stdout
+          expect { subject }
+            .to output_results(
+              'Removed 2 preview cards',
+              'approx. 119 KB'
+            )
         end
       end
 
@@ -29,10 +36,11 @@ describe Mastodon::CLI::PreviewCards do
         let(:options) { { link: true } }
 
         it 'deletes thumbnails for local preview cards' do
-          expect { cli.invoke(:remove, [], options) }.to output(
-            a_string_including('Removed 1 link-type preview cards')
-              .and(a_string_including('approx. 59.6 KB'))
-          ).to_stdout
+          expect { subject }
+            .to output_results(
+              'Removed 1 link-type preview cards',
+              'approx. 59.6 KB'
+            )
         end
       end
 
@@ -40,10 +48,11 @@ describe Mastodon::CLI::PreviewCards do
         let(:options) { { days: 365 } }
 
         it 'deletes thumbnails for local preview cards' do
-          expect { cli.invoke(:remove, [], options) }.to output(
-            a_string_including('Removed 1 preview cards')
-              .and(a_string_including('approx. 59.6 KB'))
-          ).to_stdout
+          expect { subject }
+            .to output_results(
+              'Removed 1 preview cards',
+              'approx. 59.6 KB'
+            )
         end
       end
     end
diff --git a/spec/lib/mastodon/cli/settings_spec.rb b/spec/lib/mastodon/cli/settings_spec.rb
index 7dcd1110ba..02d1042c56 100644
--- a/spec/lib/mastodon/cli/settings_spec.rb
+++ b/spec/lib/mastodon/cli/settings_spec.rb
@@ -7,59 +7,64 @@ describe Mastodon::CLI::Settings do
   it_behaves_like 'CLI Command'
 
   describe 'subcommand "registrations"' do
+    subject { cli.invoke(action, arguments, options) }
+
     let(:cli) { Mastodon::CLI::Registrations.new }
+    let(:arguments) { [] }
+    let(:options) { {} }
 
     before do
       Setting.registrations_mode = nil
     end
 
     describe '#open' do
+      let(:action) { :open }
+
       it 'changes "registrations_mode" to "open"' do
-        expect { cli.open }.to change(Setting, :registrations_mode).from(nil).to('open')
+        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('open')
       end
 
       it 'displays success message' do
-        expect { cli.open }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
       end
     end
 
     describe '#approved' do
+      let(:action) { :approved }
+
       it 'changes "registrations_mode" to "approved"' do
-        expect { cli.approved }.to change(Setting, :registrations_mode).from(nil).to('approved')
+        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('approved')
       end
 
       it 'displays success message' do
-        expect { cli.approved }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
       end
 
       context 'with --require-reason' do
-        before do
-          cli.options = { require_reason: true }
-        end
+        let(:options) { { require_reason: true } }
 
         it 'changes "registrations_mode" to "approved"' do
-          expect { cli.approved }.to change(Setting, :registrations_mode).from(nil).to('approved')
+          expect { subject }.to change(Setting, :registrations_mode).from(nil).to('approved')
         end
 
         it 'sets "require_invite_text" to "true"' do
-          expect { cli.approved }.to change(Setting, :require_invite_text).from(false).to(true)
+          expect { subject }.to change(Setting, :require_invite_text).from(false).to(true)
         end
       end
     end
 
     describe '#close' do
+      let(:action) { :close }
+
       it 'changes "registrations_mode" to "none"' do
-        expect { cli.close }.to change(Setting, :registrations_mode).from(nil).to('none')
+        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('none')
       end
 
       it 'displays success message' do
-        expect { cli.close }.to output(
-          a_string_including('OK')
-        ).to_stdout
+        expect { subject }
+          .to output_results('OK')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/statuses_spec.rb b/spec/lib/mastodon/cli/statuses_spec.rb
index 70e4e2c086..63d494bbb6 100644
--- a/spec/lib/mastodon/cli/statuses_spec.rb
+++ b/spec/lib/mastodon/cli/statuses_spec.rb
@@ -4,26 +4,31 @@ require 'rails_helper'
 require 'mastodon/cli/statuses'
 
 describe Mastodon::CLI::Statuses do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#remove', use_transactional_tests: false do
+    let(:action) { :remove }
+
     context 'with small batch size' do
       let(:options) { { batch_size: 0 } }
 
       it 'exits with error message' do
-        expect { cli.invoke :remove, [], options }.to output(
-          a_string_including('Cannot run')
-        ).to_stdout.and raise_error(SystemExit)
+        expect { subject }
+          .to output_results('Cannot run')
+          .and raise_error(SystemExit)
       end
     end
 
     context 'with default batch size' do
       it 'removes unreferenced statuses' do
-        expect { cli.invoke :remove }.to output(
-          a_string_including('Done after')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Done after')
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/upgrade_spec.rb b/spec/lib/mastodon/cli/upgrade_spec.rb
index 0d6494eeee..6861e04887 100644
--- a/spec/lib/mastodon/cli/upgrade_spec.rb
+++ b/spec/lib/mastodon/cli/upgrade_spec.rb
@@ -4,23 +4,26 @@ require 'rails_helper'
 require 'mastodon/cli/upgrade'
 
 describe Mastodon::CLI::Upgrade do
+  subject { cli.invoke(action, arguments, options) }
+
   let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
 
   it_behaves_like 'CLI Command'
 
   describe '#storage_schema' do
-    context 'with records that dont need upgrading' do
-      let(:options) { {} }
+    let(:action) { :storage_schema }
 
+    context 'with records that dont need upgrading' do
       before do
         Fabricate(:account)
         Fabricate(:media_attachment)
       end
 
       it 'does not upgrade storage for the attachments' do
-        expect { cli.invoke(:storage_schema, [], options) }.to output(
-          a_string_including('Upgraded storage schema of 0 records')
-        ).to_stdout
+        expect { subject }
+          .to output_results('Upgraded storage schema of 0 records')
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d30e7201c4..4394b470e6 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -88,6 +88,7 @@ RSpec.configure do |config|
   config.include Chewy::Rspec::Helpers
   config.include Redisable
   config.include SignedRequestHelpers, type: :request
+  config.include CommandLineHelpers, type: :cli
 
   config.around(:each, use_transactional_tests: false) do |example|
     self.use_transactional_tests = false
diff --git a/spec/support/command_line_helpers.rb b/spec/support/command_line_helpers.rb
new file mode 100644
index 0000000000..6f9d63d939
--- /dev/null
+++ b/spec/support/command_line_helpers.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CommandLineHelpers
+  def output_results(*args)
+    output(
+      include(*args)
+    ).to_stdout
+  end
+end

From da3d8aff799e9b92ebe76e2dc8f6f953869a1e42 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 7 Dec 2023 08:40:44 -0600
Subject: [PATCH 027/436] Error handling for attachment batch delete process
 (#28184)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/lib/attachment_batch.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
index 13a9da828f..b28f5c3d7f 100644
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -4,7 +4,8 @@ class AttachmentBatch
   # Maximum amount of objects you can delete in an S3 API call. It's
   # important to remember that this does not correspond to the number
   # of records in the batch, since records can have multiple attachments
-  LIMIT = 1_000
+  LIMIT = ENV.fetch('S3_BATCH_DELETE_LIMIT', 1000).to_i
+  MAX_RETRY = ENV.fetch('S3_BATCH_DELETE_RETRY', 3).to_i
 
   # Attributes generated and maintained by Paperclip (not all of them
   # are always used on every class, however)
@@ -95,6 +96,7 @@ class AttachmentBatch
     # objects can be processed at once, so we have to potentially
     # separate them into multiple calls.
 
+    retries = 0
     keys.each_slice(LIMIT) do |keys_slice|
       logger.debug { "Deleting #{keys_slice.size} objects" }
 
@@ -102,6 +104,17 @@ class AttachmentBatch
         objects: keys_slice.map { |key| { key: key } },
         quiet: true,
       })
+    rescue => e
+      retries += 1
+
+      if retries < MAX_RETRY
+        logger.debug "Retry #{retries}/#{MAX_RETRY} after #{e.message}"
+        sleep 2**retries
+        retry
+      else
+        logger.error "Batch deletion from S3 failed after #{e.message}"
+        raise e
+      end
     end
   end
 

From 3918dc68c7cf7d6f7d2352f9aa4b68d4d02b7d6a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 7 Dec 2023 09:49:05 -0500
Subject: [PATCH 028/436] Use composite primary key for `PreviewCardsStatus`
 model (#28208)

---
 app/models/preview_cards_status.rb | 4 +---
 app/models/status.rb               | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/preview_cards_status.rb b/app/models/preview_cards_status.rb
index 341771e4d3..214eec22e5 100644
--- a/app/models/preview_cards_status.rb
+++ b/app/models/preview_cards_status.rb
@@ -9,9 +9,7 @@
 #  url             :string
 #
 class PreviewCardsStatus < ApplicationRecord
-  # Composite primary keys are not properly supported in Rails. However,
-  # we shouldn't need this anyway...
-  self.primary_key = nil
+  self.primary_key = [:preview_card_id, :status_id]
 
   belongs_to :preview_card
   belongs_to :status
diff --git a/app/models/status.rb b/app/models/status.rb
index eb7159dc61..4bdadae068 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -82,8 +82,7 @@ class Status < ApplicationRecord
 
   has_and_belongs_to_many :tags
 
-  # Because of a composite primary key, the `dependent` option cannot be used on this association
-  has_one :preview_cards_status, inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
+  has_one :preview_cards_status, inverse_of: :status, dependent: :delete
 
   has_one :notification, as: :activity, dependent: :destroy
   has_one :status_stat, inverse_of: :status, dependent: nil
@@ -146,7 +145,6 @@ class Status < ApplicationRecord
   # The `prepend: true` option below ensures this runs before
   # the `dependent: destroy` callbacks remove relevant records
   before_destroy :unlink_from_conversations!, prepend: true
-  before_destroy :reset_preview_card!
 
   cache_associated :application,
                    :media_attachments,

From 8d8ae05a186bb8a5fca719dc6ea5a057d1aa197f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 7 Dec 2023 10:27:41 -0500
Subject: [PATCH 029/436] Add spec coverage for `CLI::Media#lookup` command
 (#28266)

---
 spec/lib/mastodon/cli/media_spec.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 6bbe7e7469..24e1467a3c 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -89,6 +89,32 @@ describe Mastodon::CLI::Media do
     end
   end
 
+  describe '#lookup' do
+    let(:action) { :lookup }
+    let(:arguments) { [url] }
+
+    context 'with valid url not connected to a record' do
+      let(:url) { 'https://example.host/assets/1' }
+
+      it 'warns about url and exits' do
+        expect { subject }
+          .to output_results('Not a media URL')
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'with a valid media url' do
+      let(:status) { Fabricate(:status) }
+      let(:media_attachment) { Fabricate(:media_attachment, status: status) }
+      let(:url) { media_attachment.file.url(:original) }
+
+      it 'displays the url of a connected status' do
+        expect { subject }
+          .to output_results(status.id.to_s)
+      end
+    end
+  end
+
   describe '#refresh' do
     let(:action) { :refresh }
 

From 7e514688b3db1a88636ebb24afcaf1d637366f40 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 8 Dec 2023 04:27:33 -0500
Subject: [PATCH 030/436] Convert `api/v2/search` controller spec to request
 spec (#28269)

---
 .../api/v2/search_spec.rb}                    | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)
 rename spec/{controllers/api/v2/search_controller_spec.rb => requests/api/v2/search_spec.rb} (79%)

diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/requests/api/v2/search_spec.rb
similarity index 79%
rename from spec/controllers/api/v2/search_controller_spec.rb
rename to spec/requests/api/v2/search_spec.rb
index a16716a10c..d0778cba4d 100644
--- a/spec/controllers/api/v2/search_controller_spec.rb
+++ b/spec/requests/api/v2/search_spec.rb
@@ -2,25 +2,21 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V2::SearchController do
-  render_views
-
+describe 'Search API' do
   context 'with token' do
-    let(:user)  { Fabricate(:user) }
-    let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:search') }
+    let(:user)    { Fabricate(:user) }
+    let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+    let(:scopes)  { 'read:search' }
+    let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
-    end
-
-    describe 'GET #index' do
+    describe 'GET /api/v2/search' do
       let!(:bob)   { Fabricate(:account, username: 'bob_test') }
       let!(:ana)   { Fabricate(:account, username: 'ana_test') }
       let!(:tom)   { Fabricate(:account, username: 'tom_test') }
       let(:params) { { q: 'test' } }
 
       it 'returns http success' do
-        get :index, params: params
+        get '/api/v2/search', headers: headers, params: params
 
         expect(response).to have_http_status(200)
       end
@@ -29,7 +25,7 @@ RSpec.describe Api::V2::SearchController do
         let(:params) { { q: 'test', type: 'accounts' } }
 
         it 'returns all matching accounts' do
-          get :index, params: params
+          get '/api/v2/search', headers: headers, params: params
 
           expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(bob.id.to_s, ana.id.to_s, tom.id.to_s)
         end
@@ -38,7 +34,7 @@ RSpec.describe Api::V2::SearchController do
           let(:params) { { q: 'test1', resolve: '1' } }
 
           it 'returns http unauthorized' do
-            get :index, params: params
+            get '/api/v2/search', headers: headers, params: params
 
             expect(response).to have_http_status(200)
           end
@@ -48,7 +44,7 @@ RSpec.describe Api::V2::SearchController do
           let(:params) { { q: 'test1', offset: 1 } }
 
           it 'returns http unauthorized' do
-            get :index, params: params
+            get '/api/v2/search', headers: headers, params: params
 
             expect(response).to have_http_status(200)
           end
@@ -62,7 +58,7 @@ RSpec.describe Api::V2::SearchController do
           end
 
           it 'returns only the followed accounts' do
-            get :index, params: params
+            get '/api/v2/search', headers: headers, params: params
 
             expect(body_as_json[:accounts].pluck(:id)).to contain_exactly(ana.id.to_s)
           end
@@ -73,7 +69,7 @@ RSpec.describe Api::V2::SearchController do
         before { allow(Search).to receive(:new).and_raise(Mastodon::SyntaxError) }
 
         it 'returns http unprocessable_entity' do
-          get :index, params: params
+          get '/api/v2/search', headers: headers, params: params
 
           expect(response).to have_http_status(422)
         end
@@ -83,7 +79,7 @@ RSpec.describe Api::V2::SearchController do
         before { allow(Search).to receive(:new).and_raise(ActiveRecord::RecordNotFound) }
 
         it 'returns http not_found' do
-          get :index, params: params
+          get '/api/v2/search', headers: headers, params: params
 
           expect(response).to have_http_status(404)
         end
@@ -92,11 +88,11 @@ RSpec.describe Api::V2::SearchController do
   end
 
   context 'without token' do
-    describe 'GET #index' do
+    describe 'GET /api/v2/search' do
       let(:search_params) { nil }
 
       before do
-        get :index, params: search_params
+        get '/api/v2/search', params: search_params
       end
 
       context 'without a `q` param' do

From 8de86eabbff9d5ff42f2340b1906a8595cd898e8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 8 Dec 2023 04:51:57 -0500
Subject: [PATCH 031/436] Add spec for `CLI::Domains#crawl` command (#28271)

---
 lib/mastodon/cli/domains.rb           |  6 ++--
 spec/lib/mastodon/cli/domains_spec.rb | 47 +++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/lib/mastodon/cli/domains.rb b/lib/mastodon/cli/domains.rb
index 329f171672..e092497dc9 100644
--- a/lib/mastodon/cli/domains.rb
+++ b/lib/mastodon/cli/domains.rb
@@ -97,6 +97,8 @@ module Mastodon::CLI
       say("Removed #{custom_emojis_count} custom emojis#{dry_run_mode_suffix}", :green)
     end
 
+    CRAWL_SLEEP_TIME = 20
+
     option :concurrency, type: :numeric, default: 50, aliases: [:c]
     option :format, type: :string, default: 'summary', aliases: [:f]
     option :exclude_suspended, type: :boolean, default: false, aliases: [:x]
@@ -168,8 +170,8 @@ module Mastodon::CLI
         pool.post(domain, &work_unit)
       end
 
-      sleep 20
-      sleep 20 until pool.queue_length.zero?
+      sleep CRAWL_SLEEP_TIME
+      sleep CRAWL_SLEEP_TIME until pool.queue_length.zero?
 
       pool.shutdown
       pool.wait_for_termination(20)
diff --git a/spec/lib/mastodon/cli/domains_spec.rb b/spec/lib/mastodon/cli/domains_spec.rb
index a10907f76e..24f341c124 100644
--- a/spec/lib/mastodon/cli/domains_spec.rb
+++ b/spec/lib/mastodon/cli/domains_spec.rb
@@ -28,4 +28,51 @@ describe Mastodon::CLI::Domains do
       end
     end
   end
+
+  describe '#crawl' do
+    let(:action) { :crawl }
+
+    context 'with accounts from the domain' do
+      let(:domain) { 'host.example' }
+
+      before do
+        Fabricate(:account, domain: domain)
+        stub_request(:get, 'https://host.example/api/v1/instance').to_return(status: 200, body: {}.to_json)
+        stub_request(:get, 'https://host.example/api/v1/instance/peers').to_return(status: 200, body: {}.to_json)
+        stub_request(:get, 'https://host.example/api/v1/instance/activity').to_return(status: 200, body: {}.to_json)
+        stub_const('Mastodon::CLI::Domains::CRAWL_SLEEP_TIME', 0)
+      end
+
+      context 'with --format of summary' do
+        let(:options) { { format: 'summary' } }
+
+        it 'crawls the domains and summarizes results' do
+          expect { subject }
+            .to output_results('Visited 1 domains, 0 failed')
+        end
+      end
+
+      context 'with --format of domains' do
+        let(:options) { { format: 'domains' } }
+
+        it 'crawls the domains and summarizes results' do
+          expect { subject }
+            .to output_results(domain)
+        end
+      end
+
+      context 'with --format of json' do
+        let(:options) { { format: 'json' } }
+
+        it 'crawls the domains and summarizes results' do
+          expect { subject }
+            .to output_results(json_summary)
+        end
+
+        def json_summary
+          Oj.dump('host.example': { activity: {} })
+        end
+      end
+    end
+  end
 end

From f37a1535efc7913c0f8b5d2c8e6588ff496c9984 Mon Sep 17 00:00:00 2001
From: JakePaustian <87162217+JakePaustian@users.noreply.github.com>
Date: Fri, 8 Dec 2023 03:52:28 -0600
Subject: [PATCH 032/436] Update CONTRIBUTING.md with additional requirements
 for API additions (#28274)

Co-authored-by: Jake Paustian <jake1500@iastate.edu>
---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1a5fef798..b68a9bde3e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,10 @@ You can contribute in the following ways:
 
 If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
 
+## API Changes and Additions
+
+Please note that any changes or additions made to the API should have an accompanying pull request on [our documentation repository](https://github.com/mastodon/documentation).
+
 ## Bug reports
 
 Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/mastodon/mastodon/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.

From ca1b7efb069a3cd4532d0d635f70ea47358714c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:52:32 +0100
Subject: [PATCH 033/436] New Crowdin Translations (automated) (#28275)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fr.json    |  2 +-
 app/javascript/mastodon/locales/hu.json    |  4 ++--
 app/javascript/mastodon/locales/my.json    | 12 ++++++++++++
 app/javascript/mastodon/locales/pt-PT.json |  2 +-
 config/locales/my.yml                      |  1 +
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 03b656cc47..7db4bf7bc4 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -702,7 +702,7 @@
   "timeline_hint.resources.followers": "Les abonnés",
   "timeline_hint.resources.follows": "Les abonnements",
   "timeline_hint.resources.statuses": "Messages plus anciens",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} pers.} other {{counter} pers.}} sur {days, plural, one {les dernières 24h} other {les {days} derniers jours}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "units.short.billion": "{count}Md",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index d890e4188a..386b15811a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -479,7 +479,7 @@
   "onboarding.actions.go_to_home": "Ugrás a saját hírfolyamra",
   "onboarding.compose.template": "Üdvözlet, #Mastodon!",
   "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.",
-  "onboarding.follows.lead": "A saját hírfolyamod az elsődleges tapasztalás a Mastodonon. Minél több embert követsz, annál aktívabb és érdekesebb a dolog. Az induláshoz itt van néhány javaslat:",
+  "onboarding.follows.lead": "A kezdőlapod a Mastodon használatának elsődleges módja. Minél több embert követsz, annál aktívabbak és érdekesebbek lesznek a dolgok. Az induláshoz itt van néhány javaslat:",
   "onboarding.follows.title": "Szabd személyre a kezdőlapodat",
   "onboarding.profile.discoverable": "Saját profil beállítása felfedezhetőként",
   "onboarding.profile.discoverable_hint": "A Mastodonon a felfedezhetőség választása esetén a saját bejegyzéseid megjelenhetnek a keresési eredmények és a felkapott tartalmak között, valamint a profilod a hozzád hasonló érdeklődési körrel rendelkező embereknél is ajánlásra kerülhet.",
@@ -720,7 +720,7 @@
   "upload_form.undo": "Törlés",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
-  "upload_modal.apply": "Alkalmazás",
+  "upload_modal.apply": "Alkalmaz",
   "upload_modal.applying": "Alkalmazás…",
   "upload_modal.choose_image": "Kép kiválasztása",
   "upload_modal.description_placeholder": "A gyors, barna róka átugrik a lusta kutya fölött",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 4078a4c066..917419d172 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -21,6 +21,7 @@
   "account.blocked": "ဘလော့ထားသည်",
   "account.browse_more_on_origin_server": "မူရင်းပရိုဖိုင်တွင် ပိုမိုကြည့်ရှုပါ။",
   "account.cancel_follow_request": "စောင့်ကြည့်မှု ပယ်ဖျက်ခြင်း",
+  "account.copy": "လင့်ခ်ကို ပရိုဖိုင်သို့ ကူးယူပါ",
   "account.direct": "@{name} သီးသန့် သိရှိနိုင်အောင် မန်းရှင်းခေါ်မည်",
   "account.disable_notifications": "@{name} ပို့စ်တင်သည့်အခါ ကျွန်ုပ်ထံ အသိပေးခြင်း မပြုလုပ်ရန်။",
   "account.domain_blocked": "ဒိုမိန်း ပိတ်ပင်ထားခဲ့သည်",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "ဖတ်ပြီးသားအဖြစ်မှတ်ထားပါ",
   "conversation.open": "Conversation ကိုကြည့်မည်",
   "conversation.with": "{အမည်များ} ဖြင့်",
+  "copy_icon_button.copied": "ကလစ်ဘုတ်သို့ ကူးပါ",
   "copypaste.copied": "ကူယူပြီးပါပြီ",
   "copypaste.copy_to_clipboard": "ကလစ်ဘုတ်သို့ ကူးပါ",
   "directory.federated": "သင် သိသော ဖက်ဒီမှ",
@@ -389,6 +391,7 @@
   "lists.search": "မိမိဖောလိုးထားသူများမှရှာဖွေမည်",
   "lists.subheading": "သင့်၏စာရင်းများ",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
   "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
   "mute_modal.duration": "ကြာချိန်",
@@ -477,6 +480,13 @@
   "onboarding.follows.empty": "ယခုအချိန် မည်သည့်ရလဒ်ကိုမျှ မပြသနိုင်ပါ။ လူများကိုစောင့်ကြည့်ရန်အတွက် Explore စာမျက်နှာကို အသုံးပြု၍ စမ်းကြည့်နိုင်သည် သို့မဟုတ် နောက်မှ ထပ်စမ်းကြည့်ပါ။",
   "onboarding.follows.lead": "သင့်ကိုယ်ပိုင်ပို့စ်များ တင်နိုင်သည်။ သင်စောင့်ကြည့်သူ များလေလေ၊ စိတ်ဝင်စားစရာကောင်းသောပို့စ်များ တွေ့ရလေဖြစ်သည်။ ဤပရိုဖိုင်များမှာ ကောင်းမွန်သောအစပြုမှုတစ်ခုဖြစ်ပြီး ၎င်းတို့ကိုစောင့်ကြည့်ခြင်းမှလည်း အချိန်မရွေး ပယ်ဖျက်နိုင်ပါသည်။",
   "onboarding.follows.title": "Mastodon တွင် ရေပန်းစားခြင်း",
+  "onboarding.profile.discoverable": "ပရိုဖိုင် ရှာဖွေနိုင်ပါမည်",
+  "onboarding.profile.display_name": "ဖော်ပြမည့်အမည်",
+  "onboarding.profile.display_name_hint": "သင့်အမည်အပြည့်အစုံ သို့မဟုတ် သင့်အမည်ပြောင်။",
+  "onboarding.profile.note": "ကိုယ်ရေးအကျဉ်း",
+  "onboarding.profile.save_and_continue": "သိမ်းပြီး ဆက်လုပ်ပါ",
+  "onboarding.profile.title": "ပရိုဖိုင်စနစ် ထည့်သွင်းခြင်း",
+  "onboarding.profile.upload_avatar": "ပရိုဖိုင်ပုံ အပ်လုဒ်လုပ်ပါ",
   "onboarding.share.lead": "Mastodon တွင် သင့်အား မည်သို့ရှာတွေ့နိုင်သည်ကို အသိပေးပါ။",
   "onboarding.share.message": "Mastodon ရှိ ကျွန်ုပ်၏အမည်မှာ {username} ဖြစ်သည်။ ကျွန်ုပ်ကို {url} တွင် စောင့်ကြည့်နိုင်ပါသည်",
   "onboarding.share.next_steps": "ဖြစ်နိုင်ချေရှိသော နောက်အဆင့်များ -",
@@ -520,6 +530,7 @@
   "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
   "privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
+  "recommended": "အကြံပြုသည်",
   "refresh": "ပြန်လည်စတင်ပါ",
   "regeneration_indicator.label": "လုပ်ဆောင်နေသည်…",
   "regeneration_indicator.sublabel": "သင့်ပင်မစာမျက်နှာကို ပြင်ဆင်နေပါသည်။",
@@ -590,6 +601,7 @@
   "search.quick_action.status_search": "{x} နှင့် ကိုက်ညီသော ပို့စ်များ",
   "search.search_or_paste": "URL ရိုက်ထည့်ပါ သို့မဟုတ် ရှာဖွေပါ",
   "search_popout.full_text_search_disabled_message": "{domain} တွင် မရနိုင်ပါ။",
+  "search_popout.full_text_search_logged_out_message": "အကောင့်ဝင်ထားမှသာ ရနိုင်သည်။",
   "search_popout.language_code": "ISO ဘာသာစကားကုဒ်",
   "search_popout.options": "ရွေးချယ်ထားသည်များ ရှာဖွေရန်",
   "search_popout.quick_actions": "အမြန်လုပ်ဆောင်မှုများ",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 2d1616960a..d5055b0dc5 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -7,7 +7,7 @@
   "about.domain_blocks.silenced.explanation": "Normalmente não verá perfis e conteúdo deste servidor, a menos que os procure explicitamente ou opte por os seguir.",
   "about.domain_blocks.silenced.title": "Limitados",
   "about.domain_blocks.suspended.explanation": "Nenhum dado deste servidor será processado, armazenado ou trocado, impossibilitando qualquer interação ou comunicação com os utilizadores dessas instâncias.",
-  "about.domain_blocks.suspended.title": "Supensos",
+  "about.domain_blocks.suspended.title": "Suspensos",
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Rede social descentralizada baseada no {mastodon}",
   "about.rules": "Regras do servidor",
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 03ed771a42..4ba4fcfad3 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1324,6 +1324,7 @@ my:
       '86400': ၁ ရက်
     expires_in_prompt: ဘယ်တော့မှ
     generate: ဖိတ်ကြားချက်လင့်ခ် ဖန်တီးပါ
+    invalid: ဤဖိတ်ကြားချက်မှာ မမှန်ကန်ပါ
     invited_by: သင့်ကို ဖိတ်ခေါ်ထားသည် -
     max_uses:
       other: "%{count} အသုံးပြုမှုများ"

From a3cbb4b2f1aff565582c280c6408d01cf0b54350 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 8 Dec 2023 08:54:20 -0500
Subject: [PATCH 034/436] Add spec for `CLI::Search#deploy` command (#28272)

---
 spec/lib/mastodon/cli/search_spec.rb | 74 ++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/spec/lib/mastodon/cli/search_spec.rb b/spec/lib/mastodon/cli/search_spec.rb
index 785dc2bd61..cb0c80c11d 100644
--- a/spec/lib/mastodon/cli/search_spec.rb
+++ b/spec/lib/mastodon/cli/search_spec.rb
@@ -4,5 +4,79 @@ require 'rails_helper'
 require 'mastodon/cli/search'
 
 describe Mastodon::CLI::Search do
+  subject { cli.invoke(action, arguments, options) }
+
+  let(:cli) { described_class.new }
+  let(:arguments) { [] }
+  let(:options) { {} }
+
   it_behaves_like 'CLI Command'
+
+  describe '#deploy' do
+    let(:action) { :deploy }
+
+    context 'with concurrency out of range' do
+      let(:options) { { concurrency: -100 } }
+
+      it 'Exits with error message' do
+        expect { subject }
+          .to output_results('this concurrency setting')
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'with batch size out of range' do
+      let(:options) { { batch_size: -100_000 } }
+
+      it 'Exits with error message' do
+        expect { subject }
+          .to output_results('this batch_size setting')
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'without options' do
+      before { stub_search_indexes }
+
+      let(:indexed_count) { 1 }
+      let(:deleted_count) { 2 }
+
+      it 'reports about storage size' do
+        expect { subject }
+          .to output_results(
+            "Indexed #{described_class::INDICES.size * indexed_count} records",
+            "de-indexed #{described_class::INDICES.size * deleted_count}"
+          )
+      end
+    end
+
+    def stub_search_indexes
+      described_class::INDICES.each do |index|
+        allow(index)
+          .to receive_messages(
+            specification: instance_double(Chewy::Index::Specification, changed?: true, lock!: nil),
+            purge: nil
+          )
+
+        importer_double = importer_double_for(index)
+        allow(importer_double).to receive(:on_progress).and_yield([indexed_count, deleted_count])
+        allow("Importer::#{index}Importer".constantize)
+          .to receive(:new)
+          .and_return(importer_double)
+      end
+    end
+
+    def importer_double_for(index)
+      instance_double(
+        "Importer::#{index}Importer".constantize,
+        clean_up!: nil,
+        estimate!: 100,
+        import!: nil,
+        on_failure: nil,
+        # on_progress: nil,
+        optimize_for_import!: nil,
+        optimize_for_search!: nil
+      )
+    end
+  end
 end

From 490e4969a1a657cefbc9e4a9c11d5bffb5dc7a50 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 8 Dec 2023 08:54:48 -0500
Subject: [PATCH 035/436] Correct section naming in maintenance cli script
 (#28279)

---
 lib/mastodon/cli/maintenance.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index c53d742548..d0eff7da61 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -346,7 +346,7 @@ module Mastodon::CLI
 
       remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
 
-      say 'Removing duplicate account identity proofs…'
+      say 'Removing duplicate announcement reactions…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
         AnnouncementReaction.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
       end
@@ -431,7 +431,7 @@ module Mastodon::CLI
     def deduplicate_domain_blocks!
       remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
 
-      say 'Deduplicating domain_allows…'
+      say 'Deduplicating domain_blocks…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
         domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
 
@@ -462,7 +462,7 @@ module Mastodon::CLI
         UnavailableDomain.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
       end
 
-      say 'Restoring domain_allows indexes…'
+      say 'Restoring unavailable_domains indexes…'
       ActiveRecord::Base.connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
     end
 

From afc8550b63434232bb06b196132f2a180516061b Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 11 Dec 2023 01:49:10 -0600
Subject: [PATCH 036/436] Change preview card deletes to be done using batch
 method (#28183)

---
 app/lib/vacuum/preview_cards_vacuum.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/lib/vacuum/preview_cards_vacuum.rb b/app/lib/vacuum/preview_cards_vacuum.rb
index 14fdeda1ca..9e34c87c30 100644
--- a/app/lib/vacuum/preview_cards_vacuum.rb
+++ b/app/lib/vacuum/preview_cards_vacuum.rb
@@ -14,9 +14,8 @@ class Vacuum::PreviewCardsVacuum
   private
 
   def vacuum_cached_images!
-    preview_cards_past_retention_period.find_each do |preview_card|
-      preview_card.image.destroy
-      preview_card.save
+    preview_cards_past_retention_period.find_in_batches do |preview_card|
+      AttachmentBatch.new(PreviewCard, preview_card).clear
     end
   end
 

From bd88883b6e6c7c614eac3c97fc40783ea7b8c91b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 07:52:53 +0000
Subject: [PATCH 037/436] Update eslint (non-major) (#28313)

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

diff --git a/yarn.lock b/yarn.lock
index 45f58eaadc..4e1d0bd8c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1726,9 +1726,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "@eslint/eslintrc@npm:2.1.3"
+"@eslint/eslintrc@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/eslintrc@npm:2.1.4"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
@@ -1739,14 +1739,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: f4103f4346126292eb15581c5a1d12bef03410fd3719dedbdb92e1f7031d46a5a2d60de8566790445d5d4b70b75ba050876799a11f5fff8265a91ee3fa77dab0
+  checksum: 32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.54.0":
-  version: 8.54.0
-  resolution: "@eslint/js@npm:8.54.0"
-  checksum: d61fb4a0be6af2d8cb290121c329697664a75d6255a29926d5454fb02aeb02b87112f67fdf218d10abac42f90c570ac366126751baefc5405d0e017ed0c946c5
+"@eslint/js@npm:8.55.0":
+  version: 8.55.0
+  resolution: "@eslint/js@npm:8.55.0"
+  checksum: 88ab9fc57a651becd2b32ec40a3958db27fae133b1ae77bebd733aa5bbd00a92f325bb02f20ad680d31c731fa49b22f060a4777dd52eb3e27da013d940bd978d
   languageName: node
   linkType: hard
 
@@ -3682,14 +3682,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.11.0"
+  version: 6.13.2
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.11.0"
-    "@typescript-eslint/type-utils": "npm:6.11.0"
-    "@typescript-eslint/utils": "npm:6.11.0"
-    "@typescript-eslint/visitor-keys": "npm:6.11.0"
+    "@typescript-eslint/scope-manager": "npm:6.13.2"
+    "@typescript-eslint/type-utils": "npm:6.13.2"
+    "@typescript-eslint/utils": "npm:6.13.2"
+    "@typescript-eslint/visitor-keys": "npm:6.13.2"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3702,44 +3702,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 6645aa09b9d51c5e3ea781eaf74da75b94f83f3e2d7b3dd988d5ce7eb82dd87e3509471cf2ee8c6b2428d907df5f1b02f29dbd04f54c2653f9566c8c4ce98009
+  checksum: 531a4406d872738d165c6a66cb26e976523c94053b022a8210dc9fd10e91b79b705bc0fcc77145e9744e4108b53bdba55e02a10dc17757b22be92aff57849384
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/parser@npm:6.11.0"
+  version: 6.13.2
+  resolution: "@typescript-eslint/parser@npm:6.13.2"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.11.0"
-    "@typescript-eslint/types": "npm:6.11.0"
-    "@typescript-eslint/typescript-estree": "npm:6.11.0"
-    "@typescript-eslint/visitor-keys": "npm:6.11.0"
+    "@typescript-eslint/scope-manager": "npm:6.13.2"
+    "@typescript-eslint/types": "npm:6.13.2"
+    "@typescript-eslint/typescript-estree": "npm:6.13.2"
+    "@typescript-eslint/visitor-keys": "npm:6.13.2"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: e7caeb20069102e21f468fc0dbe7ff6fb6b1efa9e72f4c9f39d4a865ed0633f39130b593ef9ae8f394ca1d70563e15410faf30a482a97809951eaac6ed3a67da
+  checksum: 2c62b8cd8a37eb2ea59cd00e559f51a9f57af746e2040e872af3c58ddd3f4071ad7b7009789bdeb0e0d4ee0343bfe96ee77288020f3ae22d08e1674203f5e156
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.11.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.11.0"
+"@typescript-eslint/scope-manager@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
   dependencies:
-    "@typescript-eslint/types": "npm:6.11.0"
-    "@typescript-eslint/visitor-keys": "npm:6.11.0"
-  checksum: d8999e2d1a4cbde8a79df5e3ec416f0e3db9532d39f2f4bb5a0ebdf954ae75c183d3277579ba05268fe2c88e88ef87f0fa12f02bb8d95d9e67d92e411241f3a3
+    "@typescript-eslint/types": "npm:6.13.2"
+    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+  checksum: 9b159e5bb10dfb5953e71488200b4126378fc7e987ce7d90946aea9ec40cd66c7ada92399657c5d9794189b764ca6f4eb38a8dcb9e4c5aa50ab6000a39636b9c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.11.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/type-utils@npm:6.11.0"
+"@typescript-eslint/type-utils@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/type-utils@npm:6.13.2"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.11.0"
-    "@typescript-eslint/utils": "npm:6.11.0"
+    "@typescript-eslint/typescript-estree": "npm:6.13.2"
+    "@typescript-eslint/utils": "npm:6.13.2"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3747,23 +3747,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ff68f2e052b8d688f1dc1a0050746704c8e0ab6263b47f1f52da73a7d251678e4950af23a95e1cd8e3fcea2457e6e5294ddbe01d29dafa2fdfb5b11ed9452a3f
+  checksum: 1ca97c78abdf479aea0c54e869fda2ae2f69de1974cc063062ce7b5b16c7fdf497ea15c50a29dd5941ea1b6b77e8f1213a5c272a747e334ac69ede083f327468
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.11.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/types@npm:6.11.0"
-  checksum: 23182813db39a5e9b9bcc1e85306c953f7b8b22d3885e41fcac0bd725c170fbcb70f4ce55633678cc5921dcf062fa0e55635eb39480c118a4411a00354820223
+"@typescript-eslint/types@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/types@npm:6.13.2"
+  checksum: 029918ca5b1442bb4bc435773504ce32191e2c3e2fde8d4176bb6513f03e3dfa2aa9724b2d22b1640656d666b97f7a7ebfeaf67b881d5e07250828fa83e3ebe8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.11.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.11.0"
+"@typescript-eslint/typescript-estree@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
   dependencies:
-    "@typescript-eslint/types": "npm:6.11.0"
-    "@typescript-eslint/visitor-keys": "npm:6.11.0"
+    "@typescript-eslint/types": "npm:6.13.2"
+    "@typescript-eslint/visitor-keys": "npm:6.13.2"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3772,34 +3772,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 3e183e554e1bc74f065da3015f7137eb40c262f989c547701b1e3f4f20134e574e56b749288cd00d77b9d1ddb705546613c2457661ffc63b6060ffa97ba3aac8
+  checksum: 1c4c59dce0c51fdfee34d9f418e64fe28e3ec1a97661efc8a3d2780bdff36aff38de9090d356a968f394fa6d4e9c058936ce9cd260d4c44a52761ecd74915bce
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.11.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/utils@npm:6.11.0"
+"@typescript-eslint/utils@npm:6.13.2, @typescript-eslint/utils@npm:^6.5.0":
+  version: 6.13.2
+  resolution: "@typescript-eslint/utils@npm:6.13.2"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.11.0"
-    "@typescript-eslint/types": "npm:6.11.0"
-    "@typescript-eslint/typescript-estree": "npm:6.11.0"
+    "@typescript-eslint/scope-manager": "npm:6.13.2"
+    "@typescript-eslint/types": "npm:6.13.2"
+    "@typescript-eslint/typescript-estree": "npm:6.13.2"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: c91eb4578607959acc2b43ddc791571682e45601a19b25d5d120786ed4af607656f83c5c1fa71972e549ddfb5542acf2f7d443ae93b32ee28192c22c106b8883
+  checksum: 84969be91e7949868eaaa289288c9d71927f0e427b572501b0991d8d62b40a4234f7287c35b35d276ccbb53e9ea5457b8250fcf4941e60e6b9ba4065fbfba416
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.11.0":
-  version: 6.11.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.11.0"
+"@typescript-eslint/visitor-keys@npm:6.13.2":
+  version: 6.13.2
+  resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
   dependencies:
-    "@typescript-eslint/types": "npm:6.11.0"
+    "@typescript-eslint/types": "npm:6.13.2"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 5f48329422b7f286196661d39e93e9defd7c5cf80e6c84c8d03459853f5d9f86a5e91c5e80ea572dcdb907ebbe503bbcc77aeb8b468c294b2aa7b3ccfc81cb88
+  checksum: c173bc1fcc42c3075a5ee094e7f3bf0279d98315c25ff49e20d02d79022b1d0402accfa113b070afb4d52a6f6d180594b67baa8b6a784eabdf82b54dd1ff454c
   languageName: node
   linkType: hard
 
@@ -7313,13 +7313,13 @@ __metadata:
   linkType: hard
 
 "eslint-config-prettier@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "eslint-config-prettier@npm:9.0.0"
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: bc1f661915845c631824178942e5d02f858fe6d0ea796f0050d63e0f681927b92696e81139dd04714c08c3e7de580fd079c66162e40070155ba79eaee78ab5d0
+  checksum: 6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
   languageName: node
   linkType: hard
 
@@ -7555,13 +7555,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.54.0
-  resolution: "eslint@npm:8.54.0"
+  version: 8.55.0
+  resolution: "eslint@npm:8.55.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/eslintrc": "npm:^2.1.3"
-    "@eslint/js": "npm:8.54.0"
+    "@eslint/eslintrc": "npm:^2.1.4"
+    "@eslint/js": "npm:8.55.0"
     "@humanwhocodes/config-array": "npm:^0.11.13"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -7598,7 +7598,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: 4f205f832bdbd0218cde374b067791f4f76d7abe8de86b2dc849c273899051126d912ebf71531ee49b8eeaa22cad77febdc8f2876698dc2a76e84a8cb976af22
+  checksum: d28c0b60f19bb7d355cb8393e77b018c8f548dba3f820b799c89bb2e0c436ee26084e700c5e57e1e97e7972ec93065277849141b82e7b0c0d02c2dc1e553a2a1
   languageName: node
   linkType: hard
 

From d0e7999a904d6d5eb290f2378ce36809bfecb502 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 07:53:13 +0000
Subject: [PATCH 038/436] Update dependency typescript to v5.3.3 (#28312)

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

diff --git a/yarn.lock b/yarn.lock
index 4e1d0bd8c2..34e22f0521 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16495,22 +16495,22 @@ __metadata:
   linkType: hard
 
 "typescript@npm:5, typescript@npm:^5.0.4":
-  version: 5.3.2
-  resolution: "typescript@npm:5.3.2"
+  version: 5.3.3
+  resolution: "typescript@npm:5.3.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: d7dbe1fbe19039e36a65468ea64b5d338c976550394ba576b7af9c68ed40c0bc5d12ecce390e4b94b287a09a71bd3229f19c2d5680611f35b7c53a3898791159
+  checksum: e33cef99d82573624fc0f854a2980322714986bc35b9cb4d1ce736ed182aeab78e2cb32b385efa493b2a976ef52c53e20d6c6918312353a91850e2b76f1ea44f
   languageName: node
   linkType: hard
 
 "typescript@patch:typescript@npm%3A5#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.3.2
-  resolution: "typescript@patch:typescript@npm%3A5.3.2#optional!builtin<compat/typescript>::version=5.3.2&hash=e012d7"
+  version: 5.3.3
+  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 73c8bad74e732d93211c9d77f28b03307e2f5fc6a0afc73f4b783261ab567686a16d6ae958bdaef383a00be1b0b8c8b6741dd6ca3d13af4963fa7e47456d49c7
+  checksum: 1d0a5f4ce496c42caa9a30e659c467c5686eae15d54b027ee7866744952547f1be1262f2d40de911618c242b510029d51d43ff605dba8fb740ec85ca2d3f9500
   languageName: node
   linkType: hard
 

From 7ddd937330103cc9030ee375c3e62904b0b7508f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 08:53:32 +0100
Subject: [PATCH 039/436] Update dependency prettier to v3.1.1 (#28311)

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

diff --git a/yarn.lock b/yarn.lock
index 34e22f0521..7a15242041 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13312,11 +13312,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "prettier@npm:3.1.0"
+  version: 3.1.1
+  resolution: "prettier@npm:3.1.1"
   bin:
     prettier: bin/prettier.cjs
-  checksum: a45ea70aa97fde162ea4c4aba3dfc7859aa6a732a1db34458d9535dc3c2c16d3bc3fb5689e6cd76aa835562555303b02d9449fd2e15af3b73c8053557e25c5b6
+  checksum: facc944ba20e194ff4db765e830ffbcb642803381f0d2033ed397e79904fa4ccc877dc25ad68f42d36985c01d051c990ca1b905fb83d2d7d65fe69e4386fa1a3
   languageName: node
   linkType: hard
 

From a117155728319e36f3a5d2256de83b0985a40e0c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 07:54:01 +0000
Subject: [PATCH 040/436] Update DefinitelyTyped types (non-major) (#28310)

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

diff --git a/yarn.lock b/yarn.lock
index 7a15242041..f246cf412c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3027,11 +3027,11 @@ __metadata:
   linkType: hard
 
 "@types/emoji-mart@npm:^3.0.9":
-  version: 3.0.13
-  resolution: "@types/emoji-mart@npm:3.0.13"
+  version: 3.0.14
+  resolution: "@types/emoji-mart@npm:3.0.14"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 840f920c3242e1d274f0102e67cb2d00434e1fd370e0bcc8983b43b6b62322b01e3ddcd5fb078c60883e613530a7c70b8c40060624897543cd4da9441ca81486
+  checksum: 23ded65fce9b3355fbe903d3971cb67cc827a5d587464bb7e3f349615527ef4a9197b3bb59fa84c4391d1b901e7f200f686a7fc83f649ae2a51a0fb948cbadfb
   languageName: node
   linkType: hard
 
@@ -3175,12 +3175,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:^29.5.2":
-  version: 29.5.10
-  resolution: "@types/jest@npm:29.5.10"
+  version: 29.5.11
+  resolution: "@types/jest@npm:29.5.11"
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: b46171d59d12a5f69bbe710f65eaf59a8073337c6b4a67dff8158575caec53f1c61f8a7d645b34d6ac3c4ea398acd30f0c5d1c4a131c0c918798019264a3397d
+  checksum: 524a3394845214581278bf4d75055927261fbeac7e1a89cd621bd0636da37d265fe0a85eac58b5778758faad1cbd7c7c361dfc190c78ebde03a91cce33463261
   languageName: node
   linkType: hard
 
@@ -3374,11 +3374,11 @@ __metadata:
   linkType: hard
 
 "@types/react-helmet@npm:^6.1.6":
-  version: 6.1.9
-  resolution: "@types/react-helmet@npm:6.1.9"
+  version: 6.1.11
+  resolution: "@types/react-helmet@npm:6.1.11"
   dependencies:
     "@types/react": "npm:*"
-  checksum: d1823582903d6e70f1f447c7bec9e844b6f85f5de84cbcde5c8bbeecc064db1394c786ed9b9ded30544afe5c91e57c7e8105171df1643998f64c0aeab9f7f2aa
+  checksum: f7b3bb2151d992a108ae46fed876fb9c8119108397d9a01d150c5642782997542c8b3c52e742b56e8689b7dbfa62ca9cfc76aa7e05dec4e60c652f7ef53fa783
   languageName: node
   linkType: hard
 
@@ -3495,13 +3495,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.41
-  resolution: "@types/react@npm:18.2.41"
+  version: 18.2.43
+  resolution: "@types/react@npm:18.2.43"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 5cc72491ce8be95e7bbedd8bf039ca971772ecd22d989feb045af7e73247c7e6cff25a2f1c2200be461fb2f6b5aacef739e1ba9fd83c744209dfd3ce8aa75afe
+  checksum: 10477a50fbd3c0cc5b8a2ade679f442717f68fb27c8460b2aa1d3256cd18c48f742bbe5b9ee37a8c4c5f832ffa37b3a23c09fd96dd880a8e3182d8929c05e803
   languageName: node
   linkType: hard
 

From b82fc8a2ca29f03f821add41bea5221ceac9cafd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 07:54:22 +0000
Subject: [PATCH 041/436] Update dependency ws to v8.15.0 (#28308)

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

diff --git a/yarn.lock b/yarn.lock
index f246cf412c..0ef881126d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17738,8 +17738,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2":
-  version: 8.14.2
-  resolution: "ws@npm:8.14.2"
+  version: 8.15.0
+  resolution: "ws@npm:8.15.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -17748,7 +17748,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 35b4c2da048b8015c797fd14bcb5a5766216ce65c8a5965616a5440ca7b6c3681ee3cbd0ea0c184a59975556e9d58f2002abf8485a14d11d3371770811050a16
+  checksum: b778a405b2589ffbf549323e2f404f1f72e372a049d332d2f0b1f33057e9fbb14a05aa474cb156e4584b418cd95edf4297c0ca5263d6519e8009064bf8e0b80d
   languageName: node
   linkType: hard
 

From 11d2bd97165bf68439a8d2293c48b1fcefc8930c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:55:07 -0500
Subject: [PATCH 042/436] Fix intermittent failure from unspecified order in
 `api/v1/accounts/relationships` spec (#28306)

---
 .../api/v1/accounts/relationships_spec.rb     | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/spec/requests/api/v1/accounts/relationships_spec.rb b/spec/requests/api/v1/accounts/relationships_spec.rb
index cea45168a2..b06ce0509d 100644
--- a/spec/requests/api/v1/accounts/relationships_spec.rb
+++ b/spec/requests/api/v1/accounts/relationships_spec.rb
@@ -31,8 +31,8 @@ describe 'GET /api/v1/accounts/relationships' do
         .to have_http_status(200)
       expect(body_as_json)
         .to be_an(Enumerable)
-        .and have_attributes(
-          first: include(
+        .and contain_exactly(
+          include(
             following: true,
             followed_by: false
           )
@@ -53,9 +53,11 @@ describe 'GET /api/v1/accounts/relationships' do
           expect(body_as_json)
             .to be_an(Enumerable)
             .and have_attributes(
-              size: 2,
-              first: include(simon_item),
-              second: include(lewis_item)
+              size: 2
+            )
+            .and contain_exactly(
+              include(simon_item),
+              include(lewis_item)
             )
         end
       end
@@ -71,10 +73,12 @@ describe 'GET /api/v1/accounts/relationships' do
           expect(body_as_json)
             .to be_an(Enumerable)
             .and have_attributes(
-              size: 3,
-              first: include(simon_item),
-              second: include(lewis_item),
-              third: include(bob_item)
+              size: 3
+            )
+            .and contain_exactly(
+              include(simon_item),
+              include(lewis_item),
+              include(bob_item)
             )
         end
       end
@@ -88,9 +92,11 @@ describe 'GET /api/v1/accounts/relationships' do
           expect(body_as_json)
             .to be_an(Enumerable)
             .and have_attributes(
-              size: 2,
-              first: include(simon_item),
-              second: include(lewis_item)
+              size: 2
+            )
+            .and contain_exactly(
+              include(simon_item),
+              include(lewis_item)
             )
         end
       end
@@ -116,7 +122,6 @@ describe 'GET /api/v1/accounts/relationships' do
           muting: false,
           requested: false,
           domain_blocking: false,
-
         }
       end
 
@@ -129,7 +134,6 @@ describe 'GET /api/v1/accounts/relationships' do
           muting: false,
           requested: false,
           domain_blocking: false,
-
         }
       end
     end
@@ -149,8 +153,10 @@ describe 'GET /api/v1/accounts/relationships' do
       expect(body_as_json)
         .to be_an(Enumerable)
         .and have_attributes(
-          size: 1,
-          first: include(
+          size: 1
+        )
+        .and contain_exactly(
+          include(
             following: true,
             showing_reblogs: true
           )
@@ -168,8 +174,8 @@ describe 'GET /api/v1/accounts/relationships' do
 
       expect(body_as_json)
         .to be_an(Enumerable)
-        .and have_attributes(
-          first: include(
+        .and contain_exactly(
+          include(
             following: false,
             showing_reblogs: false
           )

From 78347d25567b1b8cf2cb9e1fd4cab002fd6aff59 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:55:45 -0500
Subject: [PATCH 043/436] Controller spec to request spec:
 `api/v1/accounts/familiar_followers` (#28305)

---
 .../v1/accounts/familiar_followers_spec.rb}   | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)
 rename spec/{controllers/api/v1/accounts/familiar_followers_controller_spec.rb => requests/api/v1/accounts/familiar_followers_spec.rb} (53%)

diff --git a/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
similarity index 53%
rename from spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb
rename to spec/requests/api/v1/accounts/familiar_followers_spec.rb
index 3c7c7e8b84..fdc0a3a932 100644
--- a/spec/controllers/api/v1/accounts/familiar_followers_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/familiar_followers_spec.rb
@@ -2,20 +2,16 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::FamiliarFollowersController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:follows') }
+describe 'Accounts Familiar Followers API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:follows' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/familiar_followers' do
     it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get '/api/v1/accounts/familiar_followers', params: { account_id: account.id, limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
     end
@@ -26,7 +22,7 @@ describe Api::V1::Accounts::FamiliarFollowersController do
 
       it 'removes duplicate account IDs from params' do
         account_ids = [account_a, account_b, account_b, account_a, account_a].map { |a| a.id.to_s }
-        get :index, params: { id: account_ids }
+        get '/api/v1/accounts/familiar_followers', params: { id: account_ids }, headers: headers
 
         expect(body_as_json.pluck(:id)).to contain_exactly(account_a.id.to_s, account_b.id.to_s)
       end

From 8f94502e7d092584c7bd723ae3e866c0aae2c95b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:56:13 -0500
Subject: [PATCH 044/436] Controller spec to request spec:
 `api/v1/accounts/identify_proofs` (#28304)

---
 .../identity_proofs_controller_spec.rb        | 23 -------------------
 .../api/v1/accounts/identity_proofs_spec.rb   | 19 +++++++++++++++
 2 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/identity_proofs_controller_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/identity_proofs_spec.rb

diff --git a/spec/controllers/api/v1/accounts/identity_proofs_controller_spec.rb b/spec/controllers/api/v1/accounts/identity_proofs_controller_spec.rb
deleted file mode 100644
index 6351de7616..0000000000
--- a/spec/controllers/api/v1/accounts/identity_proofs_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::IdentityProofsController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/identity_proofs_spec.rb b/spec/requests/api/v1/accounts/identity_proofs_spec.rb
new file mode 100644
index 0000000000..3727af7e89
--- /dev/null
+++ b/spec/requests/api/v1/accounts/identity_proofs_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Accounts Identity Proofs API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/accounts/identity_proofs' do
+    it 'returns http success' do
+      get "/api/v1/accounts/#{account.id}/identity_proofs", params: { limit: 2 }, headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From a968898dc7d7a9c6ddea850a40d4f2fc9e7b446f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:56:47 -0500
Subject: [PATCH 045/436] Controller spec to request spec:
 `api/v1/accounts/lists` (#28303)

---
 .../api/v1/accounts/lists_controller_spec.rb  | 25 -------------------
 spec/requests/api/v1/accounts/lists_spec.rb   | 25 +++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/lists_controller_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/lists_spec.rb

diff --git a/spec/controllers/api/v1/accounts/lists_controller_spec.rb b/spec/controllers/api/v1/accounts/lists_controller_spec.rb
deleted file mode 100644
index 418839cfa5..0000000000
--- a/spec/controllers/api/v1/accounts/lists_controller_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::ListsController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
-  let(:account) { Fabricate(:account) }
-  let(:list)    { Fabricate(:list, account: user.account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-    user.account.follow!(account)
-    list.accounts << account
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index, params: { account_id: account.id }
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/lists_spec.rb b/spec/requests/api/v1/accounts/lists_spec.rb
new file mode 100644
index 0000000000..48c0337e54
--- /dev/null
+++ b/spec/requests/api/v1/accounts/lists_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Accounts Lists API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:lists' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+  let(:list)    { Fabricate(:list, account: user.account) }
+
+  before do
+    user.account.follow!(account)
+    list.accounts << account
+  end
+
+  describe 'GET /api/v1/accounts/lists' do
+    it 'returns http success' do
+      get "/api/v1/accounts/#{account.id}/lists", headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From e544b6df42a5ed8c2365f0a95d7e3e94c53c61f9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:57:33 -0500
Subject: [PATCH 046/436] Controller spec to request spec:
 `api/v1/accounts/lookup` (#28302)

---
 .../api/v1/accounts/lookup_controller_spec.rb | 23 -------------------
 spec/requests/api/v1/accounts/lookup_spec.rb  | 19 +++++++++++++++
 2 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/lookup_controller_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/lookup_spec.rb

diff --git a/spec/controllers/api/v1/accounts/lookup_controller_spec.rb b/spec/controllers/api/v1/accounts/lookup_controller_spec.rb
deleted file mode 100644
index 37407766f2..0000000000
--- a/spec/controllers/api/v1/accounts/lookup_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::Accounts::LookupController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show, params: { account_id: account.id, acct: account.acct }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/lookup_spec.rb b/spec/requests/api/v1/accounts/lookup_spec.rb
new file mode 100644
index 0000000000..4c022c7c13
--- /dev/null
+++ b/spec/requests/api/v1/accounts/lookup_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Accounts Lookup API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/accounts/lookup' do
+    it 'returns http success' do
+      get '/api/v1/accounts/lookup', params: { account_id: account.id, acct: account.acct }, headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 94cc707ab398339dfe74472300056876fac81856 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:58:48 -0500
Subject: [PATCH 047/436] Controller spec to request spec:
 `api/v1/accounts/notes` (#28301)

---
 .../api/v1/accounts/notes_spec.rb}             | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
 rename spec/{controllers/api/v1/accounts/notes_controller_spec.rb => requests/api/v1/accounts/notes_spec.rb} (66%)

diff --git a/spec/controllers/api/v1/accounts/notes_controller_spec.rb b/spec/requests/api/v1/accounts/notes_spec.rb
similarity index 66%
rename from spec/controllers/api/v1/accounts/notes_controller_spec.rb
rename to spec/requests/api/v1/accounts/notes_spec.rb
index 75599b32b2..4f3ac68c74 100644
--- a/spec/controllers/api/v1/accounts/notes_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/notes_spec.rb
@@ -2,21 +2,17 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::NotesController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts') }
+describe 'Accounts Notes API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'write:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:comment) { 'foo' }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
+  describe 'POST /api/v1/accounts/:account_id/note' do
     subject do
-      post :create, params: { account_id: account.id, comment: comment }
+      post "/api/v1/accounts/#{account.id}/note", params: { comment: comment }, headers: headers
     end
 
     context 'when account note has reasonable length', :aggregate_failures do

From 809506bdd40871ae8c56fa755d8d61bc279095a0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 02:59:40 -0500
Subject: [PATCH 048/436] Controller spec to request spec:
 `api/v1/accounts/pins` (#28300)

---
 .../api/v1/accounts/pins_controller_spec.rb   | 40 ------------------
 spec/requests/api/v1/accounts/pins_spec.rb    | 41 +++++++++++++++++++
 2 files changed, 41 insertions(+), 40 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/pins_controller_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/pins_spec.rb

diff --git a/spec/controllers/api/v1/accounts/pins_controller_spec.rb b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
deleted file mode 100644
index 36f525e756..0000000000
--- a/spec/controllers/api/v1/accounts/pins_controller_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::Accounts::PinsController do
-  let(:john)  { Fabricate(:user) }
-  let(:kevin) { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') }
-
-  before do
-    kevin.account.followers << john.account
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'POST #create' do
-    subject { post :create, params: { account_id: kevin.account.id } }
-
-    it 'creates account_pin', :aggregate_failures do
-      expect do
-        subject
-      end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(1)
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    subject { delete :destroy, params: { account_id: kevin.account.id } }
-
-    before do
-      Fabricate(:account_pin, account: john.account, target_account: kevin.account)
-    end
-
-    it 'destroys account_pin', :aggregate_failures do
-      expect do
-        subject
-      end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(-1)
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/pins_spec.rb b/spec/requests/api/v1/accounts/pins_spec.rb
new file mode 100644
index 0000000000..c293715f7e
--- /dev/null
+++ b/spec/requests/api/v1/accounts/pins_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Accounts Pins API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'write:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:kevin) { Fabricate(:user) }
+
+  before do
+    kevin.account.followers << user.account
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/pin' do
+    subject { post "/api/v1/accounts/#{kevin.account.id}/pin", headers: headers }
+
+    it 'creates account_pin', :aggregate_failures do
+      expect do
+        subject
+      end.to change { AccountPin.where(account: user.account, target_account: kevin.account).count }.by(1)
+      expect(response).to have_http_status(200)
+    end
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/unpin' do
+    subject { post "/api/v1/accounts/#{kevin.account.id}/unpin", headers: headers }
+
+    before do
+      Fabricate(:account_pin, account: user.account, target_account: kevin.account)
+    end
+
+    it 'destroys account_pin', :aggregate_failures do
+      expect do
+        subject
+      end.to change { AccountPin.where(account: user.account, target_account: kevin.account).count }.by(-1)
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 16ede59d0a01759a32e3abb6a352a3c397bd982c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 03:00:41 -0500
Subject: [PATCH 049/436] Controller spec to request spec:
 `api/v1/featured_tags/suggestions` (#28298)

---
 .../suggestions_controller_spec.rb            | 23 -------------------
 .../api/v1/featured_tags/suggestions_spec.rb  | 19 +++++++++++++++
 2 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 spec/controllers/api/v1/featured_tags/suggestions_controller_spec.rb
 create mode 100644 spec/requests/api/v1/featured_tags/suggestions_spec.rb

diff --git a/spec/controllers/api/v1/featured_tags/suggestions_controller_spec.rb b/spec/controllers/api/v1/featured_tags/suggestions_controller_spec.rb
deleted file mode 100644
index 54c63dcc6f..0000000000
--- a/spec/controllers/api/v1/featured_tags/suggestions_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V1::FeaturedTags::SuggestionsController do
-  render_views
-
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-  let(:account) { Fabricate(:account) }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index, params: { account_id: account.id, limit: 2 }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/featured_tags/suggestions_spec.rb b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
new file mode 100644
index 0000000000..f7b453b740
--- /dev/null
+++ b/spec/requests/api/v1/featured_tags/suggestions_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Featured Tags Suggestions API' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:accounts' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:account) { Fabricate(:account) }
+
+  describe 'GET /api/v1/featured_tags/suggestions' do
+    it 'returns http success' do
+      get '/api/v1/featured_tags/suggestions', params: { account_id: account.id, limit: 2 }, headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From f5d6143aa1eba03391841d6df8ed80e09a4b5e05 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:01:17 +0100
Subject: [PATCH 050/436] Update dependency addressable to v2.8.6 (#28296)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 7a7fdb01c4..738bc7b8bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,7 +118,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     android_key_attestation (0.3.0)

From 253393f3a8281dcf5850aabd917da727518f49c4 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 03:04:45 -0500
Subject: [PATCH 051/436] Only attempt to remove indexes that exist in
 `CLI::Maintenance` script (#28286)

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

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index d0eff7da61..553ca056dc 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -712,7 +712,7 @@ module Mastodon::CLI
     end
 
     def remove_index_if_exists!(table, name)
-      ActiveRecord::Base.connection.remove_index(table, name: name)
+      ActiveRecord::Base.connection.remove_index(table, name: name) if ActiveRecord::Base.connection.index_name_exists?(table, name)
     rescue ArgumentError, ActiveRecord::StatementInvalid
       nil
     end

From 0c640925009a8dbfb8a2be9e4b45d3e40f727a52 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 03:13:28 -0500
Subject: [PATCH 052/436] Controller spec to request spec:
 `api/v1/accounts/search` (#28299)

---
 .../api/v1/accounts/search_controller_spec.rb | 22 -------------------
 spec/requests/api/v1/accounts/search_spec.rb  | 18 +++++++++++++++
 2 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 spec/controllers/api/v1/accounts/search_controller_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/search_spec.rb

diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
deleted file mode 100644
index aa9455a4a3..0000000000
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::Accounts::SearchController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #show' do
-    it 'returns http success' do
-      get :show, params: { q: 'query' }
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v1/accounts/search_spec.rb b/spec/requests/api/v1/accounts/search_spec.rb
new file mode 100644
index 0000000000..76b32e7b2c
--- /dev/null
+++ b/spec/requests/api/v1/accounts/search_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Accounts Search API' do
+  let(:user)     { Fabricate(:user) }
+  let(:token)    { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v1/accounts/search' do
+    it 'returns http success' do
+      get '/api/v1/accounts/search', params: { q: 'query' }, headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 0e4233de9d8a0912b0d837e32043c325dfc2e0ff Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 03:13:57 -0500
Subject: [PATCH 053/436] Controller spec to request spec: `api/v2/suggestions`
 (#28297)

---
 .../api/v2/suggestions_controller_spec.rb     | 22 -------------------
 spec/requests/api/v2/suggestions_spec.rb      | 18 +++++++++++++++
 2 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 spec/controllers/api/v2/suggestions_controller_spec.rb
 create mode 100644 spec/requests/api/v2/suggestions_spec.rb

diff --git a/spec/controllers/api/v2/suggestions_controller_spec.rb b/spec/controllers/api/v2/suggestions_controller_spec.rb
deleted file mode 100644
index 5e6508bfda..0000000000
--- a/spec/controllers/api/v2/suggestions_controller_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Api::V2::SuggestionsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #index' do
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-end
diff --git a/spec/requests/api/v2/suggestions_spec.rb b/spec/requests/api/v2/suggestions_spec.rb
new file mode 100644
index 0000000000..5f1c97b8ae
--- /dev/null
+++ b/spec/requests/api/v2/suggestions_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Suggestions API' do
+  let(:user)    { Fabricate(:user) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2/suggestions' do
+    it 'returns http success' do
+      get '/api/v2/suggestions', headers: headers
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end

From 79a81da69c86276fe17143954f06f6e6b58356d4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:22:52 +0100
Subject: [PATCH 054/436] New Crowdin Translations (automated) (#28291)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/en-GB.json |  7 +++
 app/javascript/mastodon/locales/eo.json    | 50 ++++++++++++++++++++
 app/javascript/mastodon/locales/ko.json    |  2 +-
 app/javascript/mastodon/locales/la.json    | 16 +++----
 app/javascript/mastodon/locales/ne.json    | 54 +++++++++++++++++++++-
 app/javascript/mastodon/locales/sk.json    |  1 +
 config/locales/activerecord.hr.yml         | 15 ++++++
 config/locales/activerecord.ru.yml         |  2 +-
 config/locales/en-GB.yml                   | 16 +++++++
 config/locales/sk.yml                      |  4 ++
 10 files changed, 156 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 7745311be5..1a67fecb60 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow",
+  "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
   "conversation.with": "With {names}",
+  "copy_icon_button.copied": "Copied to clipboard",
   "copypaste.copied": "Copied",
   "copypaste.copy_to_clipboard": "Copy to clipboard",
   "directory.federated": "From known fediverse",
@@ -222,6 +224,7 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_hides_collections": "This user has chosen to not make this information available",
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
@@ -478,6 +481,8 @@
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Personalize your home feed",
+  "onboarding.profile.discoverable": "Make my profile discoverable",
+  "onboarding.profile.discoverable_hint": "When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.",
   "onboarding.profile.display_name": "Display name",
   "onboarding.profile.display_name_hint": "Your full name or your fun name…",
   "onboarding.profile.lead": "You can always complete this later in the settings, where even more customisation options are available.",
@@ -530,6 +535,7 @@
   "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
+  "recommended": "Recommended",
   "refresh": "Refresh",
   "regeneration_indicator.label": "Loading…",
   "regeneration_indicator.sublabel": "Your home feed is being prepared!",
@@ -600,6 +606,7 @@
   "search.quick_action.status_search": "Posts matching {x}",
   "search.search_or_paste": "Search or paste URL",
   "search_popout.full_text_search_disabled_message": "Unavailable on {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Only available when logged in.",
   "search_popout.language_code": "ISO language code",
   "search_popout.options": "Search options",
   "search_popout.quick_actions": "Quick actions",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 537b8d0af1..2678d83a50 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blokita",
   "account.browse_more_on_origin_server": "Foliumi pli ĉe la originala profilo",
   "account.cancel_follow_request": "Nuligi peton por sekvado",
+  "account.copy": "Kopii ligilon al profilo",
   "account.direct": "Private mencii @{name}",
   "account.disable_notifications": "Ne plu sciigi min, kiam @{name} mesaĝas",
   "account.domain_blocked": "Domajno blokita",
@@ -191,6 +192,7 @@
   "conversation.mark_as_read": "Marki legita",
   "conversation.open": "Vidi konversacion",
   "conversation.with": "Kun {names}",
+  "copy_icon_button.copied": "Kopiis al kliptabulo",
   "copypaste.copied": "Kopiita",
   "copypaste.copy_to_clipboard": "Kopii al dosierujo",
   "directory.federated": "El konata fediverso",
@@ -202,7 +204,9 @@
   "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
   "dismissable_banner.dismiss": "Eksigi",
   "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.",
+  "dismissable_banner.explore_statuses": "Ĉi tioj estas afiŝoj de socia reto kiu populariĝas hodiau.",
   "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
+  "dismissable_banner.public_timeline": "Ĉi tioj estas plej lastaj publikaj afiŝoj de personoj ĉe socia reto kiu personoj ĉe {domain} sekvas.",
   "embed.instructions": "Enkorpigu ĉi tiun afiŝon en vian retejon per kopio de la suba kodo.",
   "embed.preview": "Ĝi aperos tiel:",
   "emoji_button.activity": "Agadoj",
@@ -220,6 +224,7 @@
   "emoji_button.search_results": "Serĉaj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "Vojaĝoj kaj lokoj",
+  "empty_column.account_hides_collections": "Ĉi tiu uzanto elektis ne disponebligi ĉi tiu informon",
   "empty_column.account_suspended": "Konto suspendita",
   "empty_column.account_timeline": "Neniu afiŝo ĉi tie!",
   "empty_column.account_unavailable": "Profilo ne disponebla",
@@ -229,6 +234,8 @@
   "empty_column.direct": "Vi ankoraŭ ne havas privatan mencion. Kiam vi sendos aŭ ricevos iun, tiu aperos ĉi tie.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
   "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
+  "empty_column.favourited_statuses": "Vi ankoraŭ ne havas stelumitan afiŝon.",
+  "empty_column.favourites": "Ankoraŭ neniu stelumis tiun afiŝon.",
   "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝi aperos ĉi tie.",
   "empty_column.followed_tags": "Vi ankoraŭ ne sekvas iujn kradvortojn. Kiam vi faras, ili aperos ĉi tie.",
   "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.",
@@ -292,19 +299,36 @@
   "hashtag.column_settings.tag_mode.any": "Iu ajn",
   "hashtag.column_settings.tag_mode.none": "Neniu",
   "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno",
+  "hashtag.counter_by_accounts": "{count, plural,one {{counter} partoprenanto} other {{counter} partoprenantoj}}",
+  "hashtag.counter_by_uses": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}}",
+  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiau",
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
+  "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
+  "home.actions.go_to_explore": "Vidi kio populariĝas",
   "home.actions.go_to_suggestions": "Trovi homojn por sekvi",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
+  "home.explore_prompt.body": "Via hejmafiŝaro havos miksitajn afiŝojn de kradvortoj kiujn vi elektis sekvi, personoj kiujn vi elektis sekvi, kaj afiŝoj kiujn ili suprenigis.",
+  "home.explore_prompt.title": "Ĉi tio estas via hejma paĝo en Mastodon.",
   "home.hide_announcements": "Kaŝi la anoncojn",
+  "home.pending_critical_update.body": "Ĝisdatigu vian servilon de Mastodon kiel eble plej baldau!",
+  "home.pending_critical_update.link": "Vidi ĝisdatigojn",
+  "home.pending_critical_update.title": "Kritika sekurĝisdatigo estas disponebla!",
   "home.show_announcements": "Montri anoncojn",
+  "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumiti ĉi tiun afiŝon por sciigi la afiŝanton ke vi aprezigas ŝin kaj konservas por la estonteco.",
   "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.",
   "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
   "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
+  "interaction_modal.login.action": "Prenu min hejmen",
+  "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
+  "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
   "interaction_modal.on_another_server": "En alia servilo",
   "interaction_modal.on_this_server": "En ĉi tiu servilo",
+  "interaction_modal.sign_in": "Vi ne estas ensalutita al ĉi tiu servilo.",
+  "interaction_modal.sign_in_hint": "Gvideto: Tio estas la retejo kie vi registris. Vi ankau povas tajpi vian plenan uzantonomon!",
+  "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
   "interaction_modal.title.follow": "Sekvi {name}",
   "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
   "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
@@ -320,6 +344,8 @@
   "keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj",
   "keyboard_shortcuts.down": "iri suben en la listo",
   "keyboard_shortcuts.enter": "malfermi mesaĝon",
+  "keyboard_shortcuts.favourite": "Stelumi afiŝon",
+  "keyboard_shortcuts.favourites": "Malfermi la liston de la stelumoj",
   "keyboard_shortcuts.federated": "Malfermi la frataran templinion",
   "keyboard_shortcuts.heading": "Klavaraj mallongigoj",
   "keyboard_shortcuts.home": "Malfermi la hejman templinion",
@@ -366,6 +392,7 @@
   "lists.search": "Serĉi inter la homoj, kiujn vi sekvas",
   "lists.subheading": "Viaj listoj",
   "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
+  "loading_indicator.label": "Ŝargado…",
   "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
   "mute_modal.duration": "Daŭro",
@@ -382,6 +409,7 @@
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.explore": "Esplori",
+  "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
   "navigation_bar.follow_requests": "Petoj de sekvado",
   "navigation_bar.followed_tags": "Sekvataj kradvortoj",
@@ -389,6 +417,7 @@
   "navigation_bar.lists": "Listoj",
   "navigation_bar.logout": "Adiaŭi",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
+  "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
   "navigation_bar.personal": "Persone",
   "navigation_bar.pins": "Alpinglitaj mesaĝoj",
   "navigation_bar.preferences": "Preferoj",
@@ -398,6 +427,7 @@
   "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
   "notification.admin.report": "{name} raportis {target}",
   "notification.admin.sign_up": "{name} kreis konton",
+  "notification.favourite": "{name} stelumis vian afiŝon",
   "notification.follow": "{name} eksekvis vin",
   "notification.follow_request": "{name} petis sekvi vin",
   "notification.mention": "{name} menciis vin",
@@ -411,6 +441,7 @@
   "notifications.column_settings.admin.report": "Novaj raportoj:",
   "notifications.column_settings.admin.sign_up": "Novaj registriĝoj:",
   "notifications.column_settings.alert": "Sciigoj de la retumilo",
+  "notifications.column_settings.favourite": "Stelumoj:",
   "notifications.column_settings.filter_bar.advanced": "Montri ĉiujn kategoriojn",
   "notifications.column_settings.filter_bar.category": "Rapida filtra breto",
   "notifications.column_settings.filter_bar.show_bar": "Montri la breton de filtrilo",
@@ -428,6 +459,7 @@
   "notifications.column_settings.update": "Redaktoj:",
   "notifications.filter.all": "Ĉiuj",
   "notifications.filter.boosts": "Diskonigoj",
+  "notifications.filter.favourites": "Stelumoj",
   "notifications.filter.follows": "Sekvoj",
   "notifications.filter.mentions": "Mencioj",
   "notifications.filter.polls": "Balotenketaj rezultoj",
@@ -441,14 +473,29 @@
   "notifications_permission_banner.enable": "Ŝalti retumilajn sciigojn",
   "notifications_permission_banner.how_to_control": "Por ricevi sciigojn kiam Mastodon ne estas malfermita, ebligu labortablajn sciigojn. Vi povas regi precize kiuj specoj de interagoj generas labortablajn sciigojn per la supra butono {icon} post kiam ili estas ebligitaj.",
   "notifications_permission_banner.title": "Neniam preterlasas iun ajn",
+  "onboarding.action.back": "Prenu min reen",
+  "onboarding.actions.back": "Prenu min reen",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Saluton #Mastodon!",
   "onboarding.follows.empty": "Bedaŭrinde, neniu rezulto estas montrebla nuntempe. Vi povas provi serĉi aŭ foliumi la esploran paĝon por trovi kontojn por sekvi, aŭ retrovi baldaŭ.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Trovebligi mian profilon",
+  "onboarding.profile.discoverable_hint": "Kiam vi aliĝi al trovebleco ĉe Mastodon, viaj afiŝoj eble aperos en serĉaj rezultoj kaj populariĝoj, kaj via profilo eble estas sugestota al personoj kun similaj intereseoj al vi.",
+  "onboarding.profile.display_name": "Publika nomo",
+  "onboarding.profile.display_name_hint": "Via plena nomo aŭ via kromnomo…",
+  "onboarding.profile.lead": "Vi ĉiam povas plenigi ĉi tion poste en la agordoj, kie eĉ pli da personecigagordoj estas disponeblaj.",
+  "onboarding.profile.note": "Sinprezento",
+  "onboarding.profile.note_hint": "Vi povas @mencii aliajn homojn aŭ #kradvortojn…",
   "onboarding.profile.save_and_continue": "Konservi kaj daŭrigi",
+  "onboarding.profile.title": "Profila fikso",
+  "onboarding.profile.upload_avatar": "Alŝuti profilbildon",
+  "onboarding.profile.upload_header": "Alŝuti profilkapbildon",
+  "onboarding.share.lead": "Sciigi personojn pri kiel ili povas trovi vin ĉe Mastodon!",
   "onboarding.share.message": "Mi estas {username} en #Mastodon! Sekvu min ĉe {url}",
+  "onboarding.share.next_steps": "Eblaj malantauaj paŝoj:",
+  "onboarding.share.title": "Disvastigi vian profilon",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "Vi atingas ĝin!",
@@ -460,6 +507,9 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.tips.2fa": "<strong>Ĉu vi scias?</strong> Vi povas sekurigi vian konton per efektivigi dufaktora autentigo en via kontoagordoj.",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Ĉu vi scias?</strong> Ĉar Mastodon estas sencentra, kelkaj profiloj kiujn vi trovi estas gastigitaj ĉe aliaj serviloj kiuj ne estas via.",
+  "onboarding.tips.migration": "<strong>Ĉu vi scias?</strong> Se vi sentas ke {domain} ne estas bona servilelekto por vi en la estonteco, vi povas translokiĝi al alia servilo de Mastodon sen malgajni viajn sekvantojn.",
   "password_confirmation.mismatching": "Pasvorto konfirmo ne kongruas",
   "picture_in_picture.restore": "Remetu ĝin",
   "poll.closed": "Finita",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5b76cd67c5..4606916c1d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -239,7 +239,7 @@
   "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.",
   "empty_column.followed_tags": "아직 아무 해시태그도 팔로우하고 있지 않습니다. 해시태그를 팔로우하면, 여기에 표시됩니다.",
   "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
-  "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람들을 팔로우 하여 채워보세요. {suggestions}",
+  "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람을 팔로우하여 채워보세요. {suggestions}",
   "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index e4bd9365a8..3e5747ba8b 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -1,6 +1,6 @@
 {
   "about.contact": "Ratio:",
-  "about.domain_blocks.no_reason_available": "ratio abdere est",
+  "about.domain_blocks.no_reason_available": "Ratio abdere est",
   "account.account_note_header": "Annotatio",
   "account.badges.bot": "Robotum",
   "account.badges.group": "Congregatio",
@@ -49,7 +49,7 @@
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "emoji_button.food": "cibus et potus",
+  "emoji_button.food": "Cibus et potus",
   "emoji_button.people": "Homines",
   "emoji_button.search": "Quaerere...",
   "empty_column.account_timeline": "Hic nulla contributa!",
@@ -57,13 +57,13 @@
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "explore.trending_statuses": "Contributa",
-  "generic.saved": "servavit",
+  "generic.saved": "Servavit",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
-  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.back": "Re navigare",
+  "keyboard_shortcuts.blocked": "Aperire listam usorum obstructorum",
+  "keyboard_shortcuts.boost": "Inlustrare publicatio",
+  "keyboard_shortcuts.column": "Columnam dirigere",
+  "keyboard_shortcuts.compose": "TextArea Compositi Attendere",
   "keyboard_shortcuts.description": "Descriptio",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 0967ef424b..95f8e703c9 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -1 +1,53 @@
-{}
+{
+  "about.contact": "सम्पर्क:",
+  "about.disclaimer": "Mastodon नि:शुल्क, खुला स्रोत सफ्टवेयर, र Mastodon gGmbH को ट्रेडमार्क हो।",
+  "about.domain_blocks.no_reason_available": "कारण उपलब्ध छैन",
+  "about.domain_blocks.preamble": "Mastodon ले तपाइँलाई सामान्यतया फेडिभर्समा कुनै पनि अन्य सर्भरका सामग्री हेर्न र प्रयोगकर्ताहरूसँग अन्तरक्रिया गर्न दिन्छ। यी अपवादहरू हुन् जुन यस विशेष सर्भरमा बनाइएका छन्।",
+  "about.domain_blocks.silenced.title": "सीमित",
+  "about.domain_blocks.suspended.explanation": "यस सर्भरबाट कुनै पनि डेटा प्रशोधन, भण्डारण वा आदानप्रदान गरिने छैन, जसले यस सर्भरका प्रयोगकर्ताहरूसँग कुनै पनि अन्तरक्रिया वा सञ्चारलाई असम्भव बनाउँछ।",
+  "about.domain_blocks.suspended.title": "निलम्बित",
+  "about.not_available": "यो जानकारी यस सर्भरमा उपलब्ध गराइएको छैन।",
+  "about.powered_by": "{mastodon} द्वारा संचालित विकेन्द्रीकृत सामाजिक मिडिया",
+  "about.rules": "सर्भर नियमहरू",
+  "account.add_or_remove_from_list": "सूचीबाट थप्नुहोस् वा हटाउनुहोस्",
+  "account.badges.group": "समूह",
+  "account.block": "@{name} लाई ब्लक गर्नुहोस्",
+  "account.block_domain": "{domain} डोमेनलाई ब्लक गर्नुहोस्",
+  "account.block_short": "ब्लक",
+  "account.blocked": "ब्लक गरिएको",
+  "account.browse_more_on_origin_server": "मूल प्रोफाइलमा थप ब्राउज गर्नुहोस्",
+  "account.cancel_follow_request": "फलो अनुरोध रद्द गर्नुहोस",
+  "account.copy": "प्रोफाइलको लिङ्क प्रतिलिपि गर्नुहोस्",
+  "account.direct": "@{name} लाई निजी रूपमा उल्लेख गर्नुहोस्",
+  "account.disable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित नगर्नुहोस्",
+  "account.domain_blocked": "डोमेन ब्लक गरिएको छ",
+  "account.edit_profile": "प्रोफाइल सम्पादन गर्नुहोस्",
+  "account.enable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित गर्नुहोस्",
+  "account.endorse": "प्रोफाइलमा फिचर गर्नुहोस्",
+  "account.featured_tags.last_status_never": "कुनै पोस्ट छैन",
+  "account.follow": "फलो गर्नुहोस",
+  "account.followers.empty": "यस प्रयोगकर्तालाई अहिलेसम्म कसैले फलो गर्दैन।",
+  "account.follows.empty": "यो प्रयोगकर्ताले अहिलेसम्म कसैलाई फलो गरेको छैन।",
+  "account.go_to_profile": "प्रोफाइलमा जानुहोस्",
+  "account.hide_reblogs": "@{name} को बूस्टहरू लुकाउनुहोस्",
+  "account.link_verified_on": "यस लिङ्कको स्वामित्व {date} मा जाँच गरिएको थियो",
+  "account.media": "मिडिया",
+  "account.mention": "@{name} लाई उल्लेख गर्नुहोस्",
+  "account.no_bio": "कुनै विवरण प्रदान गरिएको छैन।",
+  "account.posts": "पोस्टहरू",
+  "account.requested": "स्वीकृतिको पर्खाइमा। फलो अनुरोध रद्द गर्न क्लिक गर्नुहोस्",
+  "account.requested_follow": "{name} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ",
+  "account.share": "@{name} को प्रोफाइल सेयर गर्नुहोस्",
+  "account.show_reblogs": "@{name} को बूस्टहरू देखाउनुहोस्",
+  "account.statuses_counter": "{count, plural, one {{counter} पोस्ट} other {{counter} पोस्टहरू}}",
+  "account.unblock": "@{name} लाई अनब्लक गर्नुहोस्",
+  "account.unblock_domain": "{domain} डोमेनलाई अनब्लक गर्नुहोस्",
+  "account.unblock_short": "अनब्लक गर्नुहोस्",
+  "account.unendorse": "प्रोफाइलमा फिचर नगर्नुहोस्",
+  "account.unfollow": "अनफलो गर्नुहोस्",
+  "account_note.placeholder": "नोट लेख्न क्लिक गर्नुहोस्",
+  "admin.dashboard.retention.average": "औसत",
+  "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
+  "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
+  "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।"
+}
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index c4ce6f8cfd..46fcc01160 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -224,6 +224,7 @@
   "emoji_button.search_results": "Výsledky hľadania",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
+  "empty_column.account_hides_collections": "Tento užívateľ si zvolil nesprístupniť túto informáciu",
   "empty_column.account_suspended": "Účet bol pozastavený",
   "empty_column.account_timeline": "Nie sú tu žiadne príspevky!",
   "empty_column.account_unavailable": "Profil nedostupný",
diff --git a/config/locales/activerecord.hr.yml b/config/locales/activerecord.hr.yml
index b095244dd6..a3e7d6d492 100644
--- a/config/locales/activerecord.hr.yml
+++ b/config/locales/activerecord.hr.yml
@@ -6,7 +6,9 @@ hr:
         expires_at: Krajnji rok
         options: Opcije
       user:
+        agreement: Ugovor o uslugama
         email: E-mail adresa
+        locale: Lokalitet
         password: Lozinka
       user/account:
         username: Korisničko ime
@@ -18,3 +20,16 @@ hr:
           attributes:
             username:
               invalid: mora sadržavati samo slova, brojeve i _
+              reserved: je rezervisano
+        admin/webhook:
+          attributes:
+            url:
+              invalid: nije validan URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: nije validan URL
+        import:
+          attributes:
+            data:
+              malformed: je neispravan
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 14f9f61f6c..92d85af4d9 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -36,7 +36,7 @@ ru:
         status:
           attributes:
             reblog:
-              taken: поста уже существует
+              taken: пост уже существует
         user:
           attributes:
             email:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 987788a7ad..a6e74c4836 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -534,6 +534,7 @@ en-GB:
       total_reported: Reports about them
       total_storage: Media attachments
       totals_time_period_hint_html: The totals displayed below include data for all time.
+      unknown_instance: There is currently no record of this domain on this server.
     invites:
       deactivate_all: Deactivate all
       filter:
@@ -610,6 +611,7 @@ en-GB:
       created_at: Reported
       delete_and_resolve: Delete posts
       forwarded: Forwarded
+      forwarded_replies_explanation: This report is from a remote user and about remote content. It has been forwarded to you because the reported content is in reply to one of your users.
       forwarded_to: Forwarded to %{domain}
       mark_as_resolved: Mark as resolved
       mark_as_sensitive: Mark as sensitive
@@ -1038,6 +1040,14 @@ en-GB:
       hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
       title: Security check
     confirmations:
+      awaiting_review: Your e-mail address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an e-mail if they approve your account!
+      awaiting_review_title: Your registration is being reviewed
+      clicking_this_link: clicking this link
+      login_link: log in
+      proceed_to_login_html: You can now proceed to %{login_link}.
+      redirect_to_app_html: You should have been redirected to the <strong>%{app_name}</strong> app. If that did not happen, try %{clicking_this_link} or manually return to the app.
+      registration_complete: Your registration on %{domain} is now complete!
+      welcome_title: Welcome, %{name}!
       wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
@@ -1099,6 +1109,7 @@ en-GB:
       functional: Your account is fully operational.
       pending: Your application is pending review by our staff. This may take some time. You will receive an e-mail if your application is approved.
       redirecting_to: Your account is inactive because it is currently redirecting to %{acct}.
+      self_destruct: As %{domain} is closing down, you will only get limited access to your account.
       view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
@@ -1356,6 +1367,7 @@ en-GB:
       '86400': 1 day
     expires_in_prompt: Never
     generate: Generate invite link
+    invalid: This invite is not valid
     invited_by: 'You were invited by:'
     max_uses:
       one: 1 use
@@ -1568,6 +1580,9 @@ en-GB:
     over_daily_limit: You have exceeded the limit of %{limit} scheduled posts for today
     over_total_limit: You have exceeded the limit of %{limit} scheduled posts
     too_soon: The scheduled date must be in the future
+  self_destruct:
+    lead_html: Unfortunately, <strong>%{domain}</strong> is permanently closing down. If you had an account there, you will not be able to continue using it, but you can still request a backup of your data.
+    title: This server is closing down
   sessions:
     activity: Last activity
     browser: Browser
@@ -1736,6 +1751,7 @@ en-GB:
       default: "%b %d, %Y, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
       quota_exceeded: The server-wide usage quota for the translation service has been exceeded.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 63779e5bd5..caf253c69c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -656,6 +656,10 @@ sk:
       rules_check:
         action: Spravuj serverové pravidlá
         message_html: Neurčil/a si žiadne serverové pravidlá.
+      software_version_critical_check:
+        action: Pozri dostupné aktualizácie
+      software_version_patch_check:
+        action: Pozri dostupné aktualizácie
       upload_check_privacy_error:
         action: Pozri tu pre viac informácií
       upload_check_privacy_error_object_storage:

From 4ad2e87c48f8ebdeeb6eab56dc195b9e28f7a5d2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:45:30 +0100
Subject: [PATCH 055/436] Update dependency debug to v1.9.0 (#28315)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 738bc7b8bc..4b39692d03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,9 +220,9 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug (1.8.0)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    debug (1.9.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     debug_inspector (1.1.0)
     devise (4.9.3)
       bcrypt (~> 3.0)

From b5a1013ae36a0ab495aa727a397b9fc9f4340a2c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 05:23:45 -0500
Subject: [PATCH 056/436] Combine `CLI::...` spec example subjects (#28285)

---
 spec/lib/mastodon/cli/accounts_spec.rb  | 263 ++++++++----------------
 spec/lib/mastodon/cli/ip_blocks_spec.rb |  89 ++++----
 spec/lib/mastodon/cli/settings_spec.rb  |  37 ++--
 3 files changed, 138 insertions(+), 251 deletions(-)

diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 06860c2ff8..563f6e877d 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -34,23 +34,21 @@ describe Mastodon::CLI::Accounts do
     let(:action) { :create }
 
     shared_examples 'a new user with given email address and username' do
-      it 'creates a new user with the specified email address' do
-        subject
-
-        expect(User.find_by(email: options[:email])).to be_present
-      end
-
-      it 'creates a new local account with the specified username' do
-        subject
-
-        expect(Account.find_local('tootctl_username')).to be_present
-      end
-
-      it 'returns "OK" and newly generated password' do
+      it 'creates user and accounts from options and displays success message' do
         allow(SecureRandom).to receive(:hex).and_return('test_password')
 
         expect { subject }
-          .to output_results("OK\nNew password: test_password")
+          .to output_results('OK', 'New password: test_password')
+        expect(user_from_options).to be_present
+        expect(account_from_options).to be_present
+      end
+
+      def user_from_options
+        User.find_by(email: options[:email])
+      end
+
+      def account_from_options
+        Account.find_local('tootctl_username')
       end
     end
 
@@ -199,14 +197,9 @@ describe Mastodon::CLI::Accounts do
       let(:arguments) { [user.account.username] }
 
       context 'when no option is provided' do
-        it 'returns a successful message' do
+        it 'returns a successful message and preserves user' do
           expect { subject }
             .to output_results('OK')
-        end
-
-        it 'does not modify the user' do
-          subject
-
           expect(user).to eq(user.reload)
         end
       end
@@ -400,15 +393,10 @@ describe Mastodon::CLI::Accounts do
       context 'with --dry-run option' do
         let(:options) { { dry_run: true } }
 
-        it 'does not delete the specified user' do
-          subject
-
-          expect(delete_account_service).to_not have_received(:call).with(account, reserve_email: false)
-        end
-
-        it 'outputs a successful message in dry run mode' do
+        it 'outputs a successful message in dry run mode and does not delete the user' do
           expect { subject }
             .to output_results('OK (DRY RUN)')
+          expect(delete_account_service).to_not have_received(:call).with(account, reserve_email: false)
         end
       end
 
@@ -435,15 +423,12 @@ describe Mastodon::CLI::Accounts do
       context 'with --dry-run option' do
         let(:options) { { email: account.user.email, dry_run: true } }
 
-        it 'does not delete the user' do
-          subject
-
-          expect(delete_account_service).to_not have_received(:call).with(account, reserve_email: false)
-        end
-
-        it 'outputs a successful message in dry run mode' do
+        it 'outputs a successful message in dry run mode and does not delete the user' do
           expect { subject }
             .to output_results('OK (DRY RUN)')
+          expect(delete_account_service)
+            .to_not have_received(:call)
+            .with(account, reserve_email: false)
         end
       end
 
@@ -482,20 +467,19 @@ describe Mastodon::CLI::Accounts do
       context 'when the number is positive' do
         let(:options) { { number: 2 } }
 
-        it 'approves the earliest n pending registrations' do
+        it 'approves the earliest n pending registrations but not the remaining ones' do
           subject
 
-          n_earliest_pending_registrations = User.order(created_at: :asc).first(options[:number])
-
           expect(n_earliest_pending_registrations.all?(&:approved?)).to be(true)
+          expect(pending_registrations.all?(&:approved?)).to be(false)
         end
 
-        it 'does not approve the remaining pending registrations' do
-          subject
+        def n_earliest_pending_registrations
+          User.order(created_at: :asc).first(options[:number])
+        end
 
-          pending_registrations = User.order(created_at: :asc).last(total_users - options[:number])
-
-          expect(pending_registrations.all?(&:approved?)).to be(false)
+        def pending_registrations
+          User.order(created_at: :asc).last(total_users - options[:number])
         end
       end
 
@@ -512,15 +496,10 @@ describe Mastodon::CLI::Accounts do
       context 'when the given number is greater than the number of users' do
         let(:options) { { number: total_users * 2 } }
 
-        it 'approves all users' do
-          subject
-
-          expect(User.pluck(:approved).all?(true)).to be(true)
-        end
-
-        it 'does not raise any error' do
+        it 'approves all users and does not raise any error' do
           expect { subject }
             .to_not raise_error
+          expect(User.pluck(:approved).all?(true)).to be(true)
         end
       end
     end
@@ -575,18 +554,13 @@ describe Mastodon::CLI::Accounts do
         stub_parallelize_with_progress!
       end
 
-      it 'makes all local accounts follow the target account' do
-        subject
-
+      it 'displays a successful message and makes all local accounts follow the target account' do
+        expect { subject }
+          .to output_results("OK, followed target from #{Account.local.count} accounts")
         expect(follow_service).to have_received(:call).with(follower_bob, target_account, any_args).once
         expect(follow_service).to have_received(:call).with(follower_rony, target_account, any_args).once
         expect(follow_service).to have_received(:call).with(follower_charles, target_account, any_args).once
       end
-
-      it 'displays a successful message' do
-        expect { subject }
-          .to output_results("OK, followed target from #{Account.local.count} accounts")
-      end
     end
   end
 
@@ -618,18 +592,13 @@ describe Mastodon::CLI::Accounts do
         stub_parallelize_with_progress!
       end
 
-      it 'makes all local accounts unfollow the target account' do
-        subject
-
+      it 'displays a successful message and makes all local accounts unfollow the target account' do
+        expect { subject }
+          .to output_results('OK, unfollowed target from 3 accounts')
         expect(unfollow_service).to have_received(:call).with(follower_chris, target_account).once
         expect(unfollow_service).to have_received(:call).with(follower_rambo, target_account).once
         expect(unfollow_service).to have_received(:call).with(follower_ana, target_account).once
       end
-
-      it 'displays a successful message' do
-        expect { subject }
-          .to output_results('OK, unfollowed target from 3 accounts')
-      end
     end
   end
 
@@ -651,22 +620,17 @@ describe Mastodon::CLI::Accounts do
       let(:user) { account.user }
       let(:arguments) { [account.username] }
 
-      it 'creates a new backup for the specified user' do
-        expect { subject }.to change { user.backups.count }.by(1)
-      end
-
-      it 'creates a backup job' do
-        allow(BackupWorker).to receive(:perform_async)
-
-        subject
-        latest_backup = user.backups.last
+      before { allow(BackupWorker).to receive(:perform_async) }
 
+      it 'creates a new backup and backup job for the specified user and outputs success message' do
+        expect { subject }
+          .to change { user.backups.count }.by(1)
+          .and output_results('OK')
         expect(BackupWorker).to have_received(:perform_async).with(latest_backup.id).once
       end
 
-      it 'displays a successful message' do
-        expect { subject }
-          .to output_results('OK')
+      def latest_backup
+        user.backups.last
       end
     end
   end
@@ -963,15 +927,15 @@ describe Mastodon::CLI::Accounts do
 
         expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
       end
+    end
 
-      context 'when the given username is not found' do
-        let(:arguments) { ['non_existent_username'] }
+    context 'when the given username is not found' do
+      let(:arguments) { ['non_existent_username'] }
 
-        it 'exits with an error message when the specified username is not found' do
-          expect { subject }
-            .to output_results('No such account')
-            .and raise_error(SystemExit)
-        end
+      it 'exits with an error message when the specified username is not found' do
+        expect { subject }
+          .to output_results('No such account')
+          .and raise_error(SystemExit)
       end
     end
 
@@ -1071,15 +1035,10 @@ describe Mastodon::CLI::Accounts do
           allow(from_account).to receive(:destroy)
         end
 
-        it 'merges "from_account" into "to_account"' do
+        it 'merges `from_account` into `to_account` and deletes `from_account`' do
           subject
 
           expect(to_account).to have_received(:merge_with!).with(from_account).once
-        end
-
-        it 'deletes "from_account"' do
-          subject
-
           expect(from_account).to have_received(:destroy).once
         end
       end
@@ -1099,15 +1058,10 @@ describe Mastodon::CLI::Accounts do
         allow(from_account).to receive(:destroy)
       end
 
-      it 'merges "from_account" into "to_account"' do
+      it 'merges "from_account" into "to_account" and deletes from_account' do
         subject
 
         expect(to_account).to have_received(:merge_with!).with(from_account).once
-      end
-
-      it 'deletes "from_account"' do
-        subject
-
         expect(from_account).to have_received(:destroy)
       end
     end
@@ -1134,28 +1088,23 @@ describe Mastodon::CLI::Accounts do
         stub_request(:head, 'https://example.net/users/tales').to_return(status: 200)
       end
 
-      it 'deletes all inactive remote accounts that longer exist in the origin server' do
-        subject
-
+      def expect_delete_inactive_remote_accounts
         expect(delete_account_service).to have_received(:call).with(bob, reserve_username: false).once
         expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
       end
 
-      it 'does not delete any active remote account that still exists in the origin server' do
-        subject
-
+      def expect_not_delete_active_accounts
         expect(delete_account_service).to_not have_received(:call).with(tom, reserve_username: false)
         expect(delete_account_service).to_not have_received(:call).with(ana, reserve_username: false)
         expect(delete_account_service).to_not have_received(:call).with(tales, reserve_username: false)
       end
 
-      it 'touches inactive remote accounts that have not been deleted' do
-        expect { subject }.to(change { tales.reload.updated_at })
-      end
-
-      it 'displays the summary correctly' do
+      it 'touches inactive remote accounts that have not been deleted and summarizes activity' do
         expect { subject }
-          .to output_results('Visited 5 accounts, removed 2')
+          .to change { tales.reload.updated_at }
+          .and output_results('Visited 5 accounts, removed 2')
+        expect_delete_inactive_remote_accounts
+        expect_not_delete_active_accounts
       end
     end
 
@@ -1168,16 +1117,15 @@ describe Mastodon::CLI::Accounts do
         stub_request(:head, 'https://example.net/users/tales').to_return(status: 404)
       end
 
-      it 'deletes inactive remote accounts that longer exist in the specified domain' do
-        subject
-
+      def expect_delete_inactive_remote_accounts
         expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
         expect(delete_account_service).to have_received(:call).with(tales, reserve_username: false).once
       end
 
-      it 'displays the summary correctly' do
+      it 'displays the summary correctly and deletes inactive remote accounts' do
         expect { subject }
           .to output_results('Visited 2 accounts, removed 2')
+        expect_delete_inactive_remote_accounts
       end
     end
 
@@ -1189,15 +1137,14 @@ describe Mastodon::CLI::Accounts do
           stub_request(:head, 'https://example.net/users/gon').to_return(status: 200)
         end
 
-        it 'skips accounts from the unavailable domain' do
-          subject
-
+        def expect_skip_accounts_from_unavailable_domain
           expect(delete_account_service).to_not have_received(:call).with(tales, reserve_username: false)
         end
 
-        it 'displays the summary correctly' do
+        it 'displays the summary correctly and skip accounts from unavailable domains' do
           expect { subject }
             .to output_results("Visited 5 accounts, removed 0\nThe following domains were not available during the check:\n    example.net")
+          expect_skip_accounts_from_unavailable_domain
         end
       end
 
@@ -1268,25 +1215,14 @@ describe Mastodon::CLI::Accounts do
 
         before do
           accounts.each { |account| target_account.follow!(account) }
-        end
-
-        it 'resets all "following" relationships from the target account' do
-          subject
-
-          expect(target_account.reload.following).to be_empty
-        end
-
-        it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
           allow(BootstrapTimelineWorker).to receive(:perform_async)
-
-          subject
-
-          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
 
-        it 'displays a successful message' do
+        it 'resets following relationships and displays a successful message and rebuilds timeline' do
           expect { subject }
             .to output_results("Processed #{total_relationships} relationships")
+          expect(target_account.reload.following).to be_empty
+          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
       end
 
@@ -1297,15 +1233,10 @@ describe Mastodon::CLI::Accounts do
           accounts.each { |account| account.follow!(target_account) }
         end
 
-        it 'resets all "followers" relationships from the target account' do
-          subject
-
-          expect(target_account.reload.followers).to be_empty
-        end
-
-        it 'displays a successful message' do
+        it 'resets followers relationships and displays a successful message' do
           expect { subject }
             .to output_results("Processed #{total_relationships} relationships")
+          expect(target_account.reload.followers).to be_empty
         end
       end
 
@@ -1315,31 +1246,15 @@ describe Mastodon::CLI::Accounts do
         before do
           accounts.first(2).each { |account| account.follow!(target_account) }
           accounts.last(1).each  { |account| target_account.follow!(account) }
-        end
-
-        it 'resets all "followers" relationships from the target account' do
-          subject
-
-          expect(target_account.reload.followers).to be_empty
-        end
-
-        it 'resets all "following" relationships from the target account' do
-          subject
-
-          expect(target_account.reload.following).to be_empty
-        end
-
-        it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
           allow(BootstrapTimelineWorker).to receive(:perform_async)
-
-          subject
-
-          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
 
-        it 'displays a successful message' do
+        it 'resets followers and following and displays a successful message and rebuilds timeline' do
           expect { subject }
             .to output_results("Processed #{total_relationships} relationships")
+          expect(target_account.reload.followers).to be_empty
+          expect(target_account.reload.following).to be_empty
+          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
         end
       end
     end
@@ -1360,57 +1275,51 @@ describe Mastodon::CLI::Accounts do
       stub_parallelize_with_progress!
     end
 
-    it 'prunes all remote accounts with no interactions with local users' do
-      subject
-
+    def expect_prune_remote_accounts_without_interaction
       prunable_account_ids = prunable_accounts.pluck(:id)
 
       expect(Account.where(id: prunable_account_ids).count).to eq(0)
     end
 
-    it 'displays a successful message' do
+    it 'displays a successful message and handles accounts correctly' do
       expect { subject }
         .to output_results("OK, pruned #{prunable_accounts.size} accounts")
+      expect_prune_remote_accounts_without_interaction
+      expect_not_prune_local_accounts
+      expect_not_prune_bot_accounts
+      expect_not_prune_group_accounts
+      expect_not_prune_mentioned_accounts
     end
 
-    it 'does not prune local accounts' do
-      subject
-
+    def expect_not_prune_local_accounts
       expect(Account.exists?(id: local_account.id)).to be(true)
     end
 
-    it 'does not prune bot accounts' do
-      subject
-
+    def expect_not_prune_bot_accounts
       expect(Account.exists?(id: bot_account.id)).to be(true)
     end
 
-    it 'does not prune group accounts' do
-      subject
-
+    def expect_not_prune_group_accounts
       expect(Account.exists?(id: group_account.id)).to be(true)
     end
 
-    it 'does not prune accounts that have been mentioned' do
-      subject
-
+    def expect_not_prune_mentioned_accounts
       expect(Account.exists?(id: mentioned_account.id)).to be true
     end
 
     context 'with --dry-run option' do
       let(:options) { { dry_run: true } }
 
-      it 'does not prune any account' do
-        subject
-
+      def expect_no_account_prunes
         prunable_account_ids = prunable_accounts.pluck(:id)
 
         expect(Account.where(id: prunable_account_ids).count).to eq(prunable_accounts.size)
       end
 
-      it 'displays a successful message with (DRY RUN)' do
+      it 'displays a successful message with (DRY RUN) and doesnt prune anything' do
         expect { subject }
           .to output_results("OK, pruned #{prunable_accounts.size} accounts (DRY RUN)")
+        expect_no_account_prunes
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index dc967a69c9..1d6c47268e 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -33,26 +33,25 @@ describe Mastodon::CLI::IpBlocks do
     let(:arguments) { ip_list }
 
     shared_examples 'ip address blocking' do
-      it 'blocks all specified IP addresses' do
-        subject
-
-        blocked_ip_addresses = IpBlock.where(ip: ip_list).pluck(:ip)
-        expected_ip_addresses = ip_list.map { |ip| IPAddr.new(ip) }
-
-        expect(blocked_ip_addresses).to match_array(expected_ip_addresses)
+      def blocked_ip_addresses
+        IpBlock.where(ip: ip_list).pluck(:ip)
       end
 
-      it 'sets the severity for all blocked IP addresses' do
-        subject
-
-        blocked_ips_severity = IpBlock.where(ip: ip_list).pluck(:severity).all?(options[:severity])
-
-        expect(blocked_ips_severity).to be(true)
+      def expected_ip_addresses
+        ip_list.map { |ip| IPAddr.new(ip) }
       end
 
-      it 'displays a success message with a summary' do
+      def blocked_ips_severity
+        IpBlock.where(ip: ip_list).pluck(:severity).all?(options[:severity])
+      end
+
+      it 'blocks and sets severity for ip address and displays summary' do
         expect { subject }
           .to output_results("Added #{ip_list.size}, skipped 0, failed 0")
+        expect(blocked_ip_addresses)
+          .to match_array(expected_ip_addresses)
+        expect(blocked_ips_severity)
+          .to be(true)
       end
     end
 
@@ -64,17 +63,13 @@ describe Mastodon::CLI::IpBlocks do
       let!(:blocked_ip) { IpBlock.create(ip: ip_list.last, severity: options[:severity]) }
       let(:arguments) { ip_list }
 
-      it 'skips the already blocked IP address' do
-        allow(IpBlock).to receive(:new).and_call_original
+      before { allow(IpBlock).to receive(:new).and_call_original }
 
-        subject
-
-        expect(IpBlock).to_not have_received(:new).with(ip: ip_list.last)
-      end
-
-      it 'displays the correct summary' do
+      it 'skips already block ip and displays the correct summary' do
         expect { subject }
           .to output_results("#{ip_list.last} is already blocked\nAdded #{ip_list.size - 1}, skipped 1, failed 0")
+
+        expect(IpBlock).to_not have_received(:new).with(ip: ip_list.last)
       end
 
       context 'with --force option' do
@@ -179,15 +174,10 @@ describe Mastodon::CLI::IpBlocks do
         ip_list.each { |ip| IpBlock.create(ip: ip, severity: :no_access) }
       end
 
-      it 'removes exact IP blocks' do
-        subject
-
-        expect(IpBlock.where(ip: ip_list)).to_not exist
-      end
-
-      it 'displays success message with a summary' do
+      it 'removes exact ip blocks and displays success message with a summary' do
         expect { subject }
           .to output_results("Removed #{ip_list.size}, skipped 0")
+        expect(IpBlock.where(ip: ip_list)).to_not exist
       end
     end
 
@@ -198,16 +188,19 @@ describe Mastodon::CLI::IpBlocks do
       let(:arguments) { ['192.168.0.5', '10.0.1.50'] }
       let(:options) { { force: true } }
 
-      it 'removes blocks for IP ranges that cover given IP(s)' do
+      it 'removes blocks for IP ranges that cover given IP(s) and keeps other ranges' do
         subject
 
-        expect(IpBlock.where(id: [first_ip_range_block.id, second_ip_range_block.id])).to_not exist
+        expect(covered_ranges).to_not exist
+        expect(other_ranges).to exist
       end
 
-      it 'does not remove other IP ranges' do
-        subject
+      def covered_ranges
+        IpBlock.where(id: [first_ip_range_block.id, second_ip_range_block.id])
+      end
 
-        expect(IpBlock.where(id: third_ip_range_block.id)).to exist
+      def other_ranges
+        IpBlock.where(id: third_ip_range_block.id)
       end
     end
 
@@ -215,14 +208,12 @@ describe Mastodon::CLI::IpBlocks do
       let(:unblocked_ip) { '192.0.2.1' }
       let(:arguments) { [unblocked_ip] }
 
-      it 'skips the IP address' do
+      it 'skips the IP address and displays summary' do
         expect { subject }
-          .to output_results("#{unblocked_ip} is not yet blocked")
-      end
-
-      it 'displays the summary correctly' do
-        expect { subject }
-          .to output_results('Removed 0, skipped 1')
+          .to output_results(
+            "#{unblocked_ip} is not yet blocked",
+            'Removed 0, skipped 1'
+          )
       end
     end
 
@@ -230,14 +221,12 @@ describe Mastodon::CLI::IpBlocks do
       let(:invalid_ip) { '320.15.175.0' }
       let(:arguments) { [invalid_ip] }
 
-      it 'skips the invalid IP address' do
+      it 'skips the invalid IP address and displays summary' do
         expect { subject }
-          .to output_results("#{invalid_ip} is invalid")
-      end
-
-      it 'displays the summary correctly' do
-        expect { subject }
-          .to output_results('Removed 0, skipped 1')
+          .to output_results(
+            "#{invalid_ip} is invalid",
+            'Removed 0, skipped 1'
+          )
       end
     end
 
@@ -265,7 +254,7 @@ describe Mastodon::CLI::IpBlocks do
           .to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
       end
 
-      it 'does not export bloked IPs with different severities' do
+      it 'does not export blocked IPs with different severities' do
         expect { subject }
           .to_not output_results("#{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}")
       end
@@ -279,7 +268,7 @@ describe Mastodon::CLI::IpBlocks do
           .to output_results("deny #{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};\ndeny #{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix};")
       end
 
-      it 'does not export bloked IPs with different severities' do
+      it 'does not export blocked IPs with different severities' do
         expect { subject }
           .to_not output_results("deny #{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};")
       end
diff --git a/spec/lib/mastodon/cli/settings_spec.rb b/spec/lib/mastodon/cli/settings_spec.rb
index 02d1042c56..568ee00393 100644
--- a/spec/lib/mastodon/cli/settings_spec.rb
+++ b/spec/lib/mastodon/cli/settings_spec.rb
@@ -20,37 +20,29 @@ describe Mastodon::CLI::Settings do
     describe '#open' do
       let(:action) { :open }
 
-      it 'changes "registrations_mode" to "open"' do
-        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('open')
-      end
-
-      it 'displays success message' do
+      it 'changes "registrations_mode" to "open" and displays success' do
         expect { subject }
-          .to output_results('OK')
+          .to change(Setting, :registrations_mode).from(nil).to('open')
+          .and output_results('OK')
       end
     end
 
     describe '#approved' do
       let(:action) { :approved }
 
-      it 'changes "registrations_mode" to "approved"' do
-        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('approved')
-      end
-
-      it 'displays success message' do
+      it 'changes "registrations_mode" to "approved" and displays success' do
         expect { subject }
-          .to output_results('OK')
+          .to change(Setting, :registrations_mode).from(nil).to('approved')
+          .and output_results('OK')
       end
 
       context 'with --require-reason' do
         let(:options) { { require_reason: true } }
 
-        it 'changes "registrations_mode" to "approved"' do
-          expect { subject }.to change(Setting, :registrations_mode).from(nil).to('approved')
-        end
-
-        it 'sets "require_invite_text" to "true"' do
-          expect { subject }.to change(Setting, :require_invite_text).from(false).to(true)
+        it 'changes registrations_mode and require_invite_text' do
+          expect { subject }
+            .to change(Setting, :registrations_mode).from(nil).to('approved')
+            .and change(Setting, :require_invite_text).from(false).to(true)
         end
       end
     end
@@ -58,13 +50,10 @@ describe Mastodon::CLI::Settings do
     describe '#close' do
       let(:action) { :close }
 
-      it 'changes "registrations_mode" to "none"' do
-        expect { subject }.to change(Setting, :registrations_mode).from(nil).to('none')
-      end
-
-      it 'displays success message' do
+      it 'changes "registrations_mode" to "none" and displays success' do
         expect { subject }
-          .to output_results('OK')
+          .to change(Setting, :registrations_mode).from(nil).to('none')
+          .and output_results('OK')
       end
     end
   end

From f3864db4090b8cec212fb99c3dabccfb6a6c7642 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 11 Dec 2023 15:23:30 +0100
Subject: [PATCH 057/436] Fix notification sounds (#28316)

---
 app/javascript/mastodon/actions/notifications_typed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/actions/notifications_typed.ts b/app/javascript/mastodon/actions/notifications_typed.ts
index 7e51fa51e7..176362f4b1 100644
--- a/app/javascript/mastodon/actions/notifications_typed.ts
+++ b/app/javascript/mastodon/actions/notifications_typed.ts
@@ -18,6 +18,6 @@ export const notificationsUpdate = createAction(
     playSound: boolean;
   }) => ({
     payload: args,
-    meta: { playSound: playSound ? { sound: 'boop' } : undefined },
+    meta: { sound: playSound ? 'boop' : undefined },
   }),
 );

From 9dfa94063626bc2351e2098e226deee7b0e3eff8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Dec 2023 15:58:10 +0100
Subject: [PATCH 058/436] Update babel monorepo to v7.23.6 (#28319)

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

diff --git a/yarn.lock b/yarn.lock
index 0ef881126d..71f1ad160c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,7 +52,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/compat-data@npm:7.23.5"
   checksum: 081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c
@@ -60,37 +60,37 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.5
-  resolution: "@babel/core@npm:7.23.5"
+  version: 7.23.6
+  resolution: "@babel/core@npm:7.23.6"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.5"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/generator": "npm:^7.23.6"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.23.5"
+    "@babel/helpers": "npm:^7.23.6"
+    "@babel/parser": "npm:^7.23.6"
     "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
+    "@babel/traverse": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 311a512a870ee330a3f9a7ea89e5df790b2b5af0b1bd98b10b4edc0de2ac440f0df4d69ea2c0ee38a4b89041b9a495802741d93603be7d4fd834ec8bb6970bd2
+  checksum: a02bae7d916029b70706dc301535e1b31e5d216f55d4ee6f64a15825c6b69ee2c14c52a213d1497ec414e925ed4e9d897d41fb0d75df9fea28ed2c0008790e31
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.23.5, @babel/generator@npm:^7.7.2":
-  version: 7.23.5
-  resolution: "@babel/generator@npm:7.23.5"
+"@babel/generator@npm:^7.23.6, @babel/generator@npm:^7.7.2":
+  version: 7.23.6
+  resolution: "@babel/generator@npm:7.23.6"
   dependencies:
-    "@babel/types": "npm:^7.23.5"
+    "@babel/types": "npm:^7.23.6"
     "@jridgewell/gen-mapping": "npm:^0.3.2"
     "@jridgewell/trace-mapping": "npm:^0.3.17"
     jsesc: "npm:^2.5.1"
-  checksum: 14c6e874f796c4368e919bed6003bb0adc3ce837760b08f9e646d20aeb5ae7d309723ce6e4f06bcb4a2b5753145446c8e4425851380f695e40e71e1760f49e7b
+  checksum: 53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda
   languageName: node
   linkType: hard
 
@@ -122,16 +122,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6":
-  version: 7.22.15
-  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
+"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
-    "@babel/compat-data": "npm:^7.22.9"
-    "@babel/helper-validator-option": "npm:^7.22.15"
-    browserslist: "npm:^4.21.9"
+    "@babel/compat-data": "npm:^7.23.5"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    browserslist: "npm:^4.22.2"
     lru-cache: "npm:^5.1.1"
     semver: "npm:^6.3.1"
-  checksum: 45b9286861296e890f674a3abb199efea14a962a27d9b8adeb44970a9fd5c54e73a9e342e8414d2851cf4f98d5994537352fbce7b05ade32e9849bbd327f9ff1
+  checksum: ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helpers@npm:7.23.5"
+"@babel/helpers@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/helpers@npm:7.23.6"
   dependencies:
     "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
-  checksum: a37e2728eb4378a4888e5d614e28de7dd79b55ac8acbecd0e5c761273e2a02a8f33b34b1932d9069db55417ace2937cbf8ec37c42f1030ce6d228857d7ccaa4f
+    "@babel/traverse": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
+  checksum: df1cf6607676ad36f52f652ec03536f2732d70aef5e76dba5c964e34d49f3c2d3dcf9fb3740db359f53071d74b64606a833d5ba156f79f437f71bfe06e2e7e19
   languageName: node
   linkType: hard
 
@@ -364,12 +364,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/parser@npm:7.23.5"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/parser@npm:7.23.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 3356aa90d7bafb4e2c7310e7c2c3d443c4be4db74913f088d3d577a1eb914ea4188e05fd50a47ce907a27b755c4400c4e3cbeee73dbeb37761f6ca85954f5a20
+  checksum: 6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e
   languageName: node
   linkType: hard
 
@@ -836,14 +836,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-transform-for-of@npm:7.23.3"
+"@babel/plugin-transform-for-of@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/plugin-transform-for-of@npm:7.23.6"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8a36202cfee312ba80e509c7c2131e6773524e572b4dc64a8ee95bd912634fdeb5ea91c6c7747ee30e03562d0f0d333f88ed7dbb929b36b60b8d74189189e12f
+  checksum: 46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec
   languageName: node
   linkType: hard
 
@@ -1200,8 +1201,8 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.4"
+  version: 7.23.6
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.6"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -1211,7 +1212,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6ac29012550cdd10b65ec43fef0c7f43904ec458c43d597f627d8f52807413e57ea94e3986dbace576d734e67c2d09be5e43e77c72567d18f8c4ac5e19844625
+  checksum: 94a7ee92f073df53fd8bebf9ed391a95553716077da1c6c3a57f10f042358c938495d55e6b09b4b50544c01f03560c4770c17698e1c24817a15d3668e8231249
   languageName: node
   linkType: hard
 
@@ -1333,11 +1334,11 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.5
-  resolution: "@babel/preset-env@npm:7.23.5"
+  version: 7.23.6
+  resolution: "@babel/preset-env@npm:7.23.6"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
     "@babel/helper-validator-option": "npm:^7.23.5"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3"
@@ -1377,7 +1378,7 @@ __metadata:
     "@babel/plugin-transform-dynamic-import": "npm:^7.23.4"
     "@babel/plugin-transform-exponentiation-operator": "npm:^7.23.3"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.23.4"
-    "@babel/plugin-transform-for-of": "npm:^7.23.3"
+    "@babel/plugin-transform-for-of": "npm:^7.23.6"
     "@babel/plugin-transform-function-name": "npm:^7.23.3"
     "@babel/plugin-transform-json-strings": "npm:^7.23.4"
     "@babel/plugin-transform-literals": "npm:^7.23.3"
@@ -1418,7 +1419,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2a0e1274dec045186e131c6433659b75492583290e8d41633c616f6bff829cb2e4b2f9a57f556283a54db3bd6aa697911e56a36f607911a29b731c445a5b5a06
+  checksum: 5b24d179af52f082d04b9b98cc4777e37bf31a97cef5a91d8917e996dbd75f2f743c88c40f80744cb8529355bb674619d150c0260c32d834aa4067e21d0c8962
   languageName: node
   linkType: hard
 
@@ -1483,11 +1484,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.5
-  resolution: "@babel/runtime@npm:7.23.5"
+  version: 7.23.6
+  resolution: "@babel/runtime@npm:7.23.6"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: ca679cc91bb7e424bc2db87bb58cc3b06ade916b9adb21fbbdc43e54cdaacb3eea201ceba2a0464b11d2eb65b9fe6a6ffcf4d7521fa52994f19be96f1af14788
+  checksum: d886954e985ef8e421222f7a2848884d96a752e0020d3078b920dd104e672fdf23bcc6f51a44313a048796319f1ac9d09c2c88ec8cbb4e1f09174bcd3335b9ff
   languageName: node
   linkType: hard
 
@@ -1502,32 +1503,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/traverse@npm:7.23.5"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.6":
+  version: 7.23.6
+  resolution: "@babel/traverse@npm:7.23.6"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
-    "@babel/generator": "npm:^7.23.5"
+    "@babel/generator": "npm:^7.23.6"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
     "@babel/helper-hoist-variables": "npm:^7.22.5"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.23.5"
-    "@babel/types": "npm:^7.23.5"
-    debug: "npm:^4.1.0"
+    "@babel/parser": "npm:^7.23.6"
+    "@babel/types": "npm:^7.23.6"
+    debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: c5ea793080ca6719b0a1612198fd25e361cee1f3c14142d7a518d2a1eeb5c1d21f7eec1b26c20ea6e1ddd8ed12ab50b960ff95ffd25be353b6b46e1b54d6f825
+  checksum: 5b4ebb94a00a7e1daf111e4b0b45a7998d5b7598637a14e75e855e88cc1b702789e09a958726b5d599a003be1e9032dbdfde4b88ea6061332228738950d5582d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.5
-  resolution: "@babel/types@npm:7.23.5"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.6
+  resolution: "@babel/types@npm:7.23.6"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.23.4"
     "@babel/helper-validator-identifier": "npm:^7.22.20"
     to-fast-properties: "npm:^2.0.0"
-  checksum: 7dd5e2f59828ed046ad0b06b039df2524a8b728d204affb4fc08da2502b9dd3140b1356b5166515d229dc811539a8b70dcd4bc507e06d62a89f4091a38d0b0fb
+  checksum: 42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70
   languageName: node
   linkType: hard
 
@@ -5170,17 +5171,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
-  version: 4.22.1
-  resolution: "browserslist@npm:4.22.1"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.1, browserslist@npm:^4.22.2":
+  version: 4.22.2
+  resolution: "browserslist@npm:4.22.2"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001541"
-    electron-to-chromium: "npm:^1.4.535"
-    node-releases: "npm:^2.0.13"
+    caniuse-lite: "npm:^1.0.30001565"
+    electron-to-chromium: "npm:^1.4.601"
+    node-releases: "npm:^2.0.14"
     update-browserslist-db: "npm:^1.0.13"
   bin:
     browserslist: cli.js
-  checksum: 6810f2d63f171d0b7b8d38cf091708e00cb31525501810a507839607839320d66e657293b0aa3d7f051ecbc025cb07390a90c037682c1d05d12604991e41050b
+  checksum: 2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465
   languageName: node
   linkType: hard
 
@@ -5408,10 +5409,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001541":
-  version: 1.0.30001561
-  resolution: "caniuse-lite@npm:1.0.30001561"
-  checksum: 6e84c84026fee53edbdbb5aded7a04a036aae4c2e367cf6bdc90c6783a591e2fdcfcdebcc4e774aca61092e542a61200c8c16b06659396492426033c4dbcc618
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
+  version: 1.0.30001568
+  resolution: "caniuse-lite@npm:1.0.30001568"
+  checksum: 13f01e5a2481134bd61cf565ce9fecbd8e107902927a0dcf534230a92191a81f1715792170f5f39719c767c3a96aa6df9917a8d5601f15bbd5e4041a8cfecc99
   languageName: node
   linkType: hard
 
@@ -6413,7 +6414,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -6955,10 +6956,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.535":
-  version: 1.4.576
-  resolution: "electron-to-chromium@npm:1.4.576"
-  checksum: b0b9e7ba803bf93ffac9cb830ed2b0e0eb07f20066127065f9ab9e08e4e6a5812040e03d76f6ee9bc59e03fb938fd414e83d4883b29111303e9e88633cf2dce4
+"electron-to-chromium@npm:^1.4.601":
+  version: 1.4.609
+  resolution: "electron-to-chromium@npm:1.4.609"
+  checksum: 9675a79388acbaff5953a4c61589af7da93e0d1f9d6a3b284c7630f10126eb0998557b07448514214d5a3d19025310039b55f405ab701b1253130fc94907f743
   languageName: node
   linkType: hard
 
@@ -11930,10 +11931,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "node-releases@npm:2.0.13"
-  checksum: 2fb44bf70fc949d27f3a48a7fd1a9d1d603ddad4ccd091f26b3fb8b1da976605d919330d7388ccd55ca2ade0dc8b2e12841ba19ef249c8bb29bf82532d401af7
+"node-releases@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "node-releases@npm:2.0.14"
+  checksum: 199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
   languageName: node
   linkType: hard
 

From 2c6369918c61a7f948f39926f987fcfa0b02fb82 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 11 Dec 2023 09:58:29 -0500
Subject: [PATCH 059/436] Fix `Style/RedundantArgument` cop (#28321)

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 48d9119fbd..135bbb0fd4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -114,7 +114,7 @@ module ApplicationHelper
   end
 
   def fa_icon(icon, attributes = {})
-    class_names = attributes[:class]&.split(' ') || []
+    class_names = attributes[:class]&.split || []
     class_names << 'fa'
     class_names += icon.split.map { |cl| "fa-#{cl}" }
 

From a8a5c6514f6676155661846398fa0398e7355f5d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 12 Dec 2023 09:29:46 +0100
Subject: [PATCH 060/436] Fix `LinkCrawlWorker` error when encountering empty
 OEmbed response (#28268)

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

diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index 1ae592238e..dc84b16b68 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -100,7 +100,7 @@ class FetchOEmbedService
   end
 
   def validate(oembed)
-    oembed if oembed[:version].to_s == '1.0' && oembed[:type].present?
+    oembed if oembed.present? && oembed[:version].to_s == '1.0' && oembed[:type].present?
   end
 
   def html

From 89a496b42ff94536fc4aa1a8f41651f8bfd52944 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 12 Dec 2023 11:39:21 +0100
Subject: [PATCH 061/436] Fix status edits not always being streamed to
 mentioned users (#28324)

---
 app/services/fan_out_on_write_service.rb      | 13 +++++++++++
 .../services/fan_out_on_write_service_spec.rb | 22 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index f2a79c9fc9..50b414bc52 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -74,6 +74,15 @@ class FanOutOnWriteService < BaseService
       LocalNotificationWorker.push_bulk(mentions) do |mention|
         [mention.account_id, mention.id, 'Mention', 'mention']
       end
+
+      next unless update?
+
+      # This may result in duplicate update payloads, but this ensures clients
+      # are aware of edits to posts only appearing in mention notifications
+      # (e.g. private mentions or mentions by people they do not follow)
+      PushUpdateWorker.push_bulk(mentions.filter { |mention| subscribed_to_streaming_api?(mention.account_id) }) do |mention|
+        [mention.account_id, @status.id, "timeline:#{mention.account_id}:notifications", { 'update' => true }]
+      end
     end
   end
 
@@ -162,4 +171,8 @@ class FanOutOnWriteService < BaseService
   def broadcastable?
     @status.public_visibility? && !@status.reblog? && !@account.silenced?
   end
+
+  def subscribed_to_streaming_api?(account_id)
+    redis.exists?("subscribed:timeline:#{account_id}") || redis.exists?("subscribed:timeline:#{account_id}:notifications")
+  end
 end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 3b554f9ea3..f657f298de 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -6,11 +6,12 @@ RSpec.describe FanOutOnWriteService, type: :service do
   subject { described_class.new }
 
   let(:last_active_at) { Time.now.utc }
-  let(:status) { Fabricate(:status, account: alice, visibility: visibility, text: 'Hello @bob #hoge') }
+  let(:status) { Fabricate(:status, account: alice, visibility: visibility, text: 'Hello @bob @eve #hoge') }
 
   let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at).account }
   let!(:bob)   { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'bob' }).account }
   let!(:tom)   { Fabricate(:user, current_sign_in_at: last_active_at).account }
+  let!(:eve)   { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'eve' }).account }
 
   before do
     bob.follow!(alice)
@@ -109,5 +110,24 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
       expect(redis).to_not have_received(:publish).with('timeline:public', anything)
     end
+
+    context 'when handling status updates', :sidekiq_fake do
+      before do
+        subject.call(status)
+
+        status.snapshot!(at_time: status.created_at, rate_limit: false)
+        status.update!(text: 'Hello @bob @eve #hoge (edited)')
+        status.snapshot!(account_id: status.account_id)
+
+        redis.set("subscribed:timeline:#{eve.id}:notifications", '1')
+
+        Sidekiq::Worker.clear_all
+      end
+
+      it 'pushes the update to mentioned users through the notifications streaming channel' do
+        subject.call(status, update: true)
+        expect(PushUpdateWorker).to have_enqueued_sidekiq_job(anything, status.id, "timeline:#{eve.id}:notifications", { 'update' => true })
+      end
+    end
   end
 end

From 8078520c762e15aedbdf11a50d9c033e7c1f8271 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:40:54 +0100
Subject: [PATCH 062/436] Update dependency oj to v3.16.3 (#28332)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 4b39692d03..405c31ae1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -484,8 +484,8 @@ GEM
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.2)
-      bigdecimal (~> 3.1)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)

From 14e64bc880ca1e301c6fdd69cb880a9c615efe6d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 12:45:10 +0100
Subject: [PATCH 063/436] New Crowdin Translations (automated) (#28334)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/zh-TW.json | 36 +++++++++++-----------
 config/locales/activerecord.zh-TW.yml      |  2 +-
 config/locales/doorkeeper.zh-TW.yml        |  2 +-
 config/locales/simple_form.zh-TW.yml       |  2 +-
 config/locales/zh-TW.yml                   | 10 +++---
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index e6dd008bf2..4fb5a12de3 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -8,7 +8,7 @@
   "about.domain_blocks.silenced.title": "已受限",
   "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法與此伺服器上的使用者互動或交流。",
   "about.domain_blocks.suspended.title": "已停權",
-  "about.not_available": "無法於本伺服器上使用此資訊。",
+  "about.not_available": "無法於此伺服器上使用此資訊。",
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
   "about.rules": "伺服器規則",
   "account.account_note_header": "備註",
@@ -34,9 +34,9 @@
   "account.follow": "跟隨",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
-  "account.followers_counter": "被 {count, plural,one {{counter} 人}other {{counter} 人}}跟隨",
+  "account.followers_counter": "被 {count, plural, other {{counter} 人}}跟隨",
   "account.following": "跟隨中",
-  "account.following_counter": "正在跟隨 {count, plural, one {{counter} 人} other {{counter} 人}}",
+  "account.following_counter": "正在跟隨 {count,plural,other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
   "account.follows_you": "跟隨了您",
   "account.go_to_profile": "前往個人檔案",
@@ -72,8 +72,8 @@
   "account.unmute_notifications_short": "取消靜音推播通知",
   "account.unmute_short": "解除靜音",
   "account_note.placeholder": "按此新增備註",
-  "admin.dashboard.daily_retention": "註冊後使用者存留率(日)",
-  "admin.dashboard.monthly_retention": "註冊後使用者存留率(月)",
+  "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
+  "admin.dashboard.monthly_retention": "註冊後使用者存留率（月）",
   "admin.dashboard.retention.average": "平均",
   "admin.dashboard.retention.cohort": "註冊月份",
   "admin.dashboard.retention.cohort_size": "新使用者",
@@ -103,9 +103,9 @@
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
   "closed_registrations.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與這個伺服器互動。",
-  "closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon 。",
+  "closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon。",
   "closed_registrations_modal.find_another_server": "尋找另一個伺服器",
-  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架一個自己的伺服器！",
+  "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設一個自己的伺服器！",
   "closed_registrations_modal.title": "註冊 Mastodon",
   "column.about": "關於",
   "column.blocks": "已封鎖的使用者",
@@ -155,7 +155,7 @@
   "compose_form.publish_form": "嘟出去",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "標記媒體為敏感內容",
+  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
   "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
   "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
   "compose_form.spoiler.marked": "移除內容警告",
@@ -207,14 +207,14 @@
   "dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
   "dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
-  "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
+  "embed.instructions": "如要將此嘟文嵌入您的網站，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
   "emoji_button.clear": "清除",
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物 & 飲料",
-  "emoji_button.label": "插入表情符號",
+  "emoji_button.label": "插入表情圖案",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "啊就沒這表情符號吼！！ (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "物件",
@@ -353,11 +353,11 @@
   "keyboard_shortcuts.legend": "顯示此說明選單",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
-  "keyboard_shortcuts.muted": "開啟靜音使用者列表",
+  "keyboard_shortcuts.muted": "開啟靜音使用者清單",
   "keyboard_shortcuts.my_profile": "開啟個人檔案頁面",
   "keyboard_shortcuts.notifications": "開啟通知欄",
   "keyboard_shortcuts.open_media": "開啟媒體",
-  "keyboard_shortcuts.pinned": "開啟釘選的嘟文列表",
+  "keyboard_shortcuts.pinned": "開啟釘選的嘟文清單",
   "keyboard_shortcuts.profile": "開啟作者的個人檔案頁面",
   "keyboard_shortcuts.reply": "回應嘟文",
   "keyboard_shortcuts.requests": "開啟跟隨請求列表",
@@ -386,7 +386,7 @@
   "lists.new.create": "新增列表",
   "lists.new.title_placeholder": "新列表標題",
   "lists.replies_policy.followed": "任何跟隨的使用者",
-  "lists.replies_policy.list": "列表成員",
+  "lists.replies_policy.list": "成員清單",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆：",
   "lists.search": "搜尋您跟隨的使用者",
@@ -452,7 +452,7 @@
   "notifications.column_settings.push": "推播通知",
   "notifications.column_settings.reblog": "轉嘟：",
   "notifications.column_settings.show": "於欄位中顯示",
-  "notifications.column_settings.sound": "播放聲音",
+  "notifications.column_settings.sound": "播放音效",
   "notifications.column_settings.status": "新嘟文：",
   "notifications.column_settings.unread_notifications.category": "未讀通知",
   "notifications.column_settings.unread_notifications.highlight": "突顯未讀通知",
@@ -477,7 +477,7 @@
   "onboarding.actions.back": "返回",
   "onboarding.actions.go_to_explore": "看看發生什麼新鮮事",
   "onboarding.actions.go_to_home": "前往您的首頁時間軸",
-  "onboarding.compose.template": "哈囉 #Mastodon！",
+  "onboarding.compose.template": "你好 #Mastodon！",
   "onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
   "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
@@ -540,7 +540,7 @@
   "regeneration_indicator.label": "載入中…",
   "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
   "relative_time.days": "{number} 天",
-  "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
+  "relative_time.full.days": "{number, plural, other {# 天}}前",
   "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
   "relative_time.full.just_now": "剛剛",
   "relative_time.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}前",
@@ -620,7 +620,7 @@
   "search_results.see_all": "檢視全部",
   "search_results.statuses": "嘟文",
   "search_results.title": "搜尋：{q}",
-  "server_banner.about_active_users": "最近三十日內使用此伺服器的人 (月活躍使用者)",
+  "server_banner.about_active_users": "最近三十日內使用此伺服器的人（月活躍使用者）",
   "server_banner.active_users": "活躍使用者",
   "server_banner.administered_by": "管理者：",
   "server_banner.introduction": "{domain} 是由 {mastodon} 提供之去中心化社群網路一部分。",
@@ -687,7 +687,7 @@
   "status.translated_from_with": "透過 {provider} 翻譯 {lang}",
   "status.uncached_media_warning": "無法預覽",
   "status.unmute_conversation": "解除此對話的靜音",
-  "status.unpin": "自個人檔案頁面取消釘選",
+  "status.unpin": "從個人檔案頁面取消釘選",
   "subscribed_languages.lead": "僅選定語言的嘟文才會出現於您的首頁上，並於變更後列出時間軸。選取「無」以接收所有語言的嘟文。",
   "subscribed_languages.save": "儲存變更",
   "subscribed_languages.target": "變更 {target} 的訂閱語言",
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml
index 792a9dbb22..24609332cd 100644
--- a/config/locales/activerecord.zh-TW.yml
+++ b/config/locales/activerecord.zh-TW.yml
@@ -28,7 +28,7 @@ zh-TW:
         doorkeeper/application:
           attributes:
             website:
-              invalid: 不是有效的 URL
+              invalid: 不是有效的網址
         import:
           attributes:
             data:
diff --git a/config/locales/doorkeeper.zh-TW.yml b/config/locales/doorkeeper.zh-TW.yml
index c0d42ec7b3..8ceaf36f3c 100644
--- a/config/locales/doorkeeper.zh-TW.yml
+++ b/config/locales/doorkeeper.zh-TW.yml
@@ -29,7 +29,7 @@ zh-TW:
       edit:
         title: 編輯應用程式
       form:
-        error: 唉呦！請看看表單以排查錯誤
+        error: 糟糕！請檢查表單以排查錯誤
       help:
         native_redirect_uri: 請使用 %{native_redirect_uri} 作本站測試
         redirect_uri: 每行輸入一個 URI
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 13b2ad30af..a31ad5eb11 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -16,7 +16,7 @@ zh-TW:
         acct: 指定要移動至的帳號的「使用者名稱@網域名稱」
       account_warning_preset:
         text: 您可使用嘟文語法，例如網址、「#」標籤與提及功能
-        title: 可選的。不會向收件者顯示
+        title: 可選。不會向收件者顯示
       admin_account_action:
         include_statuses: 使用者可看到導致檢舉或警告的嘟文
         send_email_notification: 使用者將收到帳號發生之事情的解釋
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 755ac34038..e17228da32 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -467,7 +467,7 @@ zh-TW:
           other: 錯誤嘗試於 %{count} 天。
         no_failures_recorded: 報告中沒有錯誤。
         title: 可用狀態
-        warning: 上一次嘗試連線至本伺服器失敗
+        warning: 上一次嘗試連線至此伺服器失敗
       back_to_all: 所有
       back_to_limited: 受限制的
       back_to_warning: 警告
@@ -876,7 +876,7 @@ zh-TW:
         publishers:
           no_publisher_selected: 因未選取任何發行者，所以什麼事都沒發生
         shared_by_over_week:
-          other: 上週被 %{count} 名使用者分享
+          other: 上週被 %{count} 位使用者分享
         title: 熱門連結
         usage_comparison: 於今日被 %{today} 人分享，相較於昨日 %{yesterday} 人
       not_allowed_to_trend: 不允許登上熱門
@@ -1273,7 +1273,7 @@ zh-TW:
       other: 選取 %{count} 個符合您搜尋的項目。
     today: 今天
     validation_errors:
-      other: 恩...似乎不太對勁耶？請檢查以下 %{count} 項錯誤
+      other: 恩...似乎發生了點錯誤？請檢查以下 %{count} 項錯誤
   imports:
     errors:
       empty: 空的 CSV 檔案
@@ -1796,7 +1796,7 @@ zh-TW:
     welcome:
       edit_profile_action: 設定個人檔案
       edit_profile_step: 您可以設定您的個人檔案，包括上傳大頭貼、變更顯示名稱等等。您也可以選擇於新的跟隨者跟隨前，先對他們進行審核。
-      explanation: 下面是幾個小幫助，希望它們能幫到您
+      explanation: 以下是幾個小技巧，希望它們能幫到您
       final_action: 開始嘟嘟
       final_step: '開始嘟嘟吧！即使您現在沒有跟隨者，其他人仍然能於本站時間軸、主題標籤等地方，看到您的公開嘟文。試著用 #introductions 這個主題標籤介紹一下自己吧。'
       full_handle: 您的完整帳號名稱
@@ -1805,7 +1805,7 @@ zh-TW:
       title: "%{name} 誠摯歡迎您的加入！"
   users:
     follow_limit_reached: 您無法跟隨多於 %{limit} 個人
-    go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
+    go_to_sso_account_settings: 前往您的身分識別提供者（IdP）之帳號設定
     invalid_otp_token: 兩階段認證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
     seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。

From ca51e412394cc10460ff121125262b8593e60729 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 12:45:39 +0100
Subject: [PATCH 064/436] Update dependency stylelint-config-standard-scss to
 v12 (#28333)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 62 ++++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 500d6d2cde..37139254c1 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "prettier": "^3.0.0",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^15.10.1",
-    "stylelint-config-standard-scss": "^11.0.0",
+    "stylelint-config-standard-scss": "^12.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3",
     "yargs": "^17.7.2"
diff --git a/yarn.lock b/yarn.lock
index 71f1ad160c..7903ecc5ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2433,7 +2433,7 @@ __metadata:
     stacktrace-js: "npm:^2.0.2"
     stringz: "npm:^2.1.0"
     stylelint: "npm:^15.10.1"
-    stylelint-config-standard-scss: "npm:^11.0.0"
+    stylelint-config-standard-scss: "npm:^12.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
     tesseract.js: "npm:^2.1.5"
@@ -15758,62 +15758,62 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint-config-recommended-scss@npm:^13.1.0":
-  version: 13.1.0
-  resolution: "stylelint-config-recommended-scss@npm:13.1.0"
+"stylelint-config-recommended-scss@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "stylelint-config-recommended-scss@npm:14.0.0"
   dependencies:
     postcss-scss: "npm:^4.0.9"
-    stylelint-config-recommended: "npm:^13.0.0"
-    stylelint-scss: "npm:^5.3.0"
+    stylelint-config-recommended: "npm:^14.0.0"
+    stylelint-scss: "npm:^6.0.0"
   peerDependencies:
     postcss: ^8.3.3
-    stylelint: ^15.10.0
+    stylelint: ^16.0.2
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: e07d0172c7936b4f644138e4129df2f187d297f1f96ce5865ab21ccd1c22caf94220f7caf9d6985e93e515de4c0356f6cb9c924d00df2eee5b3bc237f7e5bb48
+  checksum: 9ddc92e7a5fa131b41cee1ab1f69251934ca35c0e2803dc613329cdead7b8b27d8457048a63db29f61a1442e7cdef14207f88a3abce00ec53fdefe0d604f7de3
   languageName: node
   linkType: hard
 
-"stylelint-config-recommended@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "stylelint-config-recommended@npm:13.0.0"
+"stylelint-config-recommended@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "stylelint-config-recommended@npm:14.0.0"
   peerDependencies:
-    stylelint: ^15.10.0
-  checksum: 80420a1ab616e8637b66223f88c597388990d9991cd6a28b8372049b83329d893412f83029bb253a82b52387e497b62e042bc898064a2f22574b0d8921f01dd2
+    stylelint: ^16.0.0
+  checksum: 4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11
   languageName: node
   linkType: hard
 
-"stylelint-config-standard-scss@npm:^11.0.0":
-  version: 11.1.0
-  resolution: "stylelint-config-standard-scss@npm:11.1.0"
+"stylelint-config-standard-scss@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "stylelint-config-standard-scss@npm:12.0.0"
   dependencies:
-    stylelint-config-recommended-scss: "npm:^13.1.0"
-    stylelint-config-standard: "npm:^34.0.0"
+    stylelint-config-recommended-scss: "npm:^14.0.0"
+    stylelint-config-standard: "npm:^35.0.0"
   peerDependencies:
     postcss: ^8.3.3
-    stylelint: ^15.10.0
+    stylelint: ^16.0.2
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 22d00e75c1eacce9883fd48c3d67b1107b0e39d7d86e9f73deaa332b11c39a9678c947ae2c34cd5159a452ec9a857694ed58b5a851087480d3c9a66dab629415
+  checksum: 7f3ccfb4175f9c50b69d30ca35a97887008c5ba493dbe7d5bce0b57b1eafd21b268177b82404368e7780600077cba784f98e1046671724be3b29a00c6a7913a4
   languageName: node
   linkType: hard
 
-"stylelint-config-standard@npm:^34.0.0":
-  version: 34.0.0
-  resolution: "stylelint-config-standard@npm:34.0.0"
+"stylelint-config-standard@npm:^35.0.0":
+  version: 35.0.0
+  resolution: "stylelint-config-standard@npm:35.0.0"
   dependencies:
-    stylelint-config-recommended: "npm:^13.0.0"
+    stylelint-config-recommended: "npm:^14.0.0"
   peerDependencies:
-    stylelint: ^15.10.0
-  checksum: 2494468af2359490b6ebb9723d9653f9e31db3a0772b8d9f0e081018b0079ef84ae6f90dcf94c879a3c374f299e334941e3dcff1afb603c2284d3103085b71fb
+    stylelint: ^16.0.0
+  checksum: 791fbc26cc3029ce3c2423a643e903545b5e4cd605251b18f0ce790bac6fbaaf380469845c1ff45f4e320126af9f8a9dc1ca85d0df9274277ae60da91e81895b
   languageName: node
   linkType: hard
 
-"stylelint-scss@npm:^5.3.0":
-  version: 5.3.1
-  resolution: "stylelint-scss@npm:5.3.1"
+"stylelint-scss@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "stylelint-scss@npm:6.0.0"
   dependencies:
     known-css-properties: "npm:^0.29.0"
     postcss-media-query-parser: "npm:^0.2.3"
@@ -15821,8 +15821,8 @@ __metadata:
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    stylelint: ^14.5.1 || ^15.0.0
-  checksum: 5dfed5f9ac9812cd2ac6ef0272c720dee0326aaaee2998315a23bdcd71b8f04427f29cad634793eea2b45984182e20f03e90d43501e8e4d55bc956f80e2de477
+    stylelint: ^16.0.2
+  checksum: f5e971d19ef6879ae5c18cb8fba8033fe7928f241178e6afd80357cc080d2feddfd6f7fe564aaa696008aa10345df5885d9a4471c926b3e266088e015927782e
   languageName: node
   linkType: hard
 

From 4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 Dec 2023 06:56:39 -0500
Subject: [PATCH 065/436] Add `migrator_version` method to CLI maintenance
 script (#28323)

---
 lib/mastodon/cli/maintenance.rb | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 553ca056dc..43fd7fab33 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -185,15 +185,15 @@ module Mastodon::CLI
     end
 
     def schema_has_instances_view?
-      ActiveRecord::Migrator.current_version >= 2020_12_06_004238
+      migrator_version >= 2020_12_06_004238
     end
 
     def verify_schema_version!
-      if ActiveRecord::Migrator.current_version < MIN_SUPPORTED_VERSION
+      if migrator_version < MIN_SUPPORTED_VERSION
         say 'Your version of the database schema is too old and is not supported by this script.', :red
         say 'Please update to at least Mastodon 3.0.0 before running this script.', :red
         exit(1)
-      elsif ActiveRecord::Migrator.current_version > MAX_SUPPORTED_VERSION
+      elsif migrator_version > MAX_SUPPORTED_VERSION
         say 'Your version of the database schema is more recent than this script, this may cause unexpected errors.', :yellow
         exit(1) unless yes?('Continue anyway? (Yes/No)')
       end
@@ -228,7 +228,7 @@ module Mastodon::CLI
       end
 
       say 'Restoring index_accounts_on_username_and_domain_lower…'
-      if ActiveRecord::Migrator.current_version < 2020_06_20_164023
+      if migrator_version < 2020_06_20_164023
         ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
       else
         ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
@@ -238,7 +238,7 @@ module Mastodon::CLI
       ActiveRecord::Base.connection.execute('REINDEX INDEX search_index;')
       ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_uri;')
       ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_url;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if ActiveRecord::Migrator.current_version >= 2023_05_24_190515
+      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
     end
 
     def deduplicate_users!
@@ -269,15 +269,15 @@ module Mastodon::CLI
       say 'Restoring users indexes…'
       ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
       ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if ActiveRecord::Migrator.current_version < 2022_01_18_183010
+      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
 
-      if ActiveRecord::Migrator.current_version < 2022_03_10_060641
+      if migrator_version < 2022_03_10_060641
         ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
       else
         ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
       end
 
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if ActiveRecord::Migrator.current_version >= 2023_07_02_151753
+      ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
     end
 
     def deduplicate_users_process_confirmation_token
@@ -292,7 +292,7 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_remember_token
-      if ActiveRecord::Migrator.current_version < 2022_01_18_183010
+      if migrator_version < 2022_01_18_183010
         ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
           users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
           say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -371,7 +371,7 @@ module Mastodon::CLI
       end
 
       say 'Restoring conversations indexes…'
-      if ActiveRecord::Migrator.current_version < 2022_03_07_083603
+      if migrator_version < 2022_03_07_083603
         ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
       else
         ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
@@ -488,7 +488,7 @@ module Mastodon::CLI
       end
 
       say 'Restoring media_attachments indexes…'
-      if ActiveRecord::Migrator.current_version < 2022_03_10_060626
+      if migrator_version < 2022_03_10_060626
         ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
       else
         ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
@@ -521,7 +521,7 @@ module Mastodon::CLI
       end
 
       say 'Restoring statuses indexes…'
-      if ActiveRecord::Migrator.current_version < 2022_03_10_060706
+      if migrator_version < 2022_03_10_060706
         ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
       else
         ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
@@ -543,7 +543,7 @@ module Mastodon::CLI
       end
 
       say 'Restoring tags indexes…'
-      if ActiveRecord::Migrator.current_version < 2021_04_21_121431
+      if migrator_version < 2021_04_21_121431
         ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
       else
         ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
@@ -707,6 +707,10 @@ module Mastodon::CLI
       end
     end
 
+    def migrator_version
+      ActiveRecord::Migrator.current_version
+    end
+
     def find_duplicate_accounts
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
     end

From 393e85164980b945ad9bdfda8e906e128f5700a3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 12 Dec 2023 13:00:23 +0100
Subject: [PATCH 066/436] Change Rails' cache format to 7.0 (#27393)

---
 config/application.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index b6426516ee..990a89383e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,13 +63,6 @@ module Mastodon
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
-    # TODO: Release a version which uses the 7.0 defaults as specified above,
-    # but preserves the 6.1 cache format as set below. In a subsequent change,
-    # remove this line setting to 6.1 cache format, and then release another version.
-    # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#new-activesupport-cache-serialization-format
-    # https://github.com/mastodon/mastodon/pull/24241#discussion_r1162890242
-    config.active_support.cache_format_version = 6.1
-
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
     # Common ones are `templates`, `generators`, or `middleware`, for example.

From f37c93f3d76bcc83f20b83cfc121ff5a08d43706 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 12 Dec 2023 13:01:08 +0100
Subject: [PATCH 067/436] Change cookie rotator to use SHA1 digest for new
 cookies (#27392)

---
 config/initializers/cookie_rotator.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/initializers/cookie_rotator.rb b/config/initializers/cookie_rotator.rb
index b829b1a90b..ccc2c6b21f 100644
--- a/config/initializers/cookie_rotator.rb
+++ b/config/initializers/cookie_rotator.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-# TODO: Remove after 4.2.0
-Rails.application.configure do
-  config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA1
-end
+# TODO: remove this file some time after 4.3.0
 
 Rails.application.config.after_initialize do
   Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
@@ -12,9 +9,8 @@ Rails.application.config.after_initialize do
 
     secret_key_base = Rails.application.secret_key_base
 
-    # TODO: Switch to SHA1 after 4.2.0
     key_generator = ActiveSupport::KeyGenerator.new(
-      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA256
+      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
     )
     key_len = ActiveSupport::MessageEncryptor.key_len
 

From db3220ff77b828870fcb21e0b50a12da0e19b2e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 15:18:30 +0100
Subject: [PATCH 068/436] Update dependency rubocop to v1.59.0 (#28320)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 405c31ae1a..378102437a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -381,7 +381,7 @@ GEM
       rdoc
       reline (>= 0.3.8)
     jmespath (1.6.2)
-    json (2.7.0)
+    json (2.7.1)
     json-canonicalization (1.0.0)
     json-jwt (1.15.3)
       activesupport (>= 4.2)
@@ -622,7 +622,7 @@ GEM
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     reline (0.4.1)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -662,7 +662,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.58.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

From 3f1ec16377c11d2d7a48ccc735ed87d6619f6275 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 12 Dec 2023 15:31:37 +0100
Subject: [PATCH 069/436] Fix empty column explainer getting cropped under
 certain conditions (#28337)

---
 app/javascript/styles/mastodon/components.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2106b529d6..462dd82ac0 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4398,11 +4398,6 @@ a.status-card {
   align-items: center;
   justify-content: center;
 
-  @supports (display: grid) {
-    // hack to fix Chrome <57
-    contain: strict;
-  }
-
   & > span {
     max-width: 500px;
   }

From dcc24db793dc926823439b81839be1a3bc8e29d3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 13 Dec 2023 08:47:32 +0100
Subject: [PATCH 070/436] Fix N+1s because of association preloaders not
 actually getting called (#28339)

---
 app/lib/inline_renderer.rb                    | 4 ++--
 app/models/announcement.rb                    | 4 ++--
 app/models/concerns/account/search.rb         | 4 ++--
 app/models/notification.rb                    | 2 +-
 app/serializers/initial_state_serializer.rb   | 4 ++--
 app/services/account_search_service.rb        | 2 +-
 app/services/batched_remove_status_service.rb | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index eda3da2c29..0aebb13fce 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -37,13 +37,13 @@ class InlineRenderer
   private
 
   def preload_associations_for_status
-    ActiveRecord::Associations::Preloader.new(records: @object, associations: {
+    ActiveRecord::Associations::Preloader.new(records: [@object], associations: {
       active_mentions: :account,
 
       reblog: {
         active_mentions: :account,
       },
-    })
+    }).call
   end
 
   def current_user
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index c5d6dd62e1..2cd7c1d5ed 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -78,9 +78,9 @@ class Announcement < ApplicationRecord
       else
         scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from announcement_reactions r where r.account_id = #{account.id} and r.announcement_id = announcement_reactions.announcement_id and r.name = announcement_reactions.name) as me")
       end
-    end
+    end.to_a
 
-    ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji)
+    ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
     records
   end
 
diff --git a/app/models/concerns/account/search.rb b/app/models/concerns/account/search.rb
index b02b9bd461..40d87aaaa1 100644
--- a/app/models/concerns/account/search.rb
+++ b/app/models/concerns/account/search.rb
@@ -124,7 +124,7 @@ module Account::Search
       tsquery = generate_query_for_search(terms)
 
       find_by_sql([BASIC_SEARCH_SQL, { limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
-        ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
+        ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
       end
     end
 
@@ -133,7 +133,7 @@ module Account::Search
       sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
 
       find_by_sql([sql_template, { id: account.id, limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
-        ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
+        ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
       end
     end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 60f834a633..54212d675f 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -111,7 +111,7 @@ class Notification < ApplicationRecord
 
         # Instead of using the usual `includes`, manually preload each type.
         # If polymorphic associations are loaded with the usual `includes`, other types of associations will be loaded more.
-        ActiveRecord::Associations::Preloader.new(records: grouped_notifications, associations: associations)
+        ActiveRecord::Associations::Preloader.new(records: grouped_notifications, associations: associations).call
       end
 
       unique_target_statuses = notifications.filter_map(&:target_status).uniq
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index a8af45990f..f606836ba4 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -86,8 +86,8 @@ class InitialStateSerializer < ActiveModel::Serializer
 
     ActiveRecord::Associations::Preloader.new(
       records: [object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact,
-      associations: [:account_stat, :user, { moved_to_account: [:account_stat, :user] }]
-    )
+      associations: [:account_stat, { user: :role, moved_to_account: [:account_stat, { user: :role }] }]
+    ).call
 
     store[object.current_account.id.to_s]  = serialized_account(object.current_account) if object.current_account
     store[object.admin.id.to_s]            = serialized_account(object.admin) if object.admin
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index b437ff4759..7b85b09d8f 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -218,7 +218,7 @@ class AccountSearchService < BaseService
 
     records = query_builder.build.limit(limit_for_non_exact_results).offset(offset).objects.compact
 
-    ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
+    ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
 
     records
   rescue Faraday::ConnectionFailed, Parslet::ParseFailed
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index c54cc1d350..de4ee16e91 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -11,7 +11,7 @@ class BatchedRemoveStatusService < BaseService
     ActiveRecord::Associations::Preloader.new(
       records: statuses,
       associations: options[:skip_side_effects] ? :reblogs : [:account, :tags, reblogs: :account]
-    )
+    ).call
 
     statuses_and_reblogs = statuses.flat_map { |status| [status] + status.reblogs }
 
@@ -23,7 +23,7 @@ class BatchedRemoveStatusService < BaseService
     ActiveRecord::Associations::Preloader.new(
       records: statuses_with_account_conversations,
       associations: [mentions: :account]
-    )
+    ).call
 
     statuses_with_account_conversations.each(&:unlink_from_conversations!)
 

From aae4b5644f0fb02ce811f8f9a13d0965621d05a2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:52:33 +0100
Subject: [PATCH 071/436] Update dependency haml_lint to v0.52.0 (#28345)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 378102437a..07b1a4bbe3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -326,7 +326,7 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    haml (6.2.0)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
@@ -335,7 +335,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.51.0)
+    haml_lint (0.52.0)
       haml (>= 4.0)
       parallel (~> 1.10)
       rainbow

From b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:52:37 +0100
Subject: [PATCH 072/436] New Crowdin Translations (automated) (#28344)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/et.json |  1 +
 app/javascript/mastodon/locales/ja.json | 23 ++++++++++----------
 app/javascript/mastodon/locales/ne.json | 29 ++++++++++++++++++++++++-
 config/locales/et.yml                   | 29 +++++++++++++++++++++++++
 config/locales/ja.yml                   |  2 +-
 5 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index a67aa6feed..a41aa02f80 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -606,6 +606,7 @@
   "search.quick_action.status_search": "Sobivad postitused {x}",
   "search.search_or_paste": "Otsi või kleebi URL",
   "search_popout.full_text_search_disabled_message": "Pole saadaval kohas {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Saadaval vaid kui sisse logitud.",
   "search_popout.language_code": "Keele ISO-kood",
   "search_popout.options": "Otsimisvalikud",
   "search_popout.quick_actions": "Kiirtegevused",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 3cb0565d0e..5ad9d6dc94 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -21,7 +21,7 @@
   "account.blocked": "ブロック済み",
   "account.browse_more_on_origin_server": "リモートで表示",
   "account.cancel_follow_request": "フォローリクエストの取り消し",
-  "account.copy": "プロフィールのリンクをコピーして下さい",
+  "account.copy": "プロフィールへのリンクをコピー",
   "account.direct": "@{name}さんに非公開でメンション",
   "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
   "account.domain_blocked": "ドメインブロック中",
@@ -192,7 +192,7 @@
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
   "conversation.with": "{names}",
-  "copy_icon_button.copied": "クリップボードにコピーされた",
+  "copy_icon_button.copied": "コピーしました",
   "copypaste.copied": "コピーしました",
   "copypaste.copy_to_clipboard": "クリップボードにコピー",
   "directory.federated": "既知の連合より",
@@ -392,7 +392,7 @@
   "lists.search": "フォローしている人の中から検索",
   "lists.subheading": "あなたのリスト",
   "load_pending": "{count}件の新着",
-  "loading_indicator.label": "",
+  "loading_indicator.label": "読み込み中…",
   "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
   "mute_modal.duration": "ミュートする期間",
@@ -481,17 +481,17 @@
   "onboarding.follows.empty": "表示できる結果はありません。検索やエクスプローラーを使ったり、ほかのアカウントをフォローしたり、後でもう一度試しください。",
   "onboarding.follows.lead": "ホームタイムラインはMastodonの軸足となる場所です。たくさんのユーザーをフォローすることで、ホームタイムラインはよりにぎやかでおもしろいものになります。手はじめに、おすすめのアカウントから何人かフォローしてみましょう:",
   "onboarding.follows.title": "ホームタイムラインを埋める",
-  "onboarding.profile.discoverable": "自分のプロフィールが発見できないようにする",
-  "onboarding.profile.discoverable_hint": "マストドンの見つけやすくする機能が個人情報を利用することに承諾すると、あなたの投稿が検索結果やトレンドに表示されることがあります。また、あなたのプロフィールがあなたと似た興味関心を持つ人に提案されることがあります。",
+  "onboarding.profile.discoverable": "自分のプロフィールが見つけられるようにする",
+  "onboarding.profile.discoverable_hint": "Mastodonの「見つける」機能にオプトインすると、あなたの投稿が検索結果やトレンドに表示されることがあります。また、あなたに似た関心を持つ人にプロフィールがおすすめされることがあります。",
   "onboarding.profile.display_name": "表示名",
-  "onboarding.profile.display_name_hint": "あなたのフルネーム、または楽しい名前…",
-  "onboarding.profile.lead": "このことは後でいつでも設定から完了させることが出来ますし、設定では更に多くのカスタマイズが利用可能になっています。",
+  "onboarding.profile.display_name_hint": "フルネーム、あるいは面白い名前など",
+  "onboarding.profile.lead": "あとでいつでも修正できますし、設定画面にはこれ以外のカスタマイズ項目もあります。",
   "onboarding.profile.note": "自己紹介",
-  "onboarding.profile.note_hint": "@を使用して他の人々にメンションをすることができます。また#でハッシュタグが使用できます",
-  "onboarding.profile.save_and_continue": "保存してから続行して下さい",
+  "onboarding.profile.note_hint": "ほかの人に @言及 したり、#ハッシュタグ を付けたりできます",
+  "onboarding.profile.save_and_continue": "保存して続ける",
   "onboarding.profile.title": "プロフィールの設定",
-  "onboarding.profile.upload_avatar": "プロフィール画像をアップロードしてください",
-  "onboarding.profile.upload_header": "プロフィールのヘッダー画像をアップロードして下さい",
+  "onboarding.profile.upload_avatar": "プロフィール画像をアップロード",
+  "onboarding.profile.upload_header": "プロフィールのヘッダー画像をアップロード",
   "onboarding.share.lead": "新しいMastodonのアカウントをみんなに紹介しましょう。",
   "onboarding.share.message": "「{username}」で #Mastodon はじめました！ {url}",
   "onboarding.share.next_steps": "次のステップに進む:",
@@ -606,6 +606,7 @@
   "search.quick_action.status_search": "{x}に該当する投稿",
   "search.search_or_paste": "検索またはURLを入力",
   "search_popout.full_text_search_disabled_message": "{domain}では利用できません。",
+  "search_popout.full_text_search_logged_out_message": "ログイン時のみ利用できます。",
   "search_popout.language_code": "ISO言語コード",
   "search_popout.options": "検索オプション",
   "search_popout.quick_actions": "クイック操作",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 95f8e703c9..229d4f4718 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -49,5 +49,32 @@
   "admin.dashboard.retention.average": "औसत",
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
-  "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।"
+  "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+  "bundle_column_error.retry": "पुन: प्रयास गर्नुहोस्",
+  "bundle_modal_error.close": "बन्द गर्नुहोस्",
+  "bundle_modal_error.message": "यो कम्पोनेन्ट लोड गर्दा केही गडबड भयो।",
+  "bundle_modal_error.retry": "Try again",
+  "closed_registrations.other_server_instructions": "Mastodon विकेन्द्रीकृत भएकोले, तपाइँ अर्को सर्भरमा खाता खोल्न सक्नुहुन्छ र पनि यो सर्भरसँग अन्तरक्रिया गर्न सक्नुहुन्छ।",
+  "closed_registrations_modal.description": "हाल {domain} मा खाता सिर्जना गर्न सम्भव छैन, तर कृपया ध्यान राख्नुहोस् कि तपाईंले Mastodon प्रयोग गर्नको लागि {domain} मा नै खाता खोल्न आवश्यक छैन।",
+  "closed_registrations_modal.find_another_server": "अर्को सर्भर खोज्नुहोस्",
+  "closed_registrations_modal.title": "Mastodon मा साइन अप गर्दै",
+  "column.blocks": "ब्लक गरिएको प्रयोगकर्ताहरु",
+  "column.directory": "प्रोफाइल ब्राउज गर्नुहोस्",
+  "column.domain_blocks": "ब्लक गरिएको डोमेन",
+  "column.follow_requests": "फलो अनुरोधहरू",
+  "column.lists": "सूचीहरू",
+  "column.notifications": "सूचनाहरू",
+  "column_header.hide_settings": "सेटिङ्हरू लुकाउनुहोस्",
+  "column_subheading.settings": "सेटिङहरू",
+  "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
+  "compose.language.search": "भाषाहरू खोज्नुहोस्...",
+  "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
+  "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
+  "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
+  "compose_form.publish_form": "नयाँ पोस्ट",
+  "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
+  "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
+  "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
+  "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
 }
diff --git a/config/locales/et.yml b/config/locales/et.yml
index fb0fdc3a3e..2d48edc295 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -534,6 +534,7 @@ et:
       total_reported: Nende kohta teateid
       total_storage: Lisatud meedia
       totals_time_period_hint_html: Allpool kuvatud summad sisaldavad andmed kogu aja kohta.
+      unknown_instance: Hetkel pole selle domeeni jaoks siin serveris kirjet.
     invites:
       deactivate_all: Peata kõik
       filter:
@@ -610,6 +611,7 @@ et:
       created_at: Teavitatud
       delete_and_resolve: Kustuta postitused
       forwarded: Edastatud
+      forwarded_replies_explanation: See aruanne pärineb kaugkasutajalt ja käsitleb kaugsisu. See on edastatud sulle, sest raporteeritud sisu on vastus ühele sinu kasutajale.
       forwarded_to: Edastatud %{domain} domeeni
       mark_as_resolved: Märgi lahendatuks
       mark_as_sensitive: Märgi kui tundlik sisu
@@ -832,6 +834,20 @@ et:
     system_checks:
       database_schema_check:
         message_html: On ootel andmebaasi migreerimisi. Rakenduse ootuspäraseks toimimiseks palun käivita need
+      elasticsearch_health_red:
+        message_html: Elasticsearch klaster on ebaterve (punane staatus), otsingufunktsioonid ei ole saadaval
+      elasticsearch_health_yellow:
+        message_html: Elasticsearch klaster on ebaterve (kollane staatus), võiksid uurida põhjust
+      elasticsearch_index_mismatch:
+        message_html: Elasticsearchi indeksite kaardistused on vananenud. Palun käivita <code>tootctl search deploy --only=%{value}</code>
+      elasticsearch_preset:
+        action: Vaata dokumentatsiooni
+        message_html: Elasticsearchi klastris on rohkem kui üks sõlme, kuid Mastodon ei ole nende kasutamiseks konfigureeritud.
+      elasticsearch_preset_single_node:
+        action: Vaata dokumentatsiooni
+        message_html: Elasticsearchi klastris on ainult üks sõlm <code>ES_PRESET</code> peaks olema seatud väärtusele <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Elasticsearchi süsteemiindeks on seadistuse muutumise tõttu vananenud. Palun käivita <code>tootctl search deploy --reset-chewy</code> selle uuendamiseks.
       elasticsearch_running_check:
         message_html: Elasticsearch ei vasta. Kontrolli, kas see töötab või keela täistekstiotsing
       elasticsearch_version_check:
@@ -1024,6 +1040,14 @@ et:
       hint_html: Üks asi veel! Me peame veenduma, et oled inimene (et me saaksime spämmi väljaspoole jätta!). Lahenda allpool olev CAPTCHA ja klõpsa "Jätka".
       title: Turvalisuse kontroll
     confirmations:
+      awaiting_review: E-posti aadress on kinnitatud! %{domain} töötajad vaatavad praegu registreeringut läbi. Saad e-kirja, kui nad kiidavad konto heaks!
+      awaiting_review_title: Su registreeringut vaadatakse läbi
+      clicking_this_link: klõpsates seda linki
+      login_link: logi sisse
+      proceed_to_login_html: Saad nüüd jätkata valikuga %{login_link}.
+      redirect_to_app_html: Sind oleks pidanud suunatama rakendusse <strong>%{app_name}</strong>. Kui seda ei juhtunud, proovi %{clicking_this_link} või naase käsitsi rakendusse.
+      registration_complete: Sinu registreering domeenil %{domain} on nüüd valmis!
+      welcome_title: Tere tulemast, %{name}!
       wrong_email_hint: Kui see e-postiaadress pole korrektne, saad seda kontosätetes muuta.
     delete_account: Konto kustutamine
     delete_account_html: Kui soovid oma konto kustutada, siis <a href="%{path}">jätka siit</a>. Pead kustutamise eraldi kinnitama.
@@ -1085,6 +1109,7 @@ et:
       functional: Konto on täies mahus kasutatav.
       pending: Taotlus ootab ülevaatamist meie personali poolt. See võib võtta mõne aja. Kui taotlus on vastu võetud, saadetakse sulle e-kiri.
       redirecting_to: See konto pole aktiivne, sest on suunatud aadressile %{acct}.
+      self_destruct: Kuna %{domain} on sulgemisel, saad oma kontole vaid piiratud ligipääsu.
       view_strikes: Vaata enda eelnevaid juhtumeid
     too_fast: Vorm esitatud liiga kiirelt, proovi uuesti.
     use_security_key: Kasuta turvavõtit
@@ -1342,6 +1367,7 @@ et:
       '86400': 1 päev
     expires_in_prompt: Mitte kunagi
     generate: Loo
+    invalid: See kutse pole kehtiv
     invited_by: 'Sind kutsus:'
     max_uses:
       one: 1 kasutus
@@ -1554,6 +1580,9 @@ et:
     over_daily_limit: Lubatud ajastatud postituste arv %{limit} päevas on tänaseks ületatud
     over_total_limit: Oled jõudnud ajastatud postituste lubatud maksimumarvuni %{limit}
     too_soon: Ajastatud kuupäev peab olema tukevikus
+  self_destruct:
+    lead_html: Kahjuks suletakse <strong>%{domain}</strong> lõplikult. Kui sul oli seal konto, ei saa sa seda enam kasutada, kuid siiski võid taotleda oma andmete varukoopiat.
+    title: See server suletakse
   sessions:
     activity: Viimane aktiivsus
     browser: Veebilehitseja
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f7a2c28179..8682f37eec 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -599,7 +599,7 @@ ja:
       created_at: 通報日時
       delete_and_resolve: 投稿を削除
       forwarded: 転送済み
-      forwarded_replies_explanation: この報告はリモートユーザーからのものであり、またリモートコンテンツに関するものです。報告されたコンテンツがあなたのユーザーの内の一人に対するリプライの中にあるため、あなたに転送されました。
+      forwarded_replies_explanation: これはリモートユーザーによる、リモートコンテンツについての報告です。問題のコンテンツはあなたのサーバー利用者への返信なので、こちらにも転送されて来ました。
       forwarded_to: "%{domain}に転送されました"
       mark_as_resolved: 解決済みとしてマーク
       mark_as_sensitive: 閲覧注意にする

From 49150e2f1d6ae197b160a9dc701f5ac154929ca2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:52:40 +0100
Subject: [PATCH 073/436] Update dependency ws to v8.15.1 (#28343)

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

diff --git a/yarn.lock b/yarn.lock
index 7903ecc5ca..bd2545cf6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17739,8 +17739,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2":
-  version: 8.15.0
-  resolution: "ws@npm:8.15.0"
+  version: 8.15.1
+  resolution: "ws@npm:8.15.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -17749,7 +17749,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: b778a405b2589ffbf549323e2f404f1f72e372a049d332d2f0b1f33057e9fbb14a05aa474cb156e4584b418cd95edf4297c0ca5263d6519e8009064bf8e0b80d
+  checksum: 9964360dd5ab35c7376bd7c4295a3c8bd44ea0838c9413742548a6fb3ec371fc6c18552d5b8e76bdc21536db1909765612815bae072674b5ec69971605395a96
   languageName: node
   linkType: hard
 

From 3a59365e40733a502b4a20515e15f8e18b7abe5f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:52:43 +0100
Subject: [PATCH 074/436] Update dependency test-prof to v1.3.1 (#28342)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 07b1a4bbe3..e53e18292e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -759,7 +759,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    test-prof (1.3.0)
+    test-prof (1.3.1)
     thor (1.3.0)
     tilt (2.3.0)
     timeout (0.4.1)

From 8a3d8c6c14f4e9b57967104286fa6eaa305e6412 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 13 Dec 2023 05:14:19 -0500
Subject: [PATCH 075/436] Remove the `stub_stdout` wrapper around CLI specs
 (#28340)

---
 lib/mastodon/cli/search.rb              |  12 ++-
 spec/lib/mastodon/cli/accounts_spec.rb  | 138 ++++++++++++++++--------
 spec/lib/mastodon/cli/ip_blocks_spec.rb |   6 +-
 spec/lib/mastodon/cli/settings_spec.rb  |   3 +-
 spec/rails_helper.rb                    |   9 --
 5 files changed, 110 insertions(+), 58 deletions(-)

diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 25a595aadd..77c455f049 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -42,7 +42,13 @@ module Mastodon::CLI
 
       pool      = Concurrent::FixedThreadPool.new(options[:concurrency], max_queue: options[:concurrency] * 10)
       importers = indices.index_with { |index| "Importer::#{index.name}Importer".constantize.new(batch_size: options[:batch_size], executor: pool) }
-      progress  = ProgressBar.create(total: nil, format: '%t%c/%u |%b%i| %e (%r docs/s)', autofinish: false)
+      progress  = ProgressBar.create(
+        {
+          total: nil,
+          format: '%t%c/%u |%b%i| %e (%r docs/s)',
+          autofinish: false,
+        }.merge(progress_output_options)
+      )
 
       Chewy::Stash::Specification.reset! if options[:reset_chewy]
 
@@ -116,5 +122,9 @@ module Mastodon::CLI
       say('Cannot run with this batch_size setting, must be at least 1', :red)
       exit(1)
     end
+
+    def progress_output_options
+      Rails.env.test? ? { output: ProgressBar::Outputs::Null } : {}
+    end
   end
 end
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 563f6e877d..64df29ebb3 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -77,7 +77,8 @@ describe Mastodon::CLI::Accounts do
         it_behaves_like 'a new user with given email address and username'
 
         it 'creates a new user with confirmed status' do
-          subject
+          expect { subject }
+            .to output_results('New password')
 
           user = User.find_by(email: options[:email])
 
@@ -95,7 +96,8 @@ describe Mastodon::CLI::Accounts do
         it_behaves_like 'a new user with given email address and username'
 
         it 'creates a new user with approved status' do
-          subject
+          expect { subject }
+            .to output_results('New password')
 
           user = User.find_by(email: options[:email])
 
@@ -111,7 +113,8 @@ describe Mastodon::CLI::Accounts do
           it_behaves_like 'a new user with given email address and username'
 
           it 'creates a new user and assigns the specified role' do
-            subject
+            expect { subject }
+              .to output_results('New password')
 
             role = User.find_by(email: options[:email])&.role
 
@@ -148,7 +151,8 @@ describe Mastodon::CLI::Accounts do
             let(:options) { { email: 'tootctl_new@example.com', reattach: true, force: true } }
 
             it 'reattaches the account to the new user and deletes the previous user' do
-              subject
+              expect { subject }
+                .to output_results('New password')
 
               user = Account.find_local('tootctl_username')&.user
 
@@ -220,7 +224,8 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { role: default_role.name } }
 
           it "updates the user's role to the specified role" do
-            subject
+            expect { subject }
+              .to output_results('OK')
 
             role = user.reload.role
 
@@ -235,7 +240,8 @@ describe Mastodon::CLI::Accounts do
         let(:user) { Fabricate(:user, role: role) }
 
         it "removes the user's role successfully" do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           role = user.reload.role
 
@@ -248,13 +254,15 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { email: 'new_email@email.com' } }
 
         it "sets the user's unconfirmed email to the provided email address" do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(user.reload.unconfirmed_email).to eq(options[:email])
         end
 
         it "does not update the user's original email address" do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(user.reload.email).to eq('old_email@email.com')
         end
@@ -264,13 +272,15 @@ describe Mastodon::CLI::Accounts do
           let(:options) { { email: 'new_email@email.com', confirm: true } }
 
           it "updates the user's email address to the provided email" do
-            subject
+            expect { subject }
+              .to output_results('OK')
 
             expect(user.reload.email).to eq(options[:email])
           end
 
           it "sets the user's email address as confirmed" do
-            subject
+            expect { subject }
+              .to output_results('OK')
 
             expect(user.reload.confirmed?).to be(true)
           end
@@ -282,7 +292,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { confirm: true } }
 
         it "confirms the user's email address" do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(user.reload.confirmed?).to be(true)
         end
@@ -297,7 +308,9 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'approves the user' do
-          expect { subject }.to change { user.reload.approved }.from(false).to(true)
+          expect { subject }
+            .to output_results('OK')
+            .and change { user.reload.approved }.from(false).to(true)
         end
       end
 
@@ -306,7 +319,9 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { disable: true } }
 
         it 'disables the user' do
-          expect { subject }.to change { user.reload.disabled }.from(false).to(true)
+          expect { subject }
+            .to output_results('OK')
+            .and change { user.reload.disabled }.from(false).to(true)
         end
       end
 
@@ -315,7 +330,9 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { enable: true } }
 
         it 'enables the user' do
-          expect { subject }.to change { user.reload.disabled }.from(true).to(false)
+          expect { subject }
+            .to output_results('OK')
+            .and change { user.reload.disabled }.from(true).to(false)
         end
       end
 
@@ -335,7 +352,9 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { disable_2fa: true } }
 
         it 'disables the two-factor authentication for the user' do
-          expect { subject }.to change { user.reload.otp_required_for_login }.from(true).to(false)
+          expect { subject }
+            .to output_results('OK')
+            .and change { user.reload.otp_required_for_login }.from(true).to(false)
         end
       end
 
@@ -385,7 +404,8 @@ describe Mastodon::CLI::Accounts do
       let(:arguments) { [account.username] }
 
       it 'deletes the specified user successfully' do
-        subject
+        expect { subject }
+          .to output_results('Deleting')
 
         expect(delete_account_service).to have_received(:call).with(account, reserve_email: false).once
       end
@@ -415,7 +435,8 @@ describe Mastodon::CLI::Accounts do
       let(:options) { { email: account.user.email } }
 
       it 'deletes the specified user successfully' do
-        subject
+        expect { subject }
+          .to output_results('Deleting')
 
         expect(delete_account_service).to have_received(:call).with(account, reserve_email: false).once
       end
@@ -457,7 +478,8 @@ describe Mastodon::CLI::Accounts do
       let(:options) { { all: true } }
 
       it 'approves all pending registrations' do
-        subject
+        expect { subject }
+          .to output_results('OK')
 
         expect(User.pluck(:approved).all?(true)).to be(true)
       end
@@ -468,7 +490,8 @@ describe Mastodon::CLI::Accounts do
         let(:options) { { number: 2 } }
 
         it 'approves the earliest n pending registrations but not the remaining ones' do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(n_earliest_pending_registrations.all?(&:approved?)).to be(true)
           expect(pending_registrations.all?(&:approved?)).to be(false)
@@ -498,7 +521,7 @@ describe Mastodon::CLI::Accounts do
 
         it 'approves all users and does not raise any error' do
           expect { subject }
-            .to_not raise_error
+            .to output_results('OK')
           expect(User.pluck(:approved).all?(true)).to be(true)
         end
       end
@@ -510,7 +533,8 @@ describe Mastodon::CLI::Accounts do
         let(:arguments) { [user.account.username] }
 
         it 'approves the specified user successfully' do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(user.reload.approved?).to be(true)
         end
@@ -655,7 +679,8 @@ describe Mastodon::CLI::Accounts do
         allow(remote_account_example_com).to receive(:reset_avatar!)
         allow(account_example_net).to receive(:reset_avatar!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(remote_account_example_com).to have_received(:reset_avatar!).once
@@ -665,7 +690,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not refresh avatar for local accounts' do
         allow(local_account).to receive(:reset_avatar!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(local_account).to_not have_received(:reset_avatar!)
@@ -675,7 +701,8 @@ describe Mastodon::CLI::Accounts do
         allow(remote_account_example_com).to receive(:reset_header!)
         allow(account_example_net).to receive(:reset_header!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(remote_account_example_com).to have_received(:reset_header!).once
@@ -685,7 +712,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not refresh the header for local accounts' do
         allow(local_account).to receive(:reset_header!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(local_account).to_not have_received(:reset_header!)
@@ -706,7 +734,8 @@ describe Mastodon::CLI::Accounts do
           allow(remote_account_example_com).to receive(:reset_avatar!)
           allow(account_example_net).to receive(:reset_avatar!)
 
-          cli.refresh
+          expect { cli.refresh }
+            .to output_results('Refreshed 2 accounts')
 
           expect(cli).to have_received(:parallelize_with_progress).with(scope).once
           expect(local_account).to_not have_received(:reset_avatar!)
@@ -719,7 +748,8 @@ describe Mastodon::CLI::Accounts do
           allow(remote_account_example_com).to receive(:reset_header!)
           allow(account_example_net).to receive(:reset_header!)
 
-          cli.refresh
+          expect { cli.refresh }
+            .to output_results('Refreshed 2 accounts')
 
           expect(cli).to have_received(:parallelize_with_progress).with(scope).once
           expect(local_account).to_not have_received(:reset_header!)
@@ -752,7 +782,8 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_avatar!)
         allow(account_example_com_b).to receive(:reset_avatar!)
 
-        cli.refresh(*arguments)
+        expect { cli.refresh(*arguments) }
+          .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_avatar!).once
         expect(account_example_com_b).to have_received(:reset_avatar!).once
@@ -761,7 +792,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the avatar for unspecified accounts' do
         allow(account_example_net).to receive(:reset_avatar!)
 
-        cli.refresh(*arguments)
+        expect { cli.refresh(*arguments) }
+          .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_avatar!)
       end
@@ -770,7 +802,8 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_header!)
         allow(account_example_com_b).to receive(:reset_header!)
 
-        cli.refresh(*arguments)
+        expect { cli.refresh(*arguments) }
+          .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_header!).once
         expect(account_example_com_b).to have_received(:reset_header!).once
@@ -779,7 +812,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the header for unspecified accounts' do
         allow(account_example_net).to receive(:reset_header!)
 
-        cli.refresh(*arguments)
+        expect { cli.refresh(*arguments) }
+          .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_header!)
       end
@@ -812,7 +846,8 @@ describe Mastodon::CLI::Accounts do
           allow(account_example_com_a).to receive(:reset_avatar!)
           allow(account_example_com_b).to receive(:reset_avatar!)
 
-          cli.refresh(*arguments)
+          expect { cli.refresh(*arguments) }
+            .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_avatar!)
           expect(account_example_com_b).to_not have_received(:reset_avatar!)
@@ -822,7 +857,8 @@ describe Mastodon::CLI::Accounts do
           allow(account_example_com_a).to receive(:reset_header!)
           allow(account_example_com_b).to receive(:reset_header!)
 
-          cli.refresh(*arguments)
+          expect { cli.refresh(*arguments) }
+            .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_header!)
           expect(account_example_com_b).to_not have_received(:reset_header!)
@@ -848,7 +884,8 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_avatar!)
         allow(account_example_com_b).to receive(:reset_avatar!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(account_example_com_a).to have_received(:reset_avatar!).once
@@ -858,7 +895,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not refresh the avatar for accounts outside specified domain' do
         allow(account_example_net).to receive(:reset_avatar!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(account_example_net).to_not have_received(:reset_avatar!)
@@ -868,7 +906,8 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_header!)
         allow(account_example_com_b).to receive(:reset_header!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope)
         expect(account_example_com_a).to have_received(:reset_header!).once
@@ -878,7 +917,8 @@ describe Mastodon::CLI::Accounts do
       it 'does not refresh the header for accounts outside specified domain' do
         allow(account_example_net).to receive(:reset_header!)
 
-        cli.refresh
+        expect { cli.refresh }
+          .to output_results('Refreshed 2 accounts')
 
         expect(cli).to have_received(:parallelize_with_progress).with(scope).once
         expect(account_example_net).to_not have_received(:reset_header!)
@@ -913,7 +953,8 @@ describe Mastodon::CLI::Accounts do
         old_private_key = account.private_key
         old_public_key = account.public_key
 
-        subject
+        expect { subject }
+          .to output_results('OK')
         account.reload
 
         expect(account.private_key).to_not eq(old_private_key)
@@ -923,7 +964,8 @@ describe Mastodon::CLI::Accounts do
       it 'broadcasts the new keys for the specified account' do
         allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
 
-        subject
+        expect { subject }
+          .to output_results('OK')
 
         expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
       end
@@ -947,7 +989,8 @@ describe Mastodon::CLI::Accounts do
         old_private_keys = accounts.map(&:private_key)
         old_public_keys = accounts.map(&:public_key)
 
-        subject
+        expect { subject }
+          .to output_results('rotated')
         accounts.each(&:reload)
 
         expect(accounts.map(&:private_key)).to_not eq(old_private_keys)
@@ -957,7 +1000,8 @@ describe Mastodon::CLI::Accounts do
       it 'broadcasts the new keys for each account' do
         allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
 
-        subject
+        expect { subject }
+          .to output_results('rotated')
 
         accounts.each do |account|
           expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
@@ -1036,7 +1080,8 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'merges `from_account` into `to_account` and deletes `from_account`' do
-          subject
+          expect { subject }
+            .to output_results('OK')
 
           expect(to_account).to have_received(:merge_with!).with(from_account).once
           expect(from_account).to have_received(:destroy).once
@@ -1059,7 +1104,8 @@ describe Mastodon::CLI::Accounts do
       end
 
       it 'merges "from_account" into "to_account" and deletes from_account' do
-        subject
+        expect { subject }
+          .to output_results('OK')
 
         expect(to_account).to have_received(:merge_with!).with(from_account).once
         expect(from_account).to have_received(:destroy)
@@ -1339,7 +1385,8 @@ describe Mastodon::CLI::Accounts do
 
     shared_examples 'a successful migration' do
       it 'calls the MoveService for the last migration' do
-        subject
+        expect { subject }
+          .to output_results('OK')
 
         last_migration = source_account.migrations.last
 
@@ -1449,7 +1496,8 @@ describe Mastodon::CLI::Accounts do
         end
 
         it 'creates a migration for the specified account with the target account' do
-          subject
+          expect { subject }
+            .to output_results('migrated')
 
           last_migration = source_account.migrations.last
 
diff --git a/spec/lib/mastodon/cli/ip_blocks_spec.rb b/spec/lib/mastodon/cli/ip_blocks_spec.rb
index 1d6c47268e..82be10813e 100644
--- a/spec/lib/mastodon/cli/ip_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/ip_blocks_spec.rb
@@ -78,7 +78,8 @@ describe Mastodon::CLI::IpBlocks do
 
         it 'overwrites the existing IP block record' do
           expect { subject }
-            .to change { blocked_ip.reload.severity }
+            .to output_results('Added 11')
+            .and change { blocked_ip.reload.severity }
             .from('no_access')
             .to('sign_up_requires_approval')
         end
@@ -189,7 +190,8 @@ describe Mastodon::CLI::IpBlocks do
       let(:options) { { force: true } }
 
       it 'removes blocks for IP ranges that cover given IP(s) and keeps other ranges' do
-        subject
+        expect { subject }
+          .to output_results('Removed 2')
 
         expect(covered_ranges).to_not exist
         expect(other_ranges).to exist
diff --git a/spec/lib/mastodon/cli/settings_spec.rb b/spec/lib/mastodon/cli/settings_spec.rb
index 568ee00393..e1b353eb90 100644
--- a/spec/lib/mastodon/cli/settings_spec.rb
+++ b/spec/lib/mastodon/cli/settings_spec.rb
@@ -41,7 +41,8 @@ describe Mastodon::CLI::Settings do
 
         it 'changes registrations_mode and require_invite_text' do
           expect { subject }
-            .to change(Setting, :registrations_mode).from(nil).to('approved')
+            .to output_results('OK')
+            .and change(Setting, :registrations_mode).from(nil).to('approved')
             .and change(Setting, :require_invite_text).from(false).to(true)
         end
       end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4394b470e6..0e68fbe121 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -104,7 +104,6 @@ RSpec.configure do |config|
   end
 
   config.before :each, type: :cli do
-    stub_stdout
     stub_reset_connection_pools
   end
 
@@ -163,14 +162,6 @@ def attachment_fixture(name)
   Rails.root.join('spec', 'fixtures', 'files', name).open
 end
 
-def stub_stdout
-  # TODO: Is there a bettery way to:
-  # - Avoid CLI command output being printed out
-  # - Allow rspec to assert things against STDOUT
-  # - Avoid disabling stdout for other desirable output (deprecation warnings, for example)
-  allow($stdout).to receive(:write)
-end
-
 def stub_reset_connection_pools
   # TODO: Is there a better way to correctly run specs without stubbing this?
   # (Avoids reset_connection_pools! in test env)

From d791b470582f761f819a9862dd0ea81705e60e86 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 11:26:28 +0100
Subject: [PATCH 076/436] Update dependency chewy to v7.4.0 (#28349)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e53e18292e..ab24f5dca1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.5)
     bindata (2.4.15)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -197,7 +197,7 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.3.5)
+    chewy (7.4.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl

From 28e1a7a394db5586bdeb1d872f2bf4bfc18b5d0a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 05:29:10 -0500
Subject: [PATCH 077/436] Improve spec coverage for `models/announcement` class
 (#28350)

---
 spec/controllers/emojis_controller_spec.rb    |   2 +-
 .../announcement_mute_fabricator.rb           |   6 +
 .../announcement_reaction_fabricator.rb       |   7 +
 spec/fabricators/custom_emoji_fabricator.rb   |   2 +-
 spec/models/announcement_spec.rb              | 210 ++++++++++++++++++
 spec/models/custom_emoji_spec.rb              |   2 +-
 spec/requests/api/v1/custom_emojis_spec.rb    |   2 +-
 7 files changed, 227 insertions(+), 4 deletions(-)
 create mode 100644 spec/fabricators/announcement_mute_fabricator.rb
 create mode 100644 spec/fabricators/announcement_reaction_fabricator.rb
 create mode 100644 spec/models/announcement_spec.rb

diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
index 3fe19ee5ce..dd139de931 100644
--- a/spec/controllers/emojis_controller_spec.rb
+++ b/spec/controllers/emojis_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe EmojisController do
   render_views
 
-  let(:emoji) { Fabricate(:custom_emoji) }
+  let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
 
   describe 'GET #show' do
     let(:response) { get :show, params: { id: emoji.id, format: :json } }
diff --git a/spec/fabricators/announcement_mute_fabricator.rb b/spec/fabricators/announcement_mute_fabricator.rb
new file mode 100644
index 0000000000..0adc1d60bb
--- /dev/null
+++ b/spec/fabricators/announcement_mute_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:announcement_mute) do
+  announcement { Fabricate.build(:announcement) }
+  account { Fabricate.build(:account) }
+end
diff --git a/spec/fabricators/announcement_reaction_fabricator.rb b/spec/fabricators/announcement_reaction_fabricator.rb
new file mode 100644
index 0000000000..e845797291
--- /dev/null
+++ b/spec/fabricators/announcement_reaction_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:announcement_reaction) do
+  account { Fabricate.build(:account) }
+  announcement { Fabricate.build(:announcement) }
+  name { Fabricate(:custom_emoji).shortcode }
+end
diff --git a/spec/fabricators/custom_emoji_fabricator.rb b/spec/fabricators/custom_emoji_fabricator.rb
index fa570eec60..7ef875286f 100644
--- a/spec/fabricators/custom_emoji_fabricator.rb
+++ b/spec/fabricators/custom_emoji_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:custom_emoji) do
-  shortcode 'coolcat'
+  shortcode { sequence(:shortcode) { |i| "code_#{i}" } }
   domain    nil
   image     { Rails.root.join('spec', 'fixtures', 'files', 'emojo.png').open }
 end
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
new file mode 100644
index 0000000000..e37b81a52e
--- /dev/null
+++ b/spec/models/announcement_spec.rb
@@ -0,0 +1,210 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Announcement do
+  describe 'Scopes' do
+    context 'with published and unpublished records' do
+      let!(:published) { Fabricate(:announcement, published: true) }
+      let!(:unpublished) { Fabricate(:announcement, published: false, scheduled_at: 10.days.from_now) }
+
+      describe '#unpublished' do
+        it 'returns records with published false' do
+          results = described_class.unpublished
+
+          expect(results).to eq([unpublished])
+        end
+      end
+
+      describe '#published' do
+        it 'returns records with published true' do
+          results = described_class.published
+
+          expect(results).to eq([published])
+        end
+      end
+    end
+
+    describe '#without_muted' do
+      let!(:announcement) { Fabricate(:announcement) }
+      let(:account) { Fabricate(:account) }
+      let(:muted_announcement) { Fabricate(:announcement) }
+
+      before do
+        Fabricate(:announcement_mute, account: account, announcement: muted_announcement)
+      end
+
+      it 'returns the announcements not muted by the account' do
+        results = described_class.without_muted(account)
+        expect(results).to include(announcement)
+        expect(results).to_not include(muted_announcement)
+      end
+    end
+
+    context 'with timestamped announcements' do
+      let!(:adam_announcement) { Fabricate(:announcement, starts_at: 100.days.ago, scheduled_at: 10.days.ago, published_at: 10.days.ago, ends_at: 5.days.from_now) }
+      let!(:brenda_announcement) { Fabricate(:announcement, starts_at: 10.days.ago, scheduled_at: 100.days.ago, published_at: 10.days.ago, ends_at: 5.days.from_now) }
+      let!(:clara_announcement) { Fabricate(:announcement, starts_at: 10.days.ago, scheduled_at: 10.days.ago, published_at: 100.days.ago, ends_at: 5.days.from_now) }
+      let!(:darnelle_announcement) { Fabricate(:announcement, starts_at: 10.days.ago, scheduled_at: 10.days.ago, published_at: 10.days.ago, ends_at: 5.days.from_now, created_at: 100.days.ago) }
+
+      describe '#chronological' do
+        it 'orders the records correctly' do
+          results = described_class.chronological
+
+          expect(results).to eq(
+            [
+              adam_announcement,
+              brenda_announcement,
+              clara_announcement,
+              darnelle_announcement,
+            ]
+          )
+        end
+      end
+
+      describe '#reverse_chronological' do
+        it 'orders the records correctly' do
+          results = described_class.reverse_chronological
+
+          expect(results).to eq(
+            [
+              darnelle_announcement,
+              clara_announcement,
+              brenda_announcement,
+              adam_announcement,
+            ]
+          )
+        end
+      end
+    end
+  end
+
+  describe 'Validations' do
+    describe 'text' do
+      it 'validates presence of attribute' do
+        record = Fabricate.build(:announcement, text: nil)
+
+        expect(record).to_not be_valid
+        expect(record.errors[:text]).to be_present
+      end
+    end
+
+    describe 'ends_at' do
+      it 'validates presence when starts_at is present' do
+        record = Fabricate.build(:announcement, starts_at: 1.day.ago)
+
+        expect(record).to_not be_valid
+        expect(record.errors[:ends_at]).to be_present
+      end
+
+      it 'does not validate presence when starts_at is missing' do
+        record = Fabricate.build(:announcement, starts_at: nil)
+
+        expect(record).to be_valid
+        expect(record.errors[:ends_at]).to_not be_present
+      end
+    end
+  end
+
+  describe '#publish!' do
+    it 'publishes an unpublished record' do
+      announcement = Fabricate(:announcement, published: false, scheduled_at: 10.days.from_now)
+
+      announcement.publish!
+
+      expect(announcement).to be_published
+      expect(announcement.published_at).to_not be_nil
+      expect(announcement.scheduled_at).to be_nil
+    end
+  end
+
+  describe '#unpublish!' do
+    it 'unpublishes a published record' do
+      announcement = Fabricate(:announcement, published: true)
+
+      announcement.unpublish!
+
+      expect(announcement).to_not be_published
+      expect(announcement.scheduled_at).to be_nil
+    end
+  end
+
+  describe '#time_range?' do
+    it 'returns false when starts_at and ends_at are missing' do
+      record = Fabricate.build(:announcement, starts_at: nil, ends_at: nil)
+
+      expect(record.time_range?).to be(false)
+    end
+
+    it 'returns false when starts_at is present and ends_at is missing' do
+      record = Fabricate.build(:announcement, starts_at: 5.days.from_now, ends_at: nil)
+
+      expect(record.time_range?).to be(false)
+    end
+
+    it 'returns false when starts_at is missing and ends_at is present' do
+      record = Fabricate.build(:announcement, starts_at: nil, ends_at: 5.days.from_now)
+
+      expect(record.time_range?).to be(false)
+    end
+
+    it 'returns true when starts_at and ends_at are present' do
+      record = Fabricate.build(:announcement, starts_at: 5.days.from_now, ends_at: 10.days.from_now)
+
+      expect(record.time_range?).to be(true)
+    end
+  end
+
+  describe '#reactions' do
+    context 'with announcement_reactions present' do
+      let!(:account) { Fabricate(:account) }
+      let!(:announcement) { Fabricate(:announcement) }
+      let!(:announcement_reaction) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago) }
+      let!(:announcement_reaction_account) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account) }
+
+      before do
+        Fabricate(:announcement_reaction)
+      end
+
+      it 'returns the announcement reactions for the announcement' do
+        results = announcement.reactions
+
+        expect(results.first.name).to eq(announcement_reaction.name)
+        expect(results.last.name).to eq(announcement_reaction_account.name)
+      end
+
+      it 'returns the announcement reactions for the announcement limited to account' do
+        results = announcement.reactions(account)
+
+        expect(results.first.name).to eq(announcement_reaction.name)
+      end
+    end
+  end
+
+  describe '#statuses' do
+    let(:announcement) { Fabricate(:announcement, status_ids: status_ids) }
+
+    context 'with empty status_ids' do
+      let(:status_ids) { nil }
+
+      it 'returns empty array' do
+        results = announcement.statuses
+
+        expect(results).to eq([])
+      end
+    end
+
+    context 'with relevant status_ids' do
+      let(:status) { Fabricate(:status, visibility: :public) }
+      let(:direct_status) { Fabricate(:status, visibility: :direct) }
+      let(:status_ids) { [status.id, direct_status.id] }
+
+      it 'returns public and unlisted statuses' do
+        results = announcement.statuses
+
+        expect(results).to include(status)
+        expect(results).to_not include(direct_status)
+      end
+    end
+  end
+end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 8a6487c321..06affd634a 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe CustomEmoji do
   describe '.from_text' do
     subject { described_class.from_text(text, nil) }
 
-    let!(:emojo) { Fabricate(:custom_emoji) }
+    let!(:emojo) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
 
     context 'with plain text' do
       let(:text) { 'Hello :coolcat:' }
diff --git a/spec/requests/api/v1/custom_emojis_spec.rb b/spec/requests/api/v1/custom_emojis_spec.rb
index 5de0dda0be..2f0dc72944 100644
--- a/spec/requests/api/v1/custom_emojis_spec.rb
+++ b/spec/requests/api/v1/custom_emojis_spec.rb
@@ -9,7 +9,7 @@ describe 'Custom Emojis' do
 
   describe 'GET /api/v1/custom_emojis' do
     before do
-      Fabricate(:custom_emoji, domain: nil, disabled: false, visible_in_picker: true)
+      Fabricate(:custom_emoji, domain: nil, disabled: false, visible_in_picker: true, shortcode: 'coolcat')
     end
 
     context 'when logged out' do

From cd9ebf5f0f476c7d2fb60b59eb9f2674bebce158 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 05:35:54 -0500
Subject: [PATCH 078/436] Update stylelint to version 16.0.2 (#28354)

---
 package.json |   2 +-
 yarn.lock    | 354 +++++++++++----------------------------------------
 2 files changed, 76 insertions(+), 280 deletions(-)

diff --git a/package.json b/package.json
index 37139254c1..39d387d6f4 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
     "react-test-renderer": "^18.2.0",
-    "stylelint": "^15.10.1",
+    "stylelint": "^16.0.2",
     "stylelint-config-standard-scss": "^12.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3",
diff --git a/yarn.lock b/yarn.lock
index bd2545cf6a..e369f89d84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1539,7 +1539,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.3.1":
+"@csstools/css-parser-algorithms@npm:^2.3.2":
   version: 2.3.2
   resolution: "@csstools/css-parser-algorithms@npm:2.3.2"
   peerDependencies:
@@ -1548,14 +1548,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.0":
+"@csstools/css-tokenizer@npm:^2.2.1":
   version: 2.2.1
   resolution: "@csstools/css-tokenizer@npm:2.2.1"
   checksum: 0c6901d291e99c567893846a47068057c2a28b3edc4219b6da589a530f55f51ddd4675f906f707b393bfe7a508ab2604bf3f75708f064db857bb277636bd5a44
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.4":
+"@csstools/media-query-list-parser@npm:^2.1.5":
   version: 2.1.5
   resolution: "@csstools/media-query-list-parser@npm:2.1.5"
   peerDependencies:
@@ -2432,7 +2432,7 @@ __metadata:
     sass-loader: "npm:^10.2.0"
     stacktrace-js: "npm:^2.0.2"
     stringz: "npm:^2.1.0"
-    stylelint: "npm:^15.10.1"
+    stylelint: "npm:^16.0.2"
     stylelint-config-standard-scss: "npm:^12.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
@@ -3252,13 +3252,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimist@npm:^1.2.2":
-  version: 1.2.4
-  resolution: "@types/minimist@npm:1.2.4"
-  checksum: 01403652c09de17b8c6d7d9959cb7a244deccf31e9e7a1a7011fba73fa2724c14fe935718e0fdc48dcd30403fd76a916cb991d4c0ddf229748ccc6c4920c3371
-  languageName: node
-  linkType: hard
-
 "@types/node@npm:*":
   version: 20.8.10
   resolution: "@types/node@npm:20.8.10"
@@ -3275,13 +3268,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/normalize-package-data@npm:^2.4.0":
-  version: 2.4.3
-  resolution: "@types/normalize-package-data@npm:2.4.3"
-  checksum: 9ad94568b53f65d0c7fffed61c74e4a7b8625b1ebbc549f1de25287c2d20e6bca9d9cdc5826e508c9d95e02a48ac69d0282121c300667071661f37090224416b
-  languageName: node
-  linkType: hard
-
 "@types/npmlog@npm:^7.0.0":
   version: 7.0.0
   resolution: "@types/npmlog@npm:7.0.0"
@@ -4491,13 +4477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arrify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "arrify@npm:1.0.1"
-  checksum: c35c8d1a81bcd5474c0c57fe3f4bad1a4d46a5fa353cedcff7a54da315df60db71829e69104b859dff96c5d68af46bd2be259fe5e50dc6aa9df3b36bea0383ab
-  languageName: node
-  linkType: hard
-
 "arrow-key-navigation@npm:^1.2.0":
   version: 1.2.0
   resolution: "arrow-key-navigation@npm:1.2.0"
@@ -5371,18 +5350,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase-keys@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "camelcase-keys@npm:7.0.2"
-  dependencies:
-    camelcase: "npm:^6.3.0"
-    map-obj: "npm:^4.1.0"
-    quick-lru: "npm:^5.1.1"
-    type-fest: "npm:^1.2.1"
-  checksum: ae86a51168643e9e8a2f2c7bfa17850729979ec3dafc5253056a7d97931cbb0e3ef5b4185e59d54b7a56c54405dee2874b0c82033498d8626e512ff9034cb05c
-  languageName: node
-  linkType: hard
-
 "camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
   version: 5.3.1
   resolution: "camelcase@npm:5.3.1"
@@ -5390,7 +5357,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^6.2.0, camelcase@npm:^6.3.0":
+"camelcase@npm:^6.2.0":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
   checksum: 0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
@@ -5987,15 +5954,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "cosmiconfig@npm:8.2.0"
+"cosmiconfig@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "cosmiconfig@npm:9.0.0"
   dependencies:
-    import-fresh: "npm:^3.2.1"
+    env-paths: "npm:^2.2.1"
+    import-fresh: "npm:^3.3.0"
     js-yaml: "npm:^4.1.0"
-    parse-json: "npm:^5.0.0"
-    path-type: "npm:^4.0.0"
-  checksum: 4180aa6d1881b75ba591b2fc04b022741a3a4b67e9e243c0eb8d169b6e1efbd3cdf7e8ca19243c0f2e53a9d59ac3eccd5cad5f95f487fcbf4e740f9e86745747
+    parse-json: "npm:^5.2.0"
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee
   languageName: node
   linkType: hard
 
@@ -6435,30 +6407,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decamelize-keys@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "decamelize-keys@npm:1.1.1"
-  dependencies:
-    decamelize: "npm:^1.1.0"
-    map-obj: "npm:^1.0.0"
-  checksum: 4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d
-  languageName: node
-  linkType: hard
-
-"decamelize@npm:^1.1.0, decamelize@npm:^1.2.0":
+"decamelize@npm:^1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
   checksum: 85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
   languageName: node
   linkType: hard
 
-"decamelize@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "decamelize@npm:5.0.1"
-  checksum: 3da71022bc1e85487810fa0833138effb599fa331ca21e179650e93a765d0c4dabeb1ecdd6ad1474fa0bacd2457953c63ea335afb6e53b35f2b4bf779514e2a3
-  languageName: node
-  linkType: hard
-
 "decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3":
   version: 10.4.3
   resolution: "decimal.js@npm:10.4.3"
@@ -7093,7 +7048,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0":
+"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
   checksum: 285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
@@ -7941,6 +7896,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-glob@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.4"
+  checksum: 42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+  languageName: node
+  linkType: hard
+
 "fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
   version: 2.1.0
   resolution: "fast-json-stable-stringify@npm:2.1.0"
@@ -7998,12 +7966,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "file-entry-cache@npm:7.0.1"
+"file-entry-cache@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "file-entry-cache@npm:7.0.2"
   dependencies:
-    flat-cache: "npm:^3.1.1"
-  checksum: fc0e4f830777e07087f97da9a6734820fdffa2945583355433f40d9819dd97b89f16ac87c07118737a6bc3eb9cf4bd896e7b38b07f0768aefcf44da33e797363
+    flat-cache: "npm:^3.2.0"
+  checksum: 822664e35c3e295e6a8ca7ec490d8d8077017607f41f94b29922f1f49c6dd07025048e3ed528e2909a1439eba66d60f802c0774aa612cf6ee053ee4ecc16c8c5
   languageName: node
   linkType: hard
 
@@ -8137,7 +8105,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^3.0.4, flat-cache@npm:^3.1.1":
+"flat-cache@npm:^3.0.4, flat-cache@npm:^3.2.0":
   version: 3.2.0
   resolution: "flat-cache@npm:3.2.0"
   dependencies:
@@ -8669,13 +8637,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hard-rejection@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "hard-rejection@npm:2.1.0"
-  checksum: febc3343a1ad575aedcc112580835b44a89a89e01f400b4eda6e8110869edfdab0b00cd1bd4c3bfec9475a57e79e0b355aecd5be46454b6a62b9a359af60e564
-  languageName: node
-  linkType: hard
-
 "has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
@@ -8855,15 +8816,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^4.0.1":
-  version: 4.1.0
-  resolution: "hosted-git-info@npm:4.1.0"
-  dependencies:
-    lru-cache: "npm:^6.0.0"
-  checksum: 150fbcb001600336d17fdbae803264abed013548eea7946c2264c49ebe2ebd8c4441ba71dd23dd8e18c65de79d637f98b22d4760ba5fb2e0b15d62543d0fff07
-  languageName: node
-  linkType: hard
-
 "hpack.js@npm:^2.1.6":
   version: 2.1.6
   resolution: "hpack.js@npm:2.1.6"
@@ -9124,6 +9076,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ignore@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "ignore@npm:5.3.0"
+  checksum: dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
+  languageName: node
+  linkType: hard
+
 "immer@npm:^9.0.21":
   version: 9.0.21
   resolution: "immer@npm:9.0.21"
@@ -9145,7 +9104,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.2.1":
+"import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
   dependencies:
@@ -9155,13 +9114,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-lazy@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "import-lazy@npm:4.0.0"
-  checksum: a3520313e2c31f25c0b06aa66d167f329832b68a4f957d7c9daf6e0fa41822b6e84948191648b9b9d8ca82f94740cdf15eecf2401a5b42cd1c33fd84f2225cca
-  languageName: node
-  linkType: hard
-
 "import-local@npm:^2.0.0":
   version: 2.0.0
   resolution: "import-local@npm:2.0.0"
@@ -9214,13 +9166,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"indent-string@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "indent-string@npm:5.0.0"
-  checksum: 8ee77b57d92e71745e133f6f444d6fa3ed503ad0e1bcd7e80c8da08b42375c07117128d670589725ed07b1978065803fa86318c309ba45415b7fe13e7f170220
-  languageName: node
-  linkType: hard
-
 "infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
@@ -9482,7 +9427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.9.0":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
@@ -9764,13 +9709,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-plain-obj@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-plain-obj@npm:1.1.0"
-  checksum: daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c
-  languageName: node
-  linkType: hard
-
 "is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
   version: 2.0.4
   resolution: "is-plain-object@npm:2.0.4"
@@ -11264,20 +11202,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-obj@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "map-obj@npm:1.0.1"
-  checksum: ccca88395e7d38671ed9f5652ecf471ecd546924be2fb900836b9da35e068a96687d96a5f93dcdfa94d9a27d649d2f10a84595590f89a347fb4dda47629dcc52
-  languageName: node
-  linkType: hard
-
-"map-obj@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "map-obj@npm:4.3.0"
-  checksum: 1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b
-  languageName: node
-  linkType: hard
-
 "map-visit@npm:^1.0.0":
   version: 1.0.0
   resolution: "map-visit@npm:1.0.0"
@@ -11381,23 +11305,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^10.1.5":
-  version: 10.1.5
-  resolution: "meow@npm:10.1.5"
-  dependencies:
-    "@types/minimist": "npm:^1.2.2"
-    camelcase-keys: "npm:^7.0.0"
-    decamelize: "npm:^5.0.0"
-    decamelize-keys: "npm:^1.1.0"
-    hard-rejection: "npm:^2.1.0"
-    minimist-options: "npm:4.1.0"
-    normalize-package-data: "npm:^3.0.2"
-    read-pkg-up: "npm:^8.0.0"
-    redent: "npm:^4.0.0"
-    trim-newlines: "npm:^4.0.2"
-    type-fest: "npm:^1.2.2"
-    yargs-parser: "npm:^20.2.9"
-  checksum: a513849022edd5ddcc41d28c679d31978abe414d9db5bc457e95e537a4327b2910fd2f699cdd883293f9a5da8951a50939bf60fbd62f7fe12b9ddf96a84b1b27
+"meow@npm:^12.1.1":
+  version: 12.1.1
+  resolution: "meow@npm:12.1.1"
+  checksum: a125ca99a32e2306e2f4cbe651a0d27f6eb67918d43a075f6e80b35e9bf372ebf0fc3a9fbc201cbbc9516444b6265fb3c9f80c5b7ebd32f548aa93eb7c28e088
   languageName: node
   linkType: hard
 
@@ -11520,7 +11431,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1":
+"min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
   checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
@@ -11581,17 +11492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist-options@npm:4.1.0":
-  version: 4.1.0
-  resolution: "minimist-options@npm:4.1.0"
-  dependencies:
-    arrify: "npm:^1.0.1"
-    is-plain-obj: "npm:^1.1.0"
-    kind-of: "npm:^6.0.3"
-  checksum: 7871f9cdd15d1e7374e5b013e2ceda3d327a06a8c7b38ae16d9ef941e07d985e952c589e57213f7aa90a8744c60aed9524c0d85e501f5478382d9181f2763f54
-  languageName: node
-  linkType: hard
-
 "minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
@@ -11949,18 +11849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^3.0.2":
-  version: 3.0.3
-  resolution: "normalize-package-data@npm:3.0.3"
-  dependencies:
-    hosted-git-info: "npm:^4.0.1"
-    is-core-module: "npm:^2.5.0"
-    semver: "npm:^7.3.4"
-    validate-npm-package-license: "npm:^3.0.1"
-  checksum: e5d0f739ba2c465d41f77c9d950e291ea4af78f8816ddb91c5da62257c40b76d8c83278b0d08ffbcd0f187636ebddad20e181e924873916d03e6e5ea2ef026be
-  languageName: node
-  linkType: hard
-
 "normalize-path@npm:^2.1.1":
   version: 2.1.1
   resolution: "normalize-path@npm:2.1.1"
@@ -13160,12 +13048,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-safe-parser@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-safe-parser@npm:6.0.0"
+"postcss-safe-parser@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-safe-parser@npm:7.0.0"
   peerDependencies:
-    postcss: ^8.3.3
-  checksum: 5b0997b63de6ab4afb4b718a52dd7902e465c21d1f2e516762bcb59047787459b4dc5713132f6a19c9c8c483043b20b8a380a55fb61152ee66cbffcddf3b57f0
+    postcss: ^8.4.31
+  checksum: 4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
   languageName: node
   linkType: hard
 
@@ -13218,7 +13106,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.28":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.32":
   version: 8.4.32
   resolution: "postcss@npm:8.4.32"
   dependencies:
@@ -13541,13 +13429,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"quick-lru@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "quick-lru@npm:5.1.1"
-  checksum: a24cba5da8cec30d70d2484be37622580f64765fb6390a928b17f60cd69e8dbd32a954b3ff9176fa1b86d86ff2ba05252fae55dc4d40d0291c60412b0ad096da
-  languageName: node
-  linkType: hard
-
 "raf@npm:^3.1.0":
   version: 3.4.1
   resolution: "raf@npm:3.4.1"
@@ -14027,29 +13908,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "read-pkg-up@npm:8.0.0"
-  dependencies:
-    find-up: "npm:^5.0.0"
-    read-pkg: "npm:^6.0.0"
-    type-fest: "npm:^1.0.1"
-  checksum: cf3905ccbe5cd602f23192cc7ca65ed17561bab117eadb9aed817441d5bfc6b9a11215c2a3e9505f501d046818f3c4180dbea61fa83c42083e0b4e407d5cc745
-  languageName: node
-  linkType: hard
-
-"read-pkg@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "read-pkg@npm:6.0.0"
-  dependencies:
-    "@types/normalize-package-data": "npm:^2.4.0"
-    normalize-package-data: "npm:^3.0.2"
-    parse-json: "npm:^5.2.0"
-    type-fest: "npm:^1.0.1"
-  checksum: b51ee5eed75324f4fac34c9a40b5e4b403de4c532242be01959c9bbdb1ff9db1c6c2aefaba569622fec49d1ead866e97ba856ab145f6e11039b11f7bec1318ba
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
@@ -14118,16 +13976,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "redent@npm:4.0.0"
-  dependencies:
-    indent-string: "npm:^5.0.0"
-    strip-indent: "npm:^4.0.0"
-  checksum: a9b640c8f4b2b5b26a1a908706475ff404dd50a97d6f094bc3c59717be922622927cc7d601d4ae2857d897ad243fd979bd76d751a0481cee8be7024e5fb4c662
-  languageName: node
-  linkType: hard
-
 "redis-errors@npm:^1.0.0, redis-errors@npm:^1.2.0":
   version: 1.2.0
   resolution: "redis-errors@npm:1.2.0"
@@ -15270,16 +15118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spdx-correct@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "spdx-correct@npm:3.2.0"
-  dependencies:
-    spdx-expression-parse: "npm:^3.0.0"
-    spdx-license-ids: "npm:^3.0.0"
-  checksum: 49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386
-  languageName: node
-  linkType: hard
-
 "spdx-exceptions@npm:^2.1.0":
   version: 2.3.0
   resolution: "spdx-exceptions@npm:2.3.0"
@@ -15287,7 +15125,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spdx-expression-parse@npm:^3.0.0, spdx-expression-parse@npm:^3.0.1":
+"spdx-expression-parse@npm:^3.0.1":
   version: 3.0.1
   resolution: "spdx-expression-parse@npm:3.0.1"
   dependencies:
@@ -15723,15 +15561,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-indent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-indent@npm:4.0.0"
-  dependencies:
-    min-indent: "npm:^1.0.1"
-  checksum: 6b1fb4e22056867f5c9e7a6f3f45922d9a2436cac758607d58aeaac0d3b16ec40b1c43317de7900f1b8dd7a4107352fa47fb960f2c23566538c51e8585c8870e
-  languageName: node
-  linkType: hard
-
 "strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
@@ -15739,13 +15568,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-search@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "style-search@npm:0.1.0"
-  checksum: 9e5cb735e5dc4fc2f8c61bebdf211d5352f1cf01511a64da12bb726a01e8c6948c50d357eb8fd7893d44b4e3189655bdddcf8ab338f9d508fe89a8942c650b14
-  languageName: node
-  linkType: hard
-
 "stylehacks@npm:^6.0.0":
   version: 6.0.0
   resolution: "stylehacks@npm:6.0.0"
@@ -15826,53 +15648,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint@npm:^15.10.1":
-  version: 15.11.0
-  resolution: "stylelint@npm:15.11.0"
+"stylelint@npm:^16.0.2":
+  version: 16.0.2
+  resolution: "stylelint@npm:16.0.2"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.3.1"
-    "@csstools/css-tokenizer": "npm:^2.2.0"
-    "@csstools/media-query-list-parser": "npm:^2.1.4"
+    "@csstools/css-parser-algorithms": "npm:^2.3.2"
+    "@csstools/css-tokenizer": "npm:^2.2.1"
+    "@csstools/media-query-list-parser": "npm:^2.1.5"
     "@csstools/selector-specificity": "npm:^3.0.0"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
-    cosmiconfig: "npm:^8.2.0"
+    cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.1"
     css-tree: "npm:^2.3.1"
     debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.1"
+    fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^7.0.0"
+    file-entry-cache: "npm:^7.0.2"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^5.2.4"
-    import-lazy: "npm:^4.0.0"
+    ignore: "npm:^5.3.0"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
     known-css-properties: "npm:^0.29.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^10.1.5"
+    meow: "npm:^12.1.1"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.0"
-    postcss: "npm:^8.4.28"
+    postcss: "npm:^8.4.32"
     postcss-resolve-nested-selector: "npm:^0.1.1"
-    postcss-safe-parser: "npm:^6.0.0"
+    postcss-safe-parser: "npm:^7.0.0"
     postcss-selector-parser: "npm:^6.0.13"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    style-search: "npm:^0.1.0"
+    strip-ansi: "npm:^7.1.0"
     supports-hyperlinks: "npm:^3.0.0"
     svg-tags: "npm:^1.0.0"
     table: "npm:^6.8.1"
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 2d88b7293e308b7e418c14ba4130777b1a28b214304957f03b41a6dc8e00005266caf47479f718a6ec5e572cb52e903ca34aabf3febbe3a3ae32fff6b018d9fd
+  checksum: 5ec755e209beb1877ff40d50f18c1ebb05bf251925da1f98f28fb3911e4031195eb86adaf641ac5cdb01ba973f4c999bc0c6b0270d08c1d5c070adbdd9e734cf
   languageName: node
   linkType: hard
 
@@ -16326,13 +16146,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"trim-newlines@npm:^4.0.2":
-  version: 4.1.1
-  resolution: "trim-newlines@npm:4.1.1"
-  checksum: 70e60e652305efd0dda1f2bce1a5edc9bb5834a2e00d05dfde178715ec48faa8264a2bc1a7efc593b7936d03f6d42c398616329eef44b7bd5070180a02056981
-  languageName: node
-  linkType: hard
-
 "ts-api-utils@npm:^1.0.1":
   version: 1.0.3
   resolution: "ts-api-utils@npm:1.0.3"
@@ -16424,13 +16237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
-  version: 1.4.0
-  resolution: "type-fest@npm:1.4.0"
-  checksum: a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141
-  languageName: node
-  linkType: hard
-
 "type-fest@npm:^3.0.0":
   version: 3.13.1
   resolution: "type-fest@npm:3.13.1"
@@ -16897,16 +16703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"validate-npm-package-license@npm:^3.0.1":
-  version: 3.0.4
-  resolution: "validate-npm-package-license@npm:3.0.4"
-  dependencies:
-    spdx-correct: "npm:^3.0.0"
-    spdx-expression-parse: "npm:^3.0.0"
-  checksum: 7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f
-  languageName: node
-  linkType: hard
-
 "value-equal@npm:^1.0.1":
   version: 1.0.1
   resolution: "value-equal@npm:1.0.1"
@@ -17833,7 +17629,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^20.2.1, yargs-parser@npm:^20.2.9":
+"yargs-parser@npm:^20.2.1":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
   checksum: 0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72

From adbfd40a1b38b89587d74d4ce2d27b21b8c90ed1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 05:38:06 -0500
Subject: [PATCH 079/436] Convert `api/v1/directories` controller spec to
 request spec (#28356)

---
 .../api/v1/directories_spec.rb}               | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)
 rename spec/{controllers/api/v1/directories_controller_spec.rb => requests/api/v1/directories_spec.rb} (82%)

diff --git a/spec/controllers/api/v1/directories_controller_spec.rb b/spec/requests/api/v1/directories_spec.rb
similarity index 82%
rename from spec/controllers/api/v1/directories_controller_spec.rb
rename to spec/requests/api/v1/directories_spec.rb
index 308a8874c8..0a1864d136 100644
--- a/spec/controllers/api/v1/directories_controller_spec.rb
+++ b/spec/requests/api/v1/directories_spec.rb
@@ -2,17 +2,13 @@
 
 require 'rails_helper'
 
-describe Api::V1::DirectoriesController do
-  render_views
-
+describe 'Directories API' do
   let(:user)    { Fabricate(:user, confirmed_at: nil) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:follows') }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:follows' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
-
-  describe 'GET #show' do
+  describe 'GET /api/v1/directories' do
     context 'with no params' do
       before do
         local_unconfirmed_account = Fabricate(
@@ -58,27 +54,32 @@ describe Api::V1::DirectoriesController do
         )
         domain_blocked_account.create_account_stat!
         Fabricate(:account_domain_block, account: user.account, domain: 'test.example')
+
+        local_discoverable_account.create_account_stat!
+        eligible_remote_account.create_account_stat!
       end
 
-      it 'returns the local discoverable account and the remote discoverable account' do
-        local_discoverable_account = Fabricate(
+      let(:local_discoverable_account) do
+        Fabricate(
           :account,
           domain: nil,
           user: Fabricate(:user, confirmed_at: 10.days.ago, approved: true),
           discoverable: true,
           username: 'local_discoverable'
         )
-        local_discoverable_account.create_account_stat!
+      end
 
-        eligible_remote_account = Fabricate(
+      let(:eligible_remote_account) do
+        Fabricate(
           :account,
           domain: 'host.example',
           discoverable: true,
           username: 'eligible_remote'
         )
-        eligible_remote_account.create_account_stat!
+      end
 
-        get :show
+      it 'returns the local discoverable account and the remote discoverable account' do
+        get '/api/v1/directory', headers: headers
 
         expect(response).to have_http_status(200)
         expect(body_as_json.size).to eq(2)
@@ -87,14 +88,17 @@ describe Api::V1::DirectoriesController do
     end
 
     context 'when asking for local accounts only' do
-      it 'returns only the local accounts' do
-        user = Fabricate(:user, confirmed_at: 10.days.ago, approved: true)
-        local_account = Fabricate(:account, domain: nil, user: user)
-        remote_account = Fabricate(:account, domain: 'host.example')
+      let(:user) { Fabricate(:user, confirmed_at: 10.days.ago, approved: true) }
+      let(:local_account) { Fabricate(:account, domain: nil, user: user) }
+      let(:remote_account) { Fabricate(:account, domain: 'host.example') }
+
+      before do
         local_account.create_account_stat!
         remote_account.create_account_stat!
+      end
 
-        get :show, params: { local: '1' }
+      it 'returns only the local accounts' do
+        get '/api/v1/directory', headers: headers, params: { local: '1' }
 
         expect(response).to have_http_status(200)
         expect(body_as_json.size).to eq(1)
@@ -108,7 +112,7 @@ describe Api::V1::DirectoriesController do
         old_stat = Fabricate(:account_stat, last_status_at: 1.day.ago)
         new_stat = Fabricate(:account_stat, last_status_at: 1.minute.ago)
 
-        get :show, params: { order: 'active' }
+        get '/api/v1/directory', headers: headers, params: { order: 'active' }
 
         expect(response).to have_http_status(200)
         expect(body_as_json.size).to eq(2)
@@ -123,7 +127,7 @@ describe Api::V1::DirectoriesController do
         travel_to 10.seconds.from_now
         account_new = Fabricate(:account_stat).account
 
-        get :show, params: { order: 'new' }
+        get '/api/v1/directory', headers: headers, params: { order: 'new' }
 
         expect(response).to have_http_status(200)
         expect(body_as_json.size).to eq(2)

From ef9797a395de7cc9e44f5f29ca3a2f70aff04b48 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 05:46:43 -0500
Subject: [PATCH 080/436] Un-nest contexts in `settings/2fa/webauthn` spec
 (#28359)

---
 .../webauthn_credentials_controller_spec.rb   | 97 ++++++++-----------
 1 file changed, 42 insertions(+), 55 deletions(-)

diff --git a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
index 719ed2f886..41a3ba5eb5 100644
--- a/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb
@@ -194,60 +194,49 @@ describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
             add_webauthn_credential(user)
           end
 
-          context 'when creation succeeds' do
-            it 'adds a new credential to user credentials and does not change webauthn_id', :aggregate_failures do
-              controller.session[:webauthn_challenge] = challenge
-
-              expect do
-                post :create, params: { credential: new_webauthn_credential, nickname: nickname }
-              end.to change { user.webauthn_credentials.count }.by(1)
-                                                               .and not_change(user, :webauthn_id)
-
-              expect(response).to have_http_status(200)
-            end
-          end
-
-          context 'when the nickname is already used' do
-            it 'fails' do
-              controller.session[:webauthn_challenge] = challenge
-
-              post :create, params: { credential: new_webauthn_credential, nickname: 'USB Key' }
-
-              expect(response).to have_http_status(422)
-              expect(flash[:error]).to be_present
-            end
-          end
-
-          context 'when the credential already exists' do
-            before do
-              user2 = Fabricate(:user)
-              public_key_credential = WebAuthn::Credential.from_create(new_webauthn_credential)
-              Fabricate(:webauthn_credential,
-                        user_id: user2.id,
-                        external_id: public_key_credential.id,
-                        public_key: public_key_credential.public_key)
-            end
-
-            it 'fails' do
-              controller.session[:webauthn_challenge] = challenge
+          it 'adds a new credential to user credentials and does not change webauthn_id when creation succeeds', :aggregate_failures do
+            controller.session[:webauthn_challenge] = challenge
 
+            expect do
               post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+            end.to change { user.webauthn_credentials.count }.by(1)
+                                                             .and not_change(user, :webauthn_id)
 
-              expect(response).to have_http_status(422)
-              expect(flash[:error]).to be_present
-            end
+            expect(response).to have_http_status(200)
+          end
+
+          it 'fails when the nickname is already used' do
+            controller.session[:webauthn_challenge] = challenge
+
+            post :create, params: { credential: new_webauthn_credential, nickname: 'USB Key' }
+
+            expect(response).to have_http_status(422)
+            expect(flash[:error]).to be_present
+          end
+
+          it 'fails when the credential already exists' do
+            public_key_credential = WebAuthn::Credential.from_create(new_webauthn_credential)
+            Fabricate(:webauthn_credential,
+                      user_id: Fabricate(:user).id,
+                      external_id: public_key_credential.id,
+                      public_key: public_key_credential.public_key)
+
+            controller.session[:webauthn_challenge] = challenge
+
+            post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+
+            expect(response).to have_http_status(422)
+            expect(flash[:error]).to be_present
           end
         end
 
-        context 'when user have not enabled webauthn' do
-          context 'when creation succeeds' do
-            it 'creates a webauthn credential' do
-              controller.session[:webauthn_challenge] = challenge
+        context 'when user have not enabled webauthn and creation succeeds' do
+          it 'creates a webauthn credential' do
+            controller.session[:webauthn_challenge] = challenge
 
-              expect do
-                post :create, params: { credential: new_webauthn_credential, nickname: nickname }
-              end.to change { user.webauthn_credentials.count }.by(1)
-            end
+            expect do
+              post :create, params: { credential: new_webauthn_credential, nickname: nickname }
+            end.to change { user.webauthn_credentials.count }.by(1)
           end
         end
       end
@@ -292,15 +281,13 @@ describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
             add_webauthn_credential(user)
           end
 
-          context 'when deletion succeeds' do
-            it 'redirects to 2FA methods list and shows flash success and deletes the credential', :aggregate_failures do
-              expect do
-                delete :destroy, params: { id: user.webauthn_credentials.take.id }
-              end.to change { user.webauthn_credentials.count }.by(-1)
+          it 'redirects to 2FA methods list and shows flash success and deletes the credential when deletion succeeds', :aggregate_failures do
+            expect do
+              delete :destroy, params: { id: user.webauthn_credentials.take.id }
+            end.to change { user.webauthn_credentials.count }.by(-1)
 
-              expect(response).to redirect_to settings_two_factor_authentication_methods_path
-              expect(flash[:success]).to be_present
-            end
+            expect(response).to redirect_to settings_two_factor_authentication_methods_path
+            expect(flash[:success]).to be_present
           end
         end
 

From 1c3b5f4a7812a1c7ffaded56684882b02ca26b60 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 09:02:33 -0500
Subject: [PATCH 081/436] Fix reference to non-existent var in CLI maintenance
 command (#28363)

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

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 43fd7fab33..2e5243468b 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -254,7 +254,7 @@ module Mastodon::CLI
         users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
-        say "e-mail will be disabled for the following accounts: #{user.map { |user| user.account.acct }.join(', ')}", :yellow
+        say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
         say 'Please reach out to them and set another address with `tootctl account modify` or delete them.', :yellow
 
         users.each_with_index do |user, index|

From e17faedffba569a5925b1da35214c1f56806f6b2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 09:04:55 -0500
Subject: [PATCH 082/436] Move default `meta` options from
 `InitialStateSerializer` to private method (AbcSize reduction) (#28355)

---
 .rubocop_todo.yml                           |  2 +-
 app/serializers/initial_state_serializer.rb | 50 +++++++++++----------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 03543c8e0d..03cc2e75d3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -26,7 +26,7 @@ Lint/NonLocalExitFromIterator:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 125
+  Max: 100
 
 # Configuration parameters: CountBlocks, Max.
 Metrics/BlockNesting:
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index f606836ba4..9f7921461d 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -13,29 +13,7 @@ class InitialStateSerializer < ActiveModel::Serializer
   has_one :role, serializer: REST::RoleSerializer
 
   def meta
-    store = {
-      streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
-      access_token: object.token,
-      locale: I18n.locale,
-      domain: Addressable::IDNA.to_unicode(instance_presenter.domain),
-      title: instance_presenter.title,
-      admin: object.admin&.id&.to_s,
-      search_enabled: Chewy.enabled?,
-      repository: Mastodon::Version.repository,
-      source_url: instance_presenter.source_url,
-      version: instance_presenter.version,
-      limited_federation_mode: Rails.configuration.x.limited_federation_mode,
-      mascot: instance_presenter.mascot&.file&.url,
-      profile_directory: Setting.profile_directory,
-      trends_enabled: Setting.trends,
-      registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
-      timeline_preview: Setting.timeline_preview,
-      activity_api_enabled: Setting.activity_api_enabled,
-      single_user_mode: Rails.configuration.x.single_user_mode,
-      trends_as_landing_page: Setting.trends_as_landing_page,
-      status_page_url: Setting.status_page_url,
-      sso_redirect: sso_redirect,
-    }
+    store = default_meta_store
 
     if object.current_account
       store[:me]                = object.current_account.id.to_s
@@ -108,6 +86,32 @@ class InitialStateSerializer < ActiveModel::Serializer
 
   private
 
+  def default_meta_store
+    {
+      access_token: object.token,
+      activity_api_enabled: Setting.activity_api_enabled,
+      admin: object.admin&.id&.to_s,
+      domain: Addressable::IDNA.to_unicode(instance_presenter.domain),
+      limited_federation_mode: Rails.configuration.x.limited_federation_mode,
+      locale: I18n.locale,
+      mascot: instance_presenter.mascot&.file&.url,
+      profile_directory: Setting.profile_directory,
+      registrations_open: Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode,
+      repository: Mastodon::Version.repository,
+      search_enabled: Chewy.enabled?,
+      single_user_mode: Rails.configuration.x.single_user_mode,
+      source_url: instance_presenter.source_url,
+      sso_redirect: sso_redirect,
+      status_page_url: Setting.status_page_url,
+      streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
+      timeline_preview: Setting.timeline_preview,
+      title: instance_presenter.title,
+      trends_as_landing_page: Setting.trends_as_landing_page,
+      trends_enabled: Setting.trends,
+      version: instance_presenter.version,
+    }
+  end
+
   def object_account_user
     object.current_account.user
   end

From db897eaa5ad517154c531df2b5f0f97fdc53ad16 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 14 Dec 2023 09:07:54 -0500
Subject: [PATCH 083/436] Unwind `map` on single-item array in
 `spec/services/delete_account_service` spec (#28358)

---
 spec/services/delete_account_service_spec.rb | 58 +++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index 8a19d3cf74..a2c57f1c1e 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -50,11 +50,11 @@ RSpec.describe DeleteAccountService, type: :service do
     end
 
     def delete_associated_target_records
-      change do
-        [
-          AccountPin.where(target_account: account),
-        ].map(&:count)
-      end.from([1]).to([0])
+      change(account_pins_for_account, :count).from(1).to(0)
+    end
+
+    def account_pins_for_account
+      AccountPin.where(target_account: account)
     end
 
     def delete_associated_target_notifications
@@ -100,28 +100,34 @@ RSpec.describe DeleteAccountService, type: :service do
       it 'sends expected activities to followed and follower inboxes' do
         subject
 
-        expect(a_request(:post, account.inbox_url).with(
-                 body:
-                   hash_including({
-                     'type' => 'Reject',
-                     'object' => hash_including({
-                       'type' => 'Follow',
-                       'actor' => account.uri,
-                       'object' => ActivityPub::TagManager.instance.uri_for(local_follower),
-                     }),
-                   })
-               )).to have_been_made.once
+        expect(post_to_inbox_with_reject).to have_been_made.once
+        expect(post_to_inbox_with_undo).to have_been_made.once
+      end
 
-        expect(a_request(:post, account.inbox_url).with(
-                 body: hash_including({
-                   'type' => 'Undo',
-                   'object' => hash_including({
-                     'type' => 'Follow',
-                     'actor' => ActivityPub::TagManager.instance.uri_for(local_follower),
-                     'object' => account.uri,
-                   }),
-                 })
-               )).to have_been_made.once
+      def post_to_inbox_with_undo
+        a_request(:post, account.inbox_url).with(
+          body: hash_including({
+            'type' => 'Undo',
+            'object' => hash_including({
+              'type' => 'Follow',
+              'actor' => ActivityPub::TagManager.instance.uri_for(local_follower),
+              'object' => account.uri,
+            }),
+          })
+        )
+      end
+
+      def post_to_inbox_with_reject
+        a_request(:post, account.inbox_url).with(
+          body: hash_including({
+            'type' => 'Reject',
+            'object' => hash_including({
+              'type' => 'Follow',
+              'actor' => account.uri,
+              'object' => ActivityPub::TagManager.instance.uri_for(local_follower),
+            }),
+          })
+        )
       end
     end
   end

From 1ee8d1e50e2e113af63348c6d16ee5cface22e33 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Dec 2023 09:33:56 -0500
Subject: [PATCH 084/436] Assign a proc to `Rack::Request.ip_filter` instead of
 patching method (#28380)

---
 config/initializers/trusted_proxies.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index aa2f4510c2..33bfddbdf1 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
-module Rack
-  class Request
-    def trusted_proxy?(ip)
-      if Rails.application.config.action_dispatch.trusted_proxies.nil?
-        super
-      else
-        Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
-      end
-    end
-  end
+unless Rails.application.config.action_dispatch.trusted_proxies.nil?
+  # Rack is configured with a default collection of trusted proxies
+  # If Rails has been configured to use a specific list, configure
+  # Rack to use this Proc, which enforces the Rails-configured list.
+  Rack::Request.ip_filter = ->(ip) { Rails.application.config.action_dispatch.trusted_proxies.include?(ip) }
 end

From e5717c9bc6cb5a1bea4c93048024f6247566f8ce Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Dec 2023 09:34:24 -0500
Subject: [PATCH 085/436] Fix `Style/Lambda` cop (#28378)

---
 .rubocop_todo.yml                  |  8 --------
 config/initializers/simple_form.rb |  2 +-
 config/routes.rb                   | 10 +++++-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 03cc2e75d3..c323aa877b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -386,14 +386,6 @@ Style/InverseMethods:
     - 'app/services/update_account_service.rb'
     - 'spec/controllers/activitypub/replies_controller_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
-  Exclude:
-    - 'config/initializers/simple_form.rb'
-    - 'config/routes.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 6d9d7b8aeb..a8bc4b1921 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -164,7 +164,7 @@ SimpleForm.setup do |config|
   # config.item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
-  config.label_text = lambda { |label, required, _explicit_label| "#{label} #{required}" }
+  config.label_text = ->(label, required, _explicit_label) { "#{label} #{required}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
diff --git a/config/routes.rb b/config/routes.rb
index 150b26cf1e..85c3b18556 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,7 +51,7 @@ Rails.application.routes.draw do
 
   get 'health', to: 'health#show'
 
-  authenticate :user, lambda { |u| u.role&.can?(:view_devops) } do
+  authenticate :user, ->(user) { user.role&.can?(:view_devops) } do
     mount Sidekiq::Web, at: 'sidekiq', as: :sidekiq
     mount PgHero::Engine, at: 'pghero', as: :pghero
   end
@@ -105,10 +105,10 @@ Rails.application.routes.draw do
   }
 
   # rubocop:disable Style/FormatStringToken - those do not go through the usual formatting functions and are not safe to correct
-  get '/users/:username', to: redirect_with_vary('/@%{username}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
-  get '/users/:username/following', to: redirect_with_vary('/@%{username}/following'), constraints: lambda { |req| req.format.nil? || req.format.html? }
-  get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers'), constraints: lambda { |req| req.format.nil? || req.format.html? }
-  get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
+  get '/users/:username', to: redirect_with_vary('/@%{username}'), constraints: ->(req) { req.format.nil? || req.format.html? }
+  get '/users/:username/following', to: redirect_with_vary('/@%{username}/following'), constraints: ->(req) { req.format.nil? || req.format.html? }
+  get '/users/:username/followers', to: redirect_with_vary('/@%{username}/followers'), constraints: ->(req) { req.format.nil? || req.format.html? }
+  get '/users/:username/statuses/:id', to: redirect_with_vary('/@%{username}/%{id}'), constraints: ->(req) { req.format.nil? || req.format.html? }
   # rubocop:enable Style/FormatStringToken
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }

From 3e336fe706a7b745c97efaca402e75a8ec5a7aeb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Dec 2023 09:38:12 -0500
Subject: [PATCH 086/436] Opt out of `Rails/SkipsModelValidations` cop in
 db/migrate (#28371)

---
 .rubocop.yml                                    |  4 ++++
 .rubocop_todo.yml                               | 16 ----------------
 db/migrate/20230215074423_move_user_settings.rb |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 68352e3198..2221604224 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -105,6 +105,10 @@ Rails/Exit:
     - 'config/boot.rb'
     - 'lib/mastodon/cli/*.rb'
 
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/*migrate/**/*'
+
 # Reason: Some single letter camel case files shouldn't be split
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c323aa877b..7d05090b39 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -181,22 +181,6 @@ Rails/SkipsModelValidations:
     - 'app/workers/move_worker.rb'
     - 'app/workers/scheduler/ip_cleanup_scheduler.rb'
     - 'app/workers/scheduler/scheduled_statuses_scheduler.rb'
-    - 'db/migrate/20161203164520_add_from_account_id_to_notifications.rb'
-    - 'db/migrate/20170105224407_add_shortcode_to_media_attachments.rb'
-    - 'db/migrate/20170209184350_add_reply_to_statuses.rb'
-    - 'db/migrate/20170304202101_add_type_to_media_attachments.rb'
-    - 'db/migrate/20180528141303_fix_accounts_unique_index.rb'
-    - 'db/migrate/20180609104432_migrate_web_push_subscriptions2.rb'
-    - 'db/migrate/20181207011115_downcase_custom_emoji_domains.rb'
-    - 'db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb'
-    - 'db/migrate/20191007013357_update_pt_locales.rb'
-    - 'db/migrate/20220316233212_update_kurdish_locales.rb'
-    - 'db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb'
-    - 'db/post_migrate/20200917193528_migrate_notifications_type.rb'
-    - 'db/post_migrate/20201017234926_fill_account_suspension_origin.rb'
-    - 'db/post_migrate/20220617202502_migrate_roles.rb'
-    - 'db/post_migrate/20221101190723_backfill_admin_action_logs.rb'
-    - 'db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb'
     - 'lib/mastodon/cli/accounts.rb'
     - 'lib/mastodon/cli/maintenance.rb'
     - 'spec/lib/activitypub/activity/follow_spec.rb'
diff --git a/db/migrate/20230215074423_move_user_settings.rb b/db/migrate/20230215074423_move_user_settings.rb
index 27caac1011..86231e49e8 100644
--- a/db/migrate/20230215074423_move_user_settings.rb
+++ b/db/migrate/20230215074423_move_user_settings.rb
@@ -80,7 +80,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
           end
         end
 
-        user.update_column('settings', Oj.dump(user_settings)) # rubocop:disable Rails/SkipsModelValidations
+        user.update_column('settings', Oj.dump(user_settings))
       end
     end
   end

From b1dec09d203d535a3b0bc61e520e520ba7643878 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Dec 2023 10:52:00 -0500
Subject: [PATCH 087/436] Fix `Style/InverseMethods` cop (#28377)

---
 .rubocop_todo.yml                                       | 8 --------
 app/models/custom_filter.rb                             | 2 +-
 app/services/update_account_service.rb                  | 2 +-
 spec/controllers/activitypub/replies_controller_spec.rb | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7d05090b39..d9b2ec8144 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -362,14 +362,6 @@ Style/IfUnlessModifier:
     - 'config/initializers/devise.rb'
     - 'config/initializers/ffmpeg.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
-  Exclude:
-    - 'app/models/custom_filter.rb'
-    - 'app/services/update_account_service.rb'
-    - 'spec/controllers/activitypub/replies_controller_spec.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
   Exclude:
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 0f4fd78cbf..5a53e73ba8 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -91,7 +91,7 @@ class CustomFilter < ApplicationRecord
       filters_hash.values.map { |cache| [cache.delete(:filter), cache] }
     end.to_a
 
-    active_filters.select { |custom_filter, _| !custom_filter.expired? }
+    active_filters.reject { |custom_filter, _| custom_filter.expired? }
   end
 
   def self.apply_cached_filters(cached_filters, status)
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
index 1bbcfce3ea..78a846e03e 100644
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@@ -21,7 +21,7 @@ class UpdateAccountService < BaseService
 
   def authorize_all_follow_requests(account)
     follow_requests = FollowRequest.where(target_account: account)
-    follow_requests = follow_requests.preload(:account).select { |req| !req.account.silenced? }
+    follow_requests = follow_requests.preload(:account).reject { |req| req.account.silenced? }
     AuthorizeFollowWorker.push_bulk(follow_requests, limit: 1_000) do |req|
       [req.account_id, req.target_account_id]
     end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index 7e6e0ffb0d..5fc9698a32 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe ActivityPub::RepliesController do
         end
 
         it 'uses ids for remote toots' do
-          remote_replies = page_json[:items].select { |x| !x.is_a?(Hash) }
+          remote_replies = page_json[:items].reject { |x| x.is_a?(Hash) }
           expect(remote_replies.all? { |item| item.is_a?(String) && !ActivityPub::TagManager.instance.local_uri?(item) }).to be true
         end
 

From f99e05710ea06cf10bbd3fb64ae8c00b095cb455 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:25:21 +0100
Subject: [PATCH 088/436] New Crowdin Translations (automated) (#28373)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fil.json   | 146 +++++++-
 app/javascript/mastodon/locales/ia.json    |  23 ++
 app/javascript/mastodon/locales/ie.json    | 392 +++++++++++++++++++++
 app/javascript/mastodon/locales/io.json    |  57 ++-
 app/javascript/mastodon/locales/lad.json   | 139 ++++++++
 app/javascript/mastodon/locales/pa.json    | 288 ++++++++++-----
 app/javascript/mastodon/locales/sk.json    |   1 +
 app/javascript/mastodon/locales/th.json    |   2 +-
 app/javascript/mastodon/locales/ug.json    |   2 +
 app/javascript/mastodon/locales/zh-TW.json |  16 +-
 config/locales/activerecord.ia.yml         |   8 +
 config/locales/activerecord.ie.yml         |   1 +
 config/locales/activerecord.lad.yml        |  51 +++
 config/locales/activerecord.pa.yml         |  22 ++
 config/locales/devise.ia.yml               |   1 +
 config/locales/devise.ie.yml               |   1 +
 config/locales/devise.io.yml               |   4 +-
 config/locales/devise.lad.yml              |   1 +
 config/locales/devise.pa.yml               |  17 +
 config/locales/doorkeeper.ia.yml           |   1 +
 config/locales/doorkeeper.ie.yml           |  11 +
 config/locales/doorkeeper.io.yml           |   2 +
 config/locales/doorkeeper.lad.yml          |   1 +
 config/locales/doorkeeper.pa.yml           |  84 +++++
 config/locales/eu.yml                      |   7 +
 config/locales/ia.yml                      |  52 +++
 config/locales/ie.yml                      |  68 ++++
 config/locales/io.yml                      | 275 ++++++++++++++-
 config/locales/lad.yml                     |   1 +
 config/locales/pa.yml                      | 160 +++++++++
 config/locales/simple_form.ia.yml          |   1 +
 config/locales/simple_form.ie.yml          |  23 ++
 config/locales/simple_form.io.yml          |  48 ++-
 config/locales/simple_form.lad.yml         |   1 +
 config/locales/sk.yml                      |   1 +
 config/locales/zh-TW.yml                   |   4 +-
 36 files changed, 1779 insertions(+), 133 deletions(-)
 create mode 100644 app/javascript/mastodon/locales/ia.json
 create mode 100644 app/javascript/mastodon/locales/ie.json
 create mode 100644 app/javascript/mastodon/locales/lad.json
 create mode 100644 config/locales/activerecord.ia.yml
 create mode 100644 config/locales/activerecord.ie.yml
 create mode 100644 config/locales/activerecord.lad.yml
 create mode 100644 config/locales/devise.ia.yml
 create mode 100644 config/locales/devise.ie.yml
 create mode 100644 config/locales/devise.lad.yml
 create mode 100644 config/locales/doorkeeper.ia.yml
 create mode 100644 config/locales/doorkeeper.ie.yml
 create mode 100644 config/locales/doorkeeper.lad.yml
 create mode 100644 config/locales/ia.yml
 create mode 100644 config/locales/ie.yml
 create mode 100644 config/locales/lad.yml
 create mode 100644 config/locales/simple_form.ia.yml
 create mode 100644 config/locales/simple_form.ie.yml
 create mode 100644 config/locales/simple_form.lad.yml

diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 0967ef424b..bc76358875 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -1 +1,145 @@
-{}
+{
+  "about.blocks": "Mga pinatimping server",
+  "about.contact": "Kontak:",
+  "about.disclaimer": "Ang Mastodon ay software na malaya at bukas-na-pinagmulan, at isang tatak-pangkalakal ng Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Hindi makuha ang dahilan",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.rules": "Mga alituntunin ng server",
+  "account.account_note_header": "Tala",
+  "account.add_or_remove_from_list": "I-dagdag o tanggalin mula sa mga listahan",
+  "account.badges.bot": "Pakusa",
+  "account.badges.group": "Pangkat",
+  "account.block": "Hadlangan si @{name}",
+  "account.block_domain": "Hadlangan ang domain na {domain}",
+  "account.block_short": "Hadlangan",
+  "account.blocked": "Hinadlangan",
+  "account.browse_more_on_origin_server": "Tingnan pa sa pangunahing profile",
+  "account.cancel_follow_request": "I-kansela ang pagsunod",
+  "account.copy": "I-sipi ang kawing sa profile",
+  "account.direct": "Palihim banggitin si @{name}",
+  "account.disable_notifications": "I-tigil ang pagpapaalam sa akin tuwing nagpopost si @{name}",
+  "account.domain_blocked": "Hinadlangan ang domain",
+  "account.edit_profile": "Baguhin ang profile",
+  "account.enable_notifications": "Ipaalam sa akin kapag nag-post si @{name}",
+  "account.endorse": "I-tampok sa profile",
+  "account.featured_tags.last_status_at": "Huling post noong {date}",
+  "account.featured_tags.last_status_never": "Walang mga post",
+  "account.featured_tags.title": "Nakatampok na hashtag ni {name}",
+  "account.follow": "Sundan",
+  "account.followers": "Mga tagasunod",
+  "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
+  "account.following": "Sinusundan",
+  "account.follows.empty": "Wala pang sinusundan ang tagagamit na ito.",
+  "account.follows_you": "Sinusunod ka",
+  "account.go_to_profile": "Pumunta sa profile",
+  "account.hide_reblogs": "Itago ang mga pagpapalakas mula sa {name}",
+  "account.in_memoriam": "Sa Alaala Ni.",
+  "account.joined_short": "Sumali",
+  "account.languages": "Palitan ang mga nakasumuscribing wika",
+  "account.link_verified_on": "Sinuri ang pagmamay-ari ng kawing ito sa {date}",
+  "account.locked_info": "Nakakandado ang pagsasariling kalagayan ng account na ito. Manomano sinusuri ng may-ari kung sino ang maaaring sumunod sa kanya.",
+  "account.media": "Medya",
+  "account.mention": "Banggitin si @{name}",
+  "account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+  "bundle_column_error.error.title": "Naku!",
+  "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
+  "bundle_column_error.network.title": "Kamaliang network",
+  "bundle_column_error.retry": "Subukang muli",
+  "bundle_column_error.return": "Bumalik sa tahanan",
+  "bundle_column_error.routing.body": "Hindi mahanap ang hiniling na pahina. Sigurado ka ba na ang URL sa address bar ay tama?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "I-sara",
+  "bundle_modal_error.message": "May nangyaring mali habang kinakarga ang bahaging ito.",
+  "bundle_modal_error.retry": "Subukang muli",
+  "closed_registrations.other_server_instructions": "Dahil desentralisado ang Mastodon, pwede kang gumawa ng account sa iba pang server at makipag-ugnayan pa rin dito.",
+  "closed_registrations_modal.description": "Hindi pa pwedeng gumawa ng account sa {domain}, pero tandaan na hindi mo kailangan ng account partikular sa {domain} para gamitin ang Mastodon.",
+  "closed_registrations_modal.find_another_server": "Maghanap ng iba pang server",
+  "closed_registrations_modal.preamble": "Dahil desentralisado ang Mastodon, kahit saan ka pa gumawa ng account, maaari ka pa ring sumunod at makipag-ugnayan sa kahit-sino rito sa server na ito. Pwede mo pang i-host nang pasarili!",
+  "closed_registrations_modal.title": "Pagrerehistro sa Mastodon",
+  "column.about": "Tungkol dito",
+  "column.blocks": "Nakahadlang na mga tagagamit",
+  "column.bookmarks": "Mga bookmark",
+  "column.community": "Lokal na timeline",
+  "column.direct": "Mga palihim na banggit",
+  "column.directory": "Tingnan ang mga profile",
+  "column.domain_blocks": "Nakahadlang na mga domain",
+  "column.favourites": "Mga paborito",
+  "column.firehose": "Mga live feed",
+  "column.follow_requests": "Mga hiling para sundan",
+  "column.home": "Tahanan",
+  "column.lists": "Mga listahan",
+  "column.mutes": "Mga pinatahimik na tagagamit",
+  "column.notifications": "Mga abiso",
+  "column.pins": "Mga nakapaskil na post",
+  "column.public": "Pinagsamang timeline",
+  "column_back_button.label": "Bumalik",
+  "column_header.hide_settings": "I-tago ang mga setting",
+  "column_header.moveLeft_settings": "I-lipat ang hanay pakaliwa",
+  "column_header.moveRight_settings": "I-lipat ang hanay pakanan",
+  "column_header.pin": "I-paskil",
+  "column_header.show_settings": "Ipakita ang mga setting",
+  "column_header.unpin": "Tanggalin sa pagkapaskil",
+  "column_subheading.settings": "Mga setting",
+  "community.column_settings.local_only": "Lokal lamang",
+  "community.column_settings.media_only": "Medya Lamang",
+  "community.column_settings.remote_only": "Liblib lamang",
+  "compose.language.change": "Magpalit ng wika",
+  "compose.language.search": "Maghanap ng mga wika...",
+  "compose.published.body": "Nailathala ang post.",
+  "compose.published.open": "Buksan",
+  "compose.saved.body": "Nai-save ang post.",
+  "compose_form.direct_message_warning_learn_more": "Matuto pa",
+  "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
+  "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
+  "copy_icon_button.copied": "Sinipi sa clipboard",
+  "copypaste.copied": "Sinipi",
+  "copypaste.copy_to_clipboard": "I-sipi sa clipboard",
+  "directory.federated": "Mula sa kilalang fediverse",
+  "directory.local": "Mula sa {domain} lamang",
+  "directory.new_arrivals": "Mga bagong dating",
+  "directory.recently_active": "Kamakailang aktibo",
+  "disabled_account_banner.account_settings": "Mga setting ng account",
+  "disabled_account_banner.text": "Ang iyong account na {disabledAccount} ay hindi pinapagana ngayon.",
+  "dismissable_banner.community_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong ang mga account hinohost ng {domain}.",
+  "dismissable_banner.dismiss": "Alisin",
+  "dismissable_banner.explore_links": "Ito ang mga balitang kwento na pinaka-binabahagi sa social web ngayon. Ang mga mas bagong balitang kwento na pinost ng mas marami pang mga iba't ibang tao ay tinataasan ng antas.",
+  "dismissable_banner.explore_statuses": "Ito ang mga sumisikat na mga post sa iba't ibang bahagi ng social web ngayon. Ang mga mas bagong post na mas marami ang mga pagpapalakas at paborito ay tinataasan ng antas.",
+  "dismissable_banner.explore_tags": "Ito ang mga sumisikat na mga hashtag sa iba't ibang bahagi ng social web ngayon. Ang mga hashtag ginagamit ng mas maraming mga iba't ibang tao ay tinataasan ng antas.",
+  "dismissable_banner.public_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong nasa social web na sinusundan ng mga tao sa {domain}.",
+  "embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
+  "embed.preview": "Ito ang magiging itsura:",
+  "emoji_button.activity": "Aktibidad",
+  "emoji_button.clear": "Linisin",
+  "emoji_button.custom": "Pasadya",
+  "emoji_button.flags": "Mga watawat",
+  "emoji_button.food": "Pagkain at Inumin",
+  "emoji_button.label": "Maglagay ng emoji",
+  "emoji_button.nature": "Kalikasan",
+  "emoji_button.not_found": "Walang mahanap na mga tugmang emoji",
+  "emoji_button.objects": "Mga bagay",
+  "emoji_button.people": "Mga tao",
+  "emoji_button.recent": "Madalas na ginagamit",
+  "emoji_button.search": "Maghanap...",
+  "emoji_button.search_results": "Resulta ng paghahanap",
+  "emoji_button.symbols": "Mga tanda",
+  "emoji_button.travel": "Paglakbay at Mga Lugar",
+  "empty_column.account_hides_collections": "Pinili ng tagagamit na ito na hindi makuha ang impormasyong ito",
+  "empty_column.account_suspended": "Sinuspinde ang account",
+  "empty_column.account_timeline": "Walang mga post dito!",
+  "empty_column.account_unavailable": "Hindi makuha ang profile",
+  "empty_column.blocks": "Hindi ka pa naghahadlang ng sinumang tagagamit.",
+  "empty_column.bookmarked_statuses": "Wala ka pang naka-bookmark na post. Kapag nag-bookmark ka ng isa, makikita yun dito.",
+  "empty_column.community": "Walang laman ang lokal na timeline. Magsulat ng anuman papubliko para makaandar tayo!",
+  "empty_column.direct": "Wala ka pang mga palihim na banggit. Kapag nagpadala o tumanggap ka ng isa, makikita yun dito.",
+  "empty_column.domain_blocks": "Wala pang nakahadlang na domain.",
+  "empty_column.explore_statuses": "Wala pang sumisikat sa ngayon. Balik na lang sa muli!",
+  "empty_column.favourited_statuses": "Wala ka pang mga paboritong post. Kapag nag-paborito ka ng isa, makikita yun dito.",
+  "empty_column.favourites": "Wala pang may paborito ng post na ito. Kung may sinumang nagpaborito, makikita sila rito.",
+  "empty_column.follow_requests": "Wala ka pang mga hiling para sundan ka. Kapag nakatanggap ka ng isa, makikita yun dito.",
+  "empty_column.followed_tags": "Wala ka pang sinusunod na hashtag. Kapag may sinundan ka na, makikita sila rito.",
+  "empty_column.hashtag": "Wala pang laman ang hashtag na ito.",
+  "empty_column.home": "Walang laman ang timeline ng tahanan mo! Sumunod sa marami pang tao para mapunan ito.",
+  "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
+  "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito."
+}
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
new file mode 100644
index 0000000000..917a034667
--- /dev/null
+++ b/app/javascript/mastodon/locales/ia.json
@@ -0,0 +1,23 @@
+{
+  "account.add_or_remove_from_list": "Adder o remover ab listas",
+  "account.copy": "Copiar ligamine a profilo",
+  "bundle_column_error.network.title": "Error de rete",
+  "bundle_modal_error.close": "Clauder",
+  "column.home": "Initio",
+  "column_subheading.settings": "Parametros",
+  "compose.language.search": "Cercar linguas...",
+  "compose.published.open": "Aperir",
+  "confirmation_modal.cancel": "Cancellar",
+  "confirmations.logout.confirm": "Clauder le session",
+  "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
+  "dismissable_banner.dismiss": "Dimitter",
+  "firehose.local": "Iste servitor",
+  "footer.about": "A proposito de",
+  "home.pending_critical_update.link": "Vider actualisationes",
+  "keyboard_shortcuts.my_profile": "Aperir tu profilo",
+  "lightbox.close": "Clauder",
+  "lightbox.next": "Sequente",
+  "link_preview.author": "Per {name}",
+  "lists.account.add": "Adder al lista",
+  "navigation_bar.about": "A proposito de"
+}
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
new file mode 100644
index 0000000000..e5a4084cc1
--- /dev/null
+++ b/app/javascript/mastodon/locales/ie.json
@@ -0,0 +1,392 @@
+{
+  "about.blocks": "Moderat servitores",
+  "about.contact": "Contacter:",
+  "about.disclaimer": "Mastodon es programmatura líber e con fonte apert, e un marca de fabrica de Mastodon dGmbH.",
+  "about.domain_blocks.no_reason_available": "Rason ne disponibil",
+  "about.domain_blocks.preamble": "Mastodon generalmen possibilisa regardar li contenete de, e li interaction con usatores de quelcunc altri servitor in li fediverse. Ci trova se li exceptiones fat de ti-ci particulari servitor.",
+  "about.domain_blocks.silenced.explanation": "Generalmen, li profiles e contenete de ti-ci servitor ne va aparir, except si on sercha les explicitmen o optionalisa it per sequer.",
+  "about.domain_blocks.silenced.title": "Limitat",
+  "about.domain_blocks.suspended.explanation": "Necun data de ti-ci servitor va esser tractat, inmagasinat o exchangeat, quel inpossibilisa li interaction o comunication de usatores de ti-ci servitor.",
+  "about.domain_blocks.suspended.title": "Suspendet",
+  "about.not_available": "On ne ha disponibilisat ti-ci information sur ti-ci servitor.",
+  "about.powered_by": "Decentralisat social medie disponibilisat de {mastodon}",
+  "about.rules": "Regules del servitor",
+  "account.account_note_header": "Nota",
+  "account.add_or_remove_from_list": "Adjunter o remover de listes",
+  "account.badges.bot": "Automatisat",
+  "account.badges.group": "Gruppe",
+  "account.block": "Bloccar @{name}",
+  "account.block_domain": "Bloccar domene {domain}",
+  "account.block_short": "Bloccar",
+  "account.blocked": "Bloccat",
+  "account.browse_more_on_origin_server": "Navigar plu sur li profil original",
+  "account.cancel_follow_request": "Anullar sequer",
+  "account.copy": "Copiar ligament al profil",
+  "account.direct": "Privatmen mentionar @{name}",
+  "account.disable_notifications": "Cessa notificar me quande @{name} posta",
+  "account.domain_blocked": "Domene bloccat",
+  "account.edit_profile": "Redacter profil",
+  "account.enable_notifications": "Notificar me quande @{name} posta",
+  "account.endorse": "Recomandar sur profil",
+  "account.featured_tags.last_status_at": "Ultim post ye {date}",
+  "account.featured_tags.last_status_never": "Null postas",
+  "account.featured_tags.title": "Recomandat hashtags de {name}",
+  "account.follow": "Sequer",
+  "account.followers": "Sequitores",
+  "account.followers.empty": "Ancor nequi seque ti-ci usator.",
+  "account.followers_counter": "{count, plural, one {{counter} Sequitor} other {{counter} Sequitor}}",
+  "account.following": "Sequent",
+  "account.following_counter": "{count, plural, one {{counter} Sequent} other {{counter} Sequent}}",
+  "account.follows.empty": "Ti-ci usator ancor ne seque quemcunc.",
+  "account.follows_you": "Seque te",
+  "account.go_to_profile": "Ear a profil",
+  "account.hide_reblogs": "Celar boosts de @{name}",
+  "account.in_memoriam": "In Memoriam.",
+  "account.joined_short": "Adheret",
+  "account.languages": "Changear lingues de subscrition",
+  "account.link_verified_on": "Proprietá de ti-ci ligament esset verificat ye {date}",
+  "account.locked_info": "Li statu de confidentialitá de ti-ci conto es configurat quam cludet. Li proprietario decide manualmen qui posse sequer.",
+  "account.media": "Medie",
+  "account.mention": "Mentionar @{name}",
+  "account.moved_to": "{name} ha indicat que su nov conto es ja:",
+  "account.mute": "Silentiar @{name}",
+  "account.mute_notifications_short": "Silentiar notificationes",
+  "account.mute_short": "Silentiar",
+  "account.muted": "Silentiat",
+  "account.no_bio": "Null description providet.",
+  "account.open_original_page": "Aperter li págine original",
+  "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}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Postas}}",
+  "account.unblock": "Desbloccar @{name}",
+  "account.unblock_domain": "Desbloccar domene {domain}",
+  "account.unblock_short": "Desbloccar",
+  "account.unendorse": "Ne recomandar sur profil",
+  "account.unfollow": "Dessequer",
+  "account.unmute": "Dessilentiar @{name}",
+  "account.unmute_notifications_short": "Dessilentiar notificationes",
+  "account.unmute_short": "Dessilentiar",
+  "account_note.placeholder": "Clicca por adjunter un nota",
+  "admin.dashboard.daily_retention": "Usator-retention per die pos registration",
+  "admin.dashboard.monthly_retention": "Usator-retention per mensu pos registration",
+  "admin.dashboard.retention.average": "Medial",
+  "admin.dashboard.retention.cohort": "Mensu de registration",
+  "admin.dashboard.retention.cohort_size": "Nov usatores",
+  "admin.impact_report.instance_accounts": "Conto-profiles to-ci vell deleter",
+  "admin.impact_report.instance_followers": "Sequitores queles nor usatores vell perdir",
+  "admin.impact_report.instance_follows": "Sequitores queles lor usatores vell perdir",
+  "admin.impact_report.title": "Resumate de impact",
+  "alert.rate_limited.message": "Ples reprovar pos {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Frequentie limitat",
+  "alert.unexpected.message": "Un ínexpectat erra ha evenit.",
+  "alert.unexpected.title": "Ups!",
+  "announcement.announcement": "Proclamation",
+  "attachments_list.unprocessed": "(íntractat)",
+  "audio.hide": "Celar audio",
+  "autosuggest_hashtag.per_week": "{count} per semane",
+  "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
+  "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
+  "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
+  "bundle_column_error.error.title": "O ve!",
+  "bundle_column_error.network.body": "Un erra evenit durant li cargation de ti-ci págine, possibilmen pro un temporari problema de tui conexion del internet o de ti-ci servitor.",
+  "bundle_column_error.network.title": "Erra de retage",
+  "bundle_column_error.retry": "Provar denov",
+  "bundle_column_error.return": "Retornar al comense",
+  "bundle_column_error.routing.body": "Li demandat págine ne trovat se. Esque tu es cert que li URL in li adresse-barre es corect?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Cluder",
+  "bundle_modal_error.message": "Alquo errat durant li cargation de ti-ci componente.",
+  "bundle_modal_error.retry": "Provar denov",
+  "closed_registrations.other_server_instructions": "Pro que Mastodon es decentralisat, on posse crear un conto che un altri servitor e ancor interacter con ti-ci.",
+  "closed_registrations_modal.description": "Crear un conto che {domain} ne es possibil actualmen, ma ples memorar que on ne besona un conto specificmen che {domain} por usar Mastodon.",
+  "closed_registrations_modal.find_another_server": "Serchar altri servitor",
+  "closed_registrations_modal.preamble": "Mastodon es descentralisat, do on posse ser e interacter con quicunc che ti-ci servitor, sin egarda de u on crea su conto. On mem posse self-albergar it!",
+  "closed_registrations_modal.title": "Registrar sur Mastodon",
+  "column.about": "Information",
+  "column.blocks": "Bloccat usatores",
+  "column.bookmarks": "Marcatores",
+  "column.community": "Local témpor-linea",
+  "column.direct": "Privat mentiones",
+  "column.directory": "Navigar profiles",
+  "column.domain_blocks": "Bloccat domenes",
+  "column.favourites": "Favorites",
+  "column.firehose": "Témpor-lineas",
+  "column.follow_requests": "Petitiones de sequer",
+  "column.home": "Comense",
+  "column.lists": "Listes",
+  "column.mutes": "Silentiat usatores",
+  "column.notifications": "Notificationes",
+  "column.pins": "Pinglat postas",
+  "column.public": "Federat témpor-linea",
+  "column_back_button.label": "Retornar",
+  "column_header.hide_settings": "Celar parametres",
+  "column_header.moveLeft_settings": "Mover columne al levul",
+  "column_header.moveRight_settings": "Mover columne al dextri",
+  "column_header.pin": "Pinglar",
+  "column_header.show_settings": "Monstrar parametres",
+  "column_header.unpin": "Despinglar",
+  "column_subheading.settings": "Parametres",
+  "community.column_settings.local_only": "Solmen local",
+  "community.column_settings.media_only": "Solmen medie",
+  "community.column_settings.remote_only": "Solmen external",
+  "compose.language.change": "Changear lingue",
+  "compose.language.search": "Serchar lingues...",
+  "compose.published.body": "Post publicat.",
+  "compose.published.open": "Aperter",
+  "compose.saved.body": "Post conservat.",
+  "compose_form.direct_message_warning_learn_more": "Aprender plu",
+  "compose_form.hashtag_warning": "Ti-ci post ne va esser listat sur quelcunc hashtag pro que it ne es public. Solmen public postas posse esser serchat per hashtag.",
+  "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
+  "compose_form.lock_disclaimer.lock": "cludet",
+  "compose_form.placeholder": "Quo es in tui mente?",
+  "compose_form.poll.add_option": "Adjunter un option",
+  "compose_form.poll.duration": "Duration del balotation",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.remove_option": "Remover ti-ci option",
+  "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
+  "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Nov post",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Conservar changes",
+  "compose_form.spoiler.marked": "Remover avise pri li contenete",
+  "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
+  "compose_form.spoiler_placeholder": "Scri tui avise ci",
+  "confirmation_modal.cancel": "Anullar",
+  "confirmations.block.block_and_report": "Bloccar & Raportar",
+  "confirmations.block.confirm": "Bloccar",
+  "confirmations.block.message": "Esque tu es cert que tu vole bloccar {name}?",
+  "confirmations.cancel_follow_request.confirm": "Retraer petition",
+  "confirmations.cancel_follow_request.message": "Esque tu es cert que tu vole retraer tui petition sequer {name}?",
+  "confirmations.delete.confirm": "Deleter",
+  "confirmations.delete.message": "Esque tu es cert que tu vole deleter ti-ci post?",
+  "confirmations.delete_list.confirm": "Deleter",
+  "confirmations.delete_list.message": "Esque tu es cert que tu vole permanentmen deleter ti-ci liste?",
+  "confirmations.discard_edit_media.confirm": "Forjettar",
+  "confirmations.discard_edit_media.message": "Tu have ínconservat changes al description de medie o al previse, forjettar les sin egarda?",
+  "confirmations.domain_block.confirm": "Bloccar li tot domene",
+  "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti domene in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti domene va esser removet.",
+  "confirmations.edit.confirm": "Redacter",
+  "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu es cert que tu vole proceder?",
+  "confirmations.logout.confirm": "Exear",
+  "confirmations.logout.message": "Vole tu vermen exear?",
+  "confirmations.mute.confirm": "Silentiar",
+  "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
+  "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
+  "confirmations.redraft.confirm": "Deleter & redacter",
+  "confirmations.redraft.message": "Esque tu es cert que tu vole deleter ti-ci post e redacter it? Favorites e boosts va esser perdit, e replicas al post original va esser orfanat.",
+  "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Responder nu va remplazzar li missage quel tu actualmen composi. Esque tu es cert que tu vole proceder?",
+  "confirmations.unfollow.confirm": "Dessequer",
+  "confirmations.unfollow.message": "Esque tu es cert que tu vole dessequer {name}?",
+  "conversation.delete": "Deleter conversation",
+  "conversation.mark_as_read": "Marcar quam leet",
+  "conversation.open": "Vider conversation",
+  "conversation.with": "Con {names}",
+  "copypaste.copied": "Copiat",
+  "directory.federated": "Del conosset fediverse",
+  "directory.local": "De solmen {domain}",
+  "directory.new_arrivals": "Nov arivantes",
+  "directory.recently_active": "Recentmen activ",
+  "disabled_account_banner.account_settings": "Parametres del conto",
+  "dismissable_banner.community_timeline": "Tis-ci es li postas max recent de gente con contos che {domain}.",
+  "dismissable_banner.dismiss": "Demisser",
+  "dismissable_banner.explore_links": "Tis-ci es li novas max distribuet che li social retage hodie. Novas plu nov, postat de plu diferent persones, es monstrat plu alt.",
+  "dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
+  "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
+  "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
+  "embed.instructions": "Inbedar ti-ci post per copiar li code in infra.",
+  "embed.preview": "Vi qualmen it va aspecter:",
+  "emoji_button.activity": "Activitá",
+  "emoji_button.clear": "Efaciar",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flaggas",
+  "emoji_button.food": "Manjage & Trincage",
+  "emoji_button.label": "Inserter emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Null acordant emoji trovat",
+  "emoji_button.objects": "Objectes",
+  "emoji_button.people": "Gente",
+  "emoji_button.recent": "Frequentmen usat",
+  "emoji_button.search": "Sercha...",
+  "emoji_button.search_results": "Resultates de sercha",
+  "emoji_button.symbols": "Simboles",
+  "emoji_button.travel": "Viageation & Locos",
+  "empty_column.account_hides_collections": "Ti-ci usator ha selectet ne publicar ti-ci information",
+  "empty_column.account_suspended": "Conto suspendet",
+  "empty_column.account_timeline": "Null postas ci!",
+  "empty_column.account_unavailable": "Profil índisponibil",
+  "empty_column.blocks": "Tu ancor ha bloccat null usatores.",
+  "empty_column.bookmarked_statuses": "Tu ancor have null marcat postas. Quande tu marca un, it va aparir ci.",
+  "empty_column.community": "Li local témpor-linea es vacui. Scri alquo publicmen por initiar la festa!",
+  "empty_column.direct": "Tu ancor have null privat mentiones. Quande tu misse o recive un, it va aparir ci.",
+  "empty_column.domain_blocks": "Ancor hay null bloccat domenes.",
+  "empty_column.explore_statuses": "Nequo es popular actualmen. Retorna plu tarde!",
+  "empty_column.favourited_statuses": "Tu ancor have null favorit postas. Quande tu favoritisa un, it va aparir ci.",
+  "empty_column.favourites": "Ancor nequi ha favoritisat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
+  "empty_column.follow_requests": "Tu ancor have null petitiones de sequer. Quande tu recive un, it va aparir ci.",
+  "empty_column.followed_tags": "Tu ancor ha sequet null hashtags. Quande tu seque un, it va aparir ci.",
+  "empty_column.hashtag": "Hay nullcos en ti-ci hashtag ancor.",
+  "empty_column.home": "Tui initial témpor-linea es vacui! Sequer plu gente por plenar it.",
+  "empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
+  "empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
+  "empty_column.mutes": "Tu ancor ha silentiat null usatores.",
+  "empty_column.notifications": "Tu have null notificationes. Quande altri persones interacte con te, tu va vider it ci.",
+  "empty_column.public": "Hay nullcos ci! Scri alquo publicmen, o manualmen seque usatores de altri servitores por plenar to-ci",
+  "error.unexpected_crash.explanation": "Pro un error in nor code o un problema de compatibilitá in li navigator, ti-ci págine ne posset esser monstrat correctmen.",
+  "error.unexpected_crash.explanation_addons": "Ti-ci págine ne posset esser monstrat correctmen. Li error es probabilmen causat de un extension al navigator o instrumentes por automatic traduction.",
+  "error.unexpected_crash.next_steps": "Prova recargar li págine. Si to ne auxilia, tu fórsan posse usar Mastodon per un diferent navigator o aplication.",
+  "error.unexpected_crash.next_steps_addons": "Prova desactivisar les e recargar li págine. Si to ne auxilia, tu fórsan posse usar Mastodon per un diferent navigator o aplication.",
+  "errors.unexpected_crash.report_issue": "Raportar un problema",
+  "explore.search_results": "Resultates de sercha",
+  "explore.suggested_follows": "Gente",
+  "explore.title": "Explorar",
+  "explore.trending_links": "Novas",
+  "explore.trending_statuses": "Postas",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.context_mismatch_explanation": "Ti-ci filtre-categorie ne aplica al contextu in quel tu ha accessat ti-ci post. Si tu vole que li post es filtrat anc in ti-ci contextu, tu deve redacter li filtre.",
+  "filter_modal.added.context_mismatch_title": "Contextu íncompatibil!",
+  "filter_modal.added.expired_explanation": "Ti-ci filtre-categorie ha expirat, tu deve changear li date de expiration por far it aplicar.",
+  "filter_modal.added.expired_title": "Expirat filtre!",
+  "filter_modal.added.review_and_configure": "Por reviser e configurar ti-ci filtre-categorie, ea a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Parametres pri filtres",
+  "filter_modal.added.settings_link": "págine por parametres",
+  "filter_modal.added.short_explanation": "Ti-ci post ha esset adjuntet al sequente filtre-categorie: {title}.",
+  "filter_modal.added.title": "Filtre adjuntet!",
+  "filter_modal.select_filter.context_mismatch": "ne aplica a ti-ci contextu",
+  "filter_modal.select_filter.expired": "expirat",
+  "filter_modal.select_filter.prompt_new": "Nov categorie: {name}",
+  "filter_modal.select_filter.search": "Serchar o crear",
+  "filter_modal.select_filter.subtitle": "Usar un existent categorie o crear nov",
+  "filter_modal.select_filter.title": "Filtrar ti-ci posta",
+  "filter_modal.title.status": "Filtrar un posta",
+  "firehose.all": "Omno",
+  "firehose.local": "Ti-ci servitor",
+  "firehose.remote": "Altri servitores",
+  "follow_request.authorize": "Autorisar",
+  "follow_request.reject": "Rejecter",
+  "follow_requests.unlocked_explanation": "Benque tu conto ne es cludet, li administratores de {domain} pensat que tu fórsan vell voler tractar seque-petitiones de tis-ci contos manualmen.",
+  "followed_tags": "Sequet hashtags",
+  "footer.about": "Information",
+  "footer.directory": "Profilarium",
+  "footer.get_app": "Obtener li aplication",
+  "footer.invite": "Invitar gente",
+  "footer.source_code": "Vider li fonte-code",
+  "footer.status": "Statu",
+  "generic.saved": "Salvat",
+  "getting_started.heading": "Qualmen comensar",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sin {additional}",
+  "hashtag.column_settings.select.no_options_message": "Null suggestiones trovat",
+  "hashtag.column_settings.select.placeholder": "Inscrir hashtags…",
+  "hashtag.column_settings.tag_mode.all": "Omni tis",
+  "hashtag.column_settings.tag_mode.any": "Quelcunc de tis",
+  "hashtag.column_settings.tag_mode.none": "Necun de tis",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} postas}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} postas}} hodie",
+  "hashtag.follow": "Sequer hashtag",
+  "hashtag.unfollow": "Dessequer hashtag",
+  "hashtags.and_other": "…e {count, plural, other {# in plu}}",
+  "home.actions.go_to_explore": "Vider lu populari",
+  "home.actions.go_to_suggestions": "Trovar gente por sequer",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Monstrar boosts",
+  "home.column_settings.show_replies": "Monstrar responses",
+  "home.explore_prompt.body": "Tui hemal témpor-linea have un mixtura del hashtags queles tu selectet sequer, li gente quem tu selectet sequer, e li postas queles ili boosta. Si to sembla tro quiet, tu fórsan vole:",
+  "home.explore_prompt.title": "To-ci es tui hemal págine in Mastodon.",
+  "home.hide_announcements": "Celar proclamationes",
+  "home.pending_critical_update.body": "Ples actualisar tui Mastodon-servitor tam rapid quam es possibil!",
+  "home.pending_critical_update.link": "Vider actualisationes",
+  "home.pending_critical_update.title": "Urgent actualisation de securitá disponibil!",
+  "home.show_announcements": "Monstrar proclamationes",
+  "interaction_modal.description.favourite": "Con un conto de Mastodon, tu posse favoritisar ti-ci post por informar li autor pri quant mult tu aprecia it e conservar it por plu tard.",
+  "interaction_modal.description.follow": "Con un conto de Mastodon, tu posse sequer {name} por reciver su postas in tui hemal témpor-linea.",
+  "interaction_modal.description.reblog": "Con un conto de Mastodon, tu posse boostar ti-ci post por distribuer it a tui propri sequitores.",
+  "interaction_modal.description.reply": "Con un conto de Mastodon, tu posse responder a ti-ci post.",
+  "interaction_modal.login.action": "Retorna a hem",
+  "interaction_modal.login.prompt": "Domene de tui hemal servitor, p.ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Ne sur Mastodon?",
+  "interaction_modal.on_another_server": "Sur un servitor diferent",
+  "interaction_modal.on_this_server": "Sur ti-ci servitor",
+  "interaction_modal.sign_in": "Tu ne ha ineat a ti-ci servitor. U logia tui conto?",
+  "interaction_modal.title.favourite": "Favoritisar li post de {name}",
+  "interaction_modal.title.follow": "Sequer {name}",
+  "interaction_modal.title.reblog": "Boostar li post de {name}",
+  "interaction_modal.title.reply": "Responder al posta de {name}",
+  "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
+  "intervals.full.hours": "{number, plural, one {# hor} other {# hores}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "Retroear",
+  "keyboard_shortcuts.blocked": "Aperter li lista de bloccat usatores",
+  "keyboard_shortcuts.boost": "Boostar post",
+  "keyboard_shortcuts.description": "Descrition",
+  "keyboard_shortcuts.enter": "Aperter posta",
+  "keyboard_shortcuts.favourite": "Favoritisar post",
+  "keyboard_shortcuts.favourites": "Aperter li liste de favorites",
+  "keyboard_shortcuts.federated": "Aperter li federat témpor-linea",
+  "keyboard_shortcuts.home": "Aperter li hemal témpor-linea",
+  "keyboard_shortcuts.local": "Aperter li local témpor-linea",
+  "keyboard_shortcuts.mention": "Mentionar li autor",
+  "keyboard_shortcuts.muted": "Aperter li lista de silentiat usatores",
+  "keyboard_shortcuts.my_profile": "Aperter tui profil",
+  "keyboard_shortcuts.notifications": "Aperter li columne de notificationes",
+  "keyboard_shortcuts.open_media": "Aperter medie",
+  "keyboard_shortcuts.pinned": "Aperter li liste de pinglat postas",
+  "keyboard_shortcuts.profile": "Aperter profil del autor",
+  "keyboard_shortcuts.reply": "Responder al posta",
+  "keyboard_shortcuts.requests": "Aperter liste de seque-petitiones",
+  "limited_account_hint.title": "Ti-ci profil ha esset celat del moderatores de {domain}.",
+  "link_preview.author": "De {name}",
+  "lists.account.add": "Adjunter a liste",
+  "lists.account.remove": "Remover de liste",
+  "lists.delete": "Deleter liste",
+  "lists.edit": "Redacter liste",
+  "lists.edit.submit": "Changear titul",
+  "lists.exclusive": "Celar ti-ci postas del hemal témpor-linea",
+  "lists.new.create": "Adjunter liste",
+  "lists.new.title_placeholder": "Titul del nov liste",
+  "lists.replies_policy.followed": "Quelcunc sequet usator",
+  "lists.replies_policy.list": "Membres del liste",
+  "lists.replies_policy.none": "Nequi",
+  "lists.replies_policy.title": "Monstrar responses a:",
+  "lists.search": "Serchar inter li persones quem tu seque",
+  "lists.subheading": "Tui listes",
+  "load_pending": "{count, plural, one {# nov element} other {# nov elementes}}",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
+  "mute_modal.indefinite": "Índefinit",
+  "navigation_bar.filters": "Silentiat paroles",
+  "navigation_bar.follow_requests": "Petitiones de sequer",
+  "navigation_bar.lists": "Listes",
+  "navigation_bar.mutes": "Silentiat usatores",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinglat postas",
+  "navigation_bar.preferences": "Preferenties",
+  "navigation_bar.public_timeline": "Federat témpor-linea",
+  "navigation_bar.search": "Sercha",
+  "navigation_bar.security": "Securitá",
+  "not_signed_in_indicator.not_signed_in": "On deve aperter session por accesser ti-ci ressurse.",
+  "notification.follow_request": "{name} ha petit sequer te",
+  "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
+  "notifications.column_settings.update": "Redactiones:",
+  "notifications.group": "{count} notificationes",
+  "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.profile.display_name": "Nómine a monstrar",
+  "report.mute": "Silentiar",
+  "report.mute_explanation": "Tu ne va vider su postas. Ilu ancor posse sequer te e vider tui postas e ne va saver que ilu es silentiat.",
+  "status.mute": "Silentiar @{name}",
+  "status.mute_conversation": "Silentiar conversation",
+  "status.pin": "Pinglar sur profil",
+  "status.pinned": "Pinglat post",
+  "status.unmute_conversation": "Dessilentiar conversation",
+  "status.unpin": "Despinglar de profil",
+  "video.mute": "Silentiar li son",
+  "video.unmute": "Dessilentiar li son"
+}
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 552debdb50..ba44408935 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -20,6 +20,7 @@
   "account.blocked": "Blokusita",
   "account.browse_more_on_origin_server": "Videz pluse che la originala profilo",
   "account.cancel_follow_request": "Desendez sequodemando",
+  "account.copy": "Kopiez ligilo al profilo",
   "account.direct": "Private mencionez @{name}",
   "account.disable_notifications": "Cesez avizar me kande @{name} postas",
   "account.domain_blocked": "Domain hidden",
@@ -38,7 +39,8 @@
   "account.follows.empty": "Ca uzanto ne sequa irgu til nun.",
   "account.follows_you": "Sequas tu",
   "account.go_to_profile": "Irez al profilo",
-  "account.hide_reblogs": "Celez busti de @{name}",
+  "account.hide_reblogs": "Celez repeti de @{name}",
+  "account.in_memoriam": "Memorige.",
   "account.joined_short": "Juntita",
   "account.languages": "Chanjez abonita lingui",
   "account.link_verified_on": "Proprieteso di ca ligilo kontrolesis ye {date}",
@@ -58,7 +60,7 @@
   "account.requested": "Vartante aprobo",
   "account.requested_follow": "{name} demandis sequar tu",
   "account.share": "Partigez profilo di @{name}",
-  "account.show_reblogs": "Montrez busti de @{name}",
+  "account.show_reblogs": "Montrez repeti de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Posto} other {{counter} Posti}}",
   "account.unblock": "Desblokusar @{name}",
   "account.unblock_domain": "Desblokusar {domain}",
@@ -86,7 +88,7 @@
   "attachments_list.unprocessed": "(neprocedita)",
   "audio.hide": "Celez audio",
   "autosuggest_hashtag.per_week": "{count} dum singla semano",
-  "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo",
+  "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "bundle_column_error.copy_stacktrace": "Kopierorraporto",
   "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
   "bundle_column_error.error.title": "Ach!",
@@ -180,7 +182,7 @@
   "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
   "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
   "confirmations.redraft.confirm": "Efacez e riskisez",
-  "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e busti esos perdita, e respondi al posto originala esos orfanigita.",
+  "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.reply.confirm": "Respondez",
   "confirmations.reply.message": "Respondar nun remplos mesajo quon vu nun igas. Ka vu certe volas durar?",
   "confirmations.unfollow.confirm": "Desequez",
@@ -189,6 +191,7 @@
   "conversation.mark_as_read": "Markizez quale lektita",
   "conversation.open": "Videz konverso",
   "conversation.with": "Kun {names}",
+  "copy_icon_button.copied": "Kopiita",
   "copypaste.copied": "Kopiesis",
   "copypaste.copy_to_clipboard": "Kopiez",
   "directory.federated": "De savita fediverso",
@@ -200,7 +203,7 @@
   "dismissable_banner.community_timeline": "Co esas maxim recenta publika posti de personi quo havas konto quo hostigesas da {domain}.",
   "dismissable_banner.dismiss": "Ignorez",
   "dismissable_banner.explore_links": "Ca nova rakonti parolesas da personi che ca e altra servili di necentraligita situo nun.",
-  "dismissable_banner.explore_statuses": "Yen posti del tota reto sociala qui esas populara hodie. Posti plu nova kun plu busti e favoriziti esas rangizita plu alte.",
+  "dismissable_banner.explore_statuses": "Yen posti del tota reto sociala qui esas populara hodie. Posti plu nova kun plu repeti e favoriziti esas rangizita plu alte.",
   "dismissable_banner.explore_tags": "Ca hashtagi bezonas plu famoza inter personi che ca e altra servili di la necentraligita situo nun.",
   "dismissable_banner.public_timeline": "Yen la posti maxim recenta da personi che la reto sociala quin personi che {domain} sequas.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -220,6 +223,7 @@
   "emoji_button.search_results": "Trovuri",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Vizito & Plasi",
+  "empty_column.account_hides_collections": "Ca uzanto selektis ne publikigar ca informo",
   "empty_column.account_suspended": "Konto restriktesis",
   "empty_column.account_timeline": "No toots here!",
   "empty_column.account_unavailable": "Profilo esas nedisponebla",
@@ -294,14 +298,18 @@
   "hashtag.column_settings.tag_mode.any": "Irga co",
   "hashtag.column_settings.tag_mode.none": "Nula co",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} partoprenanto} other {{counter} partoprenanti}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} posto} other {{counter} posti}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} posto} other {{counter} posti}} hodie",
   "hashtag.follow": "Sequez hashtago",
   "hashtag.unfollow": "Desequez hashtago",
+  "hashtags.and_other": "…e {count, plural, one {# plusa}other {# plusa}}",
   "home.actions.go_to_explore": "Videz quo es populara nun",
   "home.actions.go_to_suggestions": "Trovez personi por sequar",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
-  "home.explore_prompt.body": "Vua hemala fluo havos mixuro de la hashtagi quin vu selektis sequar, la personi quin vu selektis sequar, e la posti quin ili bustis. Se to semblas tro tacanta, vu darfas volar:",
+  "home.explore_prompt.body": "Vua hemala fluo havos mixuro de la hashtagi quin vu selektis sequar, la personi quin vu selektis sequar, e la posti quin ili repetis. Se to semblas tro tacanta, vu darfas volar:",
   "home.explore_prompt.title": "Co es vua hemo en Mastodon.",
   "home.hide_announcements": "Celez anunci",
   "home.pending_critical_update.body": "Voluntez aktualigar vua Mastodon-servilo tam balde kam es posibla!",
@@ -310,7 +318,7 @@
   "home.show_announcements": "Montrez anunci",
   "interaction_modal.description.favourite": "Kun konto che Mastodon, vu povas favorizar ca posto por savigar la autoro ke vu prizas ol e sparar ol por pose.",
   "interaction_modal.description.follow": "Per konto che Mastodon, vu povas sequar {name} por ganar ola posti en vua hemniuzeto.",
-  "interaction_modal.description.reblog": "Per konto che Mastodon, vu povas bustizar ca posti por partigar kun sua sequanti.",
+  "interaction_modal.description.reblog": "Per konto che Mastodon, vu povas repetar ca posti por dissemar lo a vua propra sequati.",
   "interaction_modal.description.reply": "Per konto che Mastodon, vu povas respondar ca posto.",
   "interaction_modal.login.action": "Irar a hemo",
   "interaction_modal.login.prompt": "Domeno di vua hemala servilo, ex. mastodon.social",
@@ -321,14 +329,14 @@
   "interaction_modal.sign_in_hint": "Averto: To es la retsituo ube vu kreis konto. Se vu ne rimemoras, serchez vua bonvenanta e-posto. Vu anke povas enpozar vua kompleta uzantnomo! (ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorizez ca posto da {name}",
   "interaction_modal.title.follow": "Sequez {name}",
-  "interaction_modal.title.reblog": "Bustizez posto di {name}",
+  "interaction_modal.title.reblog": "Repetez posto di {name}",
   "interaction_modal.title.reply": "Respondez posto di {name}",
   "intervals.full.days": "{number, plural, one {# dio} other {# dii}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# hori}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.boost": "Repetez posto",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "Deskripto",
@@ -383,6 +391,7 @@
   "lists.search": "Trovez inter personi quon vu sequas",
   "lists.subheading": "Vua listi",
   "load_pending": "{count, plural, one {# nova kozo} other {# nova kozi}}",
+  "loading_indicator.label": "Kargante…",
   "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
   "mute_modal.duration": "Durado",
@@ -448,7 +457,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Briligez nelektita avizi",
   "notifications.column_settings.update": "Modifikati:",
   "notifications.filter.all": "Omna",
-  "notifications.filter.boosts": "Busti",
+  "notifications.filter.boosts": "Repeti",
   "notifications.filter.favourites": "Favoriziti",
   "notifications.filter.follows": "Sequati",
   "notifications.filter.mentions": "Mencioni",
@@ -471,6 +480,17 @@
   "onboarding.follows.empty": "Regretinde, nula rezultajo povas montresar nune. Vu povas esforcar serchar, o irar al explorala pagino por trovar personi sequinda, o esforcar itere pose.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Trovebligez mea profilo",
+  "onboarding.profile.discoverable_hint": "Se vu selektas deskovrebleso che Mastodon, vua posti povas aparar en sercho-rezultaji e populari, e vua profilo forsan sugestesos a personi kun interesi simila a vua.",
+  "onboarding.profile.display_name": "Publika nomo",
+  "onboarding.profile.display_name_hint": "Vua tota nomo o vua gaya nomo…",
+  "onboarding.profile.lead": "Vu sempre povas kompletigar co plu tarde en la opcioni, ube mem plua personalizanta opcioni es disponebla.",
+  "onboarding.profile.note": "Biografio",
+  "onboarding.profile.note_hint": "Vu povas @mencionar altra personi o #hashtagi…",
+  "onboarding.profile.save_and_continue": "Preservez e avancez",
+  "onboarding.profile.title": "Kompletigez la profilo",
+  "onboarding.profile.upload_avatar": "Kargez profiloportreto",
+  "onboarding.profile.upload_header": "Kargez profilokapimajo",
   "onboarding.share.lead": "Savigez personi quale ili povas trovar vu che Mastodon!",
   "onboarding.share.message": "Me esas {username} che #Mastodon! Venez e sequez me ye {url}",
   "onboarding.share.next_steps": "Kozi quin vu darfas volar facar sequante:",
@@ -482,7 +502,7 @@
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.publish_status.title": "Facar vua unesma posto",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
+  "onboarding.steps.setup_profile.body": "Vu interagos plue kun profilo detalizita.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
@@ -510,6 +530,7 @@
   "privacy.unlisted.short": "Ne enlistigota",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
+  "recommended": "Rekomendata",
   "refresh": "Rifreshez",
   "regeneration_indicator.label": "Chargas…",
   "regeneration_indicator.sublabel": "Vua hemniuzeto preparesas!",
@@ -580,6 +601,8 @@
   "search.quick_action.status_search": "Posti qui asortas {x}",
   "search.search_or_paste": "Serchar o pozar URL",
   "search_popout.full_text_search_disabled_message": "Nedisponebla che {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Nur disponebla enirite.",
+  "search_popout.language_code": "ISO linguokodexo",
   "search_popout.options": "Opcioni serchala",
   "search_popout.quick_actions": "Agi rapida",
   "search_popout.recent": "Lasta serchi",
@@ -607,8 +630,8 @@
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Restriktez @{name}",
   "status.bookmark": "Libromarko",
-  "status.cancel_reblog_private": "Debustez",
-  "status.cannot_reblog": "Ca posto ne povas bustesas",
+  "status.cancel_reblog_private": "Desrepetez",
+  "status.cannot_reblog": "Ca posto ne povas repetesar",
   "status.copy": "Copy link to status",
   "status.delete": "Efacar",
   "status.detailed_status": "Detala konversvido",
@@ -636,10 +659,10 @@
   "status.pin": "Pinglagez che profilo",
   "status.pinned": "Pinned toot",
   "status.read_more": "Lektez pluse",
-  "status.reblog": "Repetar",
-  "status.reblog_private": "Bustez kun originala videbleso",
-  "status.reblogged_by": "{name} repetita",
-  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.reblog": "Repetez",
+  "status.reblog_private": "Repetez kun originala videbleso",
+  "status.reblogged_by": "{name} repetis",
+  "status.reblogs.empty": "Nulu ja repetis ca posto. Kande ulu facas lo, lu montresos hike.",
   "status.redraft": "Efacez e riskisigez",
   "status.remove_bookmark": "Efacez libromarko",
   "status.replied_to": "Respondis a {name}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
new file mode 100644
index 0000000000..051e475e68
--- /dev/null
+++ b/app/javascript/mastodon/locales/lad.json
@@ -0,0 +1,139 @@
+{
+  "about.blocks": "Sirvidores moderados",
+  "about.contact": "Kontakto:",
+  "about.disclaimer": "Mastodon es un programario libero, kon kodiche avierto i una marka komersiala de Mastodon gGmbH.",
+  "about.domain_blocks.no_reason_available": "Razon no desponivle",
+  "about.domain_blocks.preamble": "Mastodon djeneralmente te permete ver kontenido de i enteraktuar kon utilizadores de kualseker otro sirvidor en el fediverso. Estas son las eksepsiones en este sirvidor en partikolar.",
+  "about.domain_blocks.silenced.explanation": "\"Djeneralmente no veras profiles i kontenido de este sirvidor, salvo ke eksplisitamente lo bushkes o sigas algun kuento de el.",
+  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Dingunos datos de este sirvidor sera prosesado, magazinado o enterkambiado kon este sirvidor. Enteraksyon o komunikasyon kon sus utilizadores sera imposivle.",
+  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.not_available": "Esta enformasyon no esta desponivle en este sirvidor.",
+  "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
+  "about.rules": "Reglas del sirvidor",
+  "account.account_note_header": "Nota",
+  "account.add_or_remove_from_list": "Adjusta a o kita de listas",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Grupo",
+  "account.block": "Bloka @{name}",
+  "account.block_domain": "Bloka el domeno {domain}",
+  "account.block_short": "Bloka",
+  "account.blocked": "Blokado",
+  "account.browse_more_on_origin_server": "Ve mas en el profil orijinal",
+  "account.cancel_follow_request": "Anula solisitud de segir",
+  "account.copy": "Kopia atadijo de profil",
+  "account.direct": "Enmenta a @{name} en privado",
+  "account.disable_notifications": "No me avizes mas sovre publikasyones de @{name}",
+  "account.domain_blocked": "Domeno blokado",
+  "account.edit_profile": "Edita profil",
+  "account.enable_notifications": "Avizame kuando @{name} publike",
+  "account.endorse": "Avalia en profil",
+  "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
+  "account.featured_tags.last_status_never": "\"No ay publikasyones",
+  "account.featured_tags.title": "Etiketas avaliadas de {name}",
+  "account.follow": "Sige",
+  "account.followers": "Suivantes",
+  "account.followers.empty": "Por agora dingun no sige a este utilizador.",
+  "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
+  "account.following": "Sigiendo",
+  "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
+  "account.follows.empty": "Este utilizador ainda no sige a ningun.",
+  "account.follows_you": "Te sige",
+  "account.go_to_profile": "Va al profil",
+  "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
+  "account.joined_short": "Adjunto",
+  "account.languages": "Troka linguas suskrividas",
+  "account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
+  "account.locked_info": "El estado de privasita de este konto esta konfigurado komo serado. El proprietario reviza manualmente kien le puede segir.",
+  "account.media": "Multimedia",
+  "account.mention": "Enmenta a @{name}",
+  "account.moved_to": "{name} tiene endikado ke su muevo kuento agora es:",
+  "account.mute": "Silensia a @{name}",
+  "account.mute_notifications_short": "Silensia avizos de @{name}",
+  "account.mute_short": "Silensia",
+  "account.muted": "Silensiado",
+  "account.open_original_page": "Avre pajina orijnala",
+  "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.share": "Partaja el profil de @{name}",
+  "account.show_reblogs": "Amostra repartajasyones de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
+  "account.unblock": "Dezbloka @{name}",
+  "account.unblock_domain": "Dezbloka domeno {domain}",
+  "account.unblock_short": "Dezbloka",
+  "account.unendorse": "No avalia en profil",
+  "account.unfollow": "Desige",
+  "account.unmute": "Desilensia a @{name}",
+  "account.unmute_notifications_short": "Desilensia avizos",
+  "account.unmute_short": "Desilensia",
+  "account_note.placeholder": "Klika para adjustar nota",
+  "admin.dashboard.daily_retention": "Proporsyon de retensyon de utilizadores por diya dempues de enrejistrasyon",
+  "admin.dashboard.monthly_retention": "Proporsyon de retensyon de utilizadores por mez dempues de enrejistrasyon",
+  "admin.dashboard.retention.average": "Media",
+  "admin.dashboard.retention.cohort": "Mez de enrejistrasyon",
+  "admin.dashboard.retention.cohort_size": "Muevos utilizadores",
+  "alert.rate_limited.message": "Por favor aprova dempues de {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Trafiko limitado",
+  "alert.unexpected.message": "Afito un yerro no asperado.",
+  "alert.unexpected.title": "Atyo!",
+  "announcement.announcement": "Pregon",
+  "attachments_list.unprocessed": "(no prosesado)",
+  "audio.hide": "Eskonder audio",
+  "autosuggest_hashtag.per_week": "{count} por semana",
+  "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
+  "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
+  "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
+  "bundle_column_error.error.title": "Atyo, no!",
+  "bundle_column_error.network.body": "Uvo un yerro kon la prova de eskargar esta pajina. Esto puede ser por un problem temporal kon tu koneksyon a la internet o a este sirvidor.",
+  "bundle_column_error.network.title": "Yerro de red",
+  "bundle_column_error.retry": "Aprova de muevo",
+  "bundle_column_error.return": "Volta a la linya prinsipala",
+  "bundle_column_error.routing.body": "No se pudo trokar la pajina solisitada. Estas siguro ke el adreso URL en la vara de adreso es djusto?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Serra",
+  "bundle_modal_error.message": "Algo negro afito al eskargar este komponente.",
+  "bundle_modal_error.retry": "Aprova de muevo",
+  "closed_registrations.other_server_instructions": "Deke Mastodon es desentralizado, puedes kriyar un kuento en otro sirvidor i ainda enteraktuar kon este.",
+  "closed_registrations_modal.description": "Aktualmente no es posivle kriyar un kuento en {domain}, ama por favor akodrate de ke no ay menester de tener un kuento espesifikamente en {domain} para kulanear Mastodon.",
+  "closed_registrations_modal.find_another_server": "Bushka otro sirvidor",
+  "closed_registrations_modal.preamble": "Mastodon es desentralizado, estonses sin emportansya ande kriyas tu kuento, podras segir i enteraktuar kon kualseker persona en este sirvidor. Tamyen puedes balabayarlo tu mezmo!",
+  "closed_registrations_modal.title": "Enrerjistrate en Mastodon",
+  "column.about": "Sovre mozotros",
+  "column.blocks": "Utilizadores blokados",
+  "column.bookmarks": "Markadores",
+  "column.community": "Linya de tiempo lokala",
+  "column.direct": "Enmentaduras privadas",
+  "column.directory": "Eksplora profiles",
+  "column.domain_blocks": "Domenos blokados",
+  "column.favourites": "Te plazen",
+  "column.firehose": "Linyas en bivo",
+  "column.follow_requests": "Solisitudes de segimiento",
+  "column.home": "Linya prinsipala",
+  "column.lists": "Listas",
+  "column.mutes": "Utilizadores silensiados",
+  "column.notifications": "Avizos",
+  "column.pins": "Publikasyones fiksadas",
+  "column.public": "Linya de tiempo federada",
+  "column_back_button.label": "Atras",
+  "column_header.hide_settings": "Eskonde opsyones",
+  "column_header.moveLeft_settings": "Move kolumna a la siedra",
+  "column_header.moveRight_settings": "Move kolumna a la derecha",
+  "column_header.pin": "Fiksa",
+  "column_header.show_settings": "Amostra opsyones",
+  "column_header.unpin": "Defiksar",
+  "column_subheading.settings": "Opsyones",
+  "community.column_settings.local_only": "Solo lokalas",
+  "community.column_settings.media_only": "Solo multimedia",
+  "community.column_settings.remote_only": "Solo remotas",
+  "compose.language.change": "Troka lingua",
+  "compose.language.search": "Bushka linguas...",
+  "compose_form.direct_message_warning_learn_more": "Ambezate mas",
+  "compose_form.encryption_warning": "Publikasyones en Mastodon no son shifradas de lado a lado. No partajes dinguna enformasyon sensivle por Mastodon.",
+  "compose_form.hashtag_warning": "Esta publikasyon no sera amostrada debasho de dinguna etiketa si no es publika. Solo publikasyones publikas se pueden bushkar por la etiketa.",
+  "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
+  "compose_form.lock_disclaimer.lock": "serrado",
+  "compose_form.placeholder": "Ke haber?"
+}
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 7faf279719..708d8c3e98 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,25 +1,39 @@
 {
   "about.contact": "ਸੰਪਰਕ:",
+  "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
+  "about.rules": "ਸਰਵਰ ਨਿਯਮ",
   "account.account_note_header": "ਨੋਟ",
-  "account.badges.bot": "Bot",
+  "account.add_or_remove_from_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
+  "account.badges.bot": "ਆਟੋਮੇਟ ਕੀਤਾ",
   "account.badges.group": "ਗਰੁੱਪ",
+  "account.block": "@{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
+  "account.block_domain": "{domain} ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
+  "account.block_short": "ਪਾਬੰਦੀ",
   "account.blocked": "ਪਾਬੰਦੀਸ਼ੁਦਾ",
-  "account.cancel_follow_request": "Withdraw follow request",
-  "account.follow": "ਪ੍ਰਸ਼ੰਸਕ ਬਣੋ",
-  "account.followers": "ਪ੍ਰਸ਼ੰਸਕ",
-  "account.following": "ਪ੍ਰਸ਼ੰਸਕ ਹਾਂ",
+  "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
+  "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+  "account.follow": "ਫ਼ਾਲੋ",
+  "account.followers": "ਫ਼ਾਲੋਅਰ",
+  "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
+  "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.follows_you": "ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "account.media": "ਮੀਡੀਆ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
+  "account.posts": "ਪੋਸਟਾਂ",
+  "account.posts_with_replies": "ਪੋਸਤਾਂ ਅਤੇ ਜਵਾਬ",
+  "account.requested": "ਮਨਜ਼ੂਰੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ ਨੂੰ ਰੱਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ",
+  "account.requested_follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
+  "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_short": "ਪਾਬੰਦੀ ਹਟਾਓ",
-  "account.unfollow": "ਪ੍ਰਸ਼ੰਸਕੀ ਰੱਦ ਕਰੋ",
+  "account.unfollow": "ਅਣ-ਫ਼ਾਲੋ",
   "account.unmute_short": "ਮੌਨ-ਰਹਿਤ ਕਰੋ",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "ਔਸਤ",
+  "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "announcement.announcement": "ਹੋਕਾ",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
@@ -27,35 +41,50 @@
   "bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
   "bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
+  "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "column.bookmarks": "ਬੁੱਕਮਾਰਕ",
-  "column.home": "ਮੁੱਖ ਪੰਨਾ",
+  "column.community": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ",
+  "column.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
+  "column.favourites": "ਮਨਪਸੰਦ",
+  "column.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
+  "column.home": "ਮੁੱਖ ਸਫ਼ਾ",
   "column.lists": "ਸੂਚੀਆਂ",
   "column.notifications": "ਸੂਚਨਾਵਾਂ",
-  "column.pins": "Pinned toot",
+  "column.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
   "column_back_button.label": "ਪਿੱਛੇ",
+  "column_header.pin": "ਟੰਗੋ",
+  "column_header.show_settings": "ਸੈਟਿੰਗਾਂ ਦਿਖਾਓ",
+  "column_header.unpin": "ਲਾਹੋ",
   "column_subheading.settings": "ਸੈਟਿੰਗਾਂ",
-  "community.column_settings.media_only": "Media only",
+  "community.column_settings.local_only": "ਸਿਰਫ ਲੋਕਲ ਹੀ",
+  "community.column_settings.media_only": "ਸਿਰਫ ਮੀਡੀਆ ਹੀ",
+  "community.column_settings.remote_only": "ਸਿਰਫ਼ ਰਿਮੋਟ ਹੀ",
+  "compose.language.change": "ਭਾਸ਼ਾ ਬਦਲੋ",
+  "compose.language.search": "ਭਾਸ਼ਾਵਾਂ ਦੀ ਖੋਜ...",
+  "compose.published.open": "ਖੋਲ੍ਹੋ",
+  "compose.saved.body": "ਪੋਸਟ ਸੰਭਾਲੀ ਗਈ।",
   "compose_form.direct_message_warning_learn_more": "ਹੋਰ ਜਾਣੋ",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
   "compose_form.publish_form": "Publish",
   "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
-  "compose_form.spoiler.marked": "Text is hidden behind warning",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
+  "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
-  "confirmations.block.confirm": "ਬਲਾਕ",
-  "confirmations.delete.confirm": "ਮਿਟਾਓ",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "ਮਿਟਾਓ",
+  "confirmations.block.confirm": "ਪਾਬੰਦੀ",
+  "confirmations.delete.confirm": "ਹਟਾਓ",
+  "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "confirmations.delete_list.confirm": "ਹਟਾਓ",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
-  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.confirm": "ਪੂਰੀ ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "confirmations.edit.confirm": "ਸੋਧ",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
   "confirmations.reply.confirm": "ਜਵਾਬ ਦੇਵੋ",
-  "confirmations.unfollow.confirm": "ਪ੍ਰਸ਼ੰਸਕੀ ਰੱਦ ਕਰੋ",
+  "confirmations.unfollow.confirm": "ਅਣ-ਫ਼ਾਲੋ",
   "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ",
   "copypaste.copy_to_clipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
   "disabled_account_banner.account_settings": "ਖਾਤੇ ਦੀਆਂ ਸੈਟਿੰਗਾਂ",
@@ -63,165 +92,252 @@
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "emoji_button.activity": "ਗਤੀਵਿਧੀਆਂ",
-  "emoji_button.clear": "ਸਾਫ਼ ਕਰੋ",
+  "emoji_button.activity": "ਗਤੀਵਿਧੀ",
+  "emoji_button.clear": "ਮਿਟਾਓ",
   "emoji_button.custom": "ਕਸਟਮ",
   "emoji_button.flags": "ਝੰਡੀਆਂ",
   "emoji_button.food": "ਖਾਣਾ-ਪੀਣਾ",
   "emoji_button.nature": "ਕੁਦਰਤ",
   "emoji_button.objects": "ਇਕਾਈ",
   "emoji_button.people": "ਲੋਕ",
-  "empty_column.account_timeline": "No toots here!",
+  "emoji_button.search": "ਖੋਜ ਕਰੋ...",
+  "emoji_button.search_results": "ਖੋਜ ਨਤੀਜੇ",
+  "emoji_button.symbols": "ਚਿੰਨ੍ਹ",
+  "emoji_button.travel": "ਸੈਰ ਸਪਾਟਾ ਤੇ ਥਾਵਾਂ",
+  "empty_column.account_timeline": "ਇੱਥੇ ਕੋਈ ਪੋਸਟ ਨਹੀਂ ਹੈ!",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
-  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home": "ਤੁਹਾਡੀ ਟਾਈਮ-ਲਾਈਨ ਖਾਲੀ ਹੈ! ਇਸ ਨੂੰ ਭਰਨ ਲਈ ਹੋਰ ਲੋਕਾਂ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ।",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "errors.unexpected_crash.report_issue": "ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
   "explore.suggested_follows": "ਲੋਕ",
   "explore.title": "ਪੜਚੋਲ ਕਰੋ",
   "explore.trending_links": "ਖ਼ਬਰਾਂ",
-  "explore.trending_statuses": "ਸੰਪਾਦਨਾਵਾਂ",
-  "follow_request.reject": "ਅਸਵੀਕਾਰ ਕਰੋ",
+  "explore.trending_statuses": "ਪੋਸਟਾਂ",
+  "explore.trending_tags": "ਹੈਸ਼ਟੈਗ",
+  "filter_modal.added.settings_link": "ਸੈਟਿੰਗਾਂ ਸਫ਼ਾ",
+  "firehose.all": "ਸਭ",
+  "firehose.local": "ਇਹ ਸਰਵਰ",
+  "firehose.remote": "ਹੋਰ ਸਰਵਰ",
+  "follow_request.reject": "ਰੱਦ ਕਰੋ",
   "footer.about": "ਸਾਡੇ ਬਾਰੇ",
+  "footer.get_app": "ਐਪ ਲਵੋ",
+  "footer.invite": "ਲੋਕਾਂ ਨੂੰ ਸੱਦਾ ਭੇਜੋ",
   "footer.keyboard_shortcuts": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
+  "footer.privacy_policy": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
+  "footer.source_code": "ਸਰੋਤ ਕੋਡ ਵੇਖੋ",
   "footer.status": "ਹਾਲਤ",
   "generic.saved": "ਸਾਂਭੀ ਗਈ",
+  "getting_started.heading": "ਸ਼ੁਰੂ ਕਰੀਏ",
+  "hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
+  "hashtag.column_header.tag_mode.any": "ਜਾਂ {additional}",
+  "hashtag.column_header.tag_mode.none": "{additional} ਬਿਨਾਂ",
+  "hashtag.column_settings.tag_mode.any": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ",
+  "hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
+  "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "home.column_settings.basic": "ਆਮ",
-  "keyboard_shortcuts.back": "to navigate back",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
-  "keyboard_shortcuts.boost": "to boost",
-  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
+  "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
+  "keyboard_shortcuts.blocked": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੂਚੀ ਖੋਲ੍ਹੋ",
+  "keyboard_shortcuts.boost": "ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰੋ",
+  "keyboard_shortcuts.column": "ਫੋਕਸ ਕਾਲਮ",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "ਵਰਣਨ",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.federated": "to open federated timeline",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.heading": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
   "keyboard_shortcuts.home": "to open home timeline",
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.notifications": "ਨੋਟੀਫਿਕੇਸ਼ਨ ਕਾਲਮ ਖੋਲ੍ਹੋ",
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
-  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.profile": "ਲੇਖਕ ਦਾ ਪਰੋਫਾਈਲ ਖੋਲ੍ਹੋ",
+  "keyboard_shortcuts.reply": "ਪੋਸਟ ਨੂੰ ਜਵਾਬ ਦਿਓ",
   "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
-  "keyboard_shortcuts.toot": "to start a brand new toot",
+  "keyboard_shortcuts.toggle_sensitivity": "ਮੀਡੀਆ ਦਿਖਾਉਣ/ਲੁਕਾਉਣ ਲਈ",
+  "keyboard_shortcuts.toot": "ਨਵੀਂ ਪੋਸਟ ਸ਼ੁਰੂ ਕਰੋ",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "ਬੰਦ ਕਰੋ",
   "lightbox.next": "ਅਗਲੀ",
   "lightbox.previous": "ਪਿਛਲੀ",
-  "lists.delete": "ਸੂਚੀ ਮਿਟਾਓ",
+  "link_preview.author": "{name} ਵਲੋਂ",
+  "lists.account.add": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ",
+  "lists.account.remove": "ਸੂਚੀ ਵਿਚੋਂ ਹਟਾਓ",
+  "lists.delete": "ਸੂਚੀ ਹਟਾਓ",
+  "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
+  "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
+  "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
   "mute_modal.duration": "ਮਿਆਦ",
-  "navigation_bar.about": "ਸਾਡੇ ਬਾਰੇ",
+  "navigation_bar.about": "ਇਸ ਬਾਰੇ",
+  "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
+  "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
-  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.community_timeline": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ",
+  "navigation_bar.compose": "ਨਵੀਂ ਪੋਸਟ ਲਿਖੋ",
+  "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.discover": "ਖੋਜ",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
+  "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
+  "navigation_bar.favourites": "ਮਨਪਸੰਦ",
+  "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
+  "navigation_bar.followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
+  "navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
-  "navigation_bar.logout": "ਲਾੱਗ ਆਊਟ, ਬਾਹਰ ਆਉਣਾ",
+  "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
   "navigation_bar.personal": "ਨਿੱਜੀ",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.preferences": "ਤਰਜੀਹਾਂ",
+  "navigation_bar.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
+  "navigation_bar.preferences": "ਪਸੰਦਾਂ",
   "navigation_bar.search": "ਖੋਜੋ",
   "navigation_bar.security": "ਸੁਰੱਖਿਆ",
-  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "not_signed_in_indicator.not_signed_in": "ਇਹ ਸਰੋਤ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾਗਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।",
+  "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
+  "notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
   "notification.reblog": "{name} boosted your status",
-  "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.follow": "ਨਵੇਂ ਫ਼ਾਲੋਅਰ:",
+  "notifications.column_settings.follow_request": "ਨਵੀਆਂ ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ:",
+  "notifications.column_settings.status": "ਨਵੀਆਂ ਪੋਸਟਾਂ:",
+  "notifications.column_settings.update": "ਸੋਧ:",
   "notifications.filter.all": "ਸਭ",
-  "notifications.filter.follows": "ਪ੍ਰਸ਼ੰਸਕ ਬਣਨ 'ਤੇ",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "notifications.filter.boosts": "ਬੂਸਟ",
+  "notifications.filter.favourites": "ਮਨਪਸੰਦ",
+  "notifications.filter.follows": "ਫ਼ਾਲੋ",
+  "notifications.filter.mentions": "ਜ਼ਿਕਰ",
+  "onboarding.actions.go_to_explore": "ਮੈਨੂੰ ਰੁਝਾਨ ਵੇਖਾਓ",
+  "onboarding.actions.go_to_home": "ਮੇਰੀ ਮੁੱਖ ਫੀਡ ਉੱਤੇ ਲੈ ਜਾਓ",
+  "onboarding.follows.lead": "",
+  "onboarding.follows.title": "ਆਪਣੀ ਹੋਮ ਫੀਡ ਨੂੰ ਨਿੱਜੀ ਬਣਾਓ",
+  "onboarding.profile.note": "ਜਾਣਕਾਰੀ",
+  "onboarding.profile.save_and_continue": "ਸੰਭਾਲੋ ਅਤੇ ਜਾਰੀ ਰੱਖੋ",
+  "onboarding.profile.title": "ਪਰੋਫਾਈਲ ਸੈਟਅੱਪ",
+  "onboarding.profile.upload_avatar": "ਪਰੋਫਾਈਲ ਤਸਵੀਰ ਅੱਪਲੋਡ ਕਰੋ",
+  "onboarding.share.title": "ਆਪਣਾ ਪਰੋਫਾਈਲ ਸਾਂਝਾ ਕਰੋ",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
+  "onboarding.start.skip": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਮਦਦ ਨਹੀਂ ਚਾਹੀਦੀ ਹੈ?",
+  "onboarding.start.title": "ਤੁਸੀਂ ਪੂਰਾ ਕਰਨ ਲਿਆ!",
+  "onboarding.steps.follow_people.body": "ਦਿਲਚਸਪ ਲੋਕਾਂ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ, ਇਹ ਤਾਂ ਮਸਟਾਡੋਨ ਹੈ।",
+  "onboarding.steps.follow_people.title": "ਆਪਣੀ ਹੋਮ ਫੀਡ ਨੂੰ ਨਿੱਜੀ ਬਣਾਓ",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "ਆਪਣੀ ਪਹਿਲੀ ਪੋਸਟ ਕਰੋ",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
-  "poll.closed": "ਬੰਦ ਹੋਇਆ",
+  "onboarding.steps.setup_profile.title": "ਆਪਣੇ ਪਰੋਫਾਈਲ ਨੂੰ ਆਪਣਾ ਬਣਾਓ",
+  "onboarding.steps.share_profile.body": "ਆਪਣੇ ਮਿੱਤਰਾਂ ਨੂੰ ਦੱਸੋ ਤੁਹਾਨੂੰ ਮਸਟਾਡੋਨ ਕਿਵੇਂ ਲੱਗਿਆ",
+  "onboarding.steps.share_profile.title": "ਆਪਣੇ ਮਸਟਾਡੋਨ ਪਰੋਫਾਈਲ ਨੂੰ ਸਾਂਝਾ ਕਰੋ",
+  "poll.closed": "ਬੰਦ ਹੈ",
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
+  "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
+  "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
+  "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "regeneration_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...",
   "relative_time.full.just_now": "ਹੁਣੇ ਹੀ",
+  "relative_time.just_now": "ਹੁਣੇ",
+  "relative_time.minutes": "{number}ਮਿੰ",
+  "relative_time.seconds": "{number}ਸ",
   "relative_time.today": "ਅੱਜ",
   "reply_indicator.cancel": "ਰੱਦ ਕਰੋ",
   "report.block": "ਬਲਾਕ",
+  "report.categories.legal": "ਕਨੂੰਨੀ",
   "report.categories.other": "ਬਾਕੀ",
-  "report.categories.spam": "ਸਪਾਮ",
-  "report.category.title_status": "ਸੰਪਾਦਨਾ",
+  "report.categories.spam": "ਸਪੈਮ",
+  "report.category.title_account": "ਪਰੋਫਾਈਲ",
+  "report.category.title_status": "ਪੋਸਟ",
   "report.close": "ਮੁਕੰਮਲ",
   "report.mute": "ਮੌਨ ਕਰੋ",
   "report.next": "ਅਗਲੀ",
-  "report.placeholder": "Type or paste additional comments",
-  "report.submit": "Submit report",
-  "report.target": "Report {target}",
+  "report.placeholder": "ਵਧੀਕ ਟਿੱਪਣੀਆਂ",
+  "report.reasons.dislike": "ਮੈਨੂੰ ਇਹ ਪਸੰਦ ਨਹੀਂ ਹੈ",
+  "report.reasons.spam": "ਇਹ ਸਪੈਮ ਹੈ",
+  "report.submit": "ਭੇਜੋ",
+  "report.target": "{target} ਰਿਪੋਰਟ",
+  "report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.other": "ਬਾਕੀ",
-  "report_notification.categories.spam": "ਸਪਾਮ",
+  "report_notification.categories.spam": "ਸਪੈਮ",
+  "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "search.placeholder": "ਖੋਜੋ",
+  "search_popout.quick_actions": "ਫੌਰੀ ਕਾਰਵਾਈਆਂ",
+  "search_popout.specific_date": "ਖਾਸ ਤਾਰੀਖ",
+  "search_popout.user": "ਵਰਤੋਂਕਾਰ",
+  "search_results.accounts": "ਪਰੋਫਾਈਲ",
   "search_results.all": "ਸਭ",
-  "search_results.statuses": "Toots",
+  "search_results.hashtags": "ਹੈਸ਼ਟੈਗ",
+  "search_results.statuses": "ਪੋਸਟਾਂ",
   "server_banner.learn_more": "ਹੋਰ ਜਾਣੋ",
   "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
-  "sign_in_banner.sign_in": "Sign in",
-  "status.admin_status": "Open this status in the moderation interface",
-  "status.copy": "Copy link to status",
-  "status.delete": "ਮਿਟਾਓ",
+  "sign_in_banner.sign_in": "ਲਾਗਇਨ",
+  "status.admin_status": "",
+  "status.block": "@{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
+  "status.bookmark": "ਬੁੱਕਮਾਰਕ",
+  "status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
+  "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
+  "status.edited": "{date} ਨੂੰ ਸੋਧਿਆ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ਮੜ੍ਹੋ",
+  "status.favourite": "ਪਸੰਦ",
+  "status.history.created": "{name} ਨੇ {date} ਨੂੰ ਬਣਾਇਆ",
+  "status.history.edited": "{name} ਨੇ {date} ਨੂੰ ਸੋਧਿਆ",
   "status.load_more": "ਹੋਰ ਦਿਖਾਓ",
+  "status.media.open": "ਖੋਲ੍ਹਣ ਲਈ ਕਲਿੱਕ ਕਰੋ",
+  "status.media.show": "ਵੇਖਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ",
+  "status.mention": "@{name} ਦਾ ਜ਼ਿਕਰ",
   "status.more": "ਹੋਰ",
-  "status.open": "Expand this status",
-  "status.pinned": "Pinned toot",
+  "status.open": "ਇਹ ਪੋਸਟ ਨੂੰ ਫੈਲਾਓ",
+  "status.pin": "ਪਰੋਫਾਈਲ ਉੱਤੇ ਟੰਗੋ",
+  "status.pinned": "ਟੰਗੀ ਹੋਈ ਪੋਸਟ",
   "status.read_more": "ਹੋਰ ਪੜ੍ਹੋ",
   "status.reblog": "ਵਧਾਓ",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.replied_to": "{name} ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ",
   "status.reply": "ਜਵਾਬ ਦੇਵੋ",
+  "status.replyAll": "ਮਾਮਲੇ ਨੂੰ ਜਵਾਬ ਦਿਓ",
+  "status.report": "@{name} ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
+  "status.sensitive_warning": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ",
   "status.share": "ਸਾਂਝਾ ਕਰੋ",
+  "status.show_filter_reason": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
   "status.show_less": "ਘੱਟ ਦਿਖਾਓ",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
-  "tabs_bar.home": "ਮੁੱਖ ਪੰਨਾ",
+  "status.show_more": "ਹੋਰ ਦਿਖਾਓ",
+  "status.title.with_attachments": "{user} ਨੇ {attachmentCount, plural,one {ਅਟੈਚਮੈਂਟ} other {{attachmentCount}ਅਟੈਚਮੈਂਟਾਂ}} ਪੋਸਟ ਕੀਤੀਆਂ",
+  "status.translate": "ਉਲੱਥਾ ਕਰੋ",
+  "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
+  "tabs_bar.home": "ਘਰ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
-  "timeline_hint.resources.followers": "ਪ੍ਰਸ਼ੰਸਕ",
-  "timeline_hint.resources.follows": "ਪ੍ਰਸ਼ੰਸਕ ਬਣਨ 'ਤੇ",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.followers": "ਫ਼ਾਲੋਅਰ",
+  "timeline_hint.resources.follows": "ਫ਼ਾਲੋ",
+  "timeline_hint.resources.statuses": "ਪੂਰਾਣੀਆਂ ਪੋਸਟਾਂ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
-  "upload_form.audio_description": "Describe for people with hearing loss",
-  "upload_form.description": "Describe for the visually impaired",
+  "units.short.billion": "{count}ਿਬ",
+  "units.short.million": "{count}ਮਿ",
+  "units.short.thousand": "{count}ਹਜ਼ਾਰ",
+  "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
+  "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.undo": "ਮਿਟਾਓ",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_form.undo": "ਹਟਾਓ",
+  "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
   "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
+  "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
   "upload_modal.choose_image": "ਤਸਵੀਰ ਚੁਣੋ",
   "upload_modal.edit_media": "ਮੀਡੀਆ ਸੋਧੋ",
-  "upload_progress.label": "Uploading…",
-  "upload_progress.processing": "ਕਾਰਜ ਅਧੀਨ ਹੈ…",
+  "upload_progress.label": "ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...",
+  "upload_progress.processing": "ਕਾਰਵਾਈ ਚੱਲ ਰਹੀ ਹੈ…",
   "video.exit_fullscreen": "ਪੂਰੀ ਸਕਰੀਨ ਵਿੱਚੋਂ ਬਾਹਰ ਨਿਕਲੋ",
   "video.fullscreen": "ਪੂਰੀ ਸਕਰੀਨ",
-  "video.pause": "ਰਹਾਉ",
+  "video.pause": "ਠਹਿਰੋ",
   "video.play": "ਚਲਾਓ"
 }
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 46fcc01160..0eb4041988 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -488,6 +488,7 @@
   "onboarding.profile.note": "O tebe",
   "onboarding.profile.note_hint": "Môžeš @spomenúť iných ľudí, alebo #haštagy…",
   "onboarding.profile.save_and_continue": "Ulož a pokračuj",
+  "onboarding.profile.title": "Nastavenie profilu",
   "onboarding.profile.upload_avatar": "Nahraj profilový obrázok",
   "onboarding.profile.upload_header": "Nahraj profilové záhlavie",
   "onboarding.share.lead": "Daj ľudom vedieť, ako ťa môžu na Mastodone nájsť!",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 0be9bf6d7a..67b920393a 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -496,7 +496,7 @@
   "onboarding.share.message": "ฉันคือ {username} ใน #Mastodon! มาติดตามฉันที่ {url}",
   "onboarding.share.next_steps": "ขั้นตอนถัดไปที่เป็นไปได้:",
   "onboarding.share.title": "แชร์โปรไฟล์ของคุณ",
-  "onboarding.start.lead": "ตอนนี้คุณเป็นส่วนหนึ่งของ Mastodon แพลตฟอร์มสื่อสังคมที่มีเอกลักษณ์เฉพาะตัว กระจายศูนย์ ที่ซึ่งคุณ—ไม่ใช่อัลกอริทึม—เรียบเรียงประสบการณ์ของคุณเอง มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:",
+  "onboarding.start.lead": "ตอนนี้คุณเป็นส่วนหนึ่งของ Mastodon แพลตฟอร์มสื่อสังคมแบบกระจายศูนย์ที่มีเอกลักษณ์เฉพาะตัว ที่ซึ่งคุณ ไม่ใช่อัลกอริทึม เรียบเรียงประสบการณ์ของคุณเอง มาช่วยให้คุณเริ่มต้นใช้งานพรมแดนทางสังคมใหม่นี้กันเลย:",
   "onboarding.start.skip": "ไม่ต้องการความช่วยเหลือในการเริ่มต้นใช้งาน?",
   "onboarding.start.title": "คุณทำสำเร็จแล้ว!",
   "onboarding.steps.follow_people.body": "การติดตามผู้คนที่น่าสนใจคือสิ่งที่ Mastodon ให้ความสำคัญ",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 4d2452e12d..6bb5ba0ebf 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -1,4 +1,6 @@
 {
+  "about.blocks": "ئوتتۇراھال مۇلازىمېتىر",
+  "about.contact": "ئالاقىلاشقۇچى:",
   "account.badges.bot": "Bot",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.posts": "Toots",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 4fb5a12de3..8484e00c83 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -8,7 +8,7 @@
   "about.domain_blocks.silenced.title": "已受限",
   "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法與此伺服器上的使用者互動或交流。",
   "about.domain_blocks.suspended.title": "已停權",
-  "about.not_available": "無法於此伺服器上使用此資訊。",
+  "about.not_available": "無法於本伺服器上使用此資訊。",
   "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
   "about.rules": "伺服器規則",
   "account.account_note_header": "備註",
@@ -207,14 +207,14 @@
   "dismissable_banner.explore_statuses": "這些於此伺服器以及去中心化網路中其他伺服器發出的嘟文正在被此伺服器上的人們熱烈討論著。越多不同人轉嘟及最愛排名更高。",
   "dismissable_banner.explore_tags": "這些主題標籤正在被此伺服器以及去中心化網路上的人們熱烈討論著。越多不同人所嘟出的主題標籤排名更高。",
   "dismissable_banner.public_timeline": "這些是來自 {domain} 使用者們跟隨中帳號所發表之最新公開嘟文。",
-  "embed.instructions": "如要將此嘟文嵌入您的網站，請複製以下程式碼。",
+  "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
   "emoji_button.clear": "清除",
   "emoji_button.custom": "自訂",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物 & 飲料",
-  "emoji_button.label": "插入表情圖案",
+  "emoji_button.label": "插入表情符號",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "啊就沒這表情符號吼！！ (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "物件",
@@ -353,11 +353,11 @@
   "keyboard_shortcuts.legend": "顯示此說明選單",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
-  "keyboard_shortcuts.muted": "開啟靜音使用者清單",
+  "keyboard_shortcuts.muted": "開啟靜音使用者列表",
   "keyboard_shortcuts.my_profile": "開啟個人檔案頁面",
   "keyboard_shortcuts.notifications": "開啟通知欄",
   "keyboard_shortcuts.open_media": "開啟媒體",
-  "keyboard_shortcuts.pinned": "開啟釘選的嘟文清單",
+  "keyboard_shortcuts.pinned": "開啟釘選的嘟文列表",
   "keyboard_shortcuts.profile": "開啟作者的個人檔案頁面",
   "keyboard_shortcuts.reply": "回應嘟文",
   "keyboard_shortcuts.requests": "開啟跟隨請求列表",
@@ -386,7 +386,7 @@
   "lists.new.create": "新增列表",
   "lists.new.title_placeholder": "新列表標題",
   "lists.replies_policy.followed": "任何跟隨的使用者",
-  "lists.replies_policy.list": "成員清單",
+  "lists.replies_policy.list": "列表成員",
   "lists.replies_policy.none": "沒有人",
   "lists.replies_policy.title": "顯示回覆：",
   "lists.search": "搜尋您跟隨的使用者",
@@ -477,7 +477,7 @@
   "onboarding.actions.back": "返回",
   "onboarding.actions.go_to_explore": "看看發生什麼新鮮事",
   "onboarding.actions.go_to_home": "前往您的首頁時間軸",
-  "onboarding.compose.template": "你好 #Mastodon！",
+  "onboarding.compose.template": "哈囉 #Mastodon！",
   "onboarding.follows.empty": "很遺憾，目前未能顯示任何結果。您可以嘗試使用搜尋、瀏覽探索頁面以找尋人們跟隨、或稍候再試。",
   "onboarding.follows.lead": "您的首頁時間軸是 Mastodon 的核心體驗。若您跟隨更多人的話，它將會變得更活躍有趣。這些個人檔案也許是個好起點，您可以隨時取消跟隨他們！",
   "onboarding.follows.title": "客製化您的首頁時間軸",
@@ -687,7 +687,7 @@
   "status.translated_from_with": "透過 {provider} 翻譯 {lang}",
   "status.uncached_media_warning": "無法預覽",
   "status.unmute_conversation": "解除此對話的靜音",
-  "status.unpin": "從個人檔案頁面取消釘選",
+  "status.unpin": "自個人檔案頁面取消釘選",
   "subscribed_languages.lead": "僅選定語言的嘟文才會出現於您的首頁上，並於變更後列出時間軸。選取「無」以接收所有語言的嘟文。",
   "subscribed_languages.save": "儲存變更",
   "subscribed_languages.target": "變更 {target} 的訂閱語言",
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
new file mode 100644
index 0000000000..480fd56f63
--- /dev/null
+++ b/config/locales/activerecord.ia.yml
@@ -0,0 +1,8 @@
+---
+ia:
+  activerecord:
+    attributes:
+      user:
+        password: Contrasigno
+      user/account:
+        username: Nomine de usator
diff --git a/config/locales/activerecord.ie.yml b/config/locales/activerecord.ie.yml
new file mode 100644
index 0000000000..09926d0d73
--- /dev/null
+++ b/config/locales/activerecord.ie.yml
@@ -0,0 +1 @@
+ie:
diff --git a/config/locales/activerecord.lad.yml b/config/locales/activerecord.lad.yml
new file mode 100644
index 0000000000..625d897d0b
--- /dev/null
+++ b/config/locales/activerecord.lad.yml
@@ -0,0 +1,51 @@
+---
+lad:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Limito temporal
+        options: Opsyones
+      user:
+        agreement: Akodro de servisyo
+        email: Adreso de posta elektronika
+        locale: Lingua
+        password: Kod
+      user/account:
+        username: Nombre de uzador
+      user/invite_request:
+        text: Razon
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: solo puede kontener letras, shifras i sulinyados
+              reserved: esta rezervado
+        admin/webhook:
+          attributes:
+            url:
+              invalid: no es adreso URL valido
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: no es adreso URL valido
+        import:
+          attributes:
+            data:
+              malformed: tiene formato yerrado
+        user:
+          attributes:
+            email:
+              blocked: uza un prokurador de posta no autorizado
+              unreachable: no parese existir
+            role_id:
+              elevated: no puede ser mas alto ke tu rolo aktual
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: inkluir permisos ke no son siguros para el rolo de baza
+              elevated: no se puede inkluir permisos kualos no tiene tu rolo aktual
+              own_role: no se puede trokar kon tu rolo aktual
+            position:
+              elevated: no puede ser mas alto ke tu rolo aktual
+              own_role: no se puede trokar kon tu rolo aktual
diff --git a/config/locales/activerecord.pa.yml b/config/locales/activerecord.pa.yml
index bb8a6c834d..ea95c89477 100644
--- a/config/locales/activerecord.pa.yml
+++ b/config/locales/activerecord.pa.yml
@@ -1 +1,23 @@
+---
 pa:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: ਆਖਰੀ ਤਾਰੀਖ
+        options: ਚੋਣਾਂ
+      user:
+        agreement: ਸੇਵਾ ਸਮਝੌਤਾ
+        email: ਈਮੇਲ ਪਤਾ
+        locale: ਲੋਕੇਲ
+        password: ਪਾਸਵਰਡ
+      user/account:
+        username: ਵਰਤੋਂਕਾਰ-ਨਾਂ
+      user/invite_request:
+        text: ਕਾਰਨ
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: ਸਿਰਫ਼ ਅੱਖਰ, ਅੰਕ ਅਤੇ ਹੇਠਾਂ-ਰੇਖਾ ਹੀ ਹੋੋਣੀ ਚਾਹੀਦੀ ਹੈ
+              reserved: ਰਾਖਵਾਂ ਹੈ
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
new file mode 100644
index 0000000000..6ab26788bd
--- /dev/null
+++ b/config/locales/devise.ia.yml
@@ -0,0 +1 @@
+ia:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
new file mode 100644
index 0000000000..09926d0d73
--- /dev/null
+++ b/config/locales/devise.ie.yml
@@ -0,0 +1 @@
+ie:
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index 7d5668c920..fb90c08c7f 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -13,7 +13,7 @@ io:
       locked: Tua konto esas extingita.
       not_found_in_database: Nejusta %{authentication_keys}.
       pending: Vua konti ankore kontrolesas.
-      timeout: Tua kunsido expiris. Voluntez rienirar por durar.
+      timeout: Vua kunsido expiris. Voluntez rienirar por avancar.
       unauthenticated: Tu devas enirar o membreskar por durar.
       unconfirmed: Tu devas konfirmar tua konto por durar.
     mailer:
@@ -102,7 +102,7 @@ io:
     unlocks:
       send_instructions: Tu recevos retpost-mesajo kun instrucioni por riacendar tua konto pos kelka minuti.
       send_paranoid_instructions: Se tua retpost-adreso existas en nia datumbazo, tu recevos ligilo por riacendar tua konto per retpost-meajo.
-      unlocked: Tua konto riacendesis senprobleme, tu nun esas enirinta.
+      unlocked: Vua konto desklefagesis senprobleme. Voluntez enirar por avancar.
   errors:
     messages:
       already_confirmed: ja konfirmesis, voluntez probar enirar
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
new file mode 100644
index 0000000000..eeaa3294e2
--- /dev/null
+++ b/config/locales/devise.lad.yml
@@ -0,0 +1 @@
+lad:
diff --git a/config/locales/devise.pa.yml b/config/locales/devise.pa.yml
index bb8a6c834d..7d56361f63 100644
--- a/config/locales/devise.pa.yml
+++ b/config/locales/devise.pa.yml
@@ -1 +1,18 @@
+---
 pa:
+  devise:
+    confirmations:
+      confirmed: ਤੁਹਾਡੇ ਈਮੇਲ ਸਿਰਨਾਵੇਂ ਨੂੰ ਕਾਮਯਾਬੀ ਨਾਲ ਤਸਦੀਕ ਕੀਤਾ ਗਿਆ ਹੈ।
+    failure:
+      inactive: ਤੁਹਾਡਾ ਖਾਤਾ ਹਾਲੇ ਸਰਗਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।
+      invalid: ਗਲਤ %{authentication_keys} ਜਾਂ ਪਾਸਵਰਡ ਹੈ।
+      last_attempt: ਤੁਹਾਡੇ ਖਾਤੇ ਦੇ ਲਾਕ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਹੋਰ ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।
+      locked: ਤੁਹਾਡਾ ਖਾਤਾ ਲਾਕ ਹੋ ਗਿਆ ਹੈ।
+      not_found_in_database: ਗਲਤ %{authentication_keys} ਜਾਂ ਪਾਸਵਰਡ ਹੈ।
+      pending: ਤੁਹਾਡਾ ਖਾਤਾ ਹਾਲੇ ਵੀ ਪੜਤਾਲ ਅਧੀਨ ਹੈ।
+      timeout: ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗੀ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਫੇਰ ਲਾਗਇਨ ਕਰੋ।
+      unauthenticated: ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਲਾਗਇਨ ਜਾਂ ਸਾਈਨ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।
+    sessions:
+      already_signed_out: ਕਾਮਯਾਬੀ ਨਾਲ ਸਾਈਨ ਆਉਟ ਕੀਤਾ।
+      signed_in: ਕਾਮਯਾਬੀ ਨਾਲ ਸਾਈਨ ਇਨ ਕੀਤਾ।
+      signed_out: ਕਾਮਯਾਬੀ ਨਾਲ ਸਾਈਨ ਆਉਟ ਕੀਤਾ।
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
new file mode 100644
index 0000000000..6ab26788bd
--- /dev/null
+++ b/config/locales/doorkeeper.ia.yml
@@ -0,0 +1 @@
+ia:
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
new file mode 100644
index 0000000000..83c9cc564f
--- /dev/null
+++ b/config/locales/doorkeeper.ie.yml
@@ -0,0 +1,11 @@
+---
+ie:
+  doorkeeper:
+    grouped_scopes:
+      title:
+        follow: Seques, silentias e bloccas
+        mutes: Silentias
+    scopes:
+      read:mutes: vider tui silentias
+      write:conversations: silentiar e deleter conversationes
+      write:mutes: silentiar persones e conversationes
diff --git a/config/locales/doorkeeper.io.yml b/config/locales/doorkeeper.io.yml
index e2418e4c77..a71fa95841 100644
--- a/config/locales/doorkeeper.io.yml
+++ b/config/locales/doorkeeper.io.yml
@@ -122,12 +122,14 @@ io:
         admin/accounts: Administrar di konti
         admin/all: Omna administrofuncioni
         admin/reports: Administro di raporti
+        all: Kompleta aceso a vua Mastodon-konto
         blocks: Restriktita
         bookmarks: Libromarki
         conversations: Konversi
         crypto: Intersequanta chifro
         favourites: Favoriziti
         filters: Filtrili
+        follow: Sequati, silencigati e blokusati
         follows: Sequati
         lists: Listi
         media: Mediatachaji
diff --git a/config/locales/doorkeeper.lad.yml b/config/locales/doorkeeper.lad.yml
new file mode 100644
index 0000000000..eeaa3294e2
--- /dev/null
+++ b/config/locales/doorkeeper.lad.yml
@@ -0,0 +1 @@
+lad:
diff --git a/config/locales/doorkeeper.pa.yml b/config/locales/doorkeeper.pa.yml
index bb8a6c834d..4ed0c7db65 100644
--- a/config/locales/doorkeeper.pa.yml
+++ b/config/locales/doorkeeper.pa.yml
@@ -1 +1,85 @@
+---
 pa:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਨਾਂ
+        website: ਐਪਲੀਕੇਸ਼ਨ ਵੈੱਬਸਾਈਟ
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: ਪਰਮਾਣਿਤ
+        cancel: ਰੱਦ ਕਰੋ
+        destroy: ਖਾਰਜ
+        edit: ਸੋਧੋ
+        submit: ਭੇਜੋ
+      confirmations:
+        destroy: ਪੱਕਾ?
+      edit:
+        title: ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਸੋਧੋ
+      form:
+        error: ਓਹ ਹੋ! ਸੰਭਾਵਿਤ ਗਲਤੀਆਂ ਲਈ ਆਪਣੇ ਫਾਰਮ ਦੀ ਜਾਂਚ ਕਰੋ
+      index:
+        application: ਐਪਲੀਕੇਸ਼ਨ
+        callback_url: ਕਾਲਬੈਕ URL
+        delete: ਹਟਾਓ
+        empty: ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਹੈ।
+        name: ਨਾਂ
+        new: ਨਵੀਂ ਐਪਲੀਕੇਸ਼ਨ
+        scopes: ਸਕੋਪ
+        show: ਵੇਖਾਓ
+        title: ਤੁਹਾਡੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ
+      new:
+        title: ਨਵੀਂ ਐਪਲੀਕੇਸ਼ਨ
+      show:
+        actions: ਕਾਰਵਾਈਆਂ
+        application_id: ਕਲਾਈਂਟ ਕੁੰਜੀ
+        callback_urls: ਕਾਲਬੈਕ URL
+        scopes: ਸਕੋਪ
+        secret: ਕਲਾਈਂਟ ਭੇਤ
+        title: 'ਐਪਲੀਕੇਸ਼ਨ: %{name}'
+    authorizations:
+      buttons:
+        authorize: ਪਰਮਾਣਿਤ
+        deny: ਇਨਕਾਰ ਕਰੋ
+      error:
+        title: ਗਲਤੀ ਆਈ ਹੈ
+      new:
+        review_permissions: ਇਜਾਜ਼ਤਾਂ ਦੀ ਪੜਤਾਲ ਕਰੋ
+        title: ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ
+    authorized_applications:
+      buttons:
+        revoke: ਮਨਸੂਖ ਕਰੋ
+      confirmations:
+        revoke: ਪੱਕਾ?
+      index:
+        authorized_at: "%{date} ਨੂੰ ਪਰਮਾਣਿਤ ਕੀਤਾ"
+        last_used_at: "%{date} ਨੂੰ ਆਖਰੀ ਵਾਰ ਵਰਤਿਆ"
+        never_used: ਕਦੀ ਨਹੀਂ ਵਰਤਿਆ
+        scopes: ਇਜਾਜ਼ਤਾਂ
+        superapp: ਅੰਦਰੂਨੀ
+    grouped_scopes:
+      title:
+        accounts: ਖਾਤੇ
+        blocks: ਪਾਬੰਦੀਸ਼ੁਦਾ
+        bookmarks: ਬੁੱਕਮਾਰਕ
+        crypto: ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇੰਕ੍ਰਿਪਸ਼ਨ
+        favourites: ਮਨਪਸੰਦ
+        filters: ਫਿਲਟਰ
+        follow: ਫ਼ਾਲੋ, ਮੌਨ ਅਤੇ ਪਾਬੰਦੀ ਲਾਏ
+        follows: ਫ਼ਾਲੋ
+        lists: ਸੂਚੀਆਂ
+        media: ਨੱਥੀ ਕੀਤਾ ਮੀਡੀਆ
+        mutes: ਮੌਨ
+        notifications: ਨੋਟੀਫਿਕੇਸ਼ਨ
+        reports: ਰਿਪੋਰਟਾਂ
+        search: ਖੋਜੋ
+        statuses: ਪੋਸਟਾਂ
+    layouts:
+      admin:
+        nav:
+          applications: ਐਪਲੀਕੇਸ਼ਨਾਂ
+    scopes:
+      write:follows: ਲੋਕਾਂ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ
+      write:lists: ਸੂਚੀਆਂ ਬਣਾਓ
+      write:media: ਮੀਡੀਆ ਫਾਇਲਾਂ ਅੱਪਲੋਡ ਕਰੋ
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e3062d9dff..bcf8540e74 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -777,6 +777,8 @@ eu:
           open: Edonork eman dezake izena
       security:
         authorized_fetch: Eskatu autentifikazioa federatutako zerbitzarietatik
+        authorized_fetch_hint: Zerbitzari federatuen autentifikazioa eskatzeak erabiltzaile-mailako zein zerbitzari-mailako blokeak zorrotzago betearaztea ahalbidetzen du. Hala ere, horrek errendimendu galera dakar, zure erantzunen irismena murrizten du eta baliteke federatutako zerbitzu batzuekin bateragarritasun-arazoak sortu ahal izatea. Horrez gain, horrek ez du eragotziko aktore dedikatuek zure mezu eta kontu publikoak eskuratzea.
+        authorized_fetch_overridden_hint: Une honetan ezin duzu ezarpen hau aldatu ingurune-aldagai batek gainidazten duelako.
         federation_authentication: Federazio autentifikazioaren betearaztea
       title: Zerbitzariko ezarpenak
     site_uploads:
@@ -784,6 +786,7 @@ eu:
       destroyed_msg: Guneko igoera ongi ezabatu da!
     software_updates:
       critical_update: Kritikoa — mesedez, eguneratu azkar
+      description: Zure Mastodon instalazioa eguneratuta mantentzea gomendatzen da azken konponketa eta hobekuntzak edukitzeko. Gainera, batzuetan funtsezkoa da Mastodon garaiz eguneratzea segurtasun-arazoak saihesteko. Arrazoi horiengatik, Mastodonek eguneratzeak egiaztatzen ditu 30 minuturo, eta zure posta elektronikoko jakinarazpen-hobespenen arabera jakinaraziko dizu.
       documentation_link: Informazio gehiago
       release_notes: Bertsio oharrak
       title: Eguneraketak eskuragarri
@@ -791,6 +794,7 @@ eu:
       types:
         major: Argitalpen handia
         minor: Argitalpen txikia
+        patch: Partxe eguneraketa — akatsen konponketa eta aplikatzeko aldaketa errazak
       version: Bertsioa
     statuses:
       account: Egilea
@@ -976,6 +980,7 @@ eu:
       next_steps: Apelazioa onartu dezakezu moderazio erabakia desegiteko, edo ez ikusia egin.
       subject: "%{username} erabiltzailea %{instance} instantziako moderazio erabaki bat apelatzen ari da"
     new_critical_software_updates:
+      body: Mastodon-en bertsio kritiko berriak kaleratu dira, agian lehenbailehen eguneratu nahi duzu!
       subject: "%{instance} ek eguneraketa kritikoak eskuragarri ditu!"
     new_pending_account:
       body: Kontu berriaren xehetasunak azpian daude. Eskaera hau onartu edo ukatu dezakezu.
@@ -1037,10 +1042,12 @@ eu:
       hint_html: Azken kontu bat! Gizakia zarela berretsi behar dugu (zabor-kontuak kanpoan mantentzeko baino ez da!) Ebatzi azpiko CAPTCHA eta sakatu "Jarraitu".
       title: Segurtasun txekeoa
     confirmations:
+      awaiting_review: Zure helbide elektronikoa baieztatu da! %{domain} lan taldea zure erregistroa berrikusten ari da. Mezu elektroniko bat jasoko duzu zure kontua onartzen badute!
       awaiting_review_title: Zure izen-ematea berrikusten ari da
       clicking_this_link: lotura hau klikatzen
       login_link: hasi saioa
       proceed_to_login_html: Orain jarraitu dezakezu %{login_link} -era.
+      redirect_to_app_html: "<strong>%{app_name}</strong> aplikaziora berbideratua izan beharko zenuke. Hori gertatu ez bada, saiatu %{clicking_this_link} edo eskuz itzuli."
       registration_complete: Osatuta dago orain zure izen-ematea %{domain} -en!
       welcome_title: Ongi etorri, %{name}!
       wrong_email_hint: Helbide-elektroniko hori zuzena ez bada, kontuaren ezarpenetan alda dezakezu.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
new file mode 100644
index 0000000000..64315d177f
--- /dev/null
+++ b/config/locales/ia.yml
@@ -0,0 +1,52 @@
+---
+ia:
+  admin:
+    accounts:
+      delete: Deler datos
+      deleted: Delite
+      display_name: Nomine visibile
+      enabled: Activate
+      location:
+        all: Toto
+        title: Location
+      moderation:
+        disabled: Disactivate
+      reset: Reinitialisar
+      reset_password: Reinitialisar contrasigno
+      search: Cercar
+      security: Securitate
+      username: Nomine de usator
+    custom_emojis:
+      copy: Copiar
+      create_new_category: Crear nove categoria
+      delete: Deler
+    domain_blocks:
+      confirm_suspension:
+        cancel: Cancellar
+      export: Exportar
+      import: Importar
+    email_domain_blocks:
+      add_new: Adder nove
+      delete: Deler
+    export_domain_allows:
+      no_file: Necun file seligite
+    follow_recommendations:
+      language: Per lingua
+      status: Stato
+    instances:
+      dashboard:
+        instance_languages_dimension: Linguas principal
+      delivery:
+        unavailable: Non disponibile
+      private_comment: Commento private
+      public_comment: Commento public
+    invites:
+      filter:
+        available: Disponibile
+    ip_blocks:
+      delete: Deler
+      expires_in:
+        '1209600': 2 septimanas
+        '15778476': 6 menses
+        '2629746': 1 mense
+        '86400': 1 die
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
new file mode 100644
index 0000000000..c5668edbd6
--- /dev/null
+++ b/config/locales/ie.yml
@@ -0,0 +1,68 @@
+---
+ie:
+  accounts:
+    pin_errors:
+      following: Tu deve ja sequer li person quem tu vole indossar
+  admin:
+    action_logs:
+      action_types:
+        create_announcement: Crear un proclamation
+        destroy_announcement: Deleter un proclamation
+        update_announcement: Actualisar un proclamation
+      actions:
+        create_announcement_html: "%{name} creat li nov proclamation %{target}"
+        destroy_announcement_html: "%{name} deletet li proclamation %{target}"
+        update_announcement_html: "%{name} actualisat li proclamation %{target}"
+    announcements:
+      destroyed_msg: Proclamation deletet successosimen!
+      edit:
+        title: Redacter proclamation
+      empty: Null proclamationes trovat.
+      live: Activ
+      new:
+        create: Crear un proclamation
+        title: Nov proclamation
+      publish: Publicar
+      published_msg: Proclamation publicat successosimen!
+      scheduled_for: Planat por %{time}
+      scheduled_msg: Proclamation planat por publication!
+      title: Proclamationes
+      unpublish: Despublicar
+      unpublished_msg: Proclamation despublicat successosimen!
+      updated_msg: Proclamation actualisat successosimen!
+    roles:
+      privileges:
+        manage_announcements: Tractar proclamationes
+        manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
+  exports:
+    mutes: Tu silentia
+  featured_tags:
+    hint_html: "<strong>Pinglar tui max important hashtags sur tui profil.</strong> Un bonissim maniere de mantener un registre de tui ovres e projectes, pinglat hashtags es monstrat prominentmen sur tui profil e permisse rapid accesse a tui propri postas."
+  imports:
+    overwrite_preambles:
+      muting_html: Tu va <strong>remplazzar tui liste de silentiat contos</strong> per til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+    preambles:
+      muting_html: Tu va <strong>silentiar</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+    titles:
+      muting: Importation de silentiat contos
+    type_groups:
+      destructive: Bloccas & silentias
+  move_handler:
+    carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat.
+  notification_mailer:
+    follow_request:
+      action: Tractar petitiones de sequer
+      body: "%{name} ha petit sequer te"
+      subject: 'Pendent sequitor: %{name}'
+      title: Nov petition de sequer
+    mention:
+      action: Responder
+  statuses:
+    pin_errors:
+      direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores
+      limit: Tu ja ha pinglat li maxim númere de postas
+      ownership: On ne posse pinglar li posta de un altri person
+      reblog: On ne posse pinglar un boost
+  statuses_cleanup:
+    keep_pinned: Conservar pinglat postas
+    keep_pinned_hint: Delete null de tui pinglat postas
diff --git a/config/locales/io.yml b/config/locales/io.yml
index c9a0dcd736..eb5fcc709d 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -91,6 +91,7 @@ io:
       moderation:
         active: Aktiva
         all: Omna
+        disabled: Desaktivigita
         pending: Vartanta
         silenced: Limitizita
         suspended: Restriktita
@@ -116,12 +117,16 @@ io:
       redownloaded_msg: Sucesoze rifreshis profilo di %{username} de origino
       reject: Refuzez
       rejected_msg: Sucesoze refuzis registroapliko di %{username}
+      remote_suspension_irreversible: La datumi di ca konto esas nerenversebla efacita.
+      remote_suspension_reversible_hint_html: Ca konto restriktesis che lua servilo, e la datumi tota efacesos ye %{date}. Ante ta tempo, la fora servilo povos restaurar ca konto sen irga mala efecti. Se vu volas efacar omna datumi dil konto quik, vu povas facar lo sube.
       remove_avatar: Efacez profilimajo
       remove_header: Efacez kapimajo
       removed_avatar_msg: Sucesoze efacis profilimajo di %{username}
       removed_header_msg: Sucesoze efacis kapimajo di %{username}
       resend_confirmation:
         already_confirmed: Ca uzanto ja konfirmesis
+        send: Risendez konfirmligilo
+        success: Konfirmligilo sucesoze sendesas!
       reset: Richanjez
       reset_password: Richanjez pasvorto
       resubscribe: Riabonez
@@ -129,6 +134,7 @@ io:
       search: Trovez
       search_same_email_domain: Altra uzanti kun sama retpostodomeno
       search_same_ip: Altra uzanti kun sama IP
+      security: Sekureso
       security_measures:
         only_password: Nur pasvorto
         password_and_2fa: Pasvorto e 2FA
@@ -205,6 +211,7 @@ io:
         reject_user: Refuzez uzanto
         remove_avatar_user: Efacez profilimajo
         reopen_report: Riapertez raporto
+        resend_user: Risendez konfirmretposto
         reset_password_user: Richanjez pasvorto
         resolve_report: Rezolvez raporto
         sensitive_account: Forcsentoza konto
@@ -263,6 +270,7 @@ io:
         reject_user_html: "%{name} refuzis registro de %{target}"
         remove_avatar_user_html: "%{name} efacis profilimajo de %{target}"
         reopen_report_html: "%{name} riapertis raporto %{target}"
+        resend_user_html: "%{name} risendis konfirmretposto por %{target}"
         reset_password_user_html: "%{name} richanjis pasvorto de uzanto %{target}"
         resolve_report_html: "%{name} rezolvis raporto %{target}"
         sensitive_account_html: "%{name} markizis medii di %{target} quale sentoza"
@@ -279,6 +287,7 @@ io:
         update_ip_block_html: "%{name} kreis regulo por IP %{target}"
         update_status_html: "%{name} novigis posto da %{target}"
         update_user_role_html: "%{name} chanjis rolo di %{target}"
+      deleted_account: konto efacita
       empty: Nula logi.
       filter_by_action: Filtrez segun ago
       filter_by_user: Filtrez segun uzanto
@@ -300,6 +309,7 @@ io:
       unpublish: Depublikigez
       unpublished_msg: Anunco sucesoze depublikigesas!
       updated_msg: Anunco sucesoza novigesas!
+    critical_update_pending: Urjanta aktualigo vartesas
     custom_emojis:
       assign_category: Insertez kategorio
       by_domain: Domeno
@@ -373,6 +383,15 @@ io:
       undo: Despermisez federato kun domeno
     domain_blocks:
       add_new: Add new
+      confirm_suspension:
+        cancel: Anulez
+        confirm: Restriktez
+        permanent_action: Desrestriktar la servilo ne restaurar irga datumi o relati.
+        preamble_html: Vu restriktos <strong>%{domain}</strong> e lua subdomeni.
+        remove_all_data: Co efacos omna kontenaji, imaji, videi e profildatumi por la konti di ca domeno de vua servilo.
+        stop_communication: Vua servilo haltos komunikar kun ca servili.
+        title: Konfirmez domenoblokuso por %{domain}
+        undo_relationships: Co desfacos irga sequorelato inter konti di ca servili e vua.
       created_msg: Domenobstrukto nun procedesas
       destroyed_msg: Domenobstrukto desagesis
       domain: Domeno
@@ -385,6 +404,7 @@ io:
         create: Kreez obstrukto
         hint: Domenobstrukto ne preventos kreo di kontrekordaji en datumaturo, ma retroaktive e automate aplikos partikulara jermetodi a ta konti.
         severity:
+          desc_html: "<strong>Limitizez</strong> facos la posti dil konti di ca domeno nevidebla da irgu qua ne sequas li. <strong>Restriktez</strong> efacos omna kontenaji, imaji, videi e profildatumi dil konti di ca domeno de vua servilo. Uzez <strong>Nulo</strong> se vu volas nur refuzar imaji e videi."
           noop: Nulo
           silence: Limito
           suspend: Restriktez
@@ -419,9 +439,23 @@ io:
         resolve: Rezolvez domeno
         title: Obstruktez nova retpostodomeno
       no_email_domain_block_selected: Retpostodomenobstrukti ne chanjesis por ke nulo selektesis
+      not_permitted: Ne permisata
       resolved_dns_records_hint_html: Ca domennomo rezolvesas a ca MX-domeni, quale esas ultime responsanta por ganar retposto. Obstruktar MX-domeno obstruktos registri de irga retpostoadreso quo uzas sama MX-domeni, mem se la videbla domennomo esas diferanta. <strong>Sorgemez e ne obstruktez majora retpostositi.</strong>
       resolved_through_html: Rezolvesis tra %{domain}
       title: Obstruktita retpostodomeni
+    export_domain_allows:
+      no_file: Nula dosiero selektesas
+    export_domain_blocks:
+      import:
+        description_html: Vu importacos listo de domenoblokusi. Voluntez kontrolar la listo sorgoze, partikulare se vu ne kreis la listo personale.
+        existing_relationships_warning: Existanta sequo-relati
+        private_comment_description_html: 'Por helpar vu savar de ube importacita blokusi venis, importacita blokusi kreesos kun la sequanta komento privata: <q>%{comment}</q>'
+        private_comment_template: Importacita de %{source} ye %{date}
+        title: Importacar domenoblokusi
+      invalid_domain_block: 'Un o plu kam un domenoblokuso omisesis pro la sequanta eroro(-i): %{error}'
+      new:
+        title: Importacar domenoblokusi
+      no_file: Nula dosiero selektesas
     follow_recommendations:
       description_html: "<strong>Sequorekomendi helpas nova uzanti rapide trovar interesanta kontenajo</strong>. Se uzanto ne interagas kun altra personi sate por igar personaligita sequorekomendi, ca konti rekomendas. Oli rikalkulesas die de mixo di konti kun maxim alta recenta interagi e maxim altra lokala sequantoquanto segun selektita linguo."
       language: Por linguo
@@ -450,6 +484,7 @@ io:
       content_policies:
         comment: Interna noto
         description_html: Vu povas fixar kontenajguidili quo aplikesos a omna konti de ca domeno e irga oli subdomeni.
+        limited_federation_mode_description_html: Vu povas selektar ka vu permisos federar kun ca domeno.
         policies:
           reject_media: Refusez medii
           reject_reports: Refusez raporti
@@ -497,6 +532,7 @@ io:
       total_reported: Raporti pri oli
       total_storage: Mediiatachaji
       totals_time_period_hint_html: Sumi quo montresas sube inkluzas informi de pos la komenco.
+      unknown_instance: Prezente ne esas registrago pri ta domeno che ca servilo.
     invites:
       deactivate_all: Deaktivigez omno
       filter:
@@ -553,20 +589,27 @@ io:
         mark_as_sensitive_description_html: Medii en raportizita posti markizesos quale sentoza e streko rekordigesos por helpar vu intensigar en nexta malagi da la sama konto.
         other_description_html: Videz plu multa opcioni por dominacar konduto di konto e kustumizar komuniko a raportizita konto.
         resolve_description_html: Nulo agesos kontre raportizita konto, streko ne rekordizesos e raporto klozesos.
+        silence_description_html: Konto esos videbla nur por personi qui ja sequas lo o manuale serchas lo, severe limitizante lua atingo. On sempre povas desfacar co. Klozas omna raporti kontra ca konto.
+        suspend_description_html: Ca konto e omna kontenaji esos neacesebla e efacota, e interagar kun ol esos neposibla. Desfacebla dum 30 dii. Klozas omna raporti kontra ca konto.
       actions_description_html: Decidez ago por rezolvar ca raporto. Se vu decidar puniso kontre raportizesis konto, retpostoavizo sendesos a ol, ecepte kande <strong>Spam</strong> kategorio selektesis.
+      actions_description_remote_html: Selektez quo vu agos por solvar ca raporto. Co nur efektigos quale <strong>vua</strong> servilo komunikas kun ca fora konto e traktas lua kontenaji.
       add_to_report: Insertez pluse a raporto
       are_you_sure: Ka vu esas certa?
       assign_to_self: Taskigez me
       assigned: Taskigita jerero
       by_target_domain: Domeno di raportizita konto
+      cancel: Anulez
       category: Kategorio
       category_description_html: La motivo ke ca konto e kontenajo raportizesis citesos por komuniko kun raportizita konto
       comment:
         none: Nulo
       comment_description_html: 'Por donar plu multa informo, %{name} skribis:'
+      confirm: Konfirmez
+      confirm_action: Konfirmez jero-ago kontra @%{acct}
       created_at: Raportizesis
       delete_and_resolve: Efacez posti
       forwarded: Sendesis
+      forwarded_replies_explanation: Ca raporto esas de fora uzanto e pri fora kontenajo. Esis dissemata a vu pro ke la raportita kontenajo es respondo a un ek vua uzanti.
       forwarded_to: Sendesis a %{domain}
       mark_as_resolved: Markizez quale rezolvita
       mark_as_sensitive: Markizez quale sentoza
@@ -580,6 +623,7 @@ io:
         placeholder: Deskriptez quo agesis o irga relatita novaji...
         title: Noti
       notes_description_html: Videz e pozez noti a altra jereri e vua su en futuro
+      processed_msg: 'Raporto #%{id} sucesoze traktita'
       quick_actions_description_html: 'Agetez o volvez base por vidar raportizita kontenajo:'
       remote_user_placeholder: nelokala uzanti de %{instance}
       reopen: Riapertez raporto
@@ -592,9 +636,28 @@ io:
       status: Stando
       statuses: Raportizita kontenajo
       statuses_description_html: Ofensanta kontenajo citesos en komuniko kun raportizita konto
+      summary:
+        action_preambles:
+          delete_html: 'Vu <strong>efacos</strong> kelka posti di <strong>@%{acct}</strong>. Co facos lo sequanta:'
+          mark_as_sensitive_html: 'Vu <strong>markizos</strong> kelka posti di <strong>@%{acct}</strong> quale <strong>provokema</strong>. Co facos lo sequanta:'
+          silence_html: 'Vu <strong>limitizos</strong> la konto di <strong>@%{acct}</strong>. Co facos lo sequanta:'
+          suspend_html: 'Vu <strong>restriktos</strong> la konto di <strong>@%{acct}</strong>. Co facos lo sequanta:'
+        actions:
+          delete_html: Efacar la ofensiva posti
+          mark_as_sensitive_html: Markizar la atachuri dil posti quale provokema
+          silence_html: Severe limitizar la atingo dil konto di <strong>@%{acct}</strong> per facar ke lua profilo e posti es videbla nur a personi qui ja sequas lu o qui manuale serchas lua profilo
+          suspend_html: Restriktar <strong>@%{acct}</strong>, facante ke lua profilo e kontenaji neacesibla e neposibla por interagado
+        close_report: 'Markizar raporto #%{id} quale solvita'
+        close_reports_html: Markizar <strong>omna</strong> raporti contra <strong>@%{acct}</strong> quale solvita
+        delete_data_html: Efacor la profilo e kontenaji di <strong>@%{acct}</strong> ye 30 dii de nun ecepte ke lu esus desrestrikita ante ta tempe
+        preview_preamble_html: "<strong>@%{acct}</strong> recevos averto kun la sequanta kontenajo:"
+        record_strike_html: Registrar punto kontra <strong>@%{acct}</strong> por helpar vu traktar futura reguloviolaci di ca konto
+        send_email_html: Sendez a <strong>@%{acct}</strong> avertala retposto
+        warning_placeholder: Neobligata plusa expliko por la jero-ago.
       target_origin: Fonto di raportizita konto
       title: Raporti
       unassign: Detaskigez
+      unknown_action_msg: 'Nekonocata ago: %{action}'
       unresolved: Nerezolvita
       updated_at: Novigesis
       view_profile: Videz profilo
@@ -676,14 +739,21 @@ io:
       branding:
         preamble: Fabrikmarko di ca servilo diferentigas lu de altra servili en la reto. Ca informi forsan montresas che diversa loki. Do, ca informi debas esar klara.
         title: Fabrikmarkeso
+      captcha_enabled:
+        title: Postular ke nova uzanti solvos CAPTCHA por konfirmar lia konti
       content_retention:
         preamble: Dominacez quale uzantigita kontenajo retenesar en Mastodon.
         title: Kontenajreteneso
+      default_noindex:
+        desc_html: Efektigas omna uzanti qui ne personale chanjis ca opciono
+        title: Despartoprenigez uzanti de serchilo-indexi quale originala stando
       discovery:
         follow_recommendations: Sequez rekomendaji
         preamble: Montrar interesanta kontenajo esas importanta ye voligar nova uzanti quo forsan ne savas irgu. Dominacez quale ca deskovrotraiti funcionar en ca servilo.
         profile_directory: Profilcheflisto
         public_timelines: Publika tempolinei
+        publish_discovered_servers: Publikar deskovrita servili
+        publish_statistics: Publikar statistiki
         title: Deskovro
         trends: Tendenci
       domain_blocks:
@@ -698,20 +768,51 @@ io:
           approved: Aprobo bezonesas por registro
           none: Nulu povas registrar
           open: Irgu povas registrar
+      security:
+        authorized_fetch: Postular autentikigo de federata servili
+        authorized_fetch_hint: Postular autentikigo de federata servili kapabligar plu strikta enforcigo dil blokusi di uzanti e dil servilo. Tamen, co enduktos exekutado-lentigo, diminutos la atingebleso di via respondi, e forsan enduktos koncilieblesoproblemi kun kelka softwari federata. Pluse, co ne preventos aganti dedikita de acesar vua publika posti e konti.
+        authorized_fetch_overridden_hint: Vu prezente ne povas chanjar ca opciono pro ke ol es remplasata da environmentala varieblo.
+        federation_authentication: Enforcigo di federado-autentikigo
+      title: Servilopcioni
     site_uploads:
       delete: Efacez adchargita failo
       destroyed_msg: Sitadchargito sucesoze efacesis!
+    software_updates:
+      critical_update: Urjanta — voluntez aktualigar rapide
+      description: On rekomendas ke vu sempre aktualigas vua Mastodon-instaluro por profitar la maxim nova solvuri e novaji. Pluse, kelkafoye es importantega aktualigar Mastodon rapide por evitar sekuresoproblemi. Pro ca motivi, Mastodon serchas aktualigi mihorale, e notifikos vu segun vua opcioni pri retposto-notifiki.
+      documentation_link: Lernez pluse
+      release_notes: Emiso-noti
+      title: Aktualigi disponebla
+      type: Tipo
+      types:
+        major: Majora emiso
+        minor: Minora emiso
+        patch: Mikra emiso — problemosolvuri e chanji facila a facar
+      version: Versiono
     statuses:
+      account: Skribinto
+      application: Apliko
       back_to_account: Retrovenez a kontopagino
       back_to_report: Retrovenez a raportpagino
       batch:
         remove_from_report: Efacez de raporto
         report: Raportizez
       deleted: Efacesis
+      favourites: Favoriziti
+      history: Historio di versioni
+      in_reply_to: Respondante a
+      language: Linguo
       media:
         title: Medii
+      metadata: Metadatumi
       no_status_selected: Nula posti chanjesis pro ke nulo selektesis
+      open: Apertez posto
+      original_status: Originala posto
+      reblogs: Dissemi
+      status_changed: Posto chanjita
       title: Kontoposti
+      trending: Populara
+      visibility: Videbleso
       with_media: Kun medii
     strikes:
       actions:
@@ -724,9 +825,14 @@ io:
         suspend: "%{name} restriktis konto di %{target}"
       appeal_approved: Apelis
       appeal_pending: Vartata apelo
+      appeal_rejected: Apelo refuzita
     system_checks:
       database_schema_check:
         message_html: Existas vartanta datamaturmigri. Startez por certigar ke la softwaro kondutar quale expektita
+      elasticsearch_preset:
+        action: Videz la dokumentajo
+      elasticsearch_preset_single_node:
+        action: Videz la dokumentajo
       elasticsearch_running_check:
         message_html: Ne povas konektas a Elasticsearch. Kontrolez ke ol functionas o desaktivigez textokompleta trovo
       elasticsearch_version_check:
@@ -737,6 +843,18 @@ io:
         message_html: Vu ne fixis irga servilreguli.
       sidekiq_process_check:
         message_html: Sidekiq procedo ne funcionas ye %{value} fask(o). Kontrolez vua opciono di Sidekiq
+      software_version_critical_check:
+        action: Videz la aktualigi disponebla
+        message_html: Urjanta Mastodon-aktualigo es disponebla, voluntez aktualigar la servilo tam rapide kam es posibla.
+      software_version_patch_check:
+        action: Videz la aktualigi disponebla
+        message_html: Problemosolvanta Mastodon-aktualigo es disponebla.
+      upload_check_privacy_error:
+        action: Konsultez hike por plu multa informo
+        message_html: "<strong>Vua retservilo es misfigurizita. La privateso di vua uzanti es domajebla.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Konsultez hike por plu multa informo
+        message_html: "<strong>Vua dosierokonservo es misfigurizita. La privateso di vua uzanti es domajebla.</strong>"
     tags:
       review: Kontrolez stando
       updated_msg: Hashtagopcioni novigesis sucesoze
@@ -759,6 +877,7 @@ io:
           other: Partigesis da %{count} personi de pos antea semano
         title: Tendencoza ligili
         usage_comparison: Partigesis %{today} foyi hodie, la nombro esas %{yesterday} hiere
+      not_allowed_to_trend: Ne permisita quale popularo
       only_allowed: Nur permisato
       pending_review: Vartas kontrolo
       preview_card_providers:
@@ -843,6 +962,9 @@ io:
       body: "%{target} apelas jerdecido da %{action_taken_by} de %{date}, quale esis %{type}. Oli skribis:"
       next_steps: Vu povas aprobar apelo por deagar jerdecido o ignorar.
       subject: "%{username} apela jerdecido che %{instance}"
+    new_critical_software_updates:
+      body: Nova urjanta versioni di Mastodon emisesis, vu forsan volas aktualigar tam balde kam es posibla!
+      subject: Urjanta Mastodon-aktualigi es disponebla por %{instance}!
     new_pending_account:
       body: Detali de nova konto esas la subo. Vu povas aprobar o refuzar ca apliko.
       subject: Nova konto bezonas kontrolesar che %{instance} (%{username})
@@ -850,6 +972,9 @@ io:
       body: "%{reporter} raportizis %{target}"
       body_remote: Ulu de %{domain} raportizis %{target}
       subject: Nova raporto por %{instance} (#%{id})
+    new_software_updates:
+      body: Nova Mastodon-versioni emisesis, vu forsan volas aktualigar!
+      subject: Nova Mastodon-versioni es disponebla por %{instance}!
     new_trends:
       body: 'Ca kozi bezonas kontrol ante ol povas montresar publike:'
       new_trending_links:
@@ -881,23 +1006,41 @@ io:
     notification_preferences: Chanjez retpostopreferaji
     salutation: "%{name},"
     settings: 'Chanjar la retpost-mesajala preferi: %{link}'
+    unsubscribe: Desabonez
     view: 'Vidar:'
     view_profile: Videz profilo
     view_status: Videz posto
   applications:
     created: Apliko sucesoze kreesas
     destroyed: Apliko sucesoze efacesas
+    logout: Ekirez
     regenerate_token: Rifacez acesficho
     token_regenerated: Acesficho sucesoze riganesas
     warning: Sorgemez per ca informi. Ne partigez kun irgu!
     your_token: Vua acesficho
   auth:
+    apply_for_account: Demandar konto
+    captcha_confirmation:
+      help_html: Se vu ne povas solvar la CAPTCHA, vu povas kontaktar ni per %{email} e ni povas helpar vu.
+      hint_html: Nur un plusa kozo! Ni postulas ke vu konfirmez ke vu esas homo (co es por ke ni povas preventar mesajachi!). Solvez la suba CAPTCHA e pulsez "Avancez".
+      title: Sekuresokontrolo
+    confirmations:
+      awaiting_review: Vua retpostadreso es konfirmita! La jeraro che %{domain} revuos vua apliko. Vu recevos retposto se li aprobas vua konto!
+      awaiting_review_title: Vua apliko vartas revuo
+      clicking_this_link: pulsante ca ligilo
+      login_link: enirar
+      proceed_to_login_html: Nun vu povas avancar a %{login_link}.
+      redirect_to_app_html: Vu devas sendesir al apliko <strong>%{app_name}</strong>. Se to ne evenis, probez %{clicking_this_link} o retroirez manuale al apliko.
+      registration_complete: Vua registrago che %{domain} nun es kompleta!
+      welcome_title: Bonvenez, %{name}!
+      wrong_email_hint: Se ta retpostadreso ne es korekta, vu povas chanjar lo en la konto-opcioni.
     delete_account: Efacez konto
     delete_account_html: Se vu volas efacar vua konto, vu povas <a href="%{path}">irar hike</a>. Vu demandesos konfirmar.
     description:
       prefix_invited_by_user: "@%{name} invitas vu juntar ca servilo di Mastodon!"
       prefix_sign_up: Registrez che Mastodon hodie!
       suffix: Per konto, vu povos sequar personi, postigar novaji e interchanjar mesaji kun uzanti de irga servilo di Mastodon e pluse!
+    didnt_get_confirmation: Ka vu ne recevis konfirmoligilo?
     dont_have_your_security_key: Ka vu ne havas sekuresklefo?
     forgot_password: Pasvorto obliviita?
     invalid_reset_password_token: Pasvorto richanjoficho esas nevalida o expirita. Demandez novo.
@@ -910,18 +1053,39 @@ io:
     migrate_account_html: Se vu volas ridirektar ca konto a diferanto, vu povas <a href="%{path}">ajustar hike</a>.
     or_log_in_with: O eniras per
     privacy_policy_agreement_html: Me lektis e konsentis <a href="%{privacy_policy_path}" target="_blank">privatesguidilo</a>
+    progress:
+      confirm: Konfirmar retpostoadreso
+      details: Vua detali
+      review: Nia revuo
+      rules: Aceptar reguli
     providers:
       cas: CAS
       saml: SAML
     register: Membreskar
     registration_closed: "%{instance} ne aceptas nova membri"
+    resend_confirmation: Risendez konfirmligilo
     reset_password: Chanjar la pasvorto
     rules:
+      accept: Aceptar
+      back: Retro
+      invited_by: 'Vu darfas krear konto che %{domain} pro ke vu recevis invito de:'
       preamble: Co igesas e exekutesas da jereri di %{domain}.
+      preamble_invited: Ante ke vu avancos, voluntez konsiderar la reguli kreita dal jeraro di %{domain}.
       title: Kelka bazala reguli.
+      title_invited: Vu esas invitita.
     security: Chanjar pasvorto
     set_new_password: Selektar nova pasvorto
+    setup:
+      email_below_hint_html: Kontrolez vua spam-dosieruro, o demandez altra ligilo. Vu povas korektigar vua retpostadreso se esas nekorekta.
+      email_settings_hint_html: Uzez la ligilo quan ni sendis a vu por verifikar %{email}. Ni vartos hike.
+      link_not_received: Ka vu ne recevis ligilo?
+      new_confirmation_instructions_sent: Vu recevos nova retposto kun la konfirmligilo pos kelka minuti!
+      title: Kontrolez vua retposti
+    sign_in:
+      preamble_html: Enirez per vua <strong>%{domain}</strong> detali. Se vua konto esas che altra servilo, vu ne povos enirar hike.
+      title: Enirez a %{domain}
     sign_up:
+      manual_review: Registragi che %{domain} es revuata da nia personaro. Por helpar ni traktar vua aplikajo, skribez kelko pri vu e pro quo vu volas konto che %{domain}.
       preamble: Per konto en ca servilo di Mastodon, on povas sequar irga persono en ca reto, ne ye ube ona konto hostagisas.
       title: Ni komencigez vu en %{domain}.
     status:
@@ -930,14 +1094,15 @@ io:
       functional: Vua konto esas tote funcionoza.
       pending: Vua apliko bezonas kontrolo da nia laborero. Co forsan esas nekurta. Vu ganos retposto se vua apliko aprobesas.
       redirecting_to: Vua konto esas neaktiva pro ke ol nun ridirektesos a %{acct}.
+      self_destruct: Pro ke %{domain} balde klozos, vu havas nur aceso limitizata a vua konto.
       view_strikes: Videz antea streki kontre vua konto
     too_fast: Formulario sendesis tro rapide, probez itere.
     use_security_key: Uzes sekuresklefo
   challenge:
-    confirm: Durez
+    confirm: Avancez
     hint_html: "<strong>Guidilo:</strong> Ni ne demandos vua pasvorto itere til 1 horo."
     invalid_password: Nevalida pasvorto
-    prompt: Konfirmez pasvorto por durar
+    prompt: Konfirmez pasvorto por avancar
   crypto:
     errors:
       invalid_key: ne esas valida klefo Ed25519 o Curve25519
@@ -1009,6 +1174,9 @@ io:
       your_appeal_rejected: Vua apelo refuzesis
   domain_validator:
     invalid_domain: ne esas valida domennomo
+  edit_profile:
+    basic_information: Fundamentala informo
+    other: Altra
   errors:
     '400': Demando quon vu sendis esas nevalida o malstrukturala.
     '403': Vu ne havas permiso por vidar ca pagino.
@@ -1044,6 +1212,8 @@ io:
     storage: Konservado di kontenajo
   featured_tags:
     add_new: Insertez novo
+    errors:
+      limit: Vu ja pinglizis la maxima nombro de hastagi
     hint_html: "<strong>Quo esas estelita hashtagi?</strong> Ol montresas eminente che vua publika profilo e povigas personi vidar vua publika posti partikulare kun ta hashtagi. Oli esas bona utensilo por jeretar kreiva agaji e longa projetaji."
   filters:
     contexts:
@@ -1095,7 +1265,9 @@ io:
     all_matching_items_selected_html:
       one: "<strong>%{count}</strong> kozo quo parigesas kun vua trovato selektesas."
       other: Omna <strong>%{count}</strong> kozi quo parigesas kun vua trovato selektesas.
+    cancel: Anulez
     changes_saved_msg: Chanji senprobleme konservita!
+    confirm: Konfirmez
     copy: Kopiez
     delete: Efacez
     deselect: Deselektez omno
@@ -1111,19 +1283,59 @@ io:
       other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti
   imports:
     errors:
+      empty: CSV-dosiero vakua
+      invalid_csv_file: 'Nevalida CSV-dosiero. Eroro: %{error}'
       over_rows_processing_limit: kontenas plu kam %{count} horizontala lineo
+      too_large: Dosiero es tro granda
+    failures: Falii
+    imported: Importacita
+    mismatched_types_warning: Semblas ke vu forsan selektis la nekorekta tipo por ca importaco, voluntez kontrolar itere.
     modes:
       merge: Kombinez
       merge_long: Retenez displonebla rekordi e insertez novi
       overwrite: Remplasez
       overwrite_long: Remplasez nuna rekordi per novi
+    overwrite_preambles:
+      blocking_html: Vu <strong>substitucos vua blokusolisto</strong> per til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Vu <strong>substitucos vua libromarki</strong> per til <strong>%{total_items} posti</strong> de <strong>%{filename}</strong>.
+      domain_blocking_html: Vu <strong>substitucos vua domenoblokusolisto</strong> per til <strong>%{total_items} domeni</strong> de <strong>%{filename}</strong>.
+      following_html: Vu <strong>sequos</strong> til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong> e <strong>haltar sequar irga altra konto</strong>.
+      lists_html: Vu <strong>substitucos vua listi</strong> kun la kontenaji di <strong>%{filename}</strong>. Til <strong>%{total_items} konti</strong> adjuntesos a nova listi.
+      muting_html: Vu <strong>substitucos vua listo di konti silencigita</strong> per til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Vu <strong>blokusos</strong> til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Vu adjuntos <strong>%{total_items} posti</strong> de <strong>%{filename}</strong> a vua <strong>libromarki</strong>.
+      domain_blocking_html: Vu <strong>blokusos</strong> til <strong>%{total_items} domeni</strong> de <strong>%{filename}</strong>.
+      following_html: Vu <strong>sequos</strong> til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong>.
+      lists_html: Vu adjuntos til <strong>%{total_items} konti</strong> de <strong>%{filename}</strong> a vua <strong>listi</strong>. Nova listi kreesos se ne existas listo a quo adjuntar.
+      muting_html: Vu <strong>silencigos</strong> til <strong>%{total_items}</strong> konti en <strong>%{filename}</strong>.
     preface: Tu povas importacar kelka datumi, tal quala listi de omna homi quin tu sequas o blokusas, a tua konto di ca instaluro, per dosiero exportacita de altra instaluro.
+    recent_imports: Importacaji recenta
+    states:
+      finished: Finita
+      in_progress: Progresanta
+      scheduled: Projetita
+      unconfirmed: Nekonfirmata
+    status: Stando
     success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita
+    time_started: Komencita ye
+    titles:
+      blocking: Importacante konti blokusata
+      bookmarks: Importacante libromarki
+      domain_blocking: Importacante domeni blokusata
+      following: Importacante konti sequata
+      lists: Importacante listi
+      muting: Importacante konti silencigata
+    type: Tipo di importaco
+    type_groups:
+      constructive: Sequati & libromarki
+      destructive: Blokusati e silencigati
     types:
       blocking: Listo de blokusiti
       bookmarks: Libromarki
       domain_blocking: Domenobstruktolisto
       following: Listo de sequati
+      lists: Listi
       muting: Silenciglisto
     upload: Kargar
   invites:
@@ -1138,6 +1350,7 @@ io:
       '86400': 1 dio
     expires_in_prompt: Nulatempe
     generate: Facez invitligilo
+    invalid: Ca invito ne es valida
     invited_by: 'Vu invitesis da:'
     max_uses:
       one: 1 uzo
@@ -1148,6 +1361,9 @@ io:
       expires_at: Expiros
       uses: Uzi
     title: Invitez personi
+  lists:
+    errors:
+      limit: Vu atingis la maxima nombro de listi
   login_activities:
     authentication_methods:
       otp: 2-faktoryurizessoftwaro
@@ -1159,6 +1375,21 @@ io:
     failed_sign_in_html: Falita enirprob per %{method} de %{ip} (%{browser})
     successful_sign_in_html: Sucesoza eniro per %{method} de %{ip} (%{browser})
     title: Yurizeshistorio
+  mail_subscriptions:
+    unsubscribe:
+      action: Yes, desabonez
+      complete: Desabonita
+      confirmation_html: Ka vu esas certa ke vu volas desabonar de recevar %{type} por Mastodon che %{domain} a vua retpostoadreso %{email}? Vu sempre povas riabonar che vua <a href="%{settings_path}">opcioni pri restposto-notifiki</a>.
+      emails:
+        notification_emails:
+          favourite: notifiko-retposti pri favoriziti
+          follow: retposti pri sequo-notifiki
+          follow_request: retposti pri sequo-demandi
+          mention: retposti pri menciono-notifiki
+          reblog: retposti pri repeto-notifiki
+      resubscribe_html: Se vu desabonis eroroze, vu povas riabonar en vua <a href="%{settings_path}">opcioni pri retposto-notifiki</a>.
+      success_html: Vu ne plus recevos %{type} por Mastodon che %{domain} a vua retpostadreso %{email}.
+      title: Desabonez
   media_attachments:
     validations:
       images_and_video: Ne povas atachar video a posto quo ja kontenar imaji
@@ -1230,14 +1461,15 @@ io:
     poll:
       subject: Votposto di %{name} finis
     reblog:
-      body: "%{name} diskonocigis tua mesajo:"
-      subject: "%{name} diskonocigis tua mesajo"
-      title: Nova busto
+      body: "%{name} repetis vua posto:"
+      subject: "%{name} repetis vua posto"
+      title: Nova repeto
     status:
       subject: "%{name} nove postigis"
     update:
       subject: "%{name} modifikis posto"
   notifications:
+    administration_emails: Jerala retpostonotifiki
     email_events: Eventi por retpostoavizi
     email_events_hint: 'Selektez eventi quon vu volas ganar avizi:'
     other_settings: Altra avizopcioni
@@ -1274,12 +1506,18 @@ io:
       expired: Votposto ja finis
       invalid_choice: Selektita votselektajo ne existas
       over_character_limit: ne povas esar plu longa kam %{max} literi por sing
+      self_vote: On ne povas votar en sua propra inquesti
       too_few_options: mustas havar kozi
       too_many_options: ne povas havar plu kam %{max} kozi
   preferences:
     other: Altra
     posting_defaults: Originala postoopcioni
     public_timelines: Publika tempolinei
+  privacy:
+    privacy: Privateso
+    reach: Atingo
+    search: Sercho
+    title: Privateso e atingo
   privacy_policy:
     title: Privatesguidilo
   reactions:
@@ -1288,7 +1526,11 @@ io:
       unrecognized_emoji: ne esas rikonocita emocimajo
   relationships:
     activity: Kontoaktiveso
+    confirm_follow_selected_followers: Ka vu es certa ke vu volas sequar la selektata sequati?
+    confirm_remove_selected_followers: Ka vu es certa ke vu volas revokar la selektata sequati?
+    confirm_remove_selected_follows: Ka vu es certa ke vu volas revokar la selektata sequanti?
     dormant: Neaktiva
+    follow_failure: Ne esis posibla sequar kelka ek la selektita konti.
     follow_selected_followers: Sequez kelka sequanti
     followers: Sequanti
     following: Sequati
@@ -1317,6 +1559,9 @@ io:
     over_daily_limit: Vu ecesas limito quale esas %{limit} projetita posti por hodio
     over_total_limit: Vu ecesas limito quale esas %{limit} projetita posti
     too_soon: Projetita dato mustas esar en futuro
+  self_destruct:
+    lead_html: Desfortunoze, <strong>%{domain}</strong> balde klozos. Se vu havis konto ibe, vu ne plus povas uzar it, ma vu ankore povas demandar exportacajo de vua datumi.
+    title: Ca servilo balde klozos
   sessions:
     activity: Antea aktiveso
     browser: Vidilo
@@ -1328,6 +1573,7 @@ io:
       electron: Electron
       firefox: Firefox
       generic: Nesavita vidilo
+      huawei_browser: Navigilo Huawei
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Vidilo Nokia S40 Ovi
@@ -1337,6 +1583,7 @@ io:
       qq: Vidilo QQ
       safari: Safari
       uc_browser: UC Browser
+      unknown_browser: Nekonocata Navigilo
       weibo: Weibo
     current_session: Nuna sesiono
     description: "%{browser} che %{platform}"
@@ -1349,8 +1596,10 @@ io:
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
+      unknown_platform: Nekonocata Platformo
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
@@ -1393,7 +1642,7 @@ io:
       video:
         one: "%{count} video"
         other: "%{count} videi"
-    boosted_from_html: Bustesis de %{acct_link}
+    boosted_from_html: Repetis de %{acct_link}
     content_warning: 'Kontenajaverto: %{warning}'
     default_language: Sama quale intervizajlinguo
     disallowed_hashtags:
@@ -1408,7 +1657,7 @@ io:
       direct: Posti quo povas videsar nur mencionita uzanti ne povas pinglagesar
       limit: Vu ja pinglagis maxima posti
       ownership: Posto di altra persono ne povas pinglagesar
-      reblog: Busto ne povas pinglagesar
+      reblog: Repeto ne povas pinglizesar
     poll:
       total_people:
         one: "%{count} persono"
@@ -1436,9 +1685,9 @@ io:
     exceptions: Ecepti
     explanation: Pro ke efacar posti esas nechipa procedo, co agas lente progresive kande servilo ne esas okupata. Do, vua posti forsan efacesos kurte pos oli atingas oldeslimito.
     ignore_favs: Ignorez favorati
-    ignore_reblogs: Ignorez busti
+    ignore_reblogs: Ignorez repeti
     interaction_exceptions: Ecepti segun interagi
-    interaction_exceptions_explanation: Notale, ne existas garantio ke posti efacesos se oli iras sub favorato o bustlimito pos iras super ol.
+    interaction_exceptions_explanation: Notale, ne existas garantio ke posti efacesos se oli iras sub la favoratala o repetala solii pos iras super oli.
     keep_direct: Retenez direta mesaji
     keep_direct_hint: Ne efacas irga vua direta mesaji
     keep_media: Retenez posti kun mediiatachaji
@@ -1462,8 +1711,9 @@ io:
       '7889238': 3 monati
     min_age_label: Oldeslimito
     min_favs: Retenez favorizita posti mine
-    min_reblogs: Retenez bustita posti mine
-    min_reblogs_hint: Ne efacas irga vua posti quo bustigesos mine ca foyoquanto. Restez quale vakua por efacar posti sen suciar olia foyoquanto
+    min_favs_hint: Ne efacas irgo ek vua posti qua havas adminime ca quanto de favoriziti. Restez vakua por efacar posti senegarde la nombro de favoriziti
+    min_reblogs: Retenez posti repetita adminime
+    min_reblogs_hint: Ne efacas irgo ek vua posti qua havas adminime ca quanto de repeti. Restez vakua por efacar posti senegarde la nombro de repeti
   stream_entries:
     sensitive_content: Titiliva kontenajo
   strikes:
@@ -1564,7 +1814,10 @@ io:
     seamless_external_login: Vu enirar tra externa serveso, do pasvorto e retpostoopcioni ne esas disponebla.
     signed_in_as: 'Eniris quale:'
   verification:
+    here_is_how: Yen quale
+    instructions_html: Kopiez e glutinez la kodexo suba en la HTML di vua retsituo. Pose adjuntez la adreso di vua retsituo en un ek la textobuxi di vua profilo per la "Modifikar profilo" pagino e konservez chanji.
     verification: Verifikeso
+    verified_links: Vua ligili verifikata
   webauthn_credentials:
     add: Insertez nova sekuresklefo
     create:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
new file mode 100644
index 0000000000..eeaa3294e2
--- /dev/null
+++ b/config/locales/lad.yml
@@ -0,0 +1 @@
+lad:
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index bb8a6c834d..7a34358ddb 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -1 +1,161 @@
+---
 pa:
+  about:
+    about_mastodon_html: ਭਵਿੱਖ ਦਾ ਸ਼ੋਸ਼ਲ ਨੈੱਟਵਰਕ ਹੈ। ਕੋਈ ਇਸ਼ਤਿਹਾਰ ਨਹੀਂ, ਕੋਈ ਵਪਾਰਕ ਨਿਗਰਾਨੀ ਨਹੀਂ, ਨੈਤਿਕ ਡਿਜ਼ਾਇਨ ਅਤੇ ਖਿੰਡਿਆ ਹੋਇਆ ਨੈੱਟਵਰਕ! ਮਸਟੋਡੋਨ ਨਾਲ ਆਪਣੇ ਡਾਟੇ ਨੂੰ ਆਪਣਾ ਹੀ ਰੱਖੋ!
+    contact_missing: ਸੈੱਟ ਨਹੀਂ ਹੈ
+    contact_unavailable: ਲਾਗ ਨਹੀਂ
+    hosted_on: "%{domain} ਉੱਤੇ ਹੋਸਟ ਕੀਤਾ ਮਸਟਾਡੋਨ"
+    title: ਇਸ ਬਾਰੇ
+  accounts:
+    follow: ਫ਼ਾਲੋ
+    following: ਫ਼ਾਲੋ ਕੀਤੇ ਜਾ ਰਹੇ
+    posts_tab_heading: ਪੋਸਟਾਂ
+  admin:
+    account_moderation_notes:
+      create: ਨੋਟ ਭੇਜੋ
+    accounts:
+      approve: ਮਨਜ਼ੂਰ
+      are_you_sure: ਪੱਕਾ?
+      avatar: ਅਵਤਾਰ
+      by_domain: ਡੋਮੇਨ
+      change_email:
+        changed_msg: ਈਮੇਲ ਨੂੰ ਕਾਮਯਾਬੀ ਨਾਲ ਬਦਲਿਆ ਗਿਆ!
+        current_email: ਮੌਜੂਦਾ ਈਮੇਲ
+        label: ਈਮੇਲ ਬਦਲੋ
+        new_email: ਨਵੀਂ ਈਮੇਲ
+        submit: ਈਮੇਲ ਨੂੰ ਬਦਲੋ
+        title: "%{username} ਲਈ ਈਮੇਲ ਨੂੰ ਬਦਲੋ"
+      confirm: ਤਸਦੀਕ
+      confirmed: ਤਸਦੀਕ ਕੀਤਾ
+      confirming: ਤਸਦੀਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
+      custom: ਕਸਟਮ
+      delete: ਡਾਟੇ ਨੂੰ ਹਟਾਓ
+      deleted: ਹਟਾਇਆ
+      display_name: ਦਿਖਾਇਆ ਜਾਣ ਵਾਲਾ ਨਾਂ
+      domain: ਡੋਮੇਨ
+      moderation:
+        all: ਸਭ
+        suspended: ਸਸਪੈਂਡ ਕੀਤਾ
+      title: ਖਾਤੇ
+      username: ਵਰਤੋਂਕਾਰ-ਨਾਂ
+    ip_blocks:
+      delete: ਹਟਾਓ
+      expires_in:
+        '1209600': 2 ਹਫ਼ਤੇ
+        '15778476': 6 ਮਹੀਨੇ
+        '2629746': 1 ਮਹੀਨਾ
+        '31556952': 1 ਸਾਲ
+        '86400': 1 ਦਿਨ
+        '94670856': 3 ਸਾਲ
+    relays:
+      enable: ਸਮਰੱਥ
+      enabled: ਸਮਰੱਥ ਹੈ
+      save_and_enable: ਸੰਭਾਲੋ ਅਤੇ ਸਮਰੱਥ ਕਰੋ
+    reports:
+      are_you_sure: ਪੱਕਾ?
+      cancel: ਰੱਦ ਕਰੋ
+      comment:
+        none: ਕੋਈ ਨਹੀਂ
+      notes:
+        delete: ਹਟਾਓ
+    settings:
+      about:
+        title: ਇਸ ਬਾਰੇ
+    statuses:
+      deleted: ਹਟਾਏ
+      favourites: ਮਨਪਸੰਦ
+      history: ਵਰਜ਼ਨ ਅਤੀਤ
+      in_reply_to: ਇਸ ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ ਜਾ ਰਿਹਾ ਹੈ
+      language: ਭਾਸ਼ਾ
+      media:
+        title: ਮੀਡੀਆ
+      metadata: ਮੇਟਾਡਾਟਾ
+    webhooks:
+      delete: ਹਟਾਓ
+      disable: ਅਸਮਰੱਥ
+      disabled: ਅਸਮਰੱਥ ਹੈ
+      enable: ਸਮਰੱਥ
+  application_mailer:
+    salutation: "%{name},"
+  applications:
+    logout: ਲਾਗ ਆਉਟ
+    your_token: ਤੁਹਾਡਾ ਪਹੁੰਚ ਟੋਕਨ
+  auth:
+    apply_for_account: ਖਾਤੇ ਲਈ ਬੇਨਤੀ
+    confirmations:
+      login_link: ਲਾਗ ਇਨ
+      welcome_title: "%{name}, ਜੀ ਆਇਆਂ ਨੂੰ!"
+    delete_account: ਖਾਤੇ ਨੂੰ ਹਟਾਓ
+    forgot_password: ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ ਹੋ?
+    log_in_with: ਇਸ ਨਾਲ ਲਾਗਇਨ ਕਰੋ
+    login: ਲਾਗ ਇਨ
+    logout: ਲਾਗ ਆਉਟ
+    rules:
+      accept: ਮਨਜ਼ੂਰ
+      back: ਪਿੱਛੇ
+  challenge:
+    confirm: ਜਾਰੀ ਰੱਖੋ
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}ਘੰ"
+      about_x_months: "%{count}ਮਹੀ"
+      about_x_years: "%{count}ਸਾ"
+      almost_x_years: "%{count}ਸ"
+      half_a_minute: ਹੁਣੇ ਹੀ
+      less_than_x_minutes: "%{count}ਮਿੰ"
+      less_than_x_seconds: ਹੁਣੇ ਹੀ
+      over_x_years: "%{count}ਸਾ"
+      x_days: "%{count}ਦਿ"
+      x_minutes: "%{count}ਮਿੰ"
+  deletes:
+    proceed: ਖਾਤੇ ਨੂੰ ਹਟਾਓ
+  disputes:
+    strikes:
+      title: "%{date} ਨੂੰ %{action}"
+  exports:
+    archive_takeout:
+      date: ਤਾਰੀਖ
+  filters:
+    contexts:
+      account: ਪਰੋਫਾਈਲ
+      home: ਹੋਮ ਅਤੇ ਸੂਚੀਆਂ
+      notifications: ਨੋਟੀਫਿਕੇਸ਼ਨ
+      thread: ਗੱਲਾਂਬਾਤਾਂ
+    index:
+      delete: ਹਟਾਓ
+  generic:
+    all: ਸਭ
+    copy: ਕਾਪੀ ਕਰੋ
+    delete: ਹਟਾਓ
+    today: ਅੱਜ
+  invites:
+    expires_in:
+      '43200': 12 ਘੰਟੇ
+      '604800': 1 ਹਫਤਾ
+      '86400': 1 ਦਿਨ
+    expires_in_prompt: ਕਦੇ ਨਹੀਂ
+  login_activities:
+    authentication_methods:
+      password: ਪਾਸਵਰਡ
+  notification_mailer:
+    follow:
+      subject: "%{name} ਹੁਣ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ ਹਨ"
+      title: ਨਵੇਂ ਫ਼ਾਲੋਅਰ
+    follow_request:
+      body: "%{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ"
+    mention:
+      action: ਜਵਾਬ ਦਿਓ
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: ਬਿ
+          million: ਮਿ
+  otp_authentication:
+    enable: ਸਮਰੱਥ
+    setup: ਸੈਟ ਅੱਪ
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
new file mode 100644
index 0000000000..6ab26788bd
--- /dev/null
+++ b/config/locales/simple_form.ia.yml
@@ -0,0 +1 @@
+ia:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
new file mode 100644
index 0000000000..256d80c881
--- /dev/null
+++ b/config/locales/simple_form.ie.yml
@@ -0,0 +1,23 @@
+---
+ie:
+  simple_form:
+    hints:
+      account:
+        unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
+      announcement:
+        all_day: Si ti-ci es marcat, solmen li dates del periode de témpor va esser monstrat
+        ends_at: Ínobligatori. Li proclamation va esser despublicat automaticmen ye ti-ci témpor
+        scheduled_at: Lassar vacui por publicar li proclamation strax
+        starts_at: Ínobligatori. In li casu que tui proclamation es ligat a un specific periode de témpor
+        text: Tu posse usar post-sintaxe. Ples considerar li spacie quel li proclamation va plenar sur li ecran del usator
+      form_admin_settings:
+        bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+    labels:
+      announcement:
+        all_day: Eveniment del tot die
+        ends_at: Fine del eveniment
+        scheduled_at: Planar publication
+        starts_at: Comense del eveniment
+        text: Proclamation
+      notification_emails:
+        follow_request: Alqui petit sequer te
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index b21b86723c..eef2014d19 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -2,6 +2,14 @@
 io:
   simple_form:
     hints:
+      account:
+        discoverable: Vua publika posti e profilo povas remarkesar o rekomendesar en diferanta parti di Mastodon e vua profilo povas sugestesar ad altra uzanti.
+        display_name: Vua tota nomo o vua gaya nomo.
+        fields: Vua retsituo, pronomi, evo, irgo quan vu volas.
+        indexable: Vua posta publika povos aparar en rezultaji di serchi che Mastodon. Personi qui interagis kun vua posti povos serchar oli irgakaze.
+        note: 'Vu povas @mencionar altra personi o #hashtagi.'
+        show_collections: Personi povos navigar tra vua sequati e sequanti. Personi quin vu sequas, vidos ke vu sequas li irgakaze.
+        unlocked: Personi povos sequar vu sen demandar aprobo. Deselektez se vu volas revuar sequadodemandi e selektez aceptar o refuzar nova sequati.
       account_alias:
         acct: Partikulare pozez uzantonomo@domeno di konto quon vua volas ektransferesar
       account_migration:
@@ -18,6 +26,8 @@ io:
           disable: Preventez uzanto de uzar olia konto ma ne efacez o celez olia kontenaji.
           none: Uzez co por sendar averto a la uzanto sen eventigar irga altra ago.
           sensitive: Koaktez omna mediiatachaji da ca uzanto markizesar quale sentoza.
+          silence: Preventez la uzanto de povar postar per publika videbleso, celez lua posti e avizi de personi qui ne sequas lu. Co klozas omna raporto kontra ca konto.
+          suspend: Preventez irga interago de o a ca konto e efacez lua kontenaji. Inversebla til 30 dii. Co klozas omna raporti kontra ca konto.
         warning_preset_id: Neobligata. Vu povas ankore insertar kustume texto a extremajo di fixito
       announcement:
         all_day: Kande kontrolesas, nur tempoporteodato montresos
@@ -43,7 +53,7 @@ io:
         password: Uzes minime 8 litri
         phrase: Parigesos ne ye textosituaciono o konteneyoaverto di posto
         scopes: Quala API quon softwaro permisesas acesar. Se vu selektas alta skopo, vu ne mustas selektar individui.
-        setting_aggregate_reblogs: Ne montrez nova busti di posti quo recente bustesas (nova busti)
+        setting_aggregate_reblogs: Ne montrez nova repeti di posti qui ja repetesis recente (nur efektigas repeti recevata nove)
         setting_always_send_emails: Normale retpostoavizi ne sendesas kande vu aktiva uzas Mastodon
         setting_default_sensitive: Sentoza medii originala celesas e povas revelesar per klikto
         setting_display_media_default: Celez medii quo markizesis quale sentoza
@@ -51,25 +61,30 @@ io:
         setting_display_media_show_all: Sempre montrez medii
         setting_use_blurhash: Inklini esas segun kolori di celesis vidaji ma kovras irga detali
         setting_use_pending_items: Celez tempolineonovi dop kliktar e ne automatike movigar niuzeto
+        username: Vu darfas uzar literi, nombri, e sublinei
         whole_word: Kande klefvorto o fraz esas nur litera e nombra, ol nur aplikesos se ol parigesas la tota vorto
       domain_allow:
         domain: Ca domeno povas ganar informi de ca servilo e venanta informo de ol procedagesos e sparesos
       email_domain_block:
         domain: Co povas esas domennomo quo montresas che retposto o registrajo MX quon ol uzas. Oli kontrolesos kande registro.
         with_dns_records: Probo di rezolvar registri DNS di la domeno agesos e rezulti anke preventesos
+      featured_tag:
+        name: 'Yen kelka hashtagi quin vu uzis maxim recente:'
       filters:
         action: Selektez ago kande posto parigas filtrilo
         actions:
           hide: Komplete celez filtrita kontenajo quale ol ne existas
           warn: Celez filtrita kontenajo dop avert quo montras titulo di filtrilo
       form_admin_settings:
+        activity_api_enabled: Quanto de lokale publikigita posti, aktiva uzanti e nova registri, donita semanope
         backups_retention_period: Retenez igita uzantoarkivi por la diiquanto.
         bootstrap_timeline_accounts: Ca konti pinglagesos a super sequorekomendi di nova uzanti.
         closed_registrations_message: Montresas kande registradi klozesas
-        content_cache_retention_period: Posti de altra servili efacesos pos la diiquanto kande fixesas a positiva nombro. Co darfas desagesar.
+        content_cache_retention_period: Omna posti e repeti de altra servili efacesos pos la specigita nombro de dii. Kelka posti forsan ne esos restaurebla. Omna relata libromarki, favoriziti e repeti anke esos perdita e neposible restaurota.
         custom_css: Vu povas pozar kustumizita staili en retverso di Mastodon.
         mascot: Remplas montreso en avanca retintervizajo.
         media_cache_retention_period: Deschargita mediifaili efacesos pos la diiquanto kande fixesas a positiva nombro, e rideschargesas irgatempe.
+        peers_api_enabled: Listo di domeni quin ca servilo trovis en la fediverso. Nula informo inkluzesas hike pri ka vu federas kun partikulara servilo, nur ke vua servilo savas pri lo. Co es uzata da enti qui kolektas statistiki pri federeso generale.
         profile_directory: La profilcheflisto montras omna uzanti quo voluntale volas esar deskovrebla.
         require_invite_text: Kande registradi bezonas manuala aprobo, ol kauzigas "Por quo vu volas juntas?" textoenpozo esar obliganta
         site_contact_email: Quale personi povas kontaktar vu por legala o suportquestioni.
@@ -78,11 +93,13 @@ io:
         site_short_description: Kurta deskripto por helpar unala identifikar ca servilo. Qua funcionigar lu e por qua?
         site_terms: Uzez vua sua privatesguidilo o ignorez por uzar la originalo. Povas strukturigesar per sintaxo di Markdown.
         site_title: Quale personi vokas ca servilo se ne uzas domennomo.
+        status_page_url: URL di pagino ube personi povas vidar la stando di ca servilo kande la servilo ne funcionas
         theme: Temo quo videsas da ekirita vizitanti e nova uzanti.
         thumbnail: Cirkum 2:1 imajo montresar kun informo di ca servilo.
         timeline_preview: Ekirita vizitanti videsos maxim recenta publika posti quo esas displonebla en la servilo.
         trendable_by_default: Ignorez manuala kontrolar di tendencoza kontenajo. Singla kozi povas ankore efacesar de tendenci pose.
         trends: Tendenci montras quala posti, hashtagi e niuzrakonti famozeskas en ca servilo.
+        trends_as_landing_page: Montrez populara posti a uzanti neeniriti e vizitanti vice deskriptajo pri ca servilo. Bezonas ke populari es aktivita.
       form_challenge:
         current_password: Vu eniras sekura areo
       imports:
@@ -103,6 +120,9 @@ io:
       sessions:
         otp: Enter the Two-factor code from your phone or use one of your recovery codes.
         webauthn: Se ol esas klefo di USB, certigar ke vu insertas e se bezonesas, tushetez.
+      settings:
+        indexable: Vua profilpagino povas aparar en serchorezultaji che Google, Bing, e altri.
+        show_application: Vu sempre povos vidar qua apliko publikigis vua posto irgakaze.
       tag:
         name: Vu povas nur chanjar literkaso, por exemplo, por kauzigar lu divenar plu lektebla
       user:
@@ -119,9 +139,13 @@ io:
         url: Ibe eventi sendesos
     labels:
       account:
+        discoverable: Inkluzar profilo e posti en trovado-algoritmi
         fields:
           name: Etiketo
           value: Kontenajo
+        indexable: Inkluzar publika posti en serchorezultaji
+        show_collections: Montrar sequati e sequanti en la profilo
+        unlocked: Automate aceptar nova sequanti
       account_alias:
         acct: Nomo di olda konto
       account_migration:
@@ -175,10 +199,10 @@ io:
         password: Pasvorto
         phrase: Klefvorto o frazo
         setting_advanced_layout: Aktivigez avancata retintervizajo
-        setting_aggregate_reblogs: Grupbusti en tempolinei
+        setting_aggregate_reblogs: Grupigar repeti en tempolinei
         setting_always_send_emails: Sempre sendez retpostoavizi
         setting_auto_play_gif: Automate pleez animigita GIFi
-        setting_boost_modal: Montrez konfirmdialogo ante bustar
+        setting_boost_modal: Montrez konfirmdialogo ante repetar
         setting_default_language: Postolinguo
         setting_default_privacy: Videbleso di la mesaji
         setting_default_sensitive: Sempre markizez medii quale sentoza
@@ -213,6 +237,7 @@ io:
           hide: Tote celez
           warn: Celez kun averto
       form_admin_settings:
+        activity_api_enabled: Publikigez rezumstatistiko pri uzantoaktiveso en API
         backups_retention_period: Uzantoarkivretendurtempo
         bootstrap_timeline_accounts: Sempre rekomendez ca konti a nova uzanti
         closed_registrations_message: Kustumizita mesajo kande registradi ne esas disponebla
@@ -220,6 +245,7 @@ io:
         custom_css: Kustumizita CSS
         mascot: Kustumizita reprezentimajo (oldo)
         media_cache_retention_period: Mediimemorajretendurtempo
+        peers_api_enabled: Publikigez listo di deskovrita servili en API
         profile_directory: Aktivigez profilcheflisto
         registrations_mode: Qua povas registragar
         require_invite_text: Mustez pozar motivo por juntar
@@ -231,11 +257,13 @@ io:
         site_short_description: Servildeskripto
         site_terms: Privatesguidilo
         site_title: Servilnomo
+        status_page_url: URL dil stando-pagino
         theme: Originala temo
         thumbnail: Servilimajeto
         timeline_preview: Permisez neyurizita aceso a publika tempolineo
         trendable_by_default: Permisez tendenci sen bezonar kontrolo
         trends: Aktivigez tendenci
+        trends_as_landing_page: Uzar populari quale la iniciala pagino
       interactions:
         must_be_follower: Celar la savigi da homi, qui ne sequas tu
         must_be_following: Celar la savigi da homi, quin tu ne sequas
@@ -260,11 +288,20 @@ io:
         follow_request: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
         mention: Sendar retpost-mesajo, kande ulu mencionas tu
         pending_account: Nova konto bezonas kontrolo
-        reblog: Sendar retpost-mesajo, kande ulu diskonocigas mesajo da tu
+        reblog: Ulu repetis vua posto
         report: Nova raport sendesas
+        software_updates:
+          all: Notifikar pri omna aktualigi
+          critical: Notifikar pri nur urjanta aktualigi
+          label: Nova Mastodon-versiono es disponebla
+          none: Nultempe notifikar pri aktualigi (ne rekomendata)
+          patch: Notifikar pri problemosolvanta aktualigi
         trending_tag: Nova tendenco bezonas kontrolo
       rule:
         text: Regulo
+      settings:
+        indexable: Inkluzar profilopagino en serchili
+        show_application: Montrar la apliko de qua vu sendis posto
       tag:
         listable: Permisez ca hashtago aparar en trovaji e sugestaji
         name: Hashtago
@@ -272,6 +309,7 @@ io:
         usable: Permisez posti uzar ca hashtago
       user:
         role: Rolo
+        time_zone: Klokozono
       user_role:
         color: Insignokoloro
         highlighted: Montrez rolo quale insigno en uzantoprofili
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
new file mode 100644
index 0000000000..eeaa3294e2
--- /dev/null
+++ b/config/locales/simple_form.lad.yml
@@ -0,0 +1 @@
+lad:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index caf253c69c..ab2bc51553 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -119,6 +119,7 @@ sk:
       reject: Zamietni
       rejected_msg: Úspešne zamietnutá prihláška %{username}
       remote_suspension_irreversible: Údaje tohto účtu boli nenávratne zmazané.
+      remote_suspension_reversible_hint_html: Účet bol pozastavený na ich serveri a údaje budú úplne odstránené dňa %{date}. Dovtedy môže vzdialený server účet obnoviť bez akýchkoľvek nepriaznivých účinkov. Ak chceš odstrániť všetky údaje účtu ihneď, môžeš tak urobiť nižšie.
       remove_avatar: Vymaž avatar
       remove_header: Vymaž záhlavie
       removed_avatar_msg: Úspešne odstránený obrázok avatara %{username}
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e17228da32..61650f8943 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1273,7 +1273,7 @@ zh-TW:
       other: 選取 %{count} 個符合您搜尋的項目。
     today: 今天
     validation_errors:
-      other: 恩...似乎發生了點錯誤？請檢查以下 %{count} 項錯誤
+      other: 恩...似乎不太對勁耶？請檢查以下 %{count} 項錯誤
   imports:
     errors:
       empty: 空的 CSV 檔案
@@ -1805,7 +1805,7 @@ zh-TW:
       title: "%{name} 誠摯歡迎您的加入！"
   users:
     follow_limit_reached: 您無法跟隨多於 %{limit} 個人
-    go_to_sso_account_settings: 前往您的身分識別提供者（IdP）之帳號設定
+    go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
     invalid_otp_token: 兩階段認證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
     seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。

From d099cf67c06b52641d0e9bfbf6f29d6db87823c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:28:06 +0100
Subject: [PATCH 089/436] Update eslint (non-major) (#28408)

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

diff --git a/yarn.lock b/yarn.lock
index e369f89d84..78757c3e1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1744,10 +1744,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.55.0":
-  version: 8.55.0
-  resolution: "@eslint/js@npm:8.55.0"
-  checksum: 88ab9fc57a651becd2b32ec40a3958db27fae133b1ae77bebd733aa5bbd00a92f325bb02f20ad680d31c731fa49b22f060a4777dd52eb3e27da013d940bd978d
+"@eslint/js@npm:8.56.0":
+  version: 8.56.0
+  resolution: "@eslint/js@npm:8.56.0"
+  checksum: 60b3a1cf240e2479cec9742424224465dc50e46d781da1b7f5ef240501b2d1202c225bd456207faac4b34a64f4765833345bc4ddffd00395e1db40fa8c426f5a
   languageName: node
   linkType: hard
 
@@ -3669,14 +3669,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.13.2
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2"
+  version: 6.14.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.14.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.13.2"
-    "@typescript-eslint/type-utils": "npm:6.13.2"
-    "@typescript-eslint/utils": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+    "@typescript-eslint/scope-manager": "npm:6.14.0"
+    "@typescript-eslint/type-utils": "npm:6.14.0"
+    "@typescript-eslint/utils": "npm:6.14.0"
+    "@typescript-eslint/visitor-keys": "npm:6.14.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3689,44 +3689,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 531a4406d872738d165c6a66cb26e976523c94053b022a8210dc9fd10e91b79b705bc0fcc77145e9744e4108b53bdba55e02a10dc17757b22be92aff57849384
+  checksum: 6360efb0e142ed91de5e9bddcd041f769feeedd256332733be08f7a74c8ae637cbfb78c6b85d747c73231bbb95cef95ed2d2854ab7d43aebfbedb3a191f447f1
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.13.2
-  resolution: "@typescript-eslint/parser@npm:6.13.2"
+  version: 6.14.0
+  resolution: "@typescript-eslint/parser@npm:6.14.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.13.2"
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/typescript-estree": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+    "@typescript-eslint/scope-manager": "npm:6.14.0"
+    "@typescript-eslint/types": "npm:6.14.0"
+    "@typescript-eslint/typescript-estree": "npm:6.14.0"
+    "@typescript-eslint/visitor-keys": "npm:6.14.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2c62b8cd8a37eb2ea59cd00e559f51a9f57af746e2040e872af3c58ddd3f4071ad7b7009789bdeb0e0d4ee0343bfe96ee77288020f3ae22d08e1674203f5e156
+  checksum: 0344f7f640374e7e5a5b50e9c90fbd161611b3f455132e541ef9116eef7bd3acf364db64bd38d4b6b4fe148414494620c9df660f8ddce036019c38ae8e146585
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
+"@typescript-eslint/scope-manager@npm:6.14.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.14.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
-  checksum: 9b159e5bb10dfb5953e71488200b4126378fc7e987ce7d90946aea9ec40cd66c7ada92399657c5d9794189b764ca6f4eb38a8dcb9e4c5aa50ab6000a39636b9c
+    "@typescript-eslint/types": "npm:6.14.0"
+    "@typescript-eslint/visitor-keys": "npm:6.14.0"
+  checksum: 8c59a215af3d7d24d8d0b21c28a858263de471650829f288a941e0eb8af8a054798da5c7594b7f39370219718270c18464b5edb96f451457e5f080a33ba57c2c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/type-utils@npm:6.13.2"
+"@typescript-eslint/type-utils@npm:6.14.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/type-utils@npm:6.14.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.13.2"
-    "@typescript-eslint/utils": "npm:6.13.2"
+    "@typescript-eslint/typescript-estree": "npm:6.14.0"
+    "@typescript-eslint/utils": "npm:6.14.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3734,23 +3734,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1ca97c78abdf479aea0c54e869fda2ae2f69de1974cc063062ce7b5b16c7fdf497ea15c50a29dd5941ea1b6b77e8f1213a5c272a747e334ac69ede083f327468
+  checksum: 836a6e84be5a245b07c76968c98e2f3bae064767dde720080fe8f33e226188510778dbca4199b7e42ef675ec3fd6d0ab522ec1c77d6e2a9b50e8e275fe7c72c9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/types@npm:6.13.2"
-  checksum: 029918ca5b1442bb4bc435773504ce32191e2c3e2fde8d4176bb6513f03e3dfa2aa9724b2d22b1640656d666b97f7a7ebfeaf67b881d5e07250828fa83e3ebe8
+"@typescript-eslint/types@npm:6.14.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/types@npm:6.14.0"
+  checksum: d59306a7a441982a4dcee7d775928fd5086aba9331f7a238f915723a0dc785df0e43af562a30a7c2f1b056a1e49fd64863a8d2450d31706193add0ade87334a4
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
+"@typescript-eslint/typescript-estree@npm:6.14.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.14.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/visitor-keys": "npm:6.13.2"
+    "@typescript-eslint/types": "npm:6.14.0"
+    "@typescript-eslint/visitor-keys": "npm:6.14.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3759,34 +3759,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1c4c59dce0c51fdfee34d9f418e64fe28e3ec1a97661efc8a3d2780bdff36aff38de9090d356a968f394fa6d4e9c058936ce9cd260d4c44a52761ecd74915bce
+  checksum: 767c3309987b8ad053a2403605a9bd7c4eb3283dece864a741a7531a1c28eea4d85acaa4613141b64e194f9f6c4cbc5bc762c9b9f3a67c6202aa8cbb18b180d2
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.13.2, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.13.2
-  resolution: "@typescript-eslint/utils@npm:6.13.2"
+"@typescript-eslint/utils@npm:6.14.0, @typescript-eslint/utils@npm:^6.5.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/utils@npm:6.14.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.13.2"
-    "@typescript-eslint/types": "npm:6.13.2"
-    "@typescript-eslint/typescript-estree": "npm:6.13.2"
+    "@typescript-eslint/scope-manager": "npm:6.14.0"
+    "@typescript-eslint/types": "npm:6.14.0"
+    "@typescript-eslint/typescript-estree": "npm:6.14.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 84969be91e7949868eaaa289288c9d71927f0e427b572501b0991d8d62b40a4234f7287c35b35d276ccbb53e9ea5457b8250fcf4941e60e6b9ba4065fbfba416
+  checksum: 72689b2897b89e1bd1c71c1c2ae436d0ccfbcfffabf3be4378de74ad8138b2ecdbeeda7c1720e2f1754569e773f2fc7216f704335e1e56c38c7601ee1d190aeb
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.13.2":
-  version: 6.13.2
-  resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
+"@typescript-eslint/visitor-keys@npm:6.14.0":
+  version: 6.14.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.14.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.13.2"
+    "@typescript-eslint/types": "npm:6.14.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: c173bc1fcc42c3075a5ee094e7f3bf0279d98315c25ff49e20d02d79022b1d0402accfa113b070afb4d52a6f6d180594b67baa8b6a784eabdf82b54dd1ff454c
+  checksum: 0e2363f9f1986ebdb41507c54a666fa1c336eb6beb383dc342a10844d3c42c89067b21c3f158851fa6f0825e1e451a5470b5454fde70a6fc33b4b0259462d954
   languageName: node
   linkType: hard
 
@@ -7349,8 +7349,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-import@npm:~2.29.0":
-  version: 2.29.0
-  resolution: "eslint-plugin-import@npm:2.29.0"
+  version: 2.29.1
+  resolution: "eslint-plugin-import@npm:2.29.1"
   dependencies:
     array-includes: "npm:^3.1.7"
     array.prototype.findlastindex: "npm:^1.2.3"
@@ -7368,16 +7368,16 @@ __metadata:
     object.groupby: "npm:^1.0.1"
     object.values: "npm:^1.1.7"
     semver: "npm:^6.3.1"
-    tsconfig-paths: "npm:^3.14.2"
+    tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 761a4e1fbc2cd318e62350bed4c448f8b11ed83091d6bb7776f096556363a09debd9922b39fd2714c895edc9aaea82e08e684eb632283f880c58a91e4bae6733
+  checksum: 5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^46.1.0":
-  version: 46.9.0
-  resolution: "eslint-plugin-jsdoc@npm:46.9.0"
+  version: 46.9.1
+  resolution: "eslint-plugin-jsdoc@npm:46.9.1"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7387,10 +7387,10 @@ __metadata:
     esquery: "npm:^1.5.0"
     is-builtin-module: "npm:^3.2.1"
     semver: "npm:^7.5.4"
-    spdx-expression-parse: "npm:^3.0.1"
+    spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 4566b0f9bda54b446c813cf5ea93ae6d5866cbc4d448cb957b9ce2563f934d3ed2ed4e665e5a870750860a57137a1714c38599c35c60be16dce0f8e5a75b6ff6
+  checksum: d15d68797e85bb7b6fdcfc1170653683c16ab1d62c2e9c537101e774cb3231913e2bc4781f2bb808d074adce5699e5b545e450c6801b637c6434587d226ad6ac
   languageName: node
   linkType: hard
 
@@ -7511,13 +7511,13 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.41.0":
-  version: 8.55.0
-  resolution: "eslint@npm:8.55.0"
+  version: 8.56.0
+  resolution: "eslint@npm:8.56.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.55.0"
+    "@eslint/js": "npm:8.56.0"
     "@humanwhocodes/config-array": "npm:^0.11.13"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -7554,7 +7554,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: d28c0b60f19bb7d355cb8393e77b018c8f548dba3f820b799c89bb2e0c436ee26084e700c5e57e1e97e7972ec93065277849141b82e7b0c0d02c2dc1e553a2a1
+  checksum: 2be598f7da1339d045ad933ffd3d4742bee610515cd2b0d9a2b8b729395a01d4e913552fff555b559fccaefd89d7b37632825789d1b06470608737ae69ab43fb
   languageName: node
   linkType: hard
 
@@ -7883,20 +7883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "fast-glob@npm:3.3.1"
-  dependencies:
-    "@nodelib/fs.stat": "npm:^2.0.2"
-    "@nodelib/fs.walk": "npm:^1.2.3"
-    glob-parent: "npm:^5.1.2"
-    merge2: "npm:^1.3.0"
-    micromatch: "npm:^4.0.4"
-  checksum: b68431128fb6ce4b804c5f9622628426d990b66c75b21c0d16e3d80e2d1398bf33f7e1724e66a2e3f299285dcf5b8d745b122d0304e7dd66f5231081f33ec67c
-  languageName: node
-  linkType: hard
-
-"fast-glob@npm:^3.3.2":
+"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1, fast-glob@npm:^3.3.2":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
   dependencies:
@@ -9069,14 +9056,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
-  version: 5.2.4
-  resolution: "ignore@npm:5.2.4"
-  checksum: 7c7cd90edd9fea6e037f9b9da4b01bf0a86b198ce78345f9bbd983929d68ff14830be31111edc5d70c264921f4962404d75b7262b4d9cc3bc12381eccbd03096
-  languageName: node
-  linkType: hard
-
-"ignore@npm:^5.3.0":
+"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.0":
   version: 5.3.0
   resolution: "ignore@npm:5.3.0"
   checksum: dc06bea5c23aae65d0725a957a0638b57e235ae4568dda51ca142053ed2c352de7e3bc93a69b2b32ac31966a1952e9a93c5ef2e2ab7c6b06aef9808f6b55b571
@@ -15125,13 +15105,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spdx-expression-parse@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "spdx-expression-parse@npm:3.0.1"
+"spdx-expression-parse@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "spdx-expression-parse@npm:4.0.0"
   dependencies:
     spdx-exceptions: "npm:^2.1.0"
     spdx-license-ids: "npm:^3.0.0"
-  checksum: 6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171
+  checksum: 965c487e77f4fb173f1c471f3eef4eb44b9f0321adc7f93d95e7620da31faa67d29356eb02523cd7df8a7fc1ec8238773cdbf9e45bd050329d2b26492771b736
   languageName: node
   linkType: hard
 
@@ -16155,15 +16135,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.2":
-  version: 3.14.2
-  resolution: "tsconfig-paths@npm:3.14.2"
+"tsconfig-paths@npm:^3.15.0":
+  version: 3.15.0
+  resolution: "tsconfig-paths@npm:3.15.0"
   dependencies:
     "@types/json5": "npm:^0.0.29"
     json5: "npm:^1.0.2"
     minimist: "npm:^1.2.6"
     strip-bom: "npm:^3.0.0"
-  checksum: fdc92bb7b18b31c0e76f8ec4f98d07236b09590fd6578e587ad024792c8b2235d65125a8fd007fa47a84400f84ceccbf33f24e5198d953249e7204f4cef3517c
+  checksum: 5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
   languageName: node
   linkType: hard
 

From 287384b3bb969173b902c819f1f4f0f687a35091 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:28:10 +0100
Subject: [PATCH 090/436] Update DefinitelyTyped types (non-major) (#28407)

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

diff --git a/yarn.lock b/yarn.lock
index 78757c3e1d..8d4c07a6f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3352,11 +3352,11 @@ __metadata:
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.4":
-  version: 18.2.17
-  resolution: "@types/react-dom@npm:18.2.17"
+  version: 18.2.18
+  resolution: "@types/react-dom@npm:18.2.18"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 33b53078ed7e9e0cfc4dc691e938f7db1cc06353bc345947b41b581c3efe2b980c9e4eb6460dbf5ddc521dd91959194c970221a2bd4bfad9d23ebce338e12938
+  checksum: 74dba11a1b8156f3a763f3fca1fb4ec1dcd349153279b8bf79210024a69f994bf2cf0728198c047f8130c5318420ea56281b0a4ef84c8ae943cd9a0cac705220
   languageName: node
   linkType: hard
 
@@ -3482,13 +3482,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.43
-  resolution: "@types/react@npm:18.2.43"
+  version: 18.2.45
+  resolution: "@types/react@npm:18.2.45"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10477a50fbd3c0cc5b8a2ade679f442717f68fb27c8460b2aa1d3256cd18c48f742bbe5b9ee37a8c4c5f832ffa37b3a23c09fd96dd880a8e3182d8929c05e803
+  checksum: 4cc650c47ffb88baac29fb7a74e842e4af4a55f437086ef70250fdc75f0a5f2fcf8adc272d05ab2e00b1de6e14613296881271caee037dadf9130fdeb498c59e
   languageName: node
   linkType: hard
 

From 43f637c1300ad8423e1d631c59387a4ef622d603 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:28:19 +0100
Subject: [PATCH 091/436] Update dependency rubocop-rails to v2.23.0 (#28396)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ab24f5dca1..1ca1839ec5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -515,7 +515,7 @@ GEM
       openssl (> 2.0)
     orm_adapter (0.5.0)
     ox (2.14.17)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -682,7 +682,7 @@ GEM
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.22.2)
+    rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From fad7dca0e492d8798207a55fc68d20d9bfe72370 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:29:41 +0100
Subject: [PATCH 092/436] Update dependency prom-client to v15.1.0 (#28394)

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

diff --git a/yarn.lock b/yarn.lock
index 8d4c07a6f4..58fab9907f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13240,12 +13240,12 @@ __metadata:
   linkType: hard
 
 "prom-client@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "prom-client@npm:15.0.0"
+  version: 15.1.0
+  resolution: "prom-client@npm:15.1.0"
   dependencies:
     "@opentelemetry/api": "npm:^1.4.0"
     tdigest: "npm:^0.1.1"
-  checksum: 4d69d4a6e086a80f1e7b5716c53d6be49d99dba8451f2a8117708f581f69648f47df68060cbea1c18e24fc1efe675868f85c5da89d0ef8d6f962a52b5f50c356
+  checksum: c10781adbf49225298e44da5396a51a0bd4d0cddc3c7e237ba50e888e12ead26a8f98261f362a442f1bbcdaddd6e7302d5675b37beac67ea9b6f82e4d39fb3cc
   languageName: node
   linkType: hard
 

From fc4eaa779a9f920ceb9f3aa72889e1401a3710b2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:31:21 +0100
Subject: [PATCH 093/436] Update dependency cssnano to v6.0.2 (#28382)

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

diff --git a/yarn.lock b/yarn.lock
index 58fab9907f..f4d12e10aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6087,12 +6087,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^6.3.1":
-  version: 6.4.0
-  resolution: "css-declaration-sorter@npm:6.4.0"
+"css-declaration-sorter@npm:^7.0.0":
+  version: 7.1.1
+  resolution: "css-declaration-sorter@npm:7.1.1"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: aef4d5927e576bae04349457be0607af44525cf5f4b28a91843c7b7f28fcbb302ba149385bb0e2172380556994e31680c5177b42d03502c417789b139e20cbc2
+  checksum: bea446e441bafde21c3c7b3f7639559311da12eea140db7ee3c61e4f41df455b7b098df107f99bc0cca32a5020841cc94bf8a2d5efb1b383e51f9de478c4816e
   languageName: node
   linkType: hard
 
@@ -6225,63 +6225,72 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "cssnano-preset-default@npm:6.0.1"
+"cssnano-preset-default@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "cssnano-preset-default@npm:6.0.2"
   dependencies:
-    css-declaration-sorter: "npm:^6.3.1"
-    cssnano-utils: "npm:^4.0.0"
-    postcss-calc: "npm:^9.0.0"
-    postcss-colormin: "npm:^6.0.0"
-    postcss-convert-values: "npm:^6.0.0"
-    postcss-discard-comments: "npm:^6.0.0"
-    postcss-discard-duplicates: "npm:^6.0.0"
-    postcss-discard-empty: "npm:^6.0.0"
-    postcss-discard-overridden: "npm:^6.0.0"
-    postcss-merge-longhand: "npm:^6.0.0"
-    postcss-merge-rules: "npm:^6.0.1"
-    postcss-minify-font-values: "npm:^6.0.0"
-    postcss-minify-gradients: "npm:^6.0.0"
-    postcss-minify-params: "npm:^6.0.0"
-    postcss-minify-selectors: "npm:^6.0.0"
-    postcss-normalize-charset: "npm:^6.0.0"
-    postcss-normalize-display-values: "npm:^6.0.0"
-    postcss-normalize-positions: "npm:^6.0.0"
-    postcss-normalize-repeat-style: "npm:^6.0.0"
-    postcss-normalize-string: "npm:^6.0.0"
-    postcss-normalize-timing-functions: "npm:^6.0.0"
-    postcss-normalize-unicode: "npm:^6.0.0"
-    postcss-normalize-url: "npm:^6.0.0"
-    postcss-normalize-whitespace: "npm:^6.0.0"
-    postcss-ordered-values: "npm:^6.0.0"
-    postcss-reduce-initial: "npm:^6.0.0"
-    postcss-reduce-transforms: "npm:^6.0.0"
-    postcss-svgo: "npm:^6.0.0"
-    postcss-unique-selectors: "npm:^6.0.0"
+    css-declaration-sorter: "npm:^7.0.0"
+    cssnano-utils: "npm:^4.0.1"
+    postcss-calc: "npm:^9.0.1"
+    postcss-colormin: "npm:^6.0.1"
+    postcss-convert-values: "npm:^6.0.1"
+    postcss-discard-comments: "npm:^6.0.1"
+    postcss-discard-duplicates: "npm:^6.0.1"
+    postcss-discard-empty: "npm:^6.0.1"
+    postcss-discard-overridden: "npm:^6.0.1"
+    postcss-merge-longhand: "npm:^6.0.1"
+    postcss-merge-rules: "npm:^6.0.2"
+    postcss-minify-font-values: "npm:^6.0.1"
+    postcss-minify-gradients: "npm:^6.0.1"
+    postcss-minify-params: "npm:^6.0.1"
+    postcss-minify-selectors: "npm:^6.0.1"
+    postcss-normalize-charset: "npm:^6.0.1"
+    postcss-normalize-display-values: "npm:^6.0.1"
+    postcss-normalize-positions: "npm:^6.0.1"
+    postcss-normalize-repeat-style: "npm:^6.0.1"
+    postcss-normalize-string: "npm:^6.0.1"
+    postcss-normalize-timing-functions: "npm:^6.0.1"
+    postcss-normalize-unicode: "npm:^6.0.1"
+    postcss-normalize-url: "npm:^6.0.1"
+    postcss-normalize-whitespace: "npm:^6.0.1"
+    postcss-ordered-values: "npm:^6.0.1"
+    postcss-reduce-initial: "npm:^6.0.1"
+    postcss-reduce-transforms: "npm:^6.0.1"
+    postcss-svgo: "npm:^6.0.1"
+    postcss-unique-selectors: "npm:^6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 401a8d0712cca6577df52cf4aac234ff4a946f0f51c0d09e7c518fff389706cff54d702ff22762e834b23401a89b836aef113e69cc66fa5dfa1f361bdd932495
+    postcss: ^8.4.31
+  checksum: c6f97674704c3a2a2473440549eac38ac722feebabbd39f2d4d1b8fae7f137f8fd0dfb88929e1ff737d54008de583c39e96f9dc450f2d71f8be6fc3bac2840a3
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "cssnano-utils@npm:4.0.0"
+"cssnano-utils@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssnano-utils@npm:4.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: ca5cb2be5ec8ea624c28f5f54c00a440557afd3c2b25cb568517db44d230833743f3db30729126efe4d7fc616a42718dd76255bbefcb7d3cc7e3ff5989d907b3
+    postcss: ^8.4.31
+  checksum: 20513a393402f283c85c450ece43d1a6a06a9906b524481043ac203a86888a4ca5cbef878c615a58fdd82a9e870ce62c6f3fea9f51814034a084d8980e17cf96
   languageName: node
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "cssnano@npm:6.0.1"
+  version: 6.0.2
+  resolution: "cssnano@npm:6.0.2"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.1"
-    lilconfig: "npm:^2.1.0"
+    cssnano-preset-default: "npm:^6.0.2"
+    lilconfig: "npm:^3.0.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: b73a3a257dd32201ce504cb34b08f1259c8a260b063f58d33e03283149d94ee2ba938d7f9beae1413f0f34e06828759575ade6ae95fa01d199f291e1d4f6d2c2
+    postcss: ^8.4.31
+  checksum: 5f4146a6c8937d24b0d1d33e3acd85db7913c7558cc80b23169f86c9a552d091a26e0af6adcc535f8355561872f797a917b9353e38fe935bbaf08ec2b66f5ff8
+  languageName: node
+  linkType: hard
+
+"csso@npm:5.0.5":
+  version: 5.0.5
+  resolution: "csso@npm:5.0.5"
+  dependencies:
+    css-tree: "npm:~2.2.0"
+  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
   languageName: node
   linkType: hard
 
@@ -6294,15 +6303,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csso@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "csso@npm:5.0.5"
-  dependencies:
-    css-tree: "npm:~2.2.0"
-  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
-  languageName: node
-  linkType: hard
-
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
@@ -10827,20 +10827,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:3.0.0":
+"lilconfig@npm:3.0.0, lilconfig@npm:^3.0.0":
   version: 3.0.0
   resolution: "lilconfig@npm:3.0.0"
   checksum: 7f5ee7a658dc016cacf146815e8d88b06f06f4402823b8b0934e305a57a197f55ccc9c5cd4fb5ea1b2b821c8ccaf2d54abd59602a4931af06eabda332388d3e6
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "lilconfig@npm:2.1.0"
-  checksum: 64645641aa8d274c99338e130554abd6a0190533c0d9eb2ce7ebfaf2e05c7d9961f3ffe2bfa39efd3b60c521ba3dd24fa236fe2775fc38501bf82bf49d4678b8
-  languageName: node
-  linkType: hard
-
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -12673,7 +12666,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^9.0.0":
+"postcss-calc@npm:^9.0.1":
   version: 9.0.1
   resolution: "postcss-calc@npm:9.0.1"
   dependencies:
@@ -12685,65 +12678,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-colormin@npm:6.0.0"
+"postcss-colormin@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-colormin@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
     caniuse-api: "npm:^3.0.0"
     colord: "npm:^2.9.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: b05763b68f7f23333f408734f13be4bde641934ecbde25ac7d7fa648ab5e826716bffac0193067b317e861c6dabad81db9c012e865a83f81b6bce5c7e25c0fdd
+    postcss: ^8.4.31
+  checksum: b0056812b3436b05b6b84284a1ebe68a72299f23e7eeb0b7b40a775978d06a1cbe235f3665e3f694f5de76fe7d9b93db607536d07697b31a59fd4e8705e5b64d
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-convert-values@npm:6.0.0"
+"postcss-convert-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-convert-values@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 8c20d31a39e0ddf7db4fde0da62e293279b5ee84c36919f2e5760650fa6f2984f1a40bfdbe8d1f7829bd37b17e5e589535f0aaaf71d4df29ad203cef830b9d7a
+    postcss: ^8.4.31
+  checksum: 53b951d7475206969c63b8427a2dea0ccba0a7cb08122e5f05aee8d12b09c870c070b101c9f8eceda76ff4d0fd9e5fa9385e83f143d658bb729dbb6a3583b872
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-comments@npm:6.0.0"
+"postcss-discard-comments@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-comments@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: c8792cd99c7696b21917d55937e02fb854a82ee308edf7564f18ad19bec4abf4756ba234e17f7d129d6b0dbaf6253bcddc435b1aeee190d4d26dcc2448f5453a
+    postcss: ^8.4.31
+  checksum: 5e9128ffb8c005081bb0521f5a23cf090e8513d928ed39935504ffde2e335a62a7e1a749c5c7bc2d03f06a8667900d19dd7eed19dfa4273043b5fd760476260d
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-duplicates@npm:6.0.0"
+"postcss-discard-duplicates@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-duplicates@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 5fb0de3b187b09538a8c10f25bcc3e7b0865337a96a0599f8213864f0d52812f6c90142d170258293a30484b95e096dee28fc8fddb302016f93d4a8d269bb18f
+    postcss: ^8.4.31
+  checksum: b9ea10a3c7528bb1630613c11756f809a95da634822d943fa91b28f2a37787e7cdb9ff96deed9776e2c3753d35e42c8afd5074b630930df7b5150573d4beda23
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-empty@npm:6.0.0"
+"postcss-discard-empty@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-empty@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 5dfe01f93ee2bb85e71f7832498bd051b772b9c724a5630f749237b07a14b47c2b2800b4215ab4cf0d8cba29552725b40334f3ef9d349f7aacf410ad351715dc
+    postcss: ^8.4.31
+  checksum: 6b95e588a3e8fb262e56bd313060daf29d7c9d44184bb6c4c5858ae81d6cd2907b15b3e3023b6621d50a67cfc10e6077920ff1e908892b207dee29477376498f
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-discard-overridden@npm:6.0.0"
+"postcss-discard-overridden@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-discard-overridden@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 3a0c91241a95a887ef10227c761fb2c48870966bda5530de635002e485abc2743dfbfdc96e3b6a21f10c6231f0cfbe1a0eae0a01a89629d64a711eab3ee008c6
+    postcss: ^8.4.31
+  checksum: 22f9d56e53b90bc0f8e6d1c24d6da6c7c1a9d757644a128a7a4263a5479aaa8eca4ce3bfe9db10358051635ed40e8778a68c3f1831b7163eae10ced001db4a87
   languageName: node
   linkType: hard
 
@@ -12770,77 +12763,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-merge-longhand@npm:6.0.0"
+"postcss-merge-longhand@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-merge-longhand@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.0"
+    stylehacks: "npm:^6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 0b67c590d301ab7f087ea7421e1eac0cccd2ff1c146a2dfa16d3f32b770d12a5999b8c6ea177efc443f4fb9df13b941c401365c634533878eef1982ad9d0bb98
+    postcss: ^8.4.31
+  checksum: 2c0eb81b6c6d3d2af3b129c46d10317b7923f218db1cadcb4723091fb951fe4624638002b65f235151129d4ce9b4775a6ed0d5fa13419c0df580f72e15fa4ad3
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-merge-rules@npm:6.0.1"
+"postcss-merge-rules@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-merge-rules@npm:6.0.2"
   dependencies:
     browserslist: "npm:^4.21.4"
     caniuse-api: "npm:^3.0.0"
-    cssnano-utils: "npm:^4.0.0"
+    cssnano-utils: "npm:^4.0.1"
     postcss-selector-parser: "npm:^6.0.5"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: b6a2a196905cd170757aa7b8bc74dab1fc7e2b2ca6a19c6d355fb7c41ff736023b4176c1008a7049f6a1b24a94a30d066c4e51229c1282a941f7fd6056085af7
+    postcss: ^8.4.31
+  checksum: 138a9921423420116b20e5761a1139392f0bcfcf34264fe11e254917d9c3170e3c0478a1b409e227d22bb0d9820b0168a871a240215d114e9c1e218ee6c132e6
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-font-values@npm:6.0.0"
+"postcss-minify-font-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-font-values@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6b74b1ec19bf76dcae7947c42145cb200b38767680512728f76168ae246db453798760e56111bd28ade9011d3655a79da4b33a93e5349f98fb0c1b22cc65ff36
+    postcss: ^8.4.31
+  checksum: 15af236245a6d27f1c83c943ef90d144ca043894bbd86f134506a984811a936a06824739984824965c7c3fd5a0ff4ed299f26a33f3b628662aa4fb40d7536fd0
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-gradients@npm:6.0.0"
+"postcss-minify-gradients@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-gradients@npm:6.0.1"
   dependencies:
     colord: "npm:^2.9.1"
-    cssnano-utils: "npm:^4.0.0"
+    cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 59046acd470bee151291ba99421846d776c4ed243acb05a005e74f64f92b968d712d35e727f5e4a90e632d6d6aeb3a01083469f50bfdf1fb9ecae7f4ae52d9b8
+    postcss: ^8.4.31
+  checksum: e700c3f6dc425072ff739fb18bb71c970599e0d909b326f4a5c84e91cf24c4f1ee78e4d161bd4cdf6e25b7d78f1ad082bb885afdd2a150f9b281520fc6359d5c
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-params@npm:6.0.0"
+"postcss-minify-params@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-params@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
-    cssnano-utils: "npm:^4.0.0"
+    cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: d4d1469b7ad7fe53900eb19c156ec6dcfeaf71641d29ba4df31f47d8fa8ac700df5b8d3e3768e66d695d5356ed348cea901314653046c8e48422962f165a1933
+    postcss: ^8.4.31
+  checksum: 0b34817f032ec9793fad4d33f3ba5551531073a36c9120d77194a3edeee860132951ed6954913494e5a6752ae8da1bc5cdb2a44fa5f428621afae8edddb0ca80
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-minify-selectors@npm:6.0.0"
+"postcss-minify-selectors@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-minify-selectors@npm:6.0.1"
   dependencies:
     postcss-selector-parser: "npm:^6.0.5"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 1cdd3bd231cf25f54ab370d959f727dfcbe839a1d97bcfd65add9df73747a45d299a009ff16111bbe78943e8f81dcf5f84ae4106847b23dd3652de7aadc0b297
+    postcss: ^8.4.31
+  checksum: ffc7ebb286beda2b2aa0ed13abafc89b5ffe232a48d57d3f2b9f69e167e354482a6f5279e9118bed753bf6e82d3cfb21228a6b07acd93d0dc9e01bbf0e7ebc75
   languageName: node
   linkType: hard
 
@@ -12888,136 +12881,136 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-charset@npm:6.0.0"
+"postcss-normalize-charset@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-charset@npm:6.0.1"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 5232eac7f62097b1d349546182af2db7db34989867c147517cd407ab23c8450558a7f858eb8dac130959dae2d02d3460c5afa510e0ffe22221cb218f2bd79adb
+    postcss: ^8.4.31
+  checksum: 8c09eedaf8813123875c65ab35120f14a87d6b9e8d6805fa808e3a714a8f868d15123f34f61e2240d89225f2f5c2bdabbcdf6385ce86b2487370d8994a65a857
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-display-values@npm:6.0.0"
+"postcss-normalize-display-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-display-values@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 58163258a52610fa0d2b61bd6e872b9a2b25da1f2209cbf34fad3b62a4139fff9e0e6b298dcd1adfe6ac556098aad8b79c387280f3a949180f8fb12e6b41fecf
+    postcss: ^8.4.31
+  checksum: d08a92c653fb4f2506e029ceb8e3fdae9bc937fb1a7e80ecde759d02f6d15f69211af384d89d8582b160fd129abd9c77c8c64d75379417098ee5a2ba779e33d3
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-positions@npm:6.0.0"
+"postcss-normalize-positions@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-positions@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: de2ced6cfdf2931d7cbc8f9c96bb12487119dba1b454c7ac01fd19f7afdaa9bf6c63f59624281293379ead5a3d5e883007a3f192f02c40ab41528ccc5a399f5c
+    postcss: ^8.4.31
+  checksum: bb0267b13c92791543f5e9f94b119a0540e08aa46f600acd73a692cd38d07d2d2fddb11148a81adb58e3f65671eebb05ea38d2ded48f3202b2582f1199aa848e
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-repeat-style@npm:6.0.0"
+"postcss-normalize-repeat-style@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-repeat-style@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 1643132094067709ca7d1fa2beededd28565c83bc8a6c2a4dec879a97e1d425ca1293a8832a45732eef12b52960f024330cfb654a8a222fb7ea768a75989c31e
+    postcss: ^8.4.31
+  checksum: f6e943dbbf9341dd6ce2c9fc6820e8ae2a838d1db84f58f75b1e5c1b8b9d6895d17fb30b320e2189b8747f844713ec687540b5b1d52ccd6c9108d6d35328c659
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-string@npm:6.0.0"
+"postcss-normalize-string@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-string@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: d586ce274451229c6a3d625edef882b342ab7702babb632845c8c201c7bcc08481f282000d19d17edb7b5ef0b1982e715a16ab60990d124e937c4aef3304151e
+    postcss: ^8.4.31
+  checksum: afcdd69522fc3ebafc349c2ef4b62f1e734ade9b6148fd20f2b841477808ac6cf6e5bfbb533c492fdc6bb2184b84be8ebb800a6ae174c4313f87fb0695088cc0
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-timing-functions@npm:6.0.0"
+"postcss-normalize-timing-functions@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-timing-functions@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: a70742648cec15eea031096f2ad99c21c79228ce4c4ccc9f63c277c07e9e3add96298cc67b0b1797896507248153e0a662f85f490f53147ded7008b459dd5ba3
+    postcss: ^8.4.31
+  checksum: c1c81d0dcb2f74fbd69cc45b0b6bd6cde390a0c9df602aabbf3eb2149a49da48e808837e811d22a525ffb036e158e63b4b2cf12c94cf28f2c2f6af858876134e
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-unicode@npm:6.0.0"
+"postcss-normalize-unicode@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-unicode@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: cd9b06ed09c29ccc0b2cb222044d7ec49fb710fdd6f0878b26d7f3324478d8271a555ba3d82fc8d9fdcf8671a83c499cdfa09c0e73d4dee928adff4042ed8b22
+    postcss: ^8.4.31
+  checksum: 8057748dade94dc2dd63a3b75a85e394c2e9a7076053886ff08aa9b7729d383f204eda52d882e5361ae1ec493036e90b2e18dcc5f8c9b3a8f1cbfada12bcc05b
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-url@npm:6.0.0"
+"postcss-normalize-url@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-url@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 719a7feee4adf638cc0b4bc204d89485388ca81f0ad0a181a225122f488f956abd29f429d69e5a57fffe93fbd2a22eab7737bd8b55b19979efba26e008b2ec11
+    postcss: ^8.4.31
+  checksum: 4e3e713a95e01f263feccd041b2b10016a0a09e494c81567f012d1326d9b2d57dc4a68956a820313630370c0ef591bdbb37cc96ed259022559623be179aad436
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-normalize-whitespace@npm:6.0.0"
+"postcss-normalize-whitespace@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-normalize-whitespace@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 8421dd5813c1e555d7c2847dd8b71a5138ee2091341ebd1ea686d5b00cd46d249a29027e142289f873ca7f5fc995b51eb68f9693fec6d61cf951c759d109c37d
+    postcss: ^8.4.31
+  checksum: 259c0b7653f033ed14303602a30e458c37dc63ee55f47226b6379a6ea553ca7c9b971d49715b8f3f36a3a06927f6f87d7997c027ad4664af3bca37a5fe30352e
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-ordered-values@npm:6.0.0"
+"postcss-ordered-values@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-ordered-values@npm:6.0.1"
   dependencies:
-    cssnano-utils: "npm:^4.0.0"
+    cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: b01352b0ea014e0037a5b8b3bd866696924bfb2cf3b47b73547786a1954e6771c04790fbe4c651bf029bafdbfde70f49e611f9ef309e945f753425841f343017
+    postcss: ^8.4.31
+  checksum: 2e71f035c90b26d7a8d31e1b716f977532367f75bc76de3318b6ba7b2e1ec43c011cc09e741f59f7d93dff427b7d90a35db0b460d2f171a6f0c6e8c938ef30ad
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-reduce-initial@npm:6.0.0"
+"postcss-reduce-initial@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-reduce-initial@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 7cf6340bde9f70c7d9b20bc3ee53e883bf27ed56fcc3bb2a2c736b311d977098a7c3a6b9e4be4d2c159d0042bf7742bb5af59628cd89cf838968dacc5ae15c80
+    postcss: ^8.4.31
+  checksum: 3f8f6c26ceeb79ddc285b0e01183fe30e911dd26b3abcdca56568e2bef3747f2b7f22ee3f9117e9752e1e93c10bcd88bd6a2842ca525b54336726292ebd3c3ad
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-reduce-transforms@npm:6.0.0"
+"postcss-reduce-transforms@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-reduce-transforms@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6da900d22dd8760b8a2ace32013036e3c4c4d9d560c31255eceea54563e3ddb2ca830bc9072fe2a1abacb8c48a008656887fc2f6ba1873e590342ad8e6bc269d
+    postcss: ^8.4.31
+  checksum: de7631302311071d86622166539162e69df506785e3674afab0602c86ed9aa67799e44405b40327f0011d58089d2dc4e2ae481b21812177818e28f9272d350a5
   languageName: node
   linkType: hard
 
@@ -13056,26 +13049,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-svgo@npm:6.0.0"
+"postcss-svgo@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-svgo@npm:6.0.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    svgo: "npm:^3.0.2"
+    svgo: "npm:^3.0.5"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: ec567cd5e982e3c0393695628bc508b87dcfe4e4b2049930e79e6c629c349fad19403f0d39d76ceda3e0f15ffd065304e76152f397fae2f3f848cdb847a0b564
+    postcss: ^8.4.31
+  checksum: 021da9b0d0696fce970f407891a0d6c05e51d1908af435026e0cd5936a75cd8502a7d504cd0e6a33b6f3369fee41f01b848e5bd919aecc3e804ce6308e91a6cc
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-unique-selectors@npm:6.0.0"
+"postcss-unique-selectors@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-unique-selectors@npm:6.0.1"
   dependencies:
     postcss-selector-parser: "npm:^6.0.5"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 63e81a7965ff8874fdf39ef0ae0f12cc21352548733538f52eda73f0ed5a7fab7fda9090facf50395d07873c5a6f02d31a6171fd476c80858b03090ec4c61d31
+    postcss: ^8.4.31
+  checksum: 637e35775d0ee8fbcf4a81b28d3832c5076de7c0232eb7769d4fbbf783f26793e2ec95e18461ae3b9f5f5cd63c3de9db102464487ba2488d4947aad24dc8841f
   languageName: node
   linkType: hard
 
@@ -15548,15 +15541,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "stylehacks@npm:6.0.0"
+"stylehacks@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "stylehacks@npm:6.0.1"
   dependencies:
     browserslist: "npm:^4.21.4"
     postcss-selector-parser: "npm:^6.0.4"
   peerDependencies:
-    postcss: ^8.2.15
-  checksum: 6ce277c816dd826fdc765258d612a160bad03dae52ab51ef1676efae07e96923ebeb6880d6522eefc50d2e81cb90b632615120c73aed190f345e8d836def67b6
+    postcss: ^8.4.31
+  checksum: 0877016f5b2a06b8ceaf39382b0c33da11ea93268209444f67f29b1ce465994058f305fc3bc90dda21e8664c959561fbb06ba12b82289c3b26ba832c6979d513
   languageName: node
   linkType: hard
 
@@ -15780,19 +15773,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svgo@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "svgo@npm:3.0.2"
+"svgo@npm:^3.0.5":
+  version: 3.1.0
+  resolution: "svgo@npm:3.1.0"
   dependencies:
     "@trysound/sax": "npm:0.2.0"
     commander: "npm:^7.2.0"
     css-select: "npm:^5.1.0"
     css-tree: "npm:^2.2.1"
-    csso: "npm:^5.0.5"
+    css-what: "npm:^6.1.0"
+    csso: "npm:5.0.5"
     picocolors: "npm:^1.0.0"
   bin:
-    svgo: bin/svgo
-  checksum: d682d416dd68cdcbab5e1e77b93d621325480e97dfe87777e845ea9a0ce05d03fc837ce17080af67e787f6b24430b805ff79f4591dda30a0ab4060b6a3ac2adf
+    svgo: ./bin/svgo
+  checksum: b3f00b3319dee6ddc53f8b8ac5acef581860e1708c98b492169e096621edc1bdf46e3778099e3dffb5116bf0d4c074a686099843dbc020c73b3ccfae7b6a88f0
   languageName: node
   linkType: hard
 

From e56fb9e4890435ef89b56ef5d1b9a8d0d46ab938 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 04:32:02 -0500
Subject: [PATCH 094/436] Fix `Style/SymbolProc` cop (#28386)

---
 .rubocop_todo.yml                 | 7 -------
 config/initializers/3_omniauth.rb | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d9b2ec8144..4ddca804a1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -478,13 +478,6 @@ Style/StringLiterals:
     - 'config/initializers/webauthn.rb'
     - 'config/routes.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
-# AllowedMethods: define_method, mail, respond_to
-Style/SymbolProc:
-  Exclude:
-    - 'config/initializers/3_omniauth.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
diff --git a/config/initializers/3_omniauth.rb b/config/initializers/3_omniauth.rb
index d316c3b73a..aa8ba1a056 100644
--- a/config/initializers/3_omniauth.rb
+++ b/config/initializers/3_omniauth.rb
@@ -79,7 +79,7 @@ Devise.setup do |config|
     oidc_options[:client_auth_method] = ENV['OIDC_CLIENT_AUTH_METHOD'] if ENV['OIDC_CLIENT_AUTH_METHOD'] # OPTIONAL (default: basic)
     scope_string = ENV['OIDC_SCOPE'] if ENV['OIDC_SCOPE'] # NEED
     scopes = scope_string.split(',')
-    oidc_options[:scope] = scopes.map { |x| x.to_sym }
+    oidc_options[:scope] = scopes.map(&:to_sym)
     oidc_options[:response_type] = ENV['OIDC_RESPONSE_TYPE'] if ENV['OIDC_RESPONSE_TYPE'] # OPTIONAL (default: code)
     oidc_options[:response_mode] = ENV['OIDC_RESPONSE_MODE'] if ENV['OIDC_RESPONSE_MODE'] # OPTIONAL (default: query)
     oidc_options[:display] = ENV['OIDC_DISPLAY'] if ENV['OIDC_DISPLAY'] # OPTIONAL (default: page)

From 89d468ada74a48a72b7810b2231dc7ff2b66b250 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 04:36:08 -0500
Subject: [PATCH 095/436] Fix `Style/StderrPuts` cop (#28389)

---
 .rubocop_todo.yml | 5 -----
 config/boot.rb    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4ddca804a1..5ce0c78762 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -455,11 +455,6 @@ Style/SingleArgumentDig:
   Exclude:
     - 'lib/webpacker/manifest_extensions.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/StderrPuts:
-  Exclude:
-    - 'config/boot.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
diff --git a/config/boot.rb b/config/boot.rb
index 3e44cbe581..717de85f20 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 unless ENV.key?('RAILS_ENV')
-  STDERR.puts 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
+  warn 'ERROR: Missing RAILS_ENV environment variable, please set it to "production", "development", or "test".'
   exit 1
 end
 

From 0e5b8fc46bed800a16385d52b2f87db096b4f3a9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 04:50:51 -0500
Subject: [PATCH 096/436] Fix `Style/RedundantReturn` cop (#28391)

---
 .rubocop_todo.yml                             |  9 --------
 .../api/v1/directories_controller.rb          |  2 +-
 .../auth/confirmations_controller.rb          |  2 +-
 app/lib/ostatus/tag_manager.rb                |  2 +-
 app/models/form/import.rb                     | 21 ++++++++++++-------
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5ce0c78762..b8b4895f54 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -426,15 +426,6 @@ Style/RedundantFetchBlock:
     - 'config/initializers/paperclip.rb'
     - 'config/puma.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/controllers/api/v1/directories_controller.rb'
-    - 'app/controllers/auth/confirmations_controller.rb'
-    - 'app/lib/ostatus/tag_manager.rb'
-    - 'app/models/form/import.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
diff --git a/app/controllers/api/v1/directories_controller.rb b/app/controllers/api/v1/directories_controller.rb
index 35c504a7ff..e79b20ce42 100644
--- a/app/controllers/api/v1/directories_controller.rb
+++ b/app/controllers/api/v1/directories_controller.rb
@@ -12,7 +12,7 @@ class Api::V1::DirectoriesController < Api::BaseController
   private
 
   def require_enabled!
-    return not_found unless Setting.profile_directory
+    not_found unless Setting.profile_directory
   end
 
   def set_accounts
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 9f6be9c424..d9cd630905 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -62,7 +62,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
   end
 
   def captcha_user_bypass?
-    return true if @confirmation_user.nil? || @confirmation_user.confirmed?
+    @confirmation_user.nil? || @confirmation_user.confirmed?
   end
 
   def require_unconfirmed!
diff --git a/app/lib/ostatus/tag_manager.rb b/app/lib/ostatus/tag_manager.rb
index 7d81316227..21b3d3aa58 100644
--- a/app/lib/ostatus/tag_manager.rb
+++ b/app/lib/ostatus/tag_manager.rb
@@ -52,7 +52,7 @@ class OStatus::TagManager
       ActivityPub::TagManager.instance.uri_to_local_id(tag)
     else
       matches = Regexp.new("objectId=([\\d]+):objectType=#{expected_type}").match(tag)
-      return matches[1] unless matches.nil?
+      matches[1] unless matches.nil?
     end
   end
 
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index 29a2975c7b..712acf3706 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -43,14 +43,19 @@ class Form::Import
   validate :validate_data
 
   def guessed_type
-    return :muting if csv_headers_match?('Hide notifications')
-    return :following if csv_headers_match?('Show boosts') || csv_headers_match?('Notify on new posts') || csv_headers_match?('Languages')
-    return :following if file_name_matches?('follows') || file_name_matches?('following_accounts')
-    return :blocking if file_name_matches?('blocks') || file_name_matches?('blocked_accounts')
-    return :muting if file_name_matches?('mutes') || file_name_matches?('muted_accounts')
-    return :domain_blocking if file_name_matches?('domain_blocks') || file_name_matches?('blocked_domains')
-    return :bookmarks if file_name_matches?('bookmarks')
-    return :lists if file_name_matches?('lists')
+    if csv_headers_match?('Hide notifications') || file_name_matches?('mutes') || file_name_matches?('muted_accounts')
+      :muting
+    elsif csv_headers_match?('Show boosts') || csv_headers_match?('Notify on new posts') || csv_headers_match?('Languages') || file_name_matches?('follows') || file_name_matches?('following_accounts')
+      :following
+    elsif file_name_matches?('blocks') || file_name_matches?('blocked_accounts')
+      :blocking
+    elsif file_name_matches?('domain_blocks') || file_name_matches?('blocked_domains')
+      :domain_blocking
+    elsif file_name_matches?('bookmarks')
+      :bookmarks
+    elsif file_name_matches?('lists')
+      :lists
+    end
   end
 
   # Whether the uploaded CSV file seems to correspond to a different import type than the one selected

From 8e9e7d57d8db697f5bc595f2e98c7e7b716fe59a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 04:58:53 -0500
Subject: [PATCH 097/436] Opt out of `Rails/UnusedIgnoredColumns` cop (#28385)

---
 .rubocop.yml      |  6 ++++++
 .rubocop_todo.yml | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2221604224..2da7e361cd 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -109,6 +109,12 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'db/*migrate/**/*'
 
+# Reason: We want to preserve the ability to migrate from arbitrary old versions,
+# and cannot guarantee that every installation has run every migration as they upgrade.
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsunusedignoredcolumns
+Rails/UnusedIgnoredColumns:
+  Enabled: false
+
 # Reason: Some single letter camel case files shouldn't be split
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b8b4895f54..2fa3a1ef65 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -196,19 +196,6 @@ Rails/UniqueValidationWithoutIndex:
     - 'app/models/identity.rb'
     - 'app/models/webauthn_credential.rb'
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UnusedIgnoredColumns:
-  Exclude:
-    - 'app/models/account.rb'
-    - 'app/models/account_stat.rb'
-    - 'app/models/admin/action_log.rb'
-    - 'app/models/custom_filter.rb'
-    - 'app/models/email_domain_block.rb'
-    - 'app/models/report.rb'
-    - 'app/models/status_edit.rb'
-    - 'app/models/user.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: exists, where

From 2bd8d343cfe06edf1b5b21ac2c5fd9e560dac1e3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 05:06:42 -0500
Subject: [PATCH 098/436] Fix `Style/SoleNestedConditional` and
 `Style/IfInsideElse` cops, regenerate haml todo (#28384)

---
 .haml-lint_todo.yml                           | 16 ++-----------
 app/views/admin/accounts/_buttons.html.haml   | 24 +++++++++----------
 .../admin/accounts/_local_account.html.haml   |  4 ++--
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 3be2a3d490..29646f28e8 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,33 +1,21 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2023-10-26 09:32:34 -0400 using Haml-Lint version 0.51.0.
+# on 2023-12-15 11:02:19 -0500 using Haml-Lint version 0.52.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 16
+  # Offense count: 11
   LineLength:
     exclude:
-      - 'app/views/admin/account_actions/new.html.haml'
-      - 'app/views/admin/accounts/index.html.haml'
-      - 'app/views/admin/ip_blocks/new.html.haml'
       - 'app/views/admin/roles/_form.html.haml'
-      - 'app/views/admin/settings/discovery/show.html.haml'
       - 'app/views/auth/registrations/edit.html.haml'
       - 'app/views/auth/registrations/new.html.haml'
-      - 'app/views/filters/_filter_fields.html.haml'
       - 'app/views/media/player.html.haml'
       - 'app/views/settings/applications/_fields.html.haml'
       - 'app/views/settings/imports/index.html.haml'
       - 'app/views/settings/preferences/appearance/show.html.haml'
       - 'app/views/settings/preferences/notifications/show.html.haml'
       - 'app/views/settings/preferences/other/show.html.haml'
-
-  # Offense count: 9
-  RuboCop:
-    exclude:
-      - 'app/views/admin/accounts/_buttons.html.haml'
-      - 'app/views/admin/accounts/_local_account.html.haml'
-      - 'app/views/admin/roles/_form.html.haml'
diff --git a/app/views/admin/accounts/_buttons.html.haml b/app/views/admin/accounts/_buttons.html.haml
index 6eb141abc9..2aaca8962c 100644
--- a/app/views/admin/accounts/_buttons.html.haml
+++ b/app/views/admin/accounts/_buttons.html.haml
@@ -6,8 +6,8 @@
     %p.muted-hint= deletion_request.present? ? t('admin.accounts.suspension_reversible_hint_html', date: content_tag(:strong, l(deletion_request.due_at.to_date))) : t('admin.accounts.suspension_irreversible')
   = link_to t('admin.accounts.undo_suspension'), unsuspend_admin_account_path(account.id), method: :post, class: 'button' if can?(:unsuspend, account)
   = link_to t('admin.accounts.redownload'), redownload_admin_account_path(account.id), method: :post, class: 'button' if can?(:redownload, account) && account.suspension_origin_remote?
-  - if deletion_request.present?
-    = link_to t('admin.accounts.delete'), admin_account_path(account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, account)
+  - if deletion_request.present? && can?(:destroy, account)
+    = link_to t('admin.accounts.delete'), admin_account_path(account.id), method: :delete, class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure') }
 - else
   .action-buttons
     %div
@@ -15,8 +15,8 @@
         = link_to t('admin.accounts.warn'), new_admin_account_action_path(account.id, type: 'none'), class: 'button' if can?(:warn, account)
         - if account.user_disabled?
           = link_to t('admin.accounts.enable'), enable_admin_account_path(account.id), method: :post, class: 'button' if can?(:enable, account.user)
-        - else
-          = link_to t('admin.accounts.disable'), new_admin_account_action_path(account.id, type: 'disable'), class: 'button' if can?(:disable, account.user)
+        - elsif can?(:disable, account.user)
+          = link_to t('admin.accounts.disable'), new_admin_account_action_path(account.id, type: 'disable'), class: 'button'
       - if account.sensitized?
         = link_to t('admin.accounts.undo_sensitized'), unsensitive_admin_account_path(account.id), method: :post, class: 'button' if can?(:unsensitive, account)
       - elsif !account.local? || account.user_approved?
@@ -29,13 +29,13 @@
         - if account.user_pending?
           = link_to t('admin.accounts.approve'), approve_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:approve, account.user)
           = link_to t('admin.accounts.reject'), reject_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:reject, account.user)
-        - unless account.user_confirmed?
-          = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(account.id), method: :post, class: 'button' if can?(:confirm, account.user)
-      - if !account.local? || account.user_approved?
-        = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(account.id, type: 'suspend'), class: 'button' if can?(:suspend, account)
+        - if !account.user_confirmed? && can?(:confirm, account.user)
+          = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(account.id), method: :post, class: 'button'
+      - if (!account.local? || account.user_approved?) && can?(:suspend, account)
+        = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(account.id, type: 'suspend'), class: 'button'
     %div
       - if account.local?
-        - if !account.memorial? && account.user_approved?
-          = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, account)
-      - else
-        = link_to t('admin.accounts.redownload'), redownload_admin_account_path(account.id), method: :post, class: 'button' if can?(:redownload, account)
+        - if !account.memorial? && account.user_approved? && can?(:memorialize, account)
+          = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'
+      - elsif can?(:redownload, account)
+        = link_to t('admin.accounts.redownload'), redownload_admin_account_path(account.id), method: :post, class: 'button'
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 4b361fc8d1..82197cda43 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -47,8 +47,8 @@
     - else
       = t 'admin.accounts.security_measures.only_password'
   %td
-    - if account.user&.two_factor_enabled?
-      = table_link_to 'unlock', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(account.user.id), method: :delete if can?(:disable_2fa, account.user)
+    - if account.user&.two_factor_enabled? && can?(:disable_2fa, account.user)
+      = table_link_to 'unlock', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(account.user.id), method: :delete
 - if can?(:reset_password, account.user)
   %tr
     %td

From 1820bad646b6260c862ddc5e421e21821380d014 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 05:26:09 -0500
Subject: [PATCH 099/436] Fix `Performance/StringIdentifierArgument` cop
 (#28399)

---
 app/helpers/application_helper.rb        |  2 +-
 app/models/account.rb                    |  4 ++--
 app/models/concerns/remotable.rb         | 16 ++++++++--------
 app/models/form/admin_settings.rb        | 14 +++++++-------
 spec/models/concerns/remotable_spec.rb   |  4 ++--
 spec/requests/omniauth_callbacks_spec.rb |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 135bbb0fd4..4f7f66985d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -110,7 +110,7 @@ module ApplicationHelper
   def can?(action, record)
     return false if record.nil?
 
-    policy(record).public_send("#{action}?")
+    policy(record).public_send(:"#{action}?")
   end
 
   def fa_icon(icon, attributes = {})
diff --git a/app/models/account.rb b/app/models/account.rb
index 4119944e59..2145cfcb64 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -457,8 +457,8 @@ class Account < ApplicationRecord
     end
 
     def inverse_alias(key, original_key)
-      define_method("#{key}=") do |value|
-        public_send("#{original_key}=", !ActiveModel::Type::Boolean.new.cast(value))
+      define_method(:"#{key}=") do |value|
+        public_send(:"#{original_key}=", !ActiveModel::Type::Boolean.new.cast(value))
       end
 
       define_method(key) do
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index bd8b6f4eb9..6118e204a1 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -7,7 +7,7 @@ module Remotable
     def remotable_attachment(attachment_name, limit, suppress_errors: true, download_on_assign: true, attribute_name: nil)
       attribute_name ||= :"#{attachment_name}_remote_url"
 
-      define_method("download_#{attachment_name}!") do |url = nil|
+      define_method(:"download_#{attachment_name}!") do |url = nil|
         url ||= self[attribute_name]
 
         return if url.blank?
@@ -24,29 +24,29 @@ module Remotable
           Request.new(:get, url).perform do |response|
             raise Mastodon::UnexpectedResponseError, response unless (200...300).cover?(response.code)
 
-            public_send("#{attachment_name}=", ResponseWithLimit.new(response, limit))
+            public_send(:"#{attachment_name}=", ResponseWithLimit.new(response, limit))
           end
         rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e
           Rails.logger.debug { "Error fetching remote #{attachment_name}: #{e}" }
-          public_send("#{attachment_name}=", nil) if public_send("#{attachment_name}_file_name").present?
+          public_send(:"#{attachment_name}=", nil) if public_send(:"#{attachment_name}_file_name").present?
           raise e unless suppress_errors
         rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError, Mastodon::StreamValidationError => e
           Rails.logger.debug { "Error fetching remote #{attachment_name}: #{e}" }
-          public_send("#{attachment_name}=", nil) if public_send("#{attachment_name}_file_name").present?
+          public_send(:"#{attachment_name}=", nil) if public_send(:"#{attachment_name}_file_name").present?
         end
 
         nil
       end
 
-      define_method("#{attribute_name}=") do |url|
-        return if self[attribute_name] == url && public_send("#{attachment_name}_file_name").present?
+      define_method(:"#{attribute_name}=") do |url|
+        return if self[attribute_name] == url && public_send(:"#{attachment_name}_file_name").present?
 
         self[attribute_name] = url if has_attribute?(attribute_name)
 
-        public_send("download_#{attachment_name}!", url) if download_on_assign
+        public_send(:"download_#{attachment_name}!", url) if download_on_assign
       end
 
-      alias_method("reset_#{attachment_name}!", "download_#{attachment_name}!")
+      alias_method(:"reset_#{attachment_name}!", "download_#{attachment_name}!")
     end
   end
 end
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 7be026d85f..cb37a52217 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -84,7 +84,7 @@ class Form::AdminSettings
 
   KEYS.each do |key|
     define_method(key) do
-      return instance_variable_get("@#{key}") if instance_variable_defined?("@#{key}")
+      return instance_variable_get(:"@#{key}") if instance_variable_defined?(:"@#{key}")
 
       stored_value = if UPLOAD_KEYS.include?(key)
                        SiteUpload.where(var: key).first_or_initialize(var: key)
@@ -94,12 +94,12 @@ class Form::AdminSettings
                        Setting.public_send(key)
                      end
 
-      instance_variable_set("@#{key}", stored_value)
+      instance_variable_set(:"@#{key}", stored_value)
     end
   end
 
   UPLOAD_KEYS.each do |key|
-    define_method("#{key}=") do |file|
+    define_method(:"#{key}=") do |file|
       value = public_send(key)
       value.file = file
     rescue Mastodon::DimensionsValidationError => e
@@ -114,13 +114,13 @@ class Form::AdminSettings
     return false unless errors.empty? && valid?
 
     KEYS.each do |key|
-      next unless instance_variable_defined?("@#{key}")
+      next unless instance_variable_defined?(:"@#{key}")
 
       if UPLOAD_KEYS.include?(key)
         public_send(key).save
       else
         setting = Setting.where(var: key).first_or_initialize(var: key)
-        setting.update(value: typecast_value(key, instance_variable_get("@#{key}")))
+        setting.update(value: typecast_value(key, instance_variable_get(:"@#{key}")))
       end
     end
   end
@@ -139,9 +139,9 @@ class Form::AdminSettings
 
   def validate_site_uploads
     UPLOAD_KEYS.each do |key|
-      next unless instance_variable_defined?("@#{key}")
+      next unless instance_variable_defined?(:"@#{key}")
 
-      upload = instance_variable_get("@#{key}")
+      upload = instance_variable_get(:"@#{key}")
       next if upload.valid?
 
       upload.errors.each do |error|
diff --git a/spec/models/concerns/remotable_spec.rb b/spec/models/concerns/remotable_spec.rb
index 9f6aeb7fb4..097e6bf006 100644
--- a/spec/models/concerns/remotable_spec.rb
+++ b/spec/models/concerns/remotable_spec.rb
@@ -178,11 +178,11 @@ RSpec.describe Remotable do
 
             allow(foo).to receive(:public_send)
             foo.hoge_remote_url = url
-            expect(foo).to have_received(:public_send).with("download_#{hoge}!", url)
+            expect(foo).to have_received(:public_send).with(:"download_#{hoge}!", url)
 
             allow(foo).to receive(:public_send)
             foo.download_hoge!(url)
-            expect(foo).to have_received(:public_send).with("#{hoge}=", response_with_limit)
+            expect(foo).to have_received(:public_send).with(:"#{hoge}=", response_with_limit)
           end
         end
       end
diff --git a/spec/requests/omniauth_callbacks_spec.rb b/spec/requests/omniauth_callbacks_spec.rb
index 27aa5ec506..0d37c41140 100644
--- a/spec/requests/omniauth_callbacks_spec.rb
+++ b/spec/requests/omniauth_callbacks_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe 'OmniAuth callbacks' do
   shared_examples 'omniauth provider callbacks' do |provider|
-    subject { post send "user_#{provider}_omniauth_callback_path" }
+    subject { post send :"user_#{provider}_omniauth_callback_path" }
 
     context 'with full information in response' do
       before do

From 0b42cf29790c00de64069bf99d25e289af2283da Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 07:21:45 -0500
Subject: [PATCH 100/436] Opt out of `Rails/NegateInclude` cop (#28370)

---
 .rubocop.yml      |  5 +++++
 .rubocop_todo.yml | 17 -----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2da7e361cd..61cb1164b4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -115,6 +115,11 @@ Rails/SkipsModelValidations:
 Rails/UnusedIgnoredColumns:
   Enabled: false
 
+# Reason: Prevailing style choice
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsnegateinclude
+Rails/NegateInclude:
+  Enabled: false
+
 # Reason: Some single letter camel case files shouldn't be split
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2fa3a1ef65..030f311101 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -119,23 +119,6 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/auth/passwords_controller.rb'
     - 'app/controllers/auth/registrations_controller.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/NegateInclude:
-  Exclude:
-    - 'app/controllers/concerns/signature_verification.rb'
-    - 'app/helpers/jsonld_helper.rb'
-    - 'app/lib/activitypub/activity/create.rb'
-    - 'app/lib/activitypub/activity/move.rb'
-    - 'app/lib/feed_manager.rb'
-    - 'app/lib/link_details_extractor.rb'
-    - 'app/models/concerns/attachmentable.rb'
-    - 'app/models/concerns/remotable.rb'
-    - 'app/models/custom_filter.rb'
-    - 'app/services/activitypub/process_status_update_service.rb'
-    - 'app/services/fetch_link_card_service.rb'
-    - 'app/workers/web/push_notification_worker.rb'
-    - 'lib/paperclip/color_extractor.rb'
-
 Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'

From b2ca71f7336a8855eca817d238c20943a6c84f5f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:41:22 +0100
Subject: [PATCH 101/436] Update dependency rubocop-performance to v1.20.0
 (#28395)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1ca1839ec5..3b33402b22 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -679,9 +679,9 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-performance (1.20.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)

From af366f65ee7f96c7f08f325bae7be499e16c4f48 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 07:41:37 -0500
Subject: [PATCH 102/436] Add spec coverage for
 `models/form/custom_emoji_batch` class (#28388)

---
 .../custom_emoji_category_fabricator.rb       |   5 +
 spec/models/form/custom_emoji_batch_spec.rb   | 118 ++++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 spec/fabricators/custom_emoji_category_fabricator.rb
 create mode 100644 spec/models/form/custom_emoji_batch_spec.rb

diff --git a/spec/fabricators/custom_emoji_category_fabricator.rb b/spec/fabricators/custom_emoji_category_fabricator.rb
new file mode 100644
index 0000000000..af41c97227
--- /dev/null
+++ b/spec/fabricators/custom_emoji_category_fabricator.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Fabricator(:custom_emoji_category) do
+  name { sequence(:name) { |i| "name_#{i}" } }
+end
diff --git a/spec/models/form/custom_emoji_batch_spec.rb b/spec/models/form/custom_emoji_batch_spec.rb
new file mode 100644
index 0000000000..abeada5d50
--- /dev/null
+++ b/spec/models/form/custom_emoji_batch_spec.rb
@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Form::CustomEmojiBatch do
+  describe '#save' do
+    subject { described_class.new({ current_account: account }.merge(options)) }
+
+    let(:options) { {} }
+    let(:account) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
+
+    context 'with empty custom_emoji_ids' do
+      let(:options) { { custom_emoji_ids: [] } }
+
+      it 'does nothing if custom_emoji_ids is empty' do
+        expect(subject.save).to be_nil
+      end
+    end
+
+    describe 'the update action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, category: Fabricate(:custom_emoji_category)) }
+      let(:custom_emoji_category) { Fabricate(:custom_emoji_category) }
+
+      context 'without anything to change' do
+        let(:options) { { action: 'update' } }
+
+        it 'silently exits without updating any custom emojis' do
+          expect { subject.save }.to_not change(Admin::ActionLog, :count)
+        end
+      end
+
+      context 'with a category_id' do
+        let(:options) { { action: 'update', custom_emoji_ids: [custom_emoji.id], category_id: custom_emoji_category.id } }
+
+        it 'updates the category of the emoji' do
+          subject.save
+
+          expect(custom_emoji.reload.category).to eq(custom_emoji_category)
+        end
+      end
+
+      context 'with a category_name' do
+        let(:options) { { action: 'update', custom_emoji_ids: [custom_emoji.id], category_name: custom_emoji_category.name } }
+
+        it 'updates the category of the emoji' do
+          subject.save
+
+          expect(custom_emoji.reload.category).to eq(custom_emoji_category)
+        end
+      end
+    end
+
+    describe 'the list action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, visible_in_picker: false) }
+      let(:options) { { action: 'list', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'updates the picker visibility of the emoji' do
+        subject.save
+
+        expect(custom_emoji.reload.visible_in_picker).to be(true)
+      end
+    end
+
+    describe 'the unlist action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, visible_in_picker: true) }
+      let(:options) { { action: 'unlist', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'updates the picker visibility of the emoji' do
+        subject.save
+
+        expect(custom_emoji.reload.visible_in_picker).to be(false)
+      end
+    end
+
+    describe 'the enable action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, disabled: true) }
+      let(:options) { { action: 'enable', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'updates the disabled value of the emoji' do
+        subject.save
+
+        expect(custom_emoji.reload).to_not be_disabled
+      end
+    end
+
+    describe 'the disable action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji, visible_in_picker: false) }
+      let(:options) { { action: 'disable', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'updates the disabled value of the emoji' do
+        subject.save
+
+        expect(custom_emoji.reload).to be_disabled
+      end
+    end
+
+    describe 'the copy action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji) }
+      let(:options) { { action: 'copy', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'makes a copy of the emoji' do
+        expect { subject.save }
+          .to change(CustomEmoji, :count).by(1)
+      end
+    end
+
+    describe 'the delete action' do
+      let(:custom_emoji) { Fabricate(:custom_emoji) }
+      let(:options) { { action: 'delete', custom_emoji_ids: [custom_emoji.id] } }
+
+      it 'destroys the emoji' do
+        subject.save
+
+        expect { custom_emoji.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end

From f4b9c2ba403c675e124b997d5ab1734b7bfc1f62 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 18 Dec 2023 23:02:19 +0900
Subject: [PATCH 103/436] Group artifact actions (#28413)

---
 .github/renovate.json5 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a7998ddfdc..aca5228594 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -99,6 +99,13 @@
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'eslint (non-major)',
     },
+    {
+      // Group actions/*-artifact in the same PR
+      matchManagers: ['github-actions'],
+      matchPackageNames: ['actions/download-artifact', 'actions/upload-artifact'],
+      matchUpdateTypes: ['major'],
+      groupName: 'artifact actions (major)'
+    },
     {
       // Update @types/* packages every week, with one grouped PR
       matchPackagePrefixes: '@types/',

From 7d9b209fe84b00eff348ea9d54905cbfffa79788 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 18 Dec 2023 17:14:43 +0100
Subject: [PATCH 104/436] Fix call to inefficient `delete_matched` cache method
 in domain blocks (#28374)

---
 .../api/v1/accounts/notes_controller.rb       |  2 +-
 .../api/v1/accounts/pins_controller.rb        |  2 +-
 .../v1/accounts/relationships_controller.rb   |  2 +-
 app/controllers/api/v1/accounts_controller.rb |  2 +-
 .../api/v1/follow_requests_controller.rb      |  4 +-
 app/controllers/relationships_controller.rb   |  2 +-
 app/models/account_domain_block.rb            | 10 +--
 app/models/concerns/account/interactions.rb   |  6 --
 app/models/concerns/relationship_cacheable.rb |  4 +-
 .../account_relationships_presenter.rb        | 63 ++++++++++++++-----
 .../account_relationships_presenter_spec.rb   | 49 +++++++++++----
 11 files changed, 96 insertions(+), 50 deletions(-)

diff --git a/app/controllers/api/v1/accounts/notes_controller.rb b/app/controllers/api/v1/accounts/notes_controller.rb
index 032e807d11..6d115631a2 100644
--- a/app/controllers/api/v1/accounts/notes_controller.rb
+++ b/app/controllers/api/v1/accounts/notes_controller.rb
@@ -25,6 +25,6 @@ class Api::V1::Accounts::NotesController < Api::BaseController
   end
 
   def relationships_presenter
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
+    AccountRelationshipsPresenter.new([@account], current_user.account_id)
   end
 end
diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb
index 73f845c614..0eb13c048c 100644
--- a/app/controllers/api/v1/accounts/pins_controller.rb
+++ b/app/controllers/api/v1/accounts/pins_controller.rb
@@ -25,6 +25,6 @@ class Api::V1::Accounts::PinsController < Api::BaseController
   end
 
   def relationships_presenter
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
+    AccountRelationshipsPresenter.new([@account], current_user.account_id)
   end
 end
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index e5ae5b007b..d43832177a 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
   before_action :require_user!
 
   def index
-    @accounts = Account.where(id: account_ids).select('id')
+    @accounts = Account.where(id: account_ids).select(:id, :domain)
     @accounts.merge!(Account.without_suspended) unless truthy_param?(:with_suspended)
     render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships
   end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index be251b4259..23fc85b475 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -88,7 +88,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def relationships(**options)
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id, **options)
+    AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
   end
 
   def account_params
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 7c197ce6ba..ee717ebbcc 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -25,11 +25,11 @@ class Api::V1::FollowRequestsController < Api::BaseController
   private
 
   def account
-    Account.find(params[:id])
+    @account ||= Account.find(params[:id])
   end
 
   def relationships(**options)
-    AccountRelationshipsPresenter.new([params[:id]], current_user.account_id, **options)
+    AccountRelationshipsPresenter.new([account], current_user.account_id, **options)
   end
 
   def load_accounts
diff --git a/app/controllers/relationships_controller.rb b/app/controllers/relationships_controller.rb
index e87b5a656f..dd794f3199 100644
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@ -33,7 +33,7 @@ class RelationshipsController < ApplicationController
   end
 
   def set_relationships
-    @relationships = AccountRelationshipsPresenter.new(@accounts.pluck(:id), current_user.account_id)
+    @relationships = AccountRelationshipsPresenter.new(@accounts, current_user.account_id)
   end
 
   def form_account_batch_params
diff --git a/app/models/account_domain_block.rb b/app/models/account_domain_block.rb
index af1e6a68dc..db2e37184f 100644
--- a/app/models/account_domain_block.rb
+++ b/app/models/account_domain_block.rb
@@ -18,16 +18,12 @@ class AccountDomainBlock < ApplicationRecord
   belongs_to :account
   validates :domain, presence: true, uniqueness: { scope: :account_id }, domain: true
 
-  after_commit :remove_blocking_cache
-  after_commit :remove_relationship_cache
+  after_commit :invalidate_domain_blocking_cache
 
   private
 
-  def remove_blocking_cache
+  def invalidate_domain_blocking_cache
     Rails.cache.delete("exclude_domains_for:#{account_id}")
-  end
-
-  def remove_relationship_cache
-    Rails.cache.delete_matched("relationship:#{account_id}:*")
+    Rails.cache.delete(['exclude_domains', account_id, domain])
   end
 end
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 0ea26e628d..4ddec9bf49 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -60,12 +60,6 @@ module Account::Interactions
       end
     end
 
-    def domain_blocking_map(target_account_ids, account_id)
-      accounts_map    = Account.where(id: target_account_ids).select('id, domain').each_with_object({}) { |a, h| h[a.id] = a.domain }
-      blocked_domains = domain_blocking_map_by_domain(accounts_map.values.compact, account_id)
-      accounts_map.reduce({}) { |h, (id, domain)| h.merge(id => blocked_domains[domain]) }
-    end
-
     def domain_blocking_map_by_domain(target_domains, account_id)
       follow_mapping(AccountDomainBlock.where(account_id: account_id, domain: target_domains), :domain)
     end
diff --git a/app/models/concerns/relationship_cacheable.rb b/app/models/concerns/relationship_cacheable.rb
index 0d9359f7e7..c32a8d62c6 100644
--- a/app/models/concerns/relationship_cacheable.rb
+++ b/app/models/concerns/relationship_cacheable.rb
@@ -10,7 +10,7 @@ module RelationshipCacheable
   private
 
   def remove_relationship_cache
-    Rails.cache.delete("relationship:#{account_id}:#{target_account_id}")
-    Rails.cache.delete("relationship:#{target_account_id}:#{account_id}")
+    Rails.cache.delete(['relationship', account_id, target_account_id])
+    Rails.cache.delete(['relationship', target_account_id, account_id])
   end
 end
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
index 5d2b5435dd..8482ef54da 100644
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@@ -5,8 +5,9 @@ class AccountRelationshipsPresenter
               :muting, :requested, :requested_by, :domain_blocking,
               :endorsed, :account_note
 
-  def initialize(account_ids, current_account_id, **options)
-    @account_ids        = account_ids.map { |a| a.is_a?(Account) ? a.id : a.to_i }
+  def initialize(accounts, current_account_id, **options)
+    @accounts = accounts.to_a
+    @account_ids        = @accounts.pluck(:id)
     @current_account_id = current_account_id
 
     @following       = cached[:following].merge(Account.following_map(@uncached_account_ids, @current_account_id))
@@ -16,10 +17,11 @@ class AccountRelationshipsPresenter
     @muting          = cached[:muting].merge(Account.muting_map(@uncached_account_ids, @current_account_id))
     @requested       = cached[:requested].merge(Account.requested_map(@uncached_account_ids, @current_account_id))
     @requested_by    = cached[:requested_by].merge(Account.requested_by_map(@uncached_account_ids, @current_account_id))
-    @domain_blocking = cached[:domain_blocking].merge(Account.domain_blocking_map(@uncached_account_ids, @current_account_id))
     @endorsed        = cached[:endorsed].merge(Account.endorsed_map(@uncached_account_ids, @current_account_id))
     @account_note    = cached[:account_note].merge(Account.account_note_map(@uncached_account_ids, @current_account_id))
 
+    @domain_blocking = domain_blocking_map
+
     cache_uncached!
 
     @following.merge!(options[:following_map] || {})
@@ -36,6 +38,31 @@ class AccountRelationshipsPresenter
 
   private
 
+  def domain_blocking_map
+    target_domains = @accounts.pluck(:domain).compact.uniq
+    blocks_by_domain = {}
+
+    # Fetch from cache
+    cache_keys = target_domains.map { |domain| domain_cache_key(domain) }
+    Rails.cache.read_multi(*cache_keys).each do |key, blocking|
+      blocks_by_domain[key.last] = blocking
+    end
+
+    uncached_domains = target_domains - blocks_by_domain.keys
+
+    # Read uncached values from database
+    AccountDomainBlock.where(account_id: @current_account_id, domain: uncached_domains).pluck(:domain).each do |domain|
+      blocks_by_domain[domain] = true
+    end
+
+    # Write database reads to cache
+    to_cache = uncached_domains.to_h { |domain| [domain_cache_key(domain), blocks_by_domain[domain]] }
+    Rails.cache.write_multi(to_cache, expires_in: 1.day)
+
+    # Return formatted value
+    @accounts.each_with_object({}) { |account, h| h[account.id] = blocks_by_domain[account.domain] }
+  end
+
   def cached
     return @cached if defined?(@cached)
 
@@ -47,28 +74,23 @@ class AccountRelationshipsPresenter
       muting: {},
       requested: {},
       requested_by: {},
-      domain_blocking: {},
       endorsed: {},
       account_note: {},
     }
 
-    @uncached_account_ids = []
+    @uncached_account_ids = @account_ids.uniq
 
-    @account_ids.each do |account_id|
-      maps_for_account = Rails.cache.read("relationship:#{@current_account_id}:#{account_id}")
-
-      if maps_for_account.is_a?(Hash)
-        @cached.deep_merge!(maps_for_account)
-      else
-        @uncached_account_ids << account_id
-      end
+    cache_ids = @account_ids.map { |account_id| relationship_cache_key(account_id) }
+    Rails.cache.read_multi(*cache_ids).each do |key, maps_for_account|
+      @cached.deep_merge!(maps_for_account)
+      @uncached_account_ids.delete(key.last)
     end
 
     @cached
   end
 
   def cache_uncached!
-    @uncached_account_ids.each do |account_id|
+    to_cache = @uncached_account_ids.to_h do |account_id|
       maps_for_account = {
         following: { account_id => following[account_id] },
         followed_by: { account_id => followed_by[account_id] },
@@ -77,12 +99,21 @@ class AccountRelationshipsPresenter
         muting: { account_id => muting[account_id] },
         requested: { account_id => requested[account_id] },
         requested_by: { account_id => requested_by[account_id] },
-        domain_blocking: { account_id => domain_blocking[account_id] },
         endorsed: { account_id => endorsed[account_id] },
         account_note: { account_id => account_note[account_id] },
       }
 
-      Rails.cache.write("relationship:#{@current_account_id}:#{account_id}", maps_for_account, expires_in: 1.day)
+      [relationship_cache_key(account_id), maps_for_account]
     end
+
+    Rails.cache.write_multi(to_cache, expires_in: 1.day)
+  end
+
+  def domain_cache_key(domain)
+    ['exclude_domains', @current_account_id, domain]
+  end
+
+  def relationship_cache_key(account_id)
+    ['relationship', @current_account_id, account_id]
   end
 end
diff --git a/spec/presenters/account_relationships_presenter_spec.rb b/spec/presenters/account_relationships_presenter_spec.rb
index 5b05ac8001..282cae4f06 100644
--- a/spec/presenters/account_relationships_presenter_spec.rb
+++ b/spec/presenters/account_relationships_presenter_spec.rb
@@ -5,19 +5,18 @@ require 'rails_helper'
 RSpec.describe AccountRelationshipsPresenter do
   describe '.initialize' do
     before do
-      allow(Account).to receive(:following_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:followed_by_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:blocking_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:muting_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:requested_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:requested_by_map).with(account_ids, current_account_id).and_return(default_map)
-      allow(Account).to receive(:domain_blocking_map).with(account_ids, current_account_id).and_return(default_map)
+      allow(Account).to receive(:following_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
+      allow(Account).to receive(:followed_by_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
+      allow(Account).to receive(:blocking_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
+      allow(Account).to receive(:muting_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
+      allow(Account).to receive(:requested_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
+      allow(Account).to receive(:requested_by_map).with(accounts.pluck(:id), current_account_id).and_return(default_map)
     end
 
-    let(:presenter)          { described_class.new(account_ids, current_account_id, **options) }
+    let(:presenter)          { described_class.new(accounts, current_account_id, **options) }
     let(:current_account_id) { Fabricate(:account).id }
-    let(:account_ids)        { [Fabricate(:account).id] }
-    let(:default_map)        { { 1 => true } }
+    let(:accounts)           { [Fabricate(:account)] }
+    let(:default_map)        { { accounts[0].id => true } }
 
     context 'when options are not set' do
       let(:options) { {} }
@@ -29,7 +28,33 @@ RSpec.describe AccountRelationshipsPresenter do
           blocking: default_map,
           muting: default_map,
           requested: default_map,
-          domain_blocking: default_map
+          domain_blocking: { accounts[0].id => nil }
+        )
+      end
+    end
+
+    context 'with a warm cache' do
+      let(:options) { {} }
+
+      before do
+        described_class.new(accounts, current_account_id, **options)
+
+        allow(Account).to receive(:following_map).with([], current_account_id).and_return({})
+        allow(Account).to receive(:followed_by_map).with([], current_account_id).and_return({})
+        allow(Account).to receive(:blocking_map).with([], current_account_id).and_return({})
+        allow(Account).to receive(:muting_map).with([], current_account_id).and_return({})
+        allow(Account).to receive(:requested_map).with([], current_account_id).and_return({})
+        allow(Account).to receive(:requested_by_map).with([], current_account_id).and_return({})
+      end
+
+      it 'sets returns expected values' do
+        expect(presenter).to have_attributes(
+          following: default_map,
+          followed_by: default_map,
+          blocking: default_map,
+          muting: default_map,
+          requested: default_map,
+          domain_blocking: { accounts[0].id => nil }
         )
       end
     end
@@ -86,7 +111,7 @@ RSpec.describe AccountRelationshipsPresenter do
       let(:options) { { domain_blocking_map: { 7 => true } } }
 
       it 'sets @domain_blocking merged with default_map and options[:domain_blocking_map]' do
-        expect(presenter.domain_blocking).to eq default_map.merge(options[:domain_blocking_map])
+        expect(presenter.domain_blocking).to eq({ accounts[0].id => nil }.merge(options[:domain_blocking_map]))
       end
     end
   end

From ab1201c9d92c9ecb0ec988e34fcdb8f76ab38383 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 17:21:54 +0100
Subject: [PATCH 105/436] Update dependency regenerator-runtime to v0.14.1
 (#28393)

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

diff --git a/yarn.lock b/yarn.lock
index f4d12e10aa..f100a2ec34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14037,9 +14037,9 @@ __metadata:
   linkType: hard
 
 "regenerator-runtime@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "regenerator-runtime@npm:0.14.0"
-  checksum: e25f062c1a183f81c99681691a342760e65c55e8d3a4d4fe347ebe72433b123754b942b70b622959894e11f8a9131dc549bd3c9a5234677db06a4af42add8d12
+  version: 0.14.1
+  resolution: "regenerator-runtime@npm:0.14.1"
+  checksum: 1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
   languageName: node
   linkType: hard
 

From 476d1237d4eda2455df8b75db523e281705c005d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 11:47:22 -0500
Subject: [PATCH 106/436] Typo fix in json ld helper spec (#28417)

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

diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index 5124bcf855..99857278a1 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -134,7 +134,7 @@ describe JsonLdHelper do
         expect(compact(json).dig('object', 'tag', 'href')).to eq 'foo'
       end
 
-      it 'compacts the activistreams Public collection' do
+      it 'compacts the activitystreams Public collection' do
         expect(compact(json)['to']).to eq 'as:Public'
       end
 

From 7cfc0781980933a6966979afeba5cc15784d665a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 18 Dec 2023 16:49:17 -0500
Subject: [PATCH 107/436] Fix rails mailer preview not honouring locale
 (#28418)

---
 app/mailers/application_mailer.rb | 2 +-
 app/mailers/user_mailer.rb        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 35f0b5fee1..3312183d47 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -12,7 +12,7 @@ class ApplicationMailer < ActionMailer::Base
   protected
 
   def locale_for_account(account, &block)
-    I18n.with_locale(account.user_locale || I18n.default_locale, &block)
+    I18n.with_locale(account.user_locale || I18n.locale || I18n.default_locale, &block)
   end
 
   def set_autoreply_headers!
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 2af2a3a41d..432b851b5e 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -202,6 +202,6 @@ class UserMailer < Devise::Mailer
   end
 
   def locale
-    @resource.locale.presence || I18n.default_locale
+    @resource.locale.presence || I18n.locale || I18n.default_locale
   end
 end

From 8b1eeb2f90a9a76c2f3738a44b63e3893c123a44 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 19 Dec 2023 00:19:27 +0100
Subject: [PATCH 108/436] Fix the loading bar with the new Redux actions
 (#28422)

---
 .../mastodon/actions/accounts_typed.ts        | 30 +++++------
 .../mastodon/actions/domain_blocks_typed.ts   |  4 +-
 .../mastodon/store/middlewares/loading_bar.ts | 50 ++++++++++++++-----
 3 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/app/javascript/mastodon/actions/accounts_typed.ts b/app/javascript/mastodon/actions/accounts_typed.ts
index b908e7528e..058a68a099 100644
--- a/app/javascript/mastodon/actions/accounts_typed.ts
+++ b/app/javascript/mastodon/actions/accounts_typed.ts
@@ -21,7 +21,7 @@ function actionWithSkipLoadingTrue<Args extends object>(args: Args) {
 }
 
 export const followAccountSuccess = createAction(
-  'accounts/followAccountSuccess',
+  'accounts/followAccount/SUCCESS',
   actionWithSkipLoadingTrue<{
     relationship: ApiRelationshipJSON;
     alreadyFollowing: boolean;
@@ -29,7 +29,7 @@ export const followAccountSuccess = createAction(
 );
 
 export const unfollowAccountSuccess = createAction(
-  'accounts/unfollowAccountSuccess',
+  'accounts/unfollowAccount/SUCCESS',
   actionWithSkipLoadingTrue<{
     relationship: ApiRelationshipJSON;
     statuses: unknown;
@@ -38,60 +38,60 @@ export const unfollowAccountSuccess = createAction(
 );
 
 export const authorizeFollowRequestSuccess = createAction<{ id: string }>(
-  'accounts/followRequestAuthorizeSuccess',
+  'accounts/followRequestAuthorize/SUCCESS',
 );
 
 export const rejectFollowRequestSuccess = createAction<{ id: string }>(
-  'accounts/followRequestRejectSuccess',
+  'accounts/followRequestReject/SUCCESS',
 );
 
 export const followAccountRequest = createAction(
-  'accounts/followRequest',
+  'accounts/follow/REQUEST',
   actionWithSkipLoadingTrue<{ id: string; locked: boolean }>,
 );
 
 export const followAccountFail = createAction(
-  'accounts/followFail',
+  'accounts/follow/FAIL',
   actionWithSkipLoadingTrue<{ id: string; error: string; locked: boolean }>,
 );
 
 export const unfollowAccountRequest = createAction(
-  'accounts/unfollowRequest',
+  'accounts/unfollow/REQUEST',
   actionWithSkipLoadingTrue<{ id: string }>,
 );
 
 export const unfollowAccountFail = createAction(
-  'accounts/unfollowFail',
+  'accounts/unfollow/FAIL',
   actionWithSkipLoadingTrue<{ id: string; error: string }>,
 );
 
 export const blockAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
   statuses: unknown;
-}>('accounts/blockSuccess');
+}>('accounts/block/SUCCESS');
 
 export const unblockAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
-}>('accounts/unblockSuccess');
+}>('accounts/unblock/SUCCESS');
 
 export const muteAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
   statuses: unknown;
-}>('accounts/muteSuccess');
+}>('accounts/mute/SUCCESS');
 
 export const unmuteAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
-}>('accounts/unmuteSuccess');
+}>('accounts/unmute/SUCCESS');
 
 export const pinAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
-}>('accounts/pinSuccess');
+}>('accounts/pin/SUCCESS');
 
 export const unpinAccountSuccess = createAction<{
   relationship: ApiRelationshipJSON;
-}>('accounts/unpinSuccess');
+}>('accounts/unpin/SUCCESS');
 
 export const fetchRelationshipsSuccess = createAction(
-  'relationships/fetchSuccess',
+  'relationships/fetch/SUCCESS',
   actionWithSkipLoadingTrue<{ relationships: ApiRelationshipJSON[] }>,
 );
diff --git a/app/javascript/mastodon/actions/domain_blocks_typed.ts b/app/javascript/mastodon/actions/domain_blocks_typed.ts
index 08e0b4a178..6a4cace0de 100644
--- a/app/javascript/mastodon/actions/domain_blocks_typed.ts
+++ b/app/javascript/mastodon/actions/domain_blocks_typed.ts
@@ -5,9 +5,9 @@ import type { Account } from 'mastodon/models/account';
 export const blockDomainSuccess = createAction<{
   domain: string;
   accounts: Account[];
-}>('domain_blocks/blockSuccess');
+}>('domain_blocks/block/SUCCESS');
 
 export const unblockDomainSuccess = createAction<{
   domain: string;
   accounts: Account[];
-}>('domain_blocks/unblockSuccess');
+}>('domain_blocks/unblock/SUCCESS');
diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts
index 5fe8000731..83056ee49f 100644
--- a/app/javascript/mastodon/store/middlewares/loading_bar.ts
+++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts
@@ -1,3 +1,9 @@
+import {
+  isAsyncThunkAction,
+  isPending as isThunkActionPending,
+  isFulfilled as isThunkActionFulfilled,
+  isRejected as isThunkActionRejected,
+} from '@reduxjs/toolkit';
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
 import type { AnyAction, Middleware } from 'redux';
 
@@ -21,25 +27,43 @@ export const loadingBarMiddleware = (
   return ({ dispatch }) =>
     (next) =>
     (action: AnyAction) => {
-      if (action.type && !action.skipLoading) {
+      let isPending = false;
+      let isFulfilled = false;
+      let isRejected = false;
+
+      if (
+        isAsyncThunkAction(action)
+        // TODO: once we get the first use-case for it, add a check for skipLoading
+      ) {
+        if (isThunkActionPending(action)) isPending = true;
+        else if (isThunkActionFulfilled(action)) isFulfilled = true;
+        else if (isThunkActionRejected(action)) isRejected = true;
+      } else if (
+        action.type &&
+        !action.skipLoading &&
+        typeof action.type === 'string'
+      ) {
         const [PENDING, FULFILLED, REJECTED] = promiseTypeSuffixes;
 
-        const isPending = new RegExp(`${PENDING}$`, 'g');
-        const isFulfilled = new RegExp(`${FULFILLED}$`, 'g');
-        const isRejected = new RegExp(`${REJECTED}$`, 'g');
+        const isPendingRegexp = new RegExp(`${PENDING}$`, 'g');
+        const isFulfilledRegexp = new RegExp(`${FULFILLED}$`, 'g');
+        const isRejectedRegexp = new RegExp(`${REJECTED}$`, 'g');
 
-        if (typeof action.type === 'string') {
-          if (action.type.match(isPending)) {
-            dispatch(showLoading());
-          } else if (
-            action.type.match(isFulfilled) ??
-            action.type.match(isRejected)
-          ) {
-            dispatch(hideLoading());
-          }
+        if (action.type.match(isPendingRegexp)) {
+          isPending = true;
+        } else if (action.type.match(isFulfilledRegexp)) {
+          isFulfilled = true;
+        } else if (action.type.match(isRejectedRegexp)) {
+          isRejected = true;
         }
       }
 
+      if (isPending) {
+        dispatch(showLoading());
+      } else if (isFulfilled || isRejected) {
+        dispatch(hideLoading());
+      }
+
       return next(action);
     };
 };

From 3598c2e1dbf9eafff3fc91b607c6b1b1f00c3675 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Dec 2023 06:08:52 +0100
Subject: [PATCH 109/436] Revert "Feature - Prevents multiple audio/video
 attachments from being played at the same time (#24717)" (#28251)

---
 .../features/__tests__/toggle-play.jsx        | 80 -------------------
 .../mastodon/features/audio/index.jsx         | 33 ++------
 .../mastodon/features/video/index.jsx         | 31 +------
 .../mastodon/reducers/media_attachments.js    |  7 --
 4 files changed, 11 insertions(+), 140 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/__tests__/toggle-play.jsx

diff --git a/app/javascript/mastodon/features/__tests__/toggle-play.jsx b/app/javascript/mastodon/features/__tests__/toggle-play.jsx
deleted file mode 100644
index 9c999db867..0000000000
--- a/app/javascript/mastodon/features/__tests__/toggle-play.jsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-
-import { render, fireEvent } from '@testing-library/react';
-
-class Media extends Component {
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      paused: props.paused || false,
-    };
-  }
-
-  handleMediaClick = () => {
-    const { onClick } = this.props;
-
-    this.setState(prevState => ({
-      paused: !prevState.paused,
-    }));
-
-    if (typeof onClick === 'function') {
-      onClick();
-    }
-
-    const { title } = this.props;
-    const mediaElements = document.querySelectorAll(`div[title="${title}"]`);
-
-    setTimeout(() => {
-      mediaElements.forEach(element => {
-        if (element !== this && !element.classList.contains('paused')) {
-          element.click();
-        }
-      });
-    }, 0);
-  };
-
-  render() {
-    const { title } = this.props;
-    const { paused } = this.state;
-
-    return (
-      <button title={title} onClick={this.handleMediaClick}>
-        Media Component - {paused ? 'Paused' : 'Playing'}
-      </button>
-    );
-  }
-
-}
-
-Media.propTypes = {
-  title: PropTypes.string.isRequired,
-  onClick: PropTypes.func,
-  paused: PropTypes.bool,
-};
-
-describe('Media attachments test', () => {
-  let currentMedia = null;
-  const togglePlayMock = jest.fn();
-
-  it('plays a new media file and pauses others that were playing', () => {
-    const container = render(
-      <div>
-        <Media title='firstMedia' paused onClick={togglePlayMock} />
-        <Media title='secondMedia' paused onClick={togglePlayMock} />
-      </div>,
-    );
-
-    fireEvent.click(container.getByTitle('firstMedia'));
-    expect(togglePlayMock).toHaveBeenCalledTimes(1);
-    currentMedia = container.getByTitle('firstMedia');
-    expect(currentMedia.textContent).toMatch(/Playing/);
-
-    fireEvent.click(container.getByTitle('secondMedia'));
-    expect(togglePlayMock).toHaveBeenCalledTimes(2);
-    currentMedia = container.getByTitle('secondMedia');
-    expect(currentMedia.textContent).toMatch(/Playing/);
-  });
-});
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index fac43416c9..7a7d0910fa 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -20,7 +20,6 @@ import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/featur
 
 import { Blurhash } from '../../components/blurhash';
 import { displayMedia, useBlurhash } from '../../initial_state';
-import { currentMedia, setCurrentMedia } from '../../reducers/media_attachments';
 
 import Visualizer from './visualizer';
 
@@ -166,32 +165,15 @@ class Audio extends PureComponent {
   }
 
   togglePlay = () => {
-    const audios = document.querySelectorAll('audio');
-
-    audios.forEach((audio) => {
-      const button = audio.previousElementSibling;
-      button.addEventListener('click', () => {
-        if(audio.paused) {
-          audios.forEach((e) => {
-            if (e !== audio) {
-              e.pause();
-            }
-          });
-          audio.play();
-          this.setState({ paused: false });
-        } else {
-          audio.pause();
-          this.setState({ paused: true });
-        }
-      });
-    });
-
-    if (currentMedia !== null) {
-      currentMedia.pause();
+    if (!this.audioContext) {
+      this._initAudioContext();
     }
 
-    this.audio.play();
-    setCurrentMedia(this.audio);
+    if (this.state.paused) {
+      this.setState({ paused: false }, () => this.audio.play());
+    } else {
+      this.setState({ paused: true }, () => this.audio.pause());
+    }
   };
 
   handleResize = debounce(() => {
@@ -213,7 +195,6 @@ class Audio extends PureComponent {
   };
 
   handlePause = () => {
-    this.audio.pause();
     this.setState({ paused: true });
 
     if (this.audioContext) {
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index 9ff6d3589e..e908715e91 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -22,7 +22,6 @@ import { Icon }  from 'mastodon/components/icon';
 import { playerSettings } from 'mastodon/settings';
 
 import { displayMedia, useBlurhash } from '../../initial_state';
-import { currentMedia, setCurrentMedia } from '../../reducers/media_attachments';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
 
 const messages = defineMessages({
@@ -182,7 +181,6 @@ class Video extends PureComponent {
   };
 
   handlePause = () => {
-    this.video.pause();
     this.setState({ paused: true });
   };
 
@@ -346,32 +344,11 @@ class Video extends PureComponent {
   };
 
   togglePlay = () => {
-    const videos = document.querySelectorAll('video');
-
-    videos.forEach((video) => {
-      const button = video.nextElementSibling;
-      button.addEventListener('click', () => {
-        if (video.paused) {
-          videos.forEach((e) => {
-            if (e !== video) {
-              e.pause();
-            }
-          });
-          video.play();
-          this.setState({ paused: false });
-        } else {
-          video.pause();
-          this.setState({ paused: true });
-        }
-      });
-    });
-
-    if (currentMedia !== null) {
-      currentMedia.pause();
+    if (this.state.paused) {
+      this.setState({ paused: false }, () => this.video.play());
+    } else {
+      this.setState({ paused: true }, () => this.video.pause());
     }
-
-    this.video.play();
-    setCurrentMedia(this.video);
   };
 
   toggleFullscreen = () => {
diff --git a/app/javascript/mastodon/reducers/media_attachments.js b/app/javascript/mastodon/reducers/media_attachments.js
index f145e1dcaa..cbb4933bc7 100644
--- a/app/javascript/mastodon/reducers/media_attachments.js
+++ b/app/javascript/mastodon/reducers/media_attachments.js
@@ -2,13 +2,6 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { STORE_HYDRATE } from '../actions/store';
 
-export let currentMedia = null;
-
-export function setCurrentMedia(value) {
-  currentMedia = value;
-}
-
-
 const initialState = ImmutableMap({
   accept_content_types: [],
 });

From fa987db73866109862ad10da8c1c1a643f1f4eba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:40:37 +0100
Subject: [PATCH 110/436] New Crowdin Translations (automated) (#28423)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ie.json  | 390 +++++++++--
 app/javascript/mastodon/locales/lad.json | 512 ++++++++++++++-
 config/locales/activerecord.ie.yml       |   8 +
 config/locales/devise.ie.yml             |  27 +
 config/locales/devise.lad.yml            | 114 ++++
 config/locales/doorkeeper.lad.yml        | 194 ++++++
 config/locales/ie.yml                    | 797 ++++++++++++++++++++++-
 config/locales/lad.yml                   | 621 ++++++++++++++++++
 config/locales/simple_form.ie.yml        |  26 +-
 config/locales/simple_form.lad.yml       | 229 +++++++
 10 files changed, 2874 insertions(+), 44 deletions(-)

diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index e5a4084cc1..966b272720 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -16,7 +16,7 @@
   "account.badges.bot": "Automatisat",
   "account.badges.group": "Gruppe",
   "account.block": "Bloccar @{name}",
-  "account.block_domain": "Bloccar domene {domain}",
+  "account.block_domain": "Bloccar dominia {domain}",
   "account.block_short": "Bloccar",
   "account.blocked": "Bloccat",
   "account.browse_more_on_origin_server": "Navigar plu sur li profil original",
@@ -24,11 +24,11 @@
   "account.copy": "Copiar ligament al profil",
   "account.direct": "Privatmen mentionar @{name}",
   "account.disable_notifications": "Cessa notificar me quande @{name} posta",
-  "account.domain_blocked": "Domene bloccat",
+  "account.domain_blocked": "Dominia bloccat",
   "account.edit_profile": "Redacter profil",
   "account.enable_notifications": "Notificar me quande @{name} posta",
   "account.endorse": "Recomandar sur profil",
-  "account.featured_tags.last_status_at": "Ultim post ye {date}",
+  "account.featured_tags.last_status_at": "Ultim posta ye {date}",
   "account.featured_tags.last_status_never": "Null postas",
   "account.featured_tags.title": "Recomandat hashtags de {name}",
   "account.follow": "Sequer",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "Silentiar notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiat",
-  "account.no_bio": "Null description providet.",
+  "account.no_bio": "Null descrition providet.",
   "account.open_original_page": "Aperter li págine original",
   "account.posts": "Postas",
   "account.posts_with_replies": "Postas e replicas",
@@ -62,9 +62,9 @@
   "account.requested_follow": "{name} ha petit sequer te",
   "account.share": "Distribuer li profil de @{name}",
   "account.show_reblogs": "Monstrar boosts de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Postas}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Posta} other {{counter} Postas}}",
   "account.unblock": "Desbloccar @{name}",
-  "account.unblock_domain": "Desbloccar domene {domain}",
+  "account.unblock_domain": "Desbloccar dominia {domain}",
   "account.unblock_short": "Desbloccar",
   "account.unendorse": "Ne recomandar sur profil",
   "account.unfollow": "Dessequer",
@@ -113,7 +113,7 @@
   "column.community": "Local témpor-linea",
   "column.direct": "Privat mentiones",
   "column.directory": "Navigar profiles",
-  "column.domain_blocks": "Bloccat domenes",
+  "column.domain_blocks": "Bloccat dominia",
   "column.favourites": "Favorites",
   "column.firehose": "Témpor-lineas",
   "column.follow_requests": "Petitiones de sequer",
@@ -136,14 +136,14 @@
   "community.column_settings.remote_only": "Solmen external",
   "compose.language.change": "Changear lingue",
   "compose.language.search": "Serchar lingues...",
-  "compose.published.body": "Post publicat.",
+  "compose.published.body": "Posta publicat.",
   "compose.published.open": "Aperter",
-  "compose.saved.body": "Post conservat.",
+  "compose.saved.body": "Posta conservat.",
   "compose_form.direct_message_warning_learn_more": "Aprender plu",
-  "compose_form.hashtag_warning": "Ti-ci post ne va esser listat sur quelcunc hashtag pro que it ne es public. Solmen public postas posse esser serchat per hashtag.",
+  "compose_form.hashtag_warning": "Ti-ci posta ne va esser listat sur quelcunc hashtag pro que it ne es public. Solmen public postas posse esser serchat per hashtag.",
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
-  "compose_form.placeholder": "Quo es in tui mente?",
+  "compose_form.placeholder": "Quo es in tui spiritu?",
   "compose_form.poll.add_option": "Adjunter un option",
   "compose_form.poll.duration": "Duration del balotation",
   "compose_form.poll.option_placeholder": "Option {number}",
@@ -151,39 +151,42 @@
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
   "compose_form.publish": "Publicar",
-  "compose_form.publish_form": "Nov post",
+  "compose_form.publish_form": "Nov posta",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Conservar changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
   "compose_form.spoiler_placeholder": "Scri tui avise ci",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
-  "confirmations.block.message": "Esque tu es cert que tu vole bloccar {name}?",
+  "confirmations.block.message": "Esque tu vermen vole bloccar {name}?",
   "confirmations.cancel_follow_request.confirm": "Retraer petition",
-  "confirmations.cancel_follow_request.message": "Esque tu es cert que tu vole retraer tui petition sequer {name}?",
+  "confirmations.cancel_follow_request.message": "Esque tu vermen vole retraer tui petition sequer {name}?",
   "confirmations.delete.confirm": "Deleter",
-  "confirmations.delete.message": "Esque tu es cert que tu vole deleter ti-ci post?",
+  "confirmations.delete.message": "Esque tu vermen vole deleter ti-ci posta?",
   "confirmations.delete_list.confirm": "Deleter",
-  "confirmations.delete_list.message": "Esque tu es cert que tu vole permanentmen deleter ti-ci liste?",
+  "confirmations.delete_list.message": "Esque tu vermen vole permanentmen deleter ti-ci liste?",
   "confirmations.discard_edit_media.confirm": "Forjettar",
-  "confirmations.discard_edit_media.message": "Tu have ínconservat changes al description de medie o al previse, forjettar les sin egarda?",
-  "confirmations.domain_block.confirm": "Bloccar li tot domene",
-  "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti domene in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti domene va esser removet.",
+  "confirmations.discard_edit_media.message": "Tu have ínconservat changes al descrition de medie o al previse, forjettar les sin egarda?",
+  "confirmations.domain_block.confirm": "Bloccar li tot dominia",
+  "confirmations.domain_block.message": "Esque tu es certissim que tu vole bloccar li tot {domain}? In mult casus, bloccar o silentiar quelc specific contos es suficent e preferibil. Tu ne va vider contenete de ti dominia in quelcunc public témpor-linea o in tui notificationes. Tui sequitores de ti dominia va esser removet.",
   "confirmations.edit.confirm": "Redacter",
-  "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu es cert que tu vole proceder?",
+  "confirmations.edit.message": "Redacter nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.logout.confirm": "Exear",
-  "confirmations.logout.message": "Vole tu vermen exear?",
+  "confirmations.logout.message": "Esque tu vermen vole exear?",
   "confirmations.mute.confirm": "Silentiar",
   "confirmations.mute.explanation": "To-ci va celar postas de ilu e postas mentionant ilu, ma it ancor va permisser ilu vider tui postas e sequer te.",
   "confirmations.mute.message": "Esque tu vermen vole silentiar {name}?",
   "confirmations.redraft.confirm": "Deleter & redacter",
-  "confirmations.redraft.message": "Esque tu es cert que tu vole deleter ti-ci post e redacter it? Favorites e boosts va esser perdit, e replicas al post original va esser orfanat.",
+  "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.reply.confirm": "Responder",
-  "confirmations.reply.message": "Responder nu va remplazzar li missage quel tu actualmen composi. Esque tu es cert que tu vole proceder?",
+  "confirmations.reply.message": "Responder nu va remplazzar li missage quel tu actualmen composi. Esque tu vermen vole proceder?",
   "confirmations.unfollow.confirm": "Dessequer",
-  "confirmations.unfollow.message": "Esque tu es cert que tu vole dessequer {name}?",
+  "confirmations.unfollow.message": "Esque tu vermen vole dessequer {name}?",
   "conversation.delete": "Deleter conversation",
   "conversation.mark_as_read": "Marcar quam leet",
   "conversation.open": "Vider conversation",
@@ -200,7 +203,7 @@
   "dismissable_banner.explore_statuses": "Tis-ci es postas del social retage queles es popular hodie. Nov postas con plu mult boosts e favorites es monstrat plu alt.",
   "dismissable_banner.explore_tags": "Tis-ci es hashtags queles es popular che li social retage hodie. Hashtags usat de plu mult persones diferent es monstrat plu alt.",
   "dismissable_banner.public_timeline": "Tis-ci es li max recent public postas de persones che li social retage quem gente che {domain} seque.",
-  "embed.instructions": "Inbedar ti-ci post per copiar li code in infra.",
+  "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
   "emoji_button.clear": "Efaciar",
@@ -225,14 +228,14 @@
   "empty_column.bookmarked_statuses": "Tu ancor have null marcat postas. Quande tu marca un, it va aparir ci.",
   "empty_column.community": "Li local témpor-linea es vacui. Scri alquo publicmen por initiar la festa!",
   "empty_column.direct": "Tu ancor have null privat mentiones. Quande tu misse o recive un, it va aparir ci.",
-  "empty_column.domain_blocks": "Ancor hay null bloccat domenes.",
+  "empty_column.domain_blocks": "Ancor hay null bloccat dominias.",
   "empty_column.explore_statuses": "Nequo es popular actualmen. Retorna plu tarde!",
   "empty_column.favourited_statuses": "Tu ancor have null favorit postas. Quande tu favoritisa un, it va aparir ci.",
   "empty_column.favourites": "Ancor nequi ha favoritisat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
   "empty_column.follow_requests": "Tu ancor have null petitiones de sequer. Quande tu recive un, it va aparir ci.",
   "empty_column.followed_tags": "Tu ancor ha sequet null hashtags. Quande tu seque un, it va aparir ci.",
   "empty_column.hashtag": "Hay nullcos en ti-ci hashtag ancor.",
-  "empty_column.home": "Tui initial témpor-linea es vacui! Sequer plu gente por plenar it.",
+  "empty_column.home": "Tui hemal témpor-linea es vacui! Sequer plu gente por plenar it.",
   "empty_column.list": "Ancor ne hay quocunc in ti-ci liste. Quande membres de ti-ci liste publica nov postas, ili va aparir ci.",
   "empty_column.lists": "Tu ancor have null listes. Quande tu crea un, it va aparir ci.",
   "empty_column.mutes": "Tu ancor ha silentiat null usatores.",
@@ -249,7 +252,7 @@
   "explore.trending_links": "Novas",
   "explore.trending_statuses": "Postas",
   "explore.trending_tags": "Hashtags",
-  "filter_modal.added.context_mismatch_explanation": "Ti-ci filtre-categorie ne aplica al contextu in quel tu ha accessat ti-ci post. Si tu vole que li post es filtrat anc in ti-ci contextu, tu deve redacter li filtre.",
+  "filter_modal.added.context_mismatch_explanation": "Ti-ci filtre-categorie ne aplica al contextu in quel tu ha accessat ti-ci posta. Si tu vole que li posta es filtrat anc in ti-ci contextu, tu deve redacter li filtre.",
   "filter_modal.added.context_mismatch_title": "Contextu íncompatibil!",
   "filter_modal.added.expired_explanation": "Ti-ci filtre-categorie ha expirat, tu deve changear li date de expiration por far it aplicar.",
   "filter_modal.added.expired_title": "Expirat filtre!",
@@ -276,9 +279,10 @@
   "footer.directory": "Profilarium",
   "footer.get_app": "Obtener li aplication",
   "footer.invite": "Invitar gente",
+  "footer.privacy_policy": "Politica pri privatie",
   "footer.source_code": "Vider li fonte-code",
   "footer.status": "Statu",
-  "generic.saved": "Salvat",
+  "generic.saved": "Conservat",
   "getting_started.heading": "Qualmen comensar",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
@@ -288,9 +292,10 @@
   "hashtag.column_settings.tag_mode.all": "Omni tis",
   "hashtag.column_settings.tag_mode.any": "Quelcunc de tis",
   "hashtag.column_settings.tag_mode.none": "Necun de tis",
+  "hashtag.column_settings.tag_toggle": "Include additional hashtags in ti-ci columne",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
-  "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} postas}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} postas}} hodie",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} posta} other {{counter} postas}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} posta} other {{counter} postas}} hodie",
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Dessequer hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in plu}}",
@@ -306,29 +311,33 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Urgent actualisation de securitá disponibil!",
   "home.show_announcements": "Monstrar proclamationes",
-  "interaction_modal.description.favourite": "Con un conto de Mastodon, tu posse favoritisar ti-ci post por informar li autor pri quant mult tu aprecia it e conservar it por plu tard.",
+  "interaction_modal.description.favourite": "Con un conto de Mastodon, tu posse favoritisar ti-ci posta por informar li autor pri quant mult tu aprecia it e conservar it por plu tard.",
   "interaction_modal.description.follow": "Con un conto de Mastodon, tu posse sequer {name} por reciver su postas in tui hemal témpor-linea.",
-  "interaction_modal.description.reblog": "Con un conto de Mastodon, tu posse boostar ti-ci post por distribuer it a tui propri sequitores.",
-  "interaction_modal.description.reply": "Con un conto de Mastodon, tu posse responder a ti-ci post.",
+  "interaction_modal.description.reblog": "Con un conto de Mastodon, tu posse boostar ti-ci posta por distribuer it a tui propri sequitores.",
+  "interaction_modal.description.reply": "Con un conto de Mastodon, tu posse responder a ti-ci posta.",
   "interaction_modal.login.action": "Retorna a hem",
-  "interaction_modal.login.prompt": "Domene de tui hemal servitor, p.ex. mastodon.social",
+  "interaction_modal.login.prompt": "Dominia de tui hemal servitor, p.ex. mastodon.social",
   "interaction_modal.no_account_yet": "Ne sur Mastodon?",
   "interaction_modal.on_another_server": "Sur un servitor diferent",
   "interaction_modal.on_this_server": "Sur ti-ci servitor",
-  "interaction_modal.sign_in": "Tu ne ha ineat a ti-ci servitor. U logia tui conto?",
-  "interaction_modal.title.favourite": "Favoritisar li post de {name}",
+  "interaction_modal.sign_in": "Tu ne ha initiat session che ti-ci servitor. U logia tui conto?",
+  "interaction_modal.title.favourite": "Favoritisar li posta de {name}",
   "interaction_modal.title.follow": "Sequer {name}",
-  "interaction_modal.title.reblog": "Boostar li post de {name}",
+  "interaction_modal.title.reblog": "Boostar li posta de {name}",
   "interaction_modal.title.reply": "Responder al posta de {name}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hor} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
   "keyboard_shortcuts.back": "Retroear",
   "keyboard_shortcuts.blocked": "Aperter li lista de bloccat usatores",
-  "keyboard_shortcuts.boost": "Boostar post",
+  "keyboard_shortcuts.boost": "Boostar posta",
+  "keyboard_shortcuts.column": "Infocar columne",
+  "keyboard_shortcuts.compose": "Infocar li text-area de composition",
   "keyboard_shortcuts.description": "Descrition",
+  "keyboard_shortcuts.direct": "por aperter li columne de privat mentiones",
+  "keyboard_shortcuts.down": "Mover ad-infra in li liste",
   "keyboard_shortcuts.enter": "Aperter posta",
-  "keyboard_shortcuts.favourite": "Favoritisar post",
+  "keyboard_shortcuts.favourite": "Favoritisar posta",
   "keyboard_shortcuts.favourites": "Aperter li liste de favorites",
   "keyboard_shortcuts.federated": "Aperter li federat témpor-linea",
   "keyboard_shortcuts.home": "Aperter li hemal témpor-linea",
@@ -342,6 +351,13 @@
   "keyboard_shortcuts.profile": "Aperter profil del autor",
   "keyboard_shortcuts.reply": "Responder al posta",
   "keyboard_shortcuts.requests": "Aperter liste de seque-petitiones",
+  "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar medie",
+  "keyboard_shortcuts.toot": "Crear un nov posta",
+  "keyboard_shortcuts.up": "Mover ad-supra in li liste",
+  "lightbox.close": "Cluder",
+  "lightbox.next": "Sequent",
+  "lightbox.previous": "Precedent",
+  "limited_account_hint.action": "Monstrar profil totvez",
   "limited_account_hint.title": "Ti-ci profil ha esset celat del moderatores de {domain}.",
   "link_preview.author": "De {name}",
   "lists.account.add": "Adjunter a liste",
@@ -359,12 +375,29 @@
   "lists.search": "Serchar inter li persones quem tu seque",
   "lists.subheading": "Tui listes",
   "load_pending": "{count, plural, one {# nov element} other {# nov elementes}}",
+  "loading_indicator.label": "Cargant…",
+  "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
+  "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
   "mute_modal.indefinite": "Índefinit",
+  "navigation_bar.about": "Information",
+  "navigation_bar.blocks": "Bloccat usatores",
+  "navigation_bar.bookmarks": "Marcatores",
+  "navigation_bar.community_timeline": "Local témpor-linea",
+  "navigation_bar.compose": "Composir un nov posta",
+  "navigation_bar.direct": "Privat mentiones",
+  "navigation_bar.discover": "Decovrir",
+  "navigation_bar.domain_blocks": "Bloccat dominias",
+  "navigation_bar.edit_profile": "Redacter profil",
+  "navigation_bar.explore": "Explorar",
+  "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
   "navigation_bar.follow_requests": "Petitiones de sequer",
+  "navigation_bar.followed_tags": "Sequet hashtags",
+  "navigation_bar.follows_and_followers": "Sequetes e sequitores",
   "navigation_bar.lists": "Listes",
+  "navigation_bar.logout": "Exear",
   "navigation_bar.mutes": "Silentiat usatores",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinglat postas",
@@ -373,20 +406,295 @@
   "navigation_bar.search": "Sercha",
   "navigation_bar.security": "Securitá",
   "not_signed_in_indicator.not_signed_in": "On deve aperter session por accesser ti-ci ressurse.",
+  "notification.admin.report": "{name} raportat {target}",
+  "notification.admin.sign_up": "{name} adheret",
+  "notification.favourite": "{name} favoritisat tui posta",
+  "notification.follow": "{name} sequet te",
   "notification.follow_request": "{name} ha petit sequer te",
+  "notification.mention": "{name} mentionat te",
+  "notification.own_poll": "Tui balotation ha finit",
+  "notification.poll": "Un balotation in quel tu votat ha finit",
+  "notification.reblog": "{name} boostat tui posta",
+  "notification.status": "{name} just postat",
+  "notification.update": "{name} modificat un posta",
+  "notifications.clear": "Aclarar notificationes",
+  "notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
+  "notifications.column_settings.admin.report": "Nov raportas:",
+  "notifications.column_settings.admin.sign_up": "Nov registrationes:",
+  "notifications.column_settings.favourite": "Favorites:",
+  "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
+  "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
+  "notifications.column_settings.mention": "Mentiones:",
+  "notifications.column_settings.poll": "Resultates del balotation:",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Monstrar in columne",
+  "notifications.column_settings.sound": "Far son",
+  "notifications.column_settings.status": "Nov postas:",
+  "notifications.column_settings.unread_notifications.category": "Ínleet notificationes",
+  "notifications.column_settings.unread_notifications.highlight": "Marcar ínleet notificationes",
   "notifications.column_settings.update": "Redactiones:",
+  "notifications.filter.all": "Omni",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favorites",
+  "notifications.filter.follows": "Seques",
+  "notifications.filter.mentions": "Mentiones",
+  "notifications.filter.polls": "Resultates del balotation",
+  "notifications.filter.statuses": "Actualisationes de gente quem tu seque",
+  "notifications.grant_permission": "Dar permission.",
   "notifications.group": "{count} notificationes",
+  "notifications.mark_as_read": "Marcar omni notificationes quam leet",
+  "onboarding.action.back": "Retroear",
+  "onboarding.actions.back": "Retroear",
+  "onboarding.actions.go_to_explore": "Ear a vider lu populari",
+  "onboarding.actions.go_to_home": "Ear al hemal témpor-linea",
   "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.follows.empty": "Ínfortunatmen, null resultates posse esser monstrat actualmen. Tu posse provar serchar o usar li \"Explorar\" págine por trovar gente por sequer, o prova denov plu tard.",
+  "onboarding.follows.lead": "Tui hemal témpor-linea es li primari maniere de experir Mastodon. Plu persones quem tu seque, plu activ e interessant it va esser. Por auxiliar te comensar, vi quelc suggestiones:",
+  "onboarding.follows.title": "Personalisar tui hemal témpor-linea",
+  "onboarding.profile.discoverable": "Fa mi profil decovribil",
+  "onboarding.profile.discoverable_hint": "Quande tu opta esser decovribil in Mastodon, tui postas posse aparir in resultates de sercha e tendenties, e tui profil posse esser suggestet a persones con interesses simil a tui.",
   "onboarding.profile.display_name": "Nómine a monstrar",
+  "onboarding.profile.display_name_hint": "Tui complet nómine o tui amusant nómine…",
+  "onboarding.profile.lead": "Tu sempre posse completar ti-ci plu tard in li parametres, u mem plu optiones de customisation es disponibil.",
+  "onboarding.profile.note": "Biografie",
+  "onboarding.profile.note_hint": "Tu posse @mentionar altri persones o #hashtags…",
+  "onboarding.profile.save_and_continue": "Conservar e avansar",
+  "onboarding.profile.title": "Popular tu profil",
+  "onboarding.profile.upload_avatar": "Cargar profil-portrete",
+  "onboarding.profile.upload_header": "Cargar cap-image",
+  "onboarding.share.lead": "Di gente qualmen ili posse trovar te che Mastodon!",
+  "onboarding.share.message": "Yo es {username} che #Mastodon! Veni e seque me a {url}",
+  "onboarding.share.next_steps": "Possibil sequent passus:",
+  "onboarding.share.title": "Partir tui profil",
+  "onboarding.start.lead": "Tu es ja un parte de Mastodon, un unic, decentralisat platform de medie social in quel tu—ne un algoritme—selectiona tui propri experientie. Lass nos departer sur un nov frontiera social:",
+  "onboarding.start.skip": "Auxilie por comensar ne besonat?",
+  "onboarding.start.title": "Tu ha successat!",
+  "onboarding.steps.follow_people.body": "Sequer interessant gente es to quo importa in Mastodon.",
+  "onboarding.steps.follow_people.title": "Personalisar tui hemal témpor-linea",
+  "onboarding.steps.publish_status.body": "Saluta li munde con text, images, videos o balotationes {emoji}",
+  "onboarding.steps.publish_status.title": "Crear tui unesim posta",
+  "onboarding.steps.setup_profile.title": "Personalisar tui profil",
+  "onboarding.steps.share_profile.body": "Di tui amics qualmen trovar te che Mastodon",
+  "onboarding.steps.share_profile.title": "Partir tui profil Mastodon",
+  "password_confirmation.exceeds_maxlength": "Confirmation de passa-parol transpassa li maxim longore de passa-paroles",
+  "password_confirmation.mismatching": "Confirmation de passa-parol ne egala",
+  "picture_in_picture.restore": "Restaurar",
+  "poll.closed": "Finit",
+  "poll.refresh": "Recargar",
+  "poll.reveal": "Vider resultates",
+  "poll.total_people": "{count, plural, one {# person} other {# persones}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Votar",
+  "poll.voted": "Tu votat por ti-ci option",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Adjunter un balotation",
+  "poll_button.remove_poll": "Remover balotation",
+  "privacy.change": "Changear li privatie del posta",
+  "privacy.direct.long": "Visibil solmen a mentionat usatores",
+  "privacy.direct.short": "Solmen persones mentionat",
+  "privacy.private.long": "Visibil solmen por sequitores",
+  "privacy.private.short": "Solmen sequitores",
+  "privacy.public.long": "Visibil a omnes",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
+  "privacy.unlisted.short": "Delistat",
+  "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
+  "privacy_policy.title": "Politica pri Privatie",
+  "recommended": "Recomandat",
+  "refresh": "Recargar",
+  "regeneration_indicator.label": "Cargant…",
+  "regeneration_indicator.sublabel": "On es preparant tui hemal témpor-linea!",
+  "relative_time.days": "{number}d",
+  "relative_time.full.days": "Ante {number, plural, one {# die} other {# dies}}",
+  "relative_time.full.hours": "Ante {number, plural, one {# hor} other {# hores}}",
+  "relative_time.full.just_now": "just nu",
+  "relative_time.full.minutes": "Ante {number, plural, one {# minute} other {# minutes}}",
+  "relative_time.full.seconds": "Ante {number, plural, one {# second} other {# secondes}}",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "nu",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "hodie",
+  "reply_indicator.cancel": "Anullar",
+  "report.block": "Bloccar",
+  "report.block_explanation": "Tu ne va vider su postas. Li usator ni va posser vider tui postas, ni sequer te, ni va posser saver pri li statu de esser bloccat.",
+  "report.categories.legal": "Legal",
+  "report.categories.other": "Altricos",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Contenete violant un o pluri regules del servitor",
+  "report.category.subtitle": "Selecte li max bon option",
+  "report.category.title": "Di nos quo passa con ti-ci {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "posta",
+  "report.close": "Finit",
+  "report.comment.title": "Hay alquo plu quel tu pensa que noi deve saver?",
+  "report.forward": "Misser anc a {target}",
+  "report.forward_hint": "Ti-ci conto es de un altri servitor. Misser un anonimisat copie del raporte anc a ta?",
   "report.mute": "Silentiar",
   "report.mute_explanation": "Tu ne va vider su postas. Ilu ancor posse sequer te e vider tui postas e ne va saver que ilu es silentiat.",
+  "report.next": "Sequent",
+  "report.placeholder": "Additional comentas",
+  "report.reasons.dislike": "It ne plese me",
+  "report.reasons.dislike_description": "It es alquo quel displese te",
+  "report.reasons.legal": "It es ínlegal",
+  "report.reasons.legal_description": "Tu crede que it viola un lege del land de te o de tui servitor",
+  "report.reasons.other": "It es altricos",
+  "report.reasons.other_description": "Li problema ne apartene in li altri categories",
+  "report.reasons.spam": "It es spam",
+  "report.reasons.spam_description": "Maliciosi ligamentes, fals activitá, o repetitiv responses",
+  "report.reasons.violation": "It viola li regules del servitor",
+  "report.reasons.violation_description": "Tu save que it viola specific regules",
+  "report.rules.subtitle": "Selecte omnes queles aplica",
+  "report.rules.title": "Quel regules es violat?",
+  "report.statuses.subtitle": "Selecte omnes queles aplica",
+  "report.statuses.title": "Hay postas queles posse subtener ti-ci raporte?",
+  "report.submit": "Misser",
+  "report.target": "Raportant {target}",
+  "report.thanks.take_action": "Tis-ci es tui optiones por controlar ti quel tu vide che Mastodon:",
+  "report.thanks.take_action_actionable": "Durante que noi tracta ti-ci, tu posse far lu sequent contra @{name}:",
+  "report.thanks.title": "Vole tu ne vider to?",
+  "report.thanks.title_actionable": "Mersí pro raportar, noi va investigar to.",
+  "report.unfollow": "Dessequer @{name}",
+  "report.unfollow_explanation": "Tu seque ti-ci conto. Por ne vider su postas en tui hemal témpor-linea, dessequer it.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} posta} other {{count} postas}} atachat",
+  "report_notification.categories.legal": "Legal",
+  "report_notification.categories.other": "Altricos",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violation de regul",
+  "report_notification.open": "Aperter raporta",
+  "search.no_recent_searches": "Null recent serchas",
+  "search.placeholder": "Serchar",
+  "search.quick_action.account_search": "Profiles acordant con {x}",
+  "search.quick_action.go_to_account": "Ear al profil {x}",
+  "search.quick_action.go_to_hashtag": "Ear al hashtag {x}",
+  "search.quick_action.open_url": "Aperter URL in Mastodon",
+  "search.quick_action.status_search": "Postas acordant con {x}",
+  "search.search_or_paste": "Serchar o glutinar URL",
+  "search_popout.full_text_search_disabled_message": "Ne disponibil che {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solmen disponibil con session initiat.",
+  "search_popout.options": "Sercha-parametres",
+  "search_popout.quick_actions": "Rapid actiones",
+  "search_popout.recent": "Recent serchas",
+  "search_popout.specific_date": "specific date",
+  "search_popout.user": "usator",
+  "search_results.accounts": "Profiles",
+  "search_results.all": "Omni",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Trovat se nullcos por ti término de sercha",
+  "search_results.see_all": "Vider omni",
+  "search_results.statuses": "Postas",
+  "search_results.title": "Sercha por {q}",
+  "server_banner.about_active_users": "Gente usant ti-ci servitor durant li ultim 30 dies (Mensual Activ Usatores)",
+  "server_banner.active_users": "activ usatores",
+  "server_banner.administered_by": "Administrat de:",
+  "server_banner.introduction": "{domain} es un part del decentralisat social retage constructet sur {mastodon}.",
+  "server_banner.learn_more": "Aprender plu",
+  "server_banner.server_stats": "Statisticas pri li servitor:",
+  "sign_in_banner.create_account": "Crear un conto",
+  "sign_in_banner.sign_in": "Intrar",
+  "sign_in_banner.sso_redirect": "Intrar o registrar se",
+  "sign_in_banner.text": "Intrar por sequer profiles o hashtags, favoritisar, partir e responder a postas. Tu posse anc interacter per tui conto che un diferent servitor.",
+  "status.admin_account": "Aperter interfacie de moderation por @{name}",
+  "status.admin_domain": "Aperter interfacie de moderation por {domain}",
+  "status.admin_status": "Aperter ti-ci posta in li interfacie de moderation",
+  "status.block": "Bloccar @{name}",
+  "status.bookmark": "Marcar",
+  "status.copy": "Copiar ligament al posta",
+  "status.delete": "Deleter",
+  "status.detailed_status": "Detalliat vise de conversation",
+  "status.direct": "Privatmen mentionar @{name}",
+  "status.direct_indicator": "Privat mention",
+  "status.edit": "Modificar",
+  "status.edited": "Modificat ye {date}",
+  "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
+  "status.embed": "Inbedar",
+  "status.favourite": "Favoritisar",
+  "status.filter": "Filtrar ti-ci posta",
+  "status.filtered": "Filtrat",
+  "status.hide": "Celar posta",
+  "status.history.created": "creat de {name} ye {date}",
+  "status.history.edited": "modificat de {name} ye {date}",
+  "status.load_more": "Cargar plu",
+  "status.media.open": "Cliccar por aperter",
+  "status.media.show": "Cliccar por monstrar",
+  "status.media_hidden": "Medie celat",
+  "status.mention": "Mentionar @{name}",
+  "status.more": "Plu",
   "status.mute": "Silentiar @{name}",
   "status.mute_conversation": "Silentiar conversation",
+  "status.open": "Expander ti-ci posta",
   "status.pin": "Pinglar sur profil",
-  "status.pinned": "Pinglat post",
+  "status.pinned": "Pinglat posta",
+  "status.read_more": "Leer plu",
+  "status.redraft": "Deleter & redacter",
+  "status.remove_bookmark": "Remover marcator",
+  "status.replied_to": "Respondet a {name}",
+  "status.reply": "Responder",
+  "status.replyAll": "Responder al fil",
+  "status.report": "Raportar @{name}",
+  "status.sensitive_warning": "Sensitiv contenete",
+  "status.share": "Partir",
+  "status.show_filter_reason": "Monstrar totvez",
+  "status.show_less": "Monstrar minu",
+  "status.show_less_all": "Monstrar minu por omno",
+  "status.show_more": "Monstrar plu",
+  "status.show_more_all": "Monstrar plu por omno",
+  "status.show_original": "Monstrar li original",
+  "status.title.with_attachments": "{user} postat {attachmentCount, plural, one {un atachament} other {{attachmentCount} atachamentes}}",
+  "status.translate": "Traducter",
+  "status.translated_from_with": "Traductet de {lang} per {provider}",
+  "status.uncached_media_warning": "Previse ne disponibil",
   "status.unmute_conversation": "Dessilentiar conversation",
   "status.unpin": "Despinglar de profil",
+  "subscribed_languages.lead": "Solmen postas in selectet lingues va aparir in tui hemal e listal témpor-lineas pos li change. Selecte null por reciver postas in omni lingues.",
+  "subscribed_languages.save": "Conservar changes",
+  "subscribed_languages.target": "Changear abonnat lingues por {target}",
+  "tabs_bar.home": "Hem",
+  "tabs_bar.notifications": "Notificationes",
+  "time_remaining.days": "{number, plural, one {# die} other {# dies}} resta",
+  "time_remaining.hours": "{number, plural, one {# hor} other {# hores}} resta",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} resta",
+  "time_remaining.moments": "Momentes resta",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# secondes}} resta",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de altri servitores ne es monstrat.",
+  "timeline_hint.resources.followers": "Sequitores",
+  "timeline_hint.resources.follows": "Sequetes",
+  "timeline_hint.resources.statuses": "Plu old postas",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} persones}} durant li ultim {days, plural, one {die} other {{days} dies}}",
+  "trends.trending_now": "Actualmen populari",
+  "ui.beforeunload": "Tui íncomplet posta va esser perdit si tu lassa Mastodon.",
+  "upload_area.title": "Trenar & lassar cader por cargar",
+  "upload_button.label": "Adjunter images, un video o un audio-file",
+  "upload_error.limit": "Límite de medie-cargationes transpassat.",
+  "upload_error.poll": "On ne es permisset cargar medie con balotationes.",
+  "upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
+  "upload_form.description": "Descrir por persones qui es ciec o have mal vision",
+  "upload_form.description_missing": "Null descrition adjuntet",
+  "upload_form.edit": "Redacter",
+  "upload_form.thumbnail": "Changear previsual image",
+  "upload_form.undo": "Deleter",
+  "upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
+  "upload_modal.analyzing_picture": "Analisant image…",
+  "upload_modal.apply": "Aplicar",
+  "upload_modal.applying": "Aplicant…",
+  "upload_modal.choose_image": "Selecter image",
+  "upload_modal.detect_text": "Detecter text del image",
+  "upload_modal.edit_media": "Redacter medie",
+  "upload_modal.hint": "Clicca o trena li circul por selecter li focal punctu quel va esser sempre visibil in omni previse-images.",
+  "upload_modal.preparing_ocr": "Preparant OCR…",
+  "upload_modal.preview_label": "Previse ({ratio})",
+  "upload_progress.label": "Cargant...",
+  "upload_progress.processing": "Tractant…",
+  "username.taken": "Ti usator-nómine es ja prendet. Trova altri",
+  "video.close": "Cluder video",
+  "video.download": "Descargar file",
+  "video.exit_fullscreen": "Exear plen-ecran",
+  "video.expand": "Expander video",
+  "video.fullscreen": "Plen-ecran",
+  "video.hide": "Celar video",
   "video.mute": "Silentiar li son",
+  "video.pause": "Pausar",
+  "video.play": "Reproducter",
   "video.unmute": "Dessilentiar li son"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 051e475e68..ffdc044412 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -41,6 +41,7 @@
   "account.follows_you": "Te sige",
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
+  "account.in_memoriam": "De bendicha memoria.",
   "account.joined_short": "Adjunto",
   "account.languages": "Troka linguas suskrividas",
   "account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silensia avizos de @{name}",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
+  "account.no_bio": "No ay deskripsion.",
   "account.open_original_page": "Avre pajina orijnala",
   "account.posts": "Publikasyones",
   "account.posts_with_replies": "Kon repuestas",
@@ -130,10 +132,518 @@
   "community.column_settings.remote_only": "Solo remotas",
   "compose.language.change": "Troka lingua",
   "compose.language.search": "Bushka linguas...",
+  "compose.published.body": "Publikasyon publikada.",
+  "compose.published.open": "Avre",
+  "compose.saved.body": "Publikasyon guadrada.",
   "compose_form.direct_message_warning_learn_more": "Ambezate mas",
   "compose_form.encryption_warning": "Publikasyones en Mastodon no son shifradas de lado a lado. No partajes dinguna enformasyon sensivle por Mastodon.",
   "compose_form.hashtag_warning": "Esta publikasyon no sera amostrada debasho de dinguna etiketa si no es publika. Solo publikasyones publikas se pueden bushkar por la etiketa.",
   "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
   "compose_form.lock_disclaimer.lock": "serrado",
-  "compose_form.placeholder": "Ke haber?"
+  "compose_form.placeholder": "Ke haber?",
+  "compose_form.poll.add_option": "Adjusta opsyon",
+  "compose_form.poll.duration": "Durasion de anketa",
+  "compose_form.poll.option_placeholder": "Opsyon {number}",
+  "compose_form.poll.remove_option": "Kita esta opsyon",
+  "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
+  "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
+  "compose_form.publish": "Publika",
+  "compose_form.publish_form": "Mueva publikasyon",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Guadra trokamientos",
+  "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
+  "compose_form.spoiler.marked": "Kita avertensya de kontenido",
+  "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
+  "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
+  "confirmation_modal.cancel": "Anula",
+  "confirmations.block.block_and_report": "Bloka i raporta",
+  "confirmations.block.confirm": "Bloka",
+  "confirmations.block.message": "Estas siguro ke keres blokar a {name}?",
+  "confirmations.cancel_follow_request.confirm": "Anula solisitud",
+  "confirmations.cancel_follow_request.message": "Estas siguro ke keres anular tu solisitud de segir a {name}?",
+  "confirmations.delete.confirm": "Efasa",
+  "confirmations.delete.message": "Estas siguro ke keres efasar esta publikasyon?",
+  "confirmations.delete_list.confirm": "Efasa",
+  "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
+  "confirmations.discard_edit_media.confirm": "Anula",
+  "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
+  "confirmations.domain_block.confirm": "Bloka domeno entero",
+  "confirmations.domain_block.message": "Estas totalmente siguro ke keres blokar todo el domeno {domain}? En djeneral unos kuantos blokos o silensiamientos son sufisientes i preferavles. No veras kontenido de akel domeno en dinguna linya de tiempo publika ni ent tus avizos. Tus suivantes de akel domeno seran kitados.",
+  "confirmations.edit.confirm": "Edita",
+  "confirmations.edit.message": "Editar agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.logout.confirm": "Sal",
+  "confirmations.logout.message": "Estas siguro ke keres salir de tu kuento?",
+  "confirmations.mute.confirm": "Silensia",
+  "confirmations.mute.explanation": "Esto eskondera las publikasyones de este kuento i publikasyones ke lo enmentan, pero ainda les permetera segirte.",
+  "confirmations.mute.message": "Estas siguro ke keres silensiar a {name}?",
+  "confirmations.redraft.confirm": "Efasar i reeskrivir",
+  "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
+  "confirmations.reply.confirm": "Arisponde",
+  "confirmations.reply.message": "Arispondir agora kitara el mesaj kualo estas eskriviendo aktualmente. Estas siguro ke keres fazerlo?",
+  "confirmations.unfollow.confirm": "Desige",
+  "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
+  "conversation.delete": "Efasa konversasyon",
+  "conversation.mark_as_read": "Marka komo meldado",
+  "conversation.open": "Ve konversasyon",
+  "conversation.with": "Kon {names}",
+  "copy_icon_button.copied": "Kopiado al portapapeles",
+  "copypaste.copied": "Kopiado",
+  "copypaste.copy_to_clipboard": "Kopia al portapapeles",
+  "directory.federated": "Dizde el fediverso konesido",
+  "directory.local": "Solo de {domain}",
+  "directory.new_arrivals": "Arivados resientemente",
+  "directory.recently_active": "Aktivos resientemente",
+  "disabled_account_banner.account_settings": "Preferensyas de kuento",
+  "disabled_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado.",
+  "dismissable_banner.community_timeline": "Estas son las publikasyones publikas mas resientes de las personas kualos kuentos estan balabayados en {domain}.",
+  "dismissable_banner.dismiss": "Kita",
+  "dismissable_banner.explore_links": "Estos haberes estan diskutidos agora por djente en este sirvidor i otros de la red desentralizada.",
+  "dismissable_banner.explore_statuses": "Estas publikasyones de este sirvidor i otros de la red desentralizada estan agora popularas. Publikasyones mas muevas, kon mas repartajasiones i favoritadas por mas djente aparesen primero.",
+  "dismissable_banner.explore_tags": "Estas etiketas estan agora popularas en la red sosyala. Etiketas uzadas por mas djente aparesen primero.",
+  "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
+  "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
+  "embed.preview": "Ansi paresera:",
+  "emoji_button.activity": "Aktivita",
+  "emoji_button.clear": "Alimpia",
+  "emoji_button.custom": "Personalizado",
+  "emoji_button.flags": "Bandieras",
+  "emoji_button.food": "Kumidas i beverajes",
+  "emoji_button.label": "Adjustar emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Emojis no topados",
+  "emoji_button.objects": "Objektos",
+  "emoji_button.people": "Djente",
+  "emoji_button.recent": "Uzados frekuentemente",
+  "emoji_button.search": "Bushka...",
+  "emoji_button.search_results": "Rizultados de bushkeda",
+  "emoji_button.symbols": "Simbolos",
+  "emoji_button.travel": "Viajes i lugares",
+  "empty_column.account_suspended": "Kuento suspendido",
+  "empty_column.account_timeline": "No ay publikasyones aki!",
+  "empty_column.account_unavailable": "Profil no desponivle",
+  "empty_column.blocks": "Ainda no tienes blokado a dingun utilizador.",
+  "empty_column.bookmarked_statuses": "Ainda no tienes dinguna publikasyon kon markador. Kuando adjustes un markador a una, se amostrara aki.",
+  "empty_column.community": "La linya de tiempo lokala esta vaziya. Eskrive algo publikamente para ampesar la fiesta!",
+  "empty_column.direct": "Ainda no tienes enmentaduras privadas. Kuando embies o risives una, se amostra aki.",
+  "empty_column.domain_blocks": "Ainda no ay domenos blokados.",
+  "empty_column.explore_statuses": "No ay dingunos trendes agora. Mira mas tadre!",
+  "empty_column.favourited_statuses": "Ainda no tienes publikasyones favoritas. Kuando indikes ke una te plaze, se amostrara aki.",
+  "empty_column.favourites": "Nadie tiene indikado ke le plaze una de tus publikasyones. Kuando algun lo aga, se amostrara aki.",
+  "empty_column.follow_requests": "No tienes dinguna solisitud de suivante. Kuando risivas una, se amostrara aki.",
+  "empty_column.followed_tags": "Ainda no tienes segido dinguna etiketa. Kuando lo agas, se amostraran aki.",
+  "empty_column.hashtag": "Ainda no ay niente en esta etiketa.",
+  "empty_column.home": "Tu linya de tiempo esta vaziya! Sige a mas personas para inchirla.",
+  "empty_column.list": "Ainda no ay niente en esta lista. Kuando miembros de esta lista publiken muevas publikasyones, se amostraran aki.",
+  "empty_column.lists": "Ainda no tienes dinguna lista. Kuando kriyes una, aperesera aki.",
+  "empty_column.mutes": "Ainda no tienes silensiado a dingun utilizador.",
+  "empty_column.notifications": "Ainda no tienes dingun avizo. Kuando otras personas enteraktuen kontigo, se amostraran aki.",
+  "empty_column.public": "No ay niente aki! Eskrive algo publikamente o manualmente sige utilizadores de otros sirvidores para inchirlo",
+  "error.unexpected_crash.explanation": "Por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador, no se puede amostrar esta pajina djustamente.",
+  "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksion.",
+  "error.unexpected_crash.next_steps": "Aprova arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulaenar Mastodon kon otro navigador u otra aplikasyon nativa.",
+  "error.unexpected_crash.next_steps_addons": "Aprova inkapasitarlos i arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulanear Mastodon kon otro navigador u otra aplikasyon nativa.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopiar stacktrace al portapapeles",
+  "errors.unexpected_crash.report_issue": "Raportar problema",
+  "explore.search_results": "Rizultados de bushkeda",
+  "explore.suggested_follows": "Djente",
+  "explore.title": "Eksplorar",
+  "explore.trending_links": "Haberes",
+  "explore.trending_statuses": "Publikasyones",
+  "explore.trending_tags": "Etiketas",
+  "filter_modal.added.context_mismatch_explanation": "Esta kategoria del filtro no se aplika al konteksto en ke tienes aksesido esta publikasyon. Si keres ke la publikasyon sea filtrada en este konteksto tamyen, kale editar el filtro.",
+  "filter_modal.added.context_mismatch_title": "El konteksto no koensida!",
+  "filter_modal.added.expired_explanation": "Esta kategoria de filtros tiene kadukado. Kale ke trokar la data de kadukasion para aplikarla.",
+  "filter_modal.added.expired_title": "Filtro kadukado!",
+  "filter_modal.added.review_and_configure": "Para revizar i konfigurar esta kategoria de filtros, va a {settings_link}.",
+  "filter_modal.added.review_and_configure_title": "Konfigurasyon de filtro",
+  "filter_modal.added.settings_link": "pajina de konfigurasyon",
+  "filter_modal.added.short_explanation": "Esta publikasyon fue adjustada a la sigiente kategoria de filtros: {title}.",
+  "filter_modal.added.title": "Filtro adjustado!",
+  "filter_modal.select_filter.context_mismatch": "no se aplika a este konteksto",
+  "filter_modal.select_filter.expired": "kadukado",
+  "filter_modal.select_filter.prompt_new": "Mueva kategoria: {name}",
+  "filter_modal.select_filter.search": "Bushkar o kriyar",
+  "filter_modal.select_filter.subtitle": "Kulanear una kategoria egzistente o kriya mueva",
+  "filter_modal.select_filter.title": "Filtrar esta publikasyon",
+  "filter_modal.title.status": "Filtrar una publikasyon",
+  "firehose.all": "Todo",
+  "firehose.local": "Este sirvidor",
+  "firehose.remote": "Otros sirvidores",
+  "follow_request.authorize": "Autoriza",
+  "follow_request.reject": "Refuza",
+  "follow_requests.unlocked_explanation": "Aunke tu kuento no esta serrado, la taifa de {domain} kreye ke talvez keres revizar manualmente las solisitudes de segimento de estos kuentos.",
+  "followed_tags": "Etiketas segidas",
+  "footer.about": "Sovre mozotros",
+  "footer.directory": "Katalogo de profiles",
+  "footer.get_app": "Abasha aplikasyon",
+  "footer.invite": "Envitar a djente",
+  "footer.keyboard_shortcuts": "Akortamientos de klavye",
+  "footer.privacy_policy": "Politika de privasita",
+  "footer.source_code": "Ve kodiche fuente",
+  "footer.status": "Estado",
+  "generic.saved": "Guadrado",
+  "getting_started.heading": "Primos pasos",
+  "hashtag.column_header.tag_mode.all": "i {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sin {additional}",
+  "hashtag.column_settings.select.no_options_message": "Rekomendasyones no topadas",
+  "hashtag.column_settings.select.placeholder": "Meter etiketas…",
+  "hashtag.column_settings.tag_mode.all": "Todos estos",
+  "hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
+  "hashtag.column_settings.tag_mode.none": "Dinguno de estos",
+  "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+  "hashtag.follow": "Segir etiketa",
+  "hashtag.unfollow": "Desegir etiketa",
+  "home.column_settings.basic": "Opsyones bazikas",
+  "home.column_settings.show_reblogs": "Amostrar repartajasyones",
+  "home.column_settings.show_replies": "Amostrar repuestas",
+  "home.hide_announcements": "Eskonde pregones",
+  "home.pending_critical_update.link": "Ve aktualizasyones",
+  "home.show_announcements": "Amostra pregones",
+  "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
+  "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
+  "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
+  "interaction_modal.description.reply": "Kon un kuento en Mastodon, puedes arispondir a esta publikasyon.",
+  "interaction_modal.on_another_server": "En otro sirvidor",
+  "interaction_modal.on_this_server": "En este sirvidor",
+  "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
+  "interaction_modal.title.follow": "Sige a {name}",
+  "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
+  "interaction_modal.title.reply": "Arisponde a publikasyon de {name}",
+  "intervals.full.days": "{number, plural, one {# diya} other {# diyas}}",
+  "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
+  "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
+  "keyboard_shortcuts.back": "Volta atras",
+  "keyboard_shortcuts.blocked": "Avre lista de utilizadores blokados",
+  "keyboard_shortcuts.boost": "Repartaja publikasyon",
+  "keyboard_shortcuts.column": "Enfoka en una kolumna",
+  "keyboard_shortcuts.compose": "Enfoka en el area de eskrivir publikasyon",
+  "keyboard_shortcuts.description": "Deskripsyon",
+  "keyboard_shortcuts.direct": "Avre la kolumna de enmentaduras privadas",
+  "keyboard_shortcuts.down": "Move verso abasho en la lista",
+  "keyboard_shortcuts.enter": "Avre publikasyon",
+  "keyboard_shortcuts.favourite": "Endika ke te plaze una publikasyon",
+  "keyboard_shortcuts.favourites": "Avre lista de favoritos",
+  "keyboard_shortcuts.federated": "Avre linya federada",
+  "keyboard_shortcuts.heading": "Akortamientos de klavye",
+  "keyboard_shortcuts.home": "Avre linya prinsipala",
+  "keyboard_shortcuts.hotkey": "Klave rapido",
+  "keyboard_shortcuts.legend": "Amostra esta lejenda",
+  "keyboard_shortcuts.local": "Avre linya lokala",
+  "keyboard_shortcuts.mention": "Enmenta al autor",
+  "keyboard_shortcuts.muted": "Avre lista de utilizadores silensiados",
+  "keyboard_shortcuts.my_profile": "Avre tu profil",
+  "keyboard_shortcuts.notifications": "Avre kolumna de avizos",
+  "keyboard_shortcuts.open_media": "Avre multimedia",
+  "keyboard_shortcuts.pinned": "Avre lista de publikasyones fiksadas",
+  "keyboard_shortcuts.profile": "Avre profil del autor",
+  "keyboard_shortcuts.reply": "Arisponde a publikasyon",
+  "keyboard_shortcuts.requests": "Avre lista de solisitudes de suivantes",
+  "keyboard_shortcuts.search": "Enfoka en la vara de bushkeda",
+  "keyboard_shortcuts.spoilers": "Amostra/eskonde el kampo de avertensya de kontenido (CW)",
+  "keyboard_shortcuts.start": "Avre la kolumna \"para ampesar\"",
+  "keyboard_shortcuts.toggle_hidden": "Amostra/eskonde teksto detras de avertensya de kontenido (CW)",
+  "keyboard_shortcuts.toggle_sensitivity": "Amostra/eskonde multimedia",
+  "keyboard_shortcuts.toot": "Eskrive mueva publikasyon",
+  "keyboard_shortcuts.unfocus": "No enfoka en el area de eskrivir/bushkeda",
+  "keyboard_shortcuts.up": "Move verso arriva en la lista",
+  "lightbox.close": "Serra",
+  "lightbox.compress": "Kompresa kuadro de imaje",
+  "lightbox.expand": "Espande kuadro de imaje",
+  "lightbox.next": "Sigiente",
+  "lightbox.previous": "Anterior",
+  "limited_account_hint.action": "Amostra el profil entanto",
+  "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.",
+  "lists.account.add": "Adjusta a lista",
+  "lists.account.remove": "Kita de lista",
+  "lists.delete": "Efasa lista",
+  "lists.edit": "Edita lista",
+  "lists.edit.submit": "Troka titolo",
+  "lists.new.create": "Adjusta lista",
+  "lists.new.title_placeholder": "Titolo de mueva lista",
+  "lists.replies_policy.followed": "Kualseker utilizardo segido",
+  "lists.replies_policy.list": "Miembros de la lista",
+  "lists.replies_policy.none": "Dinguno",
+  "lists.replies_policy.title": "Amostra repuestas a:",
+  "lists.search": "Bushka entre personas a las kualas siges",
+  "lists.subheading": "Tus listas",
+  "load_pending": "{count, plural, one {# muevo elemento} other {# muevos elementos}}",
+  "loading_indicator.label": "Eskargando…",
+  "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
+  "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
+  "mute_modal.duration": "Durasyon",
+  "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
+  "mute_modal.indefinite": "Indefinida",
+  "navigation_bar.about": "Sovre mozotros",
+  "navigation_bar.blocks": "Utilizadores blokados",
+  "navigation_bar.bookmarks": "Markadores",
+  "navigation_bar.community_timeline": "Linya de tiempo lokala",
+  "navigation_bar.compose": "Eskrivir mueva publikasyon",
+  "navigation_bar.direct": "Enmentaduras privadas",
+  "navigation_bar.discover": "Diskuvre",
+  "navigation_bar.domain_blocks": "Domenos blokados",
+  "navigation_bar.edit_profile": "Edita profil",
+  "navigation_bar.explore": "Eksplorar",
+  "navigation_bar.favourites": "Te plazen",
+  "navigation_bar.filters": "Biervos silensiados",
+  "navigation_bar.follow_requests": "Solisitudes de segimiento",
+  "navigation_bar.followed_tags": "Etiketas segidas",
+  "navigation_bar.follows_and_followers": "Segidos i suivantes",
+  "navigation_bar.lists": "Listas",
+  "navigation_bar.logout": "Salir",
+  "navigation_bar.mutes": "Utilizadores silensiados",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Publikasyones fiksadas",
+  "navigation_bar.preferences": "Preferensyas",
+  "navigation_bar.public_timeline": "Linya de tiempo federada",
+  "navigation_bar.search": "Bushka",
+  "navigation_bar.security": "Segurita",
+  "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
+  "notification.admin.report": "{name} raporto {target}",
+  "notification.admin.sign_up": "{name} kriyo un konto",
+  "notification.favourite": "A {name} le plaze tu publikasyon",
+  "notification.follow": "{name} te ampeso a segir",
+  "notification.follow_request": "{name} tiene solisitado segirte",
+  "notification.mention": "{name} te enmento",
+  "notification.own_poll": "Tu anketa eskapo",
+  "notification.poll": "Anketa en ke votates eskapo",
+  "notification.reblog": "{name} repartajo tu publikasyon",
+  "notification.status": "{name} publiko algo",
+  "notification.update": "{name} edito una publikasyon",
+  "notifications.clear": "Efasar avizos",
+  "notifications.clear_confirmation": "Estas siguro ke keres permanentemente efasar todos tus avizos?",
+  "notifications.column_settings.admin.report": "Muveos raportos:",
+  "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
+  "notifications.column_settings.alert": "Avizos de ensimameza",
+  "notifications.column_settings.favourite": "Te plazen:",
+  "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
+  "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
+  "notifications.column_settings.filter_bar.show_bar": "Amostra vara de filtros",
+  "notifications.column_settings.follow": "Muevos suivantes:",
+  "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
+  "notifications.column_settings.mention": "Enmentaduras:",
+  "notifications.column_settings.poll": "Rizultados de anketas:",
+  "notifications.column_settings.push": "Avizos arrepushados",
+  "notifications.column_settings.reblog": "Repartajasyones:",
+  "notifications.column_settings.show": "Amostra en kolumna",
+  "notifications.column_settings.sound": "Reproduzir son",
+  "notifications.column_settings.status": "Publikasyones muevas:",
+  "notifications.column_settings.unread_notifications.category": "Avizos no meldados",
+  "notifications.column_settings.unread_notifications.highlight": "Avaliar avizos no meldados",
+  "notifications.column_settings.update": "Edisyones:",
+  "notifications.filter.all": "Todos",
+  "notifications.filter.boosts": "Repartajasyones",
+  "notifications.filter.favourites": "Te plazen",
+  "notifications.filter.follows": "Segidos",
+  "notifications.filter.mentions": "Enmentaduras",
+  "notifications.filter.polls": "Rizultados de anketa",
+  "notifications.filter.statuses": "Aktualizasyones de personas a las kualas siges",
+  "notifications.grant_permission": "Da permiso.",
+  "notifications.group": "{count} avizos",
+  "notifications.mark_as_read": "Marka todos avizos komo meldados",
+  "notifications.permission_denied": "Avizos de ensimameza no estan desponivles porke ya se tiene refuzado el permiso",
+  "notifications.permission_denied_alert": "\"No se pueden kapasitar los avizos de ensimameza, porke ya se tiene refuzado el permiso de navigador",
+  "notifications.permission_required": "Avizos de ensimameza no estan desponivles porke los nesesarios permisos no tienen sido risividos.",
+  "notifications_permission_banner.enable": "Kapasitar avizos de ensimameza",
+  "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
+  "notifications_permission_banner.title": "Nunka te piedres niente",
+  "onboarding.action.back": "Va atras",
+  "onboarding.actions.back": "Va atras",
+  "onboarding.profile.display_name": "Nombre amostrado",
+  "picture_in_picture.restore": "Restora",
+  "poll.closed": "Serrado",
+  "poll.refresh": "Arefreska",
+  "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
+  "poll.vote": "Vota",
+  "poll.voted": "Votates por esta repuesta",
+  "poll.votes": "{votes, plural, one {# voto} other {# votos}}",
+  "poll_button.add_poll": "Adjusta anketa",
+  "poll_button.remove_poll": "Kita anketa",
+  "privacy.change": "Troka privasita de publikasyon",
+  "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
+  "privacy.direct.short": "Solo personas enmentadas",
+  "privacy.private.long": "Vizivle solo para suivantes",
+  "privacy.private.short": "Solo suivantes",
+  "privacy.public.long": "Vizivle para todos",
+  "privacy.public.short": "Publiko",
+  "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
+  "privacy.unlisted.short": "No listado",
+  "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
+  "privacy_policy.title": "Politika de privasita",
+  "refresh": "Arefreska",
+  "regeneration_indicator.label": "Eskargando…",
+  "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!",
+  "relative_time.days": "{number} d",
+  "relative_time.full.days": "antes {number, plural, one {# diya} other {# diyas}}",
+  "relative_time.full.hours": "antes {number, plural, one {# ora} other {# oras}}",
+  "relative_time.full.just_now": "agora",
+  "relative_time.full.minutes": "antes {number, plural, one {# minuto} other {# minutos}}",
+  "relative_time.full.seconds": "antes {number, plural, one {# sigundo} other {# sigundos}}",
+  "relative_time.hours": "{number} o",
+  "relative_time.just_now": "agora",
+  "relative_time.minutes": "{number} m",
+  "relative_time.seconds": "{number} s",
+  "relative_time.today": "oy",
+  "reply_indicator.cancel": "Anula",
+  "report.block": "Bloka",
+  "report.block_explanation": "No veras sus publikasyones. No podra ver tus publikasyones ni segirte. Podra saver ke le blokates.",
+  "report.categories.other": "Otros",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "El kontenido viola una o mas reglas del sirvidor",
+  "report.category.subtitle": "Eskoje la mijor koensidensya",
+  "report.category.title": "Deskrive el problem kon {type}",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "publikasyon",
+  "report.close": "Fecho",
+  "report.comment.title": "Ay algo mas ke deveriamos saver?",
+  "report.forward": "Reembiar a {target}",
+  "report.forward_hint": "Este kuento es de otro sirvidor. Embiar una kopia anonimizada del raporto ayi tamyen?",
+  "report.mute": "Silensia",
+  "report.mute_explanation": "No veras sus publikasyones. Ainda pueden segirte i no va saver ke le silensiates.",
+  "report.placeholder": "Otros komentos",
+  "report.reasons.dislike": "No me plaze",
+  "report.reasons.dislike_description": "\"No es algo ke kero ver",
+  "report.reasons.other": "Es otra koza",
+  "report.reasons.other_description": "El problem no es de las otras kategorias",
+  "report.reasons.spam": "Es spam",
+  "report.reasons.spam_description": "Atadijos malisiozos, enteraksyones falsas o repuestas repetitivas",
+  "report.reasons.violation": "Viola las reglas del sirvidor",
+  "report.reasons.violation_description": "Saves ke viola reglas espesifikas",
+  "report.rules.subtitle": "Eskoje todas ke korespondan",
+  "report.rules.title": "Kualas reglas estan violadas?",
+  "report.statuses.subtitle": "Eskoje todas ke korespondan",
+  "report.statuses.title": "Ay alguna publikasyon ke suporta este raporto?",
+  "report.submit": "Embiar",
+  "report.target": "Raportando a {target}",
+  "report.thanks.take_action": "Aki estan tus opsyones para kontrolar lo ke ves en Mastodon:",
+  "report.thanks.take_action_actionable": "Mientres revizamos esto, puedes tomar aksyones kontra @{name}:",
+  "report.thanks.title": "No keres ver esto?",
+  "report.thanks.title_actionable": "Mersi por raportarlo, vamos revizarlo.",
+  "report.unfollow": "Desegir a @{name}",
+  "report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
+  "report_notification.categories.other": "Otros",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.violation": "Violasion de reglas",
+  "report_notification.open": "Avre raporto",
+  "search.no_recent_searches": "No ay bushkedas resientes",
+  "search.placeholder": "Bushka",
+  "search.quick_action.account_search": "Profiles ke koresponden kon {x}",
+  "search.quick_action.go_to_account": "Va al profil {x}",
+  "search.quick_action.go_to_hashtag": "Va a la etiketa {x}",
+  "search.quick_action.open_url": "Avre URL en Mastodon",
+  "search.quick_action.status_search": "Publikasyones ke koresponden kon {x}",
+  "search.search_or_paste": "Bushka o apega URL",
+  "search_popout.quick_actions": "Aksiones rapidas",
+  "search_popout.recent": "Bushkedas resientes",
+  "search_results.accounts": "Profiles",
+  "search_results.all": "Todos",
+  "search_results.hashtags": "Etiketas",
+  "search_results.nothing_found": "No se pudo topar niente para estos terminos de bushkeda",
+  "search_results.see_all": "Ve todo",
+  "search_results.statuses": "Publikasyones",
+  "search_results.title": "Bushka por {q}",
+  "server_banner.about_active_users": "Utilizadores aktivos en este sirvidor durante los ultimos 30 diyas (utilizadores aktivos mensuales)",
+  "server_banner.active_users": "utilizadores aktivos",
+  "server_banner.administered_by": "Administrado por:",
+  "server_banner.introduction": "{domain} es parte de la red sosyala desentralizada liderada por {mastodon}.",
+  "server_banner.learn_more": "Ambezate mas",
+  "server_banner.server_stats": "Estatistikas del sirvidor:",
+  "sign_in_banner.create_account": "Kriya kuento",
+  "sign_in_banner.sign_in": "Konektate",
+  "sign_in_banner.sso_redirect": "Konektate o enrejistrate",
+  "status.filter": "Filtra esta publikasyon",
+  "status.filtered": "Filtrado",
+  "status.hide": "Eskonde publikasyon",
+  "status.history.created": "{name} kriyo {date}",
+  "status.history.edited": "{name} edito {date}",
+  "status.load_more": "Eskarga mas",
+  "status.media_hidden": "Multimedia eskondidos",
+  "status.mention": "Enmenta a @{name}",
+  "status.more": "Mas",
+  "status.mute": "Silensia a @{name}",
+  "status.mute_conversation": "Silensia konversasyon",
+  "status.open": "Espande publikasyon",
+  "status.pin": "Fiksa en profil",
+  "status.pinned": "Publikasyon fiksada",
+  "status.read_more": "Melda mas",
+  "status.reblog": "Repartaja",
+  "status.reblog_private": "Repartaja kon vizibilita orijinala",
+  "status.reblogged_by": "{name} repartajo",
+  "status.reblogs.empty": "Ainda nadie tiene repartajado esta publikasyon. Kuando algien lo aga, se amostrara aki.",
+  "status.redraft": "Efasa i eskrive de muevo",
+  "status.remove_bookmark": "Kita markador",
+  "status.replied_to": "Arispondio a {name}",
+  "status.reply": "Arisponde",
+  "status.replyAll": "Arisponde al filo",
+  "status.report": "Raporta @{name}",
+  "status.sensitive_warning": "Kontenido sensivle",
+  "status.share": "Partaja",
+  "status.show_filter_reason": "Amostra entanto",
+  "status.show_less": "Amostra manko",
+  "status.show_less_all": "Amostra manko para todo",
+  "status.show_more": "Amostra mas",
+  "status.show_more_all": "Amostra mas para todo",
+  "status.show_original": "Amostra orijinal",
+  "status.translate": "Trezlada",
+  "status.translated_from_with": "Trezladado dizde {lang} kon {provider}",
+  "status.uncached_media_warning": "Vista previa no desponivle",
+  "status.unmute_conversation": "Desilensiar konversasyon",
+  "status.unpin": "Defiksar del profil",
+  "subscribed_languages.lead": "Solo publikasyones en linguas eskojidas se amostraran en tus linya de tiempo prinsipala i listas dempues del trokamiento. Eskoje dinguna para risivir publikasyones en todas las linguas.",
+  "subscribed_languages.save": "Guadra trokamientos",
+  "subscribed_languages.target": "Troka linguas abonadas para {target}",
+  "tabs_bar.home": "Linya prinsipala",
+  "tabs_bar.notifications": "Avizos",
+  "time_remaining.days": "{number, plural, one {# diya restante} other {# diyas restantes}}",
+  "time_remaining.hours": "{number, plural, one {# ora restante} other {# oras restantes}}",
+  "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
+  "time_remaining.moments": "Momentos restantes",
+  "time_remaining.seconds": "{number, plural, one {# sigundo restante} other {# sigundos restantes}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de otros sirvidores no se amostran.",
+  "timeline_hint.resources.followers": "Suivantes",
+  "timeline_hint.resources.follows": "Segidos",
+  "timeline_hint.resources.statuses": "Publikasyones mas viejas",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} kuento} other {{counter} kuentos}} en los ultimos {days, plural, one {diyas} other {{days} diyas}}",
+  "trends.trending_now": "Trendes",
+  "ui.beforeunload": "La publikasyon ke estas eskriviendo se pedrera si sales de Mastodon.",
+  "units.short.billion": "{count} MM",
+  "units.short.million": "{count} M",
+  "units.short.thousand": "{count} K",
+  "upload_area.title": "Arastra i mete para kargar",
+  "upload_button.label": "Adjusta imajes, un video or una dosya audio",
+  "upload_error.limit": "Limito de dosyas kargadas eksedido.",
+  "upload_error.poll": "No se permite kargar dosyas kon anketas.",
+  "upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
+  "upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
+  "upload_form.description_missing": "No adjustates deskripsion",
+  "upload_form.edit": "Edita",
+  "upload_form.thumbnail": "Troka minyatura",
+  "upload_form.undo": "Efasa",
+  "upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
+  "upload_modal.analyzing_picture": "Analizando imaje…",
+  "upload_modal.apply": "Aplika",
+  "upload_modal.applying": "Aplikando…",
+  "upload_modal.choose_image": "Eskoje imaje",
+  "upload_modal.description_placeholder": "Lorem ipsum dolor sit amet",
+  "upload_modal.detect_text": "Detektar teksto de la imaje",
+  "upload_modal.edit_media": "Edita multimedia",
+  "upload_modal.hint": "Klika o arrastra el sirkolo en la vista previa para eskojer el punto fokal ke siempre estara en vista en todas las minyaturas.",
+  "upload_modal.preparing_ocr": "Preparando OCR…",
+  "upload_modal.preview_label": "Vista previa ({ratio})",
+  "upload_progress.label": "Kargando...",
+  "upload_progress.processing": "Prosesando…",
+  "video.close": "Serra video",
+  "video.download": "Abasha dosya",
+  "video.exit_fullscreen": "Sal de ekran kompleto",
+  "video.expand": "Espande video",
+  "video.fullscreen": "Ekran kompleto",
+  "video.hide": "Eskonde video",
+  "video.mute": "Silensia son",
+  "video.pause": "Pauza",
+  "video.play": "Reproduze",
+  "video.unmute": "Desilensia son"
 }
diff --git a/config/locales/activerecord.ie.yml b/config/locales/activerecord.ie.yml
index 09926d0d73..0c63299e04 100644
--- a/config/locales/activerecord.ie.yml
+++ b/config/locales/activerecord.ie.yml
@@ -1 +1,9 @@
+---
 ie:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Cludent date
+        options: Optiones
+      user:
+        password: Passa-parol
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 09926d0d73..16d51dba16 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -1 +1,28 @@
+---
 ie:
+  devise:
+    failure:
+      invalid: Ínvalid %{authentication_keys} o passa-parol.
+      not_found_in_database: Ínvalid %{authentication_keys} o passa-parol.
+    mailer:
+      email_changed:
+        extra: Si tu ne changeat tui email-adresse, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto.
+      password_change:
+        explanation: Li passa-parol de tui conto ha esset changeat.
+        extra: Si tu ne changeat tui passa-parol, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto.
+        subject: 'Mastodon: Passa-parol changeat'
+        title: Passa-parol changeat
+      reset_password_instructions:
+        action: Changear passa-parol
+        explanation: Tu demandat un nov passa-parol por tui conto.
+        extra: Si tu ne demandat to-ci, ples ignorar ti-ci email. Tui passa-parol ne va changear til que tu accessaye li ligament supra e crear un nov.
+        subject: 'Mastodon: Instructiones por reiniciar li passa-parol'
+        title: Reiniciar passa-parol
+      two_factor_disabled:
+        explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+    passwords:
+      no_token: Tu ne posse accessar ti-ci págine sin venir de un email pri reiniciar li passa-parol. Si tu ha venit de un email pri reiniciar li passa-parol, ples far cert que tu usat li complet URL providet.
+      send_instructions: Si tui email-adresse existe in nor database, tu va reciver un ligament por recuperar li passa-parol a tui email-adresse in quelc minutes. Ples vider tui spam-emails si tu ne recivet ti email.
+      send_paranoid_instructions: Si tui email-adresse existe in nor database, tu va reciver un ligament por recuperar li passa-parol a tui email-adresse in quelc minutes. Ples vider tui spam-emails si tu ne recivet ti email.
+      updated: Tui passa-parol ha esset changeat successosimen. Tu nu ha apertet session.
+      updated_not_active: Tui passa-parol ha esset changeat successosimen.
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index eeaa3294e2..63933b80fc 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -1 +1,115 @@
+---
 lad:
+  devise:
+    confirmations:
+      confirmed: Tu adreso de posta elektronika tyene sido konfirmado korektamente.
+      send_instructions: Risiviras una posta elektronika kon instruksyones para konfirmar tu adreso de posta elektronika en unos minutos. Por favor, komprova tu kuti de spam si no risivites esta posta elektronika.
+      send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras una posta elektronika kon instruksyones sobre komo konfirmar tu adreso de posta elektronika en pokos minutos.
+    failure:
+      already_authenticated: Ya te konektates kon tu kuento.
+      inactive: Tu kuento ainda no tyene sido aktivado.
+      invalid: "%{authentication_keys} o kod invalido."
+      last_attempt: Aprova una vez mas antes de ke tu kuento sea blokado.
+      locked: Tu kuento esta blokado.
+      not_found_in_database: Inkorekto %{authentication_keys} o kod.
+      pending: Tu ainda esta basho revizyon.
+      timeout: Tu sesyon tiene kadukado. Por favor konektate kon tu kuento de muevo para kontinuar.
+      unauthenticated: Kale konektarte kon tu kuento o enregistrarte antes de kontinuar.
+      unconfirmed: Tyenes ke konfirmar tu adreso de posta elektronika antes de kontinuar.
+    mailer:
+      confirmation_instructions:
+        action: Verifika tu adreso de posta elektronika
+        action_with_app: Konfirma i volta a %{app}
+        explanation: Tyenes kriyado un kuento en %{host} kon este adreso de posta elektronika. Estas a un solo klik de aktivarlo. Si no fuites tu, por favor ignora esta posta elektronika.
+        explanation_when_pending: Tienes solisitado una envitasyon a %{host} kon este adreso de posta elektronika. Una vez ke konfirmes tu adreso de posta elektronika, revizaremos tu solisitud. Puedes konektarte kon tu kuento para trokar tus datos o supremir tu kuento, pero no puedes akseder a la majorita de las funciones hasta ke tu kuento sea achetado. Si tu solisitud es refuzada, tus datos seran supremidos, por lo ke no ay menester de dinguna aksyon adicional por tu parte. Si no fuites tu, por favor ignora esta posta elektronika.
+        extra_html: Por favor, reviza <a href="%{terms_path}">las reglas del sirvidor</a> i <a href="%{policy_path}">muestros terminos de sirvisyo</a>.
+        subject: 'Mastodon: Instruksyones de konfirmasyon para %{instance}'''
+        title: Verifika tu adreso de posta elektronika
+      email_changed:
+        explanation: 'La posta elektronika para tu kuento esta siendo trokado a:'
+        extra: Si no tienes trokado tu posta elektronika, es probavle ke algun aya konsigido akseso a tu kuento. Por favor troka tu kod inmediatamente o kontakta al administrador de la instansya si no puedes konektarte kon tu kuento.
+        subject: 'Mastodon: Posta elektronika trokada'
+        title: Muevo adreso de posta elektronika
+      password_change:
+        explanation: El kod de tu kuento tyene sido trokado.
+        extra: Si no tienes trokado tu kod. es probavle ke algun a konsigido akseso a tu kuento. Por favor troka tu kod inmediatamente o kontakta al administrador de la instansya si no puedes konektarte kon tu kuento.
+        subject: 'Mastodon: Kod trokado'
+        title: Kod trokado
+      reconfirmation_instructions:
+        explanation: Konfirma el muevo adreso para trokar tu posta elektronika.
+        extra: Si no inisyates este trokamiento, por favor ignora esta posta. Este adreso de posta elektronika para el kuento de Mastodon no trokara asta ke aksedas al atadijo arriva.
+        subject: 'Mastodon: Konfirma posta elektronika para %{instance}'
+        title: Verifika tu adreso de posta elektronika
+      reset_password_instructions:
+        action: Troka el kod
+        explanation: Solisitates un muevo kod para tu kuento.
+        extra: Si no solisitates esto, por favor ignora esta posta. Tu kod no trokara asta ke tu aksedas al atadijo arriva i kriyes un muevo.
+        subject: 'Mastodon: Instruksyones para reinisyar kod'
+        title: Reinisyar kod
+      two_factor_disabled:
+        explanation: La autentifikasyon de dos pasos para tu kuento a sido inkapasitada. Agora puedes konektarte solamente uzando el adreso de posta elektronika i el kod.
+        subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
+        title: Autentifikasyon 2FA inkapasitada
+      two_factor_enabled:
+        explanation: La autentifikasyon de dos pasos para tu kuento a sido kapasitada. Se rekiere un token djenerado por la aplikasyon TOTP konektada para entrar.
+        subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
+        title: Autentifikasyon 2FA aktivada
+      two_factor_recovery_codes_changed:
+        explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
+        subject: 'Mastodon: Los kodiches de rekuperasyon de dos pasos fueron rejenerados'
+        title: Kodiches de rekuperasyon 2FA trokados
+      unlock_instructions:
+        subject: 'Mastodon: Instruksyones para dezblokar'
+      webauthn_credential:
+        added:
+          explanation: La sigiente yave de sigurita tiene sido adjustada a tu kuento
+          subject: 'Mastodon: Mueva yave de sigurita'
+          title: Se tiene adjustado una mueva yave de sigurita
+        deleted:
+          explanation: La sigiente yave de sigurita a sido supremida de tu kuento
+          subject: 'Mastodon: Yave de sigurita supremida'
+          title: Una de tus yaves de sigurita tiene sido supremida
+      webauthn_disabled:
+        explanation: La autentifikasyon kon yaves de sigurita a sido inkapasitada para tu kuento. Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
+        subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
+        title: Yaves de sigurita inkapasitadas
+      webauthn_enabled:
+        explanation: La autentifikasyon kon yave de sigurita a sido kapasitada para tu kuento. Agora tu yave de sigurita puede ser utilizada para inisyar sesyon.
+        subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
+        title: Yaves de sigurita kapasitadas
+    omniauth_callbacks:
+      failure: No se te pudo autentifikar dizde %{kind} porke “%{reason}”.
+      success: Autentifikado djustamente dizde el kuento de %{kind}.
+    passwords:
+      no_token: No puedes akseder a esta pajina si no vienes dizde una posta elektronika de restablesimyento de kod. Si vienes dizde una posta elektronika de restablesimyento de kod, por favor asigurate de utilizar el URL kompleto embiado.
+      send_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      send_paranoid_instructions: Si tu adreso de posta elektronika existe en muestra baza de datos, risiviras un atadijo de rekuperasyon de kod en tu adreso de posta elektronika en pokos minutos. Por favor, komprova tu kuti de posta no deseado si no risives akeya posta elektronika.
+      updated: Tu kod a sido trokado kon reusho. Tinenes entrado en kuento.
+      updated_not_active: Tu kod se tiene trokado kon reusho.
+    registrations:
+      destroyed: Tu kuento a sido efasado kon reusho. Asperamos verte de muevo pronto.
+      signed_up: Bienvenido! Te tienes enrejistrado djustamente.
+      signed_up_but_inactive: Te tienes enrejistrado kon reusho. Entanto, no se pudio inisyar sesyon porke tu kuento ainda no esta aktivado.
+      signed_up_but_locked: Te tienes enrejistrado kon reusho. Entanto, no pudites konektarte kon tu kuento porke tu kuento esta blokado.
+      signed_up_but_pending: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Dempues de klikar en el atadijo, revizaremos tu solisitud. Seras avizado si se acheta.
+      signed_up_but_unconfirmed: Un mesaj kon un atadijo de konfirmasyon a sido enviado a tu adreso de posta elektronika. Por favor, sigue el atadijo para aktivar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      update_needs_confirmation: Tienes aktualizado tu kuento kon reusho, pero kale verifikar tu muevo adreso de posta elektronika. Por favor, komprova tu posta elektronika i sige el atadijo de konfirmasyon para konfirmar tu muevo adreso de posta elektronika. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      updated: Tu kuento se aktualizo kon reusho.
+    sessions:
+      already_signed_out: Salites del kuento kon reusho.
+      signed_in: Konektates kon tu kuento kon reusho.
+      signed_out: Salites del kuento kon reusho.
+    unlocks:
+      send_instructions: En unos minutos risiviras una posta elektronika kon instruksyones para dezblokar tu kuento. Por favor, komprova tu kuti de posta spam si no risives akeya posta elektronika.
+      send_paranoid_instructions: Si tu kuento existe, en unos minutos risiviras una posta elektronika kon instruksyones para dezblokarlo. Por favor, reviza tu kuti de posta spam si no risives akeya posta elektronika.
+      unlocked: Tu kuento fue dezblokado kon reusho. Por favor, konektate kon tu kuento para kontinuar.
+  errors:
+    messages:
+      already_confirmed: ya estaba konfirmado, por favor aprova konektarte kon tu kuento
+      confirmation_period_expired: nesesita konfirmarse dentro de %{period}, por favor, solisita una mueva
+      expired: tiene kadukado, por favor solisita una mueva
+      not_found: no topado
+      not_locked: no estava blokado
+      not_saved:
+        one: '1 yerro impidio ke este %{resource} se guadrase:'
+        other: "%{count} yerros impidieron ke este %{resource} se guadrase:"
diff --git a/config/locales/doorkeeper.lad.yml b/config/locales/doorkeeper.lad.yml
index eeaa3294e2..f52bac39c2 100644
--- a/config/locales/doorkeeper.lad.yml
+++ b/config/locales/doorkeeper.lad.yml
@@ -1 +1,195 @@
+---
 lad:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nombre de aplikasyon
+        redirect_uri: URI para readreso
+        scopes: Ambitos
+        website: Sitio internetiko
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: no puede kontener un fragmento.
+              invalid_uri: deve ser un URI valido.
+              relative_uri: deve ser un URI asoluto.
+              secured_uri: deve ser un URI de HTTPS/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autoriza
+        cancel: Anula
+        destroy: Destruye
+        edit: Edita
+        submit: Embia
+      confirmations:
+        destroy: Estas siguro?
+      edit:
+        title: Edita aplikasyon
+      form:
+        error: Atyo! Komprova tu formulario
+      help:
+        native_redirect_uri: Utiliza %{native_redirect_uri} para provas lokalas
+        redirect_uri: Uza una linya por URI
+        scopes: Separa los ambitos kon espasyos. Deshalo en blanko para kulanear los ambitos predeterminados.
+      index:
+        application: Aplikasyon
+        callback_url: URL de callback
+        delete: Efasa
+        empty: No tienes aplikasyones.
+        name: Nombre
+        new: Mueva aplikasyon
+        scopes: Ambitos
+        show: Amostra
+        title: Tus aplikasyones
+      new:
+        title: Mueva aplikasyon
+      show:
+        actions: Aksyones
+        application_id: Yave de mushteri
+        callback_urls: URLs de callback
+        scopes: Ambitos
+        secret: Mushteri sekreto
+        title: 'Aplikasyon: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autoriza
+        deny: Dezautoriza
+      error:
+        title: Un yerro tiene afitado
+      new:
+        prompt_html: "%{client_name} kere permiso para akseder tu kuento. Es una aplikasyon de terseros. <strong>Si no konfias en eya, no deverias autorizarla.</strong>"
+        review_permissions: Reviza permisos
+        title: Autorizasyon rekerida
+      show:
+        title: Kopia este kodiche de autorizasyon i apegalo en la aplikasyon.
+    authorized_applications:
+      buttons:
+        revoke: Revoka
+      confirmations:
+        revoke: Estas siguro?
+      index:
+        authorized_at: Autorizado el %{date}
+        description_html: Estas son las aplikasyones ke pueden akseder tu kuento uzando el API. Si ay aplikasyones aki las kualas no rekoneses, o unas ke no se komporten bien, puedes revokar sus akseso.
+        last_used_at: Ultimo uzo el %{date}
+        never_used: Nunkua uzado
+        scopes: Permisos
+        superapp: Interno
+        title: Tus aplikasyones autorizadas
+    errors:
+      messages:
+        access_denied: El patron del rekurso o el sirvidor de autorizasyon refuzo tu solisitud.
+        credential_flow_not_configured: Las kredensyalas de kod del patron del rekurso no funksyonan porke Doorkeeper.configure.resource_owner_from_credentials no esta konfigurado.
+        invalid_client: La autentifikasyon del mushteri no reushida porke el mushteri no es konesido, no ay autentifikasyon del mushteri inkluyida, o el metodo de autentifikasyon no es suportada.
+        invalid_grant: La konsesyon de autorizasyon ofresida es invalida, kadukada, revokada, no koensida kon el URI de readreso utilizado en la solisitud de autorizasyon, o fue emitida para otro mushteri.
+        invalid_redirect_uri: El URI de readreso inkluydo no es valido.
+        invalid_request:
+          missing_param: 'Parametro rekerido no topado: %{value}.'
+          request_not_authorized: Solisitud deve ser autorizada. Parametro rekerido para autorizar la solisitud no topado o no valido.
+          unknown: La solisitud no tiene un parametro rekerido, inkluye una valuta de parametro no suportada o es yerrado de otra forma.
+        invalid_resource_owner: Las kredensyalas de patron del rekurso no son validas o patron del rekurso no topado
+        invalid_scope: El ambito pedido es invalido, no konesido o yerrado.
+        invalid_token:
+          expired: El token de akseso tiene kadukado
+          revoked: El token de akseso fue revokado
+          unknown: El token de akseso no es valido
+        resource_owner_authenticator_not_configured: El patron del rekurso no topado porke Doorkeeper.configure.resource_owner_authenticator no esta konfigurado.
+        server_error: El sirvidor de autorizasyon topo una kondisyon no ekspektada ke no le permite kumplir kon la solisitud.
+        temporarily_unavailable: El sirvidor de autorizasyon agora no puede realizar la solisitud porke el sirvidor esta sobrekargado o basho mantenimiento.
+        unauthorized_client: El mushteri no esta autorizado para realizar esta solisitud uzando este metodo.
+        unsupported_grant_type: El tipo de konsesyon de autorizasyon no esta suportado por el sirvidor de autentifikasyon.
+        unsupported_response_type: El sirvidor de autorizasyon no suporta este tipo de repuesta.
+    flash:
+      applications:
+        create:
+          notice: Aplikasyon kriyada.
+        destroy:
+          notice: Aplikasyon efasada.
+        update:
+          notice: Aplikasyon aktualizada.
+      authorized_applications:
+        destroy:
+          notice: Aplikasyon revokada.
+    grouped_scopes:
+      access:
+        read: Akseso solo de meldar
+        read/write: Akseso de meldar i eskrivir
+        write: Akseso solo de eskrivir
+      title:
+        accounts: Kuentos
+        admin/accounts: Administrasyon de kuentos
+        admin/all: Todas las funksyones administrativas
+        admin/reports: Administrasyon de raportos
+        all: Akseso total a tu kuento de Mastodon
+        blocks: Blokos
+        bookmarks: Markadores
+        conversations: Konversasyones
+        crypto: Shifrasyon de lado a lado
+        favourites: Favoritos
+        filters: Filtros
+        follow: Segimientos, silensiasyones i blokos
+        follows: Segimientos
+        lists: Listas
+        media: Aneksos de multimedia
+        mutes: Silensiasyones
+        notifications: Avizos
+        push: Avizos arrepushados
+        reports: Raportos
+        search: Bushkeda
+        statuses: Publikasyones
+    layouts:
+      admin:
+        nav:
+          applications: Publikasyones
+          oauth2_provider: Prokurador de OAuth2
+      application:
+        title: Autorizasyon OAuth rekerida
+    scopes:
+      admin:read: meldar todos los datos en el sirvidor
+      admin:read:accounts: meldar informasyon sensivle en todos los kuentos
+      admin:read:canonical_email_blocks: meldar informasyon sensivle de todos blokos kanonikos de posta
+      admin:read:domain_allows: meldar informasyon sensivle de todos los domenos permitidos
+      admin:read:domain_blocks: meldar informasyon sensivle de todos los blokos de domeno
+      admin:read:email_domain_blocks: meldar informasyon sensivle de todos los blokos de domenos de posta
+      admin:read:ip_blocks: meldar informasyon sensivle de todos los blokos de IP
+      admin:read:reports: meldar informasyon sensivle de todos los raportos i kuentos raportados
+      admin:write: modifikar todos los datos en el sirvidor
+      admin:write:accounts: fazer aksyones de moderasyon en kuentos
+      admin:write:canonical_email_blocks: fazer aksyones de moderasyon en blokos kanonikos de posta
+      admin:write:domain_allows: fazer aksyones de moderasyon en domenos permitidos
+      admin:write:domain_blocks: fazer aksyones de moderasyon en blokos de domeno
+      admin:write:email_domain_blocks: fazer aksyones de moderasyon en blokos de domenos de posta
+      admin:write:ip_blocks: fazer aksyones de moderasyon en blokos de IP
+      admin:write:reports: fazer aksyones de moderasyon en raportos
+      crypto: kulanear shifrasyon de lado a lado
+      follow: modifikar relasyones de kuentos
+      push: risivir tus avizos arrepushados
+      read: meldar todos tus datos de kuento
+      read:accounts: ver enformasyon de kuentos
+      read:blocks: ver tus blokos
+      read:bookmarks: ver tus markadores
+      read:favourites: ver ke te plaze
+      read:filters: ver tus filtros
+      read:follows: ver a ken siges
+      read:lists: ver tus listas
+      read:mutes: ver tus silensiasyones
+      read:notifications: ver tus avizos
+      read:reports: ver tus raportos
+      read:search: bushkar en tu nombre
+      read:statuses: ver todas las publikasyones
+      write: modifikar todos los datos de tu kuento
+      write:accounts: modifikar tu profil
+      write:blocks: blokar kuentos i domenos
+      write:bookmarks: markar publikasyones
+      write:conversations: silensyar i efasar konversasyones
+      write:favourites: indikar ke publikasyones te plazen
+      write:filters: kriyar filtros
+      write:follows: segir a djente
+      write:lists: kriyar listas
+      write:media: kargar dosyas multimedia
+      write:mutes: silensyar a djente i konversasyones
+      write:notifications: alimpiar tus avizos
+      write:reports: raportar a otras personas
+      write:statuses: publikar publikasyones
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c5668edbd6..3a85602ba5 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1,18 +1,290 @@
 ---
 ie:
+  about:
+    about_mastodon_html: 'Li social rete del futur: sin reclams, sin supervision de corporationes, con un dessine etical e decentralisation! Repossede vor data med Mastodon!'
+    contact_missing: Ne assignat
+    contact_unavailable: Ne disponibil
+    hosted_on: Mastodon logiat che %{domain}
+    title: Pri
   accounts:
+    follow: Sequer
+    followers:
+      one: Sequitor
+      other: Sequitores
+    following: Sequent
+    instance_actor_flash: Ti-ci conto es un virtual actor usat por representer li servitor self e null individual usator. It es usat por federational rasones e deve ne esser suspendet.
+    last_active: ultim activitá
+    link_verified_on: Proprietá de ti-ci ligament esset verificat ye %{date}
+    nothing_here: Hay nullcos ci!
     pin_errors:
       following: Tu deve ja sequer li person quem tu vole indossar
+    posts:
+      one: Posta
+      other: Postas
+    posts_tab_heading: Postas
   admin:
+    account_actions:
+      action: Acter
+      title: Far un moderatori action a %{acct}
+    account_moderation_notes:
+      create: Scrir un note
+      created_msg: Moderatori nota creat successosimen!
+      destroyed_msg: Moderatori nota destructet successosimen!
+    accounts:
+      add_email_domain_block: Bloccar email-dominia {domain}
+      approve: Aprobar
+      approved_msg: Successosimen aprobat li aplication de registration de %{username}
+      are_you_sure: Es tu cert?
+      avatar: Avatar
+      by_domain: Dominia
+      change_email:
+        changed_msg: Email-adresse changeat successosimen!
+        current_email: Actual e-post
+        label: Cambiar li e-post
+        new_email: Nov e-post
+        submit: Cambiar li e-post
+        title: Changear li email-adresse de %{username}
+      change_role:
+        changed_msg: Rol changeat successosimen!
+        label: Cambiar li rol
+        no_role: Sin rol
+        title: Changear li rol de %{username}
+      confirm: Confirmar
+      confirmed: Confirmat
+      confirming: Atende confirmation
+      custom: Personalisat
+      delete: Deleter data
+      deleted: Deletet
+      demote: Demoer
+      destroyed_msg: Li data de %{username} es nu in li linea por esser deletet iminentmen
+      disable: Gelar
+      disable_sign_in_token_auth: Desactivisar autentication per email-claves
+      disable_two_factor_authentication: Desactivisar 2FA
+      disabled: Gelat
+      display_name: Visibil nómine
+      domain: Dominia
+      edit: Modificar
+      email: E-post
+      email_status: Statu del e-post
+      enable: Desgelar
+      enable_sign_in_token_auth: Activisar autentication per email-claves
+      enabled: Activ
+      enabled_msg: Successosimen desgelat li conto de %{username}
+      followers: Sequitores
+      follows: Seque
+      inbox_url: Inbuxe URL
+      invite_request_text: Rason por adhesion
+      invited_by: Invitat de
+      ip: IP
+      joined: Adheret
+      location:
+        all: Omni
+        local: Local
+        remote: Lontan
+        title: Localisation
+      login_status: Statu de intration
+      media_attachments: Medie-atachamentes
+      memorialize: Converter al memoriale
+      memorialized: Memorialisat
+      memorialized_msg: Successosimen convertet %{username} a un conto de memoriale
+      moderation:
+        active: Activ
+        all: Omni
+        disabled: Desactivat
+        pending: Atendent
+        silenced: Limitat
+        suspended: Suspendet
+        title: Moderation
+      moderation_notes: Notes de moderator
+      most_recent_activity: Ultim activitá
+      most_recent_ip: Ultim IP
+      no_account_selected: Null contos esset changeat pro que null contos esset selectet
+      no_limits_imposed: Null límites imposit
+      no_role_assigned: Null rol assignat
+      not_subscribed: Ne abonnat
+      pending: Atende li revision
+      perform_full_suspension: Suspender
+      previous_strikes: Precedent violationes
+      previous_strikes_description_html:
+        one: Ti conto have <strong>un</strong> violation.
+        other: Ti conto have <strong>%{count}</strong> violationes.
+      promote: Promoer
+      protocol: Protocol
+      public: Public
+      redownload: Recargar li profil
+      redownloaded_msg: Successosimen recargat li profil de %{username} del original fonte
+      reject: Rejecter
+      rejected_msg: Successosimen rejectet li aplication de registration de %{username}
+      remote_suspension_irreversible: Li data de ti-ci conto ha esset deletet ínreversibilmen.
+      remote_suspension_reversible_hint_html: Li conto ha esset suspendet che su servitor, e li data va esser completmen removet ye %{date}. Til tande, li lontan servitor posse restaurar ti conto sin quelcunc mal efectes. Si tu vole remover omni data del conto ínmediatmen, tu posse far it in infra.
+      remove_avatar: Remover li avatar
+      removed_avatar_msg: Successosimen removet li avatar-image de %{username}
+      resend_confirmation:
+        already_confirmed: Ti usator ja esset confirmat
+        send: Inviar li confirmation denov
+        success: Ligament de confirmation successosimen misset!
+      reset: Reiniciar
+      reset_password: Reiniciar passa-parol
+      resubscribe: Reabonnar
+      role: Rol
+      search: Serchar
+      search_same_email_domain: Altri usatores con li sam email-dominia
+      search_same_ip: Altri usatores con li sam IP
+      security: Securitá
+      security_measures:
+        only_password: Solmen un passa-parol
+        password_and_2fa: Passa-parol e 2FA
+      sensitive: Marcar sensitiv
+      sensitized: Marcat quam sensitiv
+      shared_inbox_url: Partit URL de inbuxe
+      show:
+        created_reports: Raportes fat
+        targeted_reports: Raportat de altres
+      silence: Limitar
+      silenced: Limitat
+      statuses: Postas
+      strikes: Precedent violationes
+      subscribe: Abonnar
+      suspend: Suspender
+      suspended: Suspendet
+      suspension_irreversible: Li data de ti-ci conto ha esset deletet ínreversibilmen. Tu posse dessuspender li conto por far it usabil ma it ne va reganiar quelcunc data quel it anteriorimen havet.
+      suspension_reversible_hint_html: Li conto ha esset suspendet, e li data va esser completmen removet ye %{date}. Til tande, li conto posse esser restaurat sin quelcunc mal efectes. Si tu vole remover omni data del conto ínmediatmen, tu posse far it in infra.
+      title: Contos
+      unblock_email: Desbloccar email-adresse
+      unblocked_email_msg: Successosimen desbloccat li email-adresse de %{username}
+      unconfirmed_email: Ínconfirmat email-adresse
+      undo_sensitized: Desmarcar quam sensitiv
+      undo_silenced: Deslimitar
+      undo_suspension: Desfar li suspension
+      unsilenced_msg: Successosimen deslimitat li conto de %{username}
+      unsubscribe: Desabonnar
+      unsuspended_msg: Successosimen dessuspendet li conto de %{username}
+      username: Nómine de usator
+      view_domain: Vider summarium pri li dominia
+      warn: Admonir
+      web: Web
+      whitelisted: Permisset por federation
     action_logs:
       action_types:
+        approve_appeal: Aprobar Apelle
+        approve_user: Aprobar usator
+        assigned_to_self_report: Assignar Raporte
+        change_email_user: Changear li email-adresse del usator
+        change_role_user: Changear li rol del usator
+        confirm_user: Confirmar usator
+        create_account_warning: Crear admonimentes
         create_announcement: Crear un proclamation
-        destroy_announcement: Deleter un proclamation
+        create_canonical_email_block: Crear Email-Blocca
+        create_custom_emoji: Crear Customisat Emoji
+        create_domain_allow: Crear Dominia-Permisse
+        create_domain_block: Crear Dominia-Blocca
+        create_email_domain_block: Crear Email-Dominia-Blocca
+        create_ip_block: Crear regules por IP
+        create_unavailable_domain: Crear Dominia Índisponibil
+        create_user_role: Crear roles
+        demote_user: Demoer Usator
+        destroy_announcement: Deleter proclamation
+        destroy_canonical_email_block: Deleter Email-Blocca
+        destroy_custom_emoji: Deleter Customisat Emoji
+        destroy_domain_allow: Deleter Dominia-Permisse
+        destroy_domain_block: Deleter Dominia-Blocca
+        destroy_email_domain_block: Deleter Email-Dominia-Blocca
+        destroy_instance: Purgar Dominia
+        destroy_ip_block: Deleter regul por IP
+        destroy_status: Deleter Posta
+        destroy_unavailable_domain: Deleter Dominia Índisponibil
+        destroy_user_role: Destructer Rol
+        disable_2fa_user: Desactivisar 2FA
+        disable_custom_emoji: Desactivisar Customisat Emoji
+        disable_sign_in_token_auth_user: Desactivisar autentication per email-claves por usator
+        disable_user: Desactivisar Usator
+        enable_custom_emoji: Activisar Customisat Emoji
+        enable_sign_in_token_auth_user: Activisar autentication per email-claves por usator
+        enable_user: Activisar Usator
+        memorialize_account: Memorialisar Conto
+        promote_user: Promoer Usator
+        reject_appeal: Rejecter Apelle
+        reject_user: Rejecter Usator
+        remove_avatar_user: Remover Avatar
+        reopen_report: Reaperter Raporte
+        resend_user: Reinviar Confirmation
+        reset_password_user: Reiniciar Passa-parol
+        resolve_report: Resoluer Raporte
+        sensitive_account: Fortiar que medie de ti conto es marcat quam sensitiv
+        silence_account: Limitar Conto
+        suspend_account: Suspender Conto
+        unassigned_report: Deassignar Raporte
+        unblock_email_account: Desbloccar email-adresse
+        unsensitive_account: Desfar li fortiation que medie de ti conto es marcat quam sensitiv
+        unsilence_account: Deslimitar Conto
+        unsuspend_account: Dessuspender Conto
         update_announcement: Actualisar un proclamation
+        update_custom_emoji: Actualisar Customisat Emoji
+        update_domain_block: Actualisar Dominia-Blocca
+        update_ip_block: Actualisar regul por IP
+        update_status: Actualisar Posta
+        update_user_role: Actualisar Rol
       actions:
+        approve_appeal_html: "%{name} aprobat li apelle de %{target} contra un decision de moderation"
+        approve_user_html: "%{name} aprobat li registration de %{target}"
+        assigned_to_self_report_html: "%{name} assignat raporte %{target} a su self"
+        change_email_user_html: "%{name} changeat li email-adresse de usator %{target}"
+        change_role_user_html: "%{name} changeat li rol de %{target}"
+        confirm_user_html: "%{name} confirmat li email-adresse de usator %{target}"
+        create_account_warning_html: "%{name} dat un admoniment a %{target}"
         create_announcement_html: "%{name} creat li nov proclamation %{target}"
+        create_canonical_email_block_html: "%{name} bloccat email con li hash %{target}"
+        create_custom_emoji_html: "%{name} cargat nov emoji %{target}"
+        create_domain_allow_html: "%{name} permisset federation con dominia %{target}"
+        create_domain_block_html: "%{name} bloccat dominia %{target}"
+        create_email_domain_block_html: "%{name} bloccat email-dominia %{target}"
+        create_ip_block_html: "%{name} creat regul por IP %{target}"
+        create_unavailable_domain_html: "%{name} haltat liveration a dominia %{target}"
+        create_user_role_html: "%{name} creat li rol %{target}"
+        demote_user_html: "%{name} demoet li usator %{target}"
         destroy_announcement_html: "%{name} deletet li proclamation %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloccat email con li hash %{target}"
+        destroy_custom_emoji_html: "%{name} deletet emoji %{target}"
+        destroy_domain_allow_html: "%{name} interdictet federation con dominia %{target}"
+        destroy_domain_block_html: "%{name} desbloccat dominia %{target}"
+        destroy_email_domain_block_html: "%{name} desbloccat email-dominia %{target}"
+        destroy_instance_html: "%{name} purgat dominia %{target}"
+        destroy_ip_block_html: "%{name} deletet regul por IP %{target}"
+        destroy_status_html: "%{name} removet posta de %{target}"
+        destroy_unavailable_domain_html: "%{name} recomensat liveration a dominia %{target}"
+        destroy_user_role_html: "%{name} deletet li rol %{target}"
+        disable_2fa_user_html: "%{name} desactivisat 2-factor postulation por li usator %{target}"
+        disable_custom_emoji_html: "%{name} desactivisat emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desactivisat autentication per email-clave por %{target}"
+        disable_user_html: "%{name} desactivisat li abilitá de %{target} a intrar"
+        enable_custom_emoji_html: "%{name} activisat emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} activisat autentication per email-clave por %{target}"
+        enable_user_html: "%{name} activisat li abilitá de %{target} a intrar"
+        memorialize_account_html: "%{name} fat li conto de %{target} un págine de memorial"
+        promote_user_html: "%{name} promoet li usator %{target}"
+        reject_appeal_html: "%{name} rejectet li apelle de %{target} contra un decision de moderation"
+        reject_user_html: "%{name} rejectet li registration de %{target}"
+        remove_avatar_user_html: "%{name} removet li avatar de %{target}"
+        reopen_report_html: "%{name} reapertet raporte %{target}"
+        resend_user_html: "%{name} remisset un confirmation-email a %{target}"
+        reset_password_user_html: "%{name} reiniciat li passa-parol del usator %{target}"
+        resolve_report_html: "%{name} soluet raporte %{target}"
+        sensitive_account_html: "%{name} marcat li medie de %{target} quam sensitiv"
+        silence_account_html: "%{name} limitat li conto de %{target}"
+        suspend_account_html: "%{name} suspendet li conto de %{target}"
+        unassigned_report_html: "%{name} deassignat raporte %{target}"
+        unblock_email_account_html: "%{name} desbloccat li email-adresse de %{target}"
+        unsensitive_account_html: "%{name} desmarcat li medie de %{target} quam sensitiv"
+        unsilence_account_html: "%{name} deslimitat li conto de %{target}"
+        unsuspend_account_html: "%{name} dessuspendet li conto de %{target}"
         update_announcement_html: "%{name} actualisat li proclamation %{target}"
+        update_custom_emoji_html: "%{name} actualisat emoji %{target}"
+        update_domain_block_html: "%{name} actualisat li dominia-blocca de %{target}"
+        update_status_html: "%{name} actualisat posta de %{target}"
+        update_user_role_html: "%{name} changeat li rol %{target}"
+      deleted_account: deletet conto
+      filter_by_action: Filtrar per action
+      filter_by_user: Filtrar per usator
     announcements:
       destroyed_msg: Proclamation deletet successosimen!
       edit:
@@ -30,23 +302,448 @@ ie:
       unpublish: Despublicar
       unpublished_msg: Proclamation despublicat successosimen!
       updated_msg: Proclamation actualisat successosimen!
+    critical_update_pending: Urgente actualisation atendent
+    custom_emojis:
+      assign_category: Assignar categorie
+      by_domain: Dominia
+      copied_msg: Successosimen creat un local copie del emoji
+      copy: Copiar
+      copy_failed_msg: Ne posset crear un local copie de ti-ta emoji
+      create_new_category: Crear nov categorie
+      created_msg: Emoji successosimen creat!
+      delete: Deleter
+      destroyed_msg: Emoji successosimen deletet!
+      disable: Desactivisar
+      disabled: Desactivisat
+      disabled_msg: Successosimen desactivisat ti emoji
+      emoji: Emoji
+      enable: Activar
+      enabled: Activ
+      enabled_msg: Successosimen activisat ti emoji
+      image_hint: PNG o GIF minu quam %{size}
+      list: Inlistar
+      listed: Inlistat
+      new:
+        title: Adjunter nov customisat emoji
+      no_emoji_selected: Null emoji esset changeat pro que null esset selectet
+      not_permitted: Tu ne es permisset far ti action
+      shortcode_hint: Adminim 2 carácteres, solmen lítteres, ciffres e sublineas
+      title: Customisat emoji
+      uncategorized: Íncategorisat
+      unlist: Delistar
+      unlisted: Delistat
+      update_failed_msg: Ne posset actualisar ti emoji
+      updated_msg: Emoji successosimen actualisat!
+      upload: Cargar
+    dashboard:
+      active_users: activ usatores
+      interactions: interactiones
+      media_storage: Inmagasination de medie
+      new_users: nov usatores
+      opened_reports: raportes apertet
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> pendent apelle"
+        other: "<strong>%{count}</strong> pendent apelles"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> pendent raporte"
+        other: "<strong>%{count}</strong> pendent raportes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> pendent hashtag"
+        other: "<strong>%{count}</strong> pendent hashtags"
+      pending_users_html:
+        one: "<strong>%{count}</strong> pendent usator"
+        other: "<strong>%{count}</strong> pendent usatores"
+      resolved_reports: raportes soluet
+      software: Programmas
+      sources: Fontes de adhesiones
+      space: Usation de spacie
+      title: Panel de control
+      top_languages: Max activ lingues
+      top_servers: Max activ servitores
+      website: Websitu
+    disputes:
+      appeals:
+        empty: Null apelles trovat.
+        title: Apelles
+    domain_allows:
+      add_new: Permisse federation con dominia
+      created_msg: Dominia ha esset successosimen permisset por federation
+      destroyed_msg: Dominia ha esset interdictet por federation
+      export: Exportar
+      import: Importar
+      undo: Interdicter federation con dominia
+    domain_blocks:
+      add_new: Adjunte nov dominia-blocca
+      confirm_suspension:
+        cancel: Anullar
+        confirm: Suspender
+        permanent_action: Desfar li suspension ne va restaurar quelcunc data o relation.
+        preamble_html: Tu va suspender <strong>%{domain}</strong> e su subdominias.
+        remove_all_data: Ti va remover omni contenete, medie e profil-data por li contos de ti-ci dominia de tui servitor.
+        stop_communication: Tui servitor va haltar comunication con ti servitores.
+        title: Confirmar dominia-blocca por %{domain}
+        undo_relationships: Ti va desfar quelcunc seque-relation inter contos de ti servitores e tis de tui.
+      created_msg: On tracta li dominia-blocca nu
+      destroyed_msg: Dominia-blocca ha esset desfat
+      domain: Dominia
+      edit: Modificar dominia-blocca
+      existing_domain_block: Tu ja ha imposit plu strict límites sur %{name}.
+      existing_domain_block_html: Tu ja ha imposit plu strict límites sur %{name}, tu besona <a href="%{unblock_url}">desbloccar it</a> erst.
+      export: Exportar
+      import: Importar
+      new:
+        create: Crear blocca
+        hint: Li dominia-blocca ne va prevenir li creation de intradas por contos in li database, ma it va retroactivmen e automaticmen aplica specific metodes de moderation a ti contos.
+        severity:
+          desc_html: "<strong>Limitar</strong> va far que postas de contos che ti dominia es ínvisibil a quicunc ne ja seque les. <strong>Suspender</strong> va remover omni contenete, medie e profil-data por li contos de ti dominia de tui servitor. Usa <strong>Null</strong> si tu vole simplicmen rejecter medie-files."
+          noop: 'Null'
+          silence: Limitar
+          suspend: Suspender
+        title: Nov dominia-blocca
+      no_domain_block_selected: Null dominia-bloccas esset changeat pro que null esset selectet
+      not_permitted: Tu ne es permisset far ti action
+      obfuscate: Obscurar dominia-nómine
+      obfuscate_hint: Partialmen obscurar li dominia-nómine in li liste si li publication de dominia-limitationes es activisat
+      private_comment: Privat comenta
+      private_comment_hint: Comenta pri ti dominia-limitation por usation internal del moderatores.
+      public_comment: Public comenta
+      public_comment_hint: Comenta pri ti dominia-limitation por li general public, si li publication del liste de dominia-limitationes es activisat.
+      reject_media: Rejecter medie-files
+      reject_media_hint: Remove medie-files inmagasinat localmen e refusa descargar quelcunc plu in li futur. Ínpertinent por suspensiones
+      reject_reports: Rejecter raportes
+      reject_reports_hint: Ignorar omni raportes venient de ti dominia. Ínpertinent por suspensiones
+      undo: Desfar dominia-blocca
+      view: Vider dominia-blocca
+    email_domain_blocks:
+      add_new: Adjunter un nov
+      attempts_over_week:
+        one: "%{count} registration-prova durant li ultim semane"
+        other: "%{count} registration-prova durant li ultim semane"
+      created_msg: Successosimen bloccat email-dominia
+      delete: Deleter
+      dns:
+        types:
+          mx: Registre MX
+      domain: Dominia
+      new:
+        create: Adjunter dominia
+        resolve: Resolver un dominia
+        title: Bloccar nov email-dominia
+      no_email_domain_block_selected: Null email-dominia-bloccas esset changeat pro que null esset selectet
+      not_permitted: Ne permisset
+      title: Bloccat email-dominias
+    export_domain_allows:
+      new:
+        title: Importar permisset dominias
+      no_file: Null file selectet
+    export_domain_blocks:
+      import:
+        description_html: Tu va importar un liste de dominia-bloccas. Ples controlar ti liste tre cuidosimen, precipue si tu ne creat li liste personalmen.
+        existing_relationships_warning: Existent seque-relationes
+        private_comment_description_html: 'Por auxiliar te saver de u veni importat bloccas, importat bloccas va esser creat con li sequent privat comenta: <q>%{comment}</q>'
+        private_comment_template: Importat de %{source} ye %{date}
+        title: Importar dominia-bloccas
+      invalid_domain_block: 'Un o plu dominia-bloccas esset omisset pro li sequent errore(s): %{error}'
+      new:
+        title: Importar dominia-bloccas
+      no_file: Null file selectet
+    follow_recommendations:
+      language: Por li lingue
+      status: Statu
+      suppress: Supresser seque-recomandation
+      suppressed: Supresset
+      title: Seque-recomandationes
+      unsuppress: Restaurar seque-recomandation
+    instances:
+      availability:
+        title: Disponibilitá
+        warning: Li ultim prova conexer a ti servitor ha esset ínsuccessosi
+      back_to_all: Omni
+      back_to_limited: Limitat
+      back_to_warning: Admonit
+      by_domain: Dominia
+      confirm_purge: Vole tu vermen permanentmen deleter data de ti dominia?
+      content_policies:
+        comment: Internal nota
+        policy: Politica
+        reason: Visibil rason
+        title: Politicas pri contenete
+      delivery:
+        unavailable: Índisponibil
+      delivery_error_hint: Si liveration ne es possibil durant %{count} dies, it va esser marcat automaticmen quam ínliverabil.
+      destroyed_msg: Data de %{domain} es nu in li linea por iminent deletion.
+      empty: Null dominias trovat.
+      known_accounts:
+        one: "%{count} conosset conto"
+        other: "%{count} conosset contos"
+      moderation:
+        all: Omni
+        limited: Limitat
+        title: Moderation
+      private_comment: Privat comenta
+      public_comment: Public comenta
+      purge: Purgar
+      title: Federation
+      total_blocked_by_us: Bloccat de nos
+      total_followed_by_them: Sequet de les
+      total_followed_by_us: Sequet de nos
+      total_reported: Raportes pri les
+      total_storage: Medie-atachamentes
+      totals_time_period_hint_html: Li totales monstrat in infra include data por omni témpor.
+      unknown_instance: Actualmen hay null registre de ti dominia che ti-ci servitor.
+    invites:
+      deactivate_all: Desactivisar omni
+      filter:
+        all: Omni
+        available: Disponibil
+        expired: Expirat
+        title: Filtre
+      title: Invitationes
+    ip_blocks:
+      add_new: Crear regul
+      created_msg: Successosimen adjuntet nov IP-regul
+      delete: Deleter
+      expires_in:
+        '1209600': 2 semanes
+        '15778476': 6 mensus
+        '2629746': 1 mensu
+        '31556952': 1 annu
+        '86400': 1 die
+        '94670856': 3 annus
+      new:
+        title: Crear nov IP-regul
+      no_ip_block_selected: Null IP-regules esset changeat pro que null esset selectet
+      title: Regules por IPs
+    relationships:
+      title: Li relationes de %{acct}
+    relays:
+      add_new: Adjunter un nov relé
+      delete: Deleter
+      description_html: Un <strong>federational relé</strong> es un intermediari servitor quel exchangea grandissim quantitás de public postas inter li servitores queles abonna e publicar a it. <strong>It posse auxiliar micri e medial servitores decovrir contenete del fediverse</strong>, quel altrimen vell besonar que local usatores seque altri persones che lontan servitores manualmen.
+      disable: Desactivisar
+      disabled: Desactivisat
+      enable: Activisar
+      enable_hint: Pos activisation, tui servitor va abonnar al omni public postas de ti relé, e va comensar misser li public postas de ti-ci servitor a it.
+      enabled: Activisat
+      inbox_url: URL del relé
+      pending: Atendent li aprobation del relé
+      save_and_enable: Conservar e activisar
+      setup: Etablisser un conexion a un relé
+      signatures_not_enabled: Relés fórsan ne va functionar corectmen si secur mode o mode de limitat federation es activisat
+      status: Statu
+      title: Relés
+    report_notes:
+      created_msg: Raportal nota creat successosimen!
+      destroyed_msg: Raportal nota deletet successosimen!
+    reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+      action_taken_by: Action fat de
+      actions:
+        delete_description_html: Li raportat postas va esser deletet e un admoniment va esser registrat por auxiliar te escalar si hay futuri infractiones del sam conto.
+        mark_as_sensitive_description_html: Li medie in li raportat postas va esser marcat quam sensitiv e un admoniment va esser registrat por auxiliar te escalar si hay futuri infractiones del sam conto.
+        other_description_html: Vider plu optiones por controlar li conduida del conto e customisar comunication al raportat conto.
+        resolve_description_html: Null action va esser fat contra li raportat conto, null admoniment registrat, e li raporte va esser cludet.
+        silence_description_html: Li conto va esser visibil nur a tis qui ja seque it o qui sercha it manualmen, limitante severimen su atingement. Ti sempre posse esser revertet. Ti clude omni raportes contra ti conto.
+      add_to_report: Adjunter plu al raporte
+      are_you_sure: Es tu cert?
+      assign_to_self: Assignar it a me
+      assigned: Assignat moderator
+      by_target_domain: Dominia del conto raportat
+      cancel: Anullar
+      category: Categorie
+      category_description_html: Li rason pro quel ti conto e/o contenete esset raportat va esser citat in comunication con li conto raportat
+      comment:
+        none: 'Null'
+      comment_description_html: 'Por provider plu mult information, %{name} scrit:'
+      confirm: Confirmar
+      confirm_action: Confirmar moderatori action contra @%{acct}
+      created_at: Raportat
+      delete_and_resolve: Deleter postas
+      mark_as_resolved: Marcar quam soluet
+      mark_as_sensitive: Marcar quam sensitiv
+      mark_as_unresolved: Marcar quam ínsoluet
+      no_one_assigned: Nequi
+      notes:
+        create: Adjunter nota
+        create_and_resolve: Soluer med nota
+        create_and_unresolve: Reaperter med nota
+        delete: Deleter
+        placeholder: Descrir li actiones queles ha esset fat, o quelcunc altri relatent actualisationes...
+        title: Notas
+      notes_description_html: Vider e lassar notas a altri moderatores e a tui futuri self
+      processed_msg: 'Raporte #%{id} successosimen tractat'
+      quick_actions_description_html: 'Fa un rapid action o ear ad-infra por vider li contenete raportat:'
+      remote_user_placeholder: li lontan usator de %{instance}
+      reopen: Reaperter raporte
+      report: 'Raporte #%{id}'
+      reported_account: Raportat conto
+      reported_by: Raportat de
+      resolved: Soluet
+      resolved_msg: Raporte successosimen soluet!
+      skip_to_actions: Ear rect al actiones
+      status: Statu
+      statuses: Contenete raportat
+      title: Raportes
     roles:
+      categories:
+        moderation: Moderation
       privileges:
+        administrator: Administrator
         manage_announcements: Tractar proclamationes
         manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
+        manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
+        manage_users: Gerer usatores
+      title: Roles
+    rules:
+      add_new: Adjunter un regule
+    settings:
+      about:
+        title: Pri
+      appearance:
+        title: Aspecte
+      domain_blocks:
+        users: A local usatores qui ha initiat session
+    site_uploads:
+      delete: Deleter cargat file
+      destroyed_msg: Cargat file successosimen deletet!
+    software_updates:
+      type: Tip
+      version: Version
+    statuses:
+      account: Autor
+      language: Lingue
+      metadata: Metadata
+      visibility: Visibilitá
+    title: Administration
+    trends:
+      approved: Aprobat
+      statuses:
+        shared_by:
+          one: Partit o favoritisat un vez
+          other: Partit e favoritisat %{friendly_count} vezes
+      tags:
+        listable: Suggestibil
+        not_listable: Ne suggestibil
+        not_usable: Prohibit
+        usable: Permisset
+        usage_comparison: 'Usat hodie: %{today} vez(es), yer: %{yesterday}'
+    webhooks:
+      events: Evenimentes
+      status: Statu
+  application_mailer:
+    salutation: "%{name},"
+  auth:
+    confirmations:
+      welcome_title: Benevenit, %{name}!
+    delete_account: Deleter li conto
+    forgot_password: Obliviat tu tui passa-parol?
+    invalid_reset_password_token: Li clave por reiniciar li passa-parol es ínvalid o expirat. Ples demandar un nov.
+    reset_password: Reiniciar passa-parol
+    rules:
+      accept: Acceptar
+      back: Retro
+    security: Securitá
+    set_new_password: Establisser nov passa-parol
+  challenge:
+    confirm: Continuar
+    hint_html: "<strong>Nota</strong>: On ne va petir tui passa-parol denov por li venient hor."
+    invalid_password: Ínvalid passa-parol
+    prompt: Confirmar passa-parol por avansar
+  date:
+    formats:
+      default: "%d.%m.%Y"
+      with_month_name: "%d. %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}h"
+      about_x_years: "%{count}a"
+      almost_x_years: "%{count}a"
+      x_seconds: "%{count}s"
+  deletes:
+    confirm_password: Introducte tui actual passa-parol por verificar tui identitá
+    proceed: Deleter li conto
+  disputes:
+    strikes:
+      appeal: Apellar
   exports:
+    archive_takeout:
+      date: Date
+      size: Grandore
+    blocks: Tu ha bloccat
+    bookmarks: Marcatores
+    csv: CSV
+    lists: Listes
     mutes: Tu silentia
   featured_tags:
+    add_new: Adjunter un nov
     hint_html: "<strong>Pinglar tui max important hashtags sur tui profil.</strong> Un bonissim maniere de mantener un registre de tui ovres e projectes, pinglat hashtags es monstrat prominentmen sur tui profil e permisse rapid accesse a tui propri postas."
+  filters:
+    contexts:
+      account: Profiles
+      thread: Conversationes
+    index:
+      title: Filtres
+    new:
+      save: Conservar nov filtre
+  generic:
+    all: Omni
+    cancel: Anullar
+    changes_saved_msg: Modificationes conservat successosimen!
+    confirm: Confirmar
+    copy: Copiar
+    none: 'Null'
+    save_changes: Conservar changes
+    today: hodie
   imports:
+    errors:
+      empty: li file es vacui
+      invalid_csv_file: 'Ínvalid file CSV. Errore: %{error}'
+      over_rows_processing_limit: contene plu quam %{count} lineas
+      too_large: li file es tro grand
+    imported: Importat
+    modes:
+      merge: Coalescer
     overwrite_preambles:
       muting_html: Tu va <strong>remplazzar tui liste de silentiat contos</strong> per til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
     preambles:
       muting_html: Tu va <strong>silentiar</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+    states:
+      finished: Finit
     titles:
+      lists: Importar listes
       muting: Importation de silentiat contos
+    type: Tip de importation
     type_groups:
+      constructive: Seques e marcatores
       destructive: Bloccas & silentias
+    types:
+      blocking: Liste de bloccas
+      bookmarks: Marcatores
+      following: Liste de sequetes
+      lists: Listes
+    upload: Cargar
+  invites:
+    expired: Expirat
+    expires_in:
+      '1800': 30 minutes
+      '21600': 6 hores
+      '3600': 1 hor
+      '43200': 12 hores
+      '604800': 1 semane
+      '86400': 1 die
+    expires_in_prompt: Nequande
+  login_activities:
+    authentication_methods:
+      password: passa-parol
+    description_html: Si tu vide activitá quel tu ne conosse, considera changear tui passa-parol e activisar 2-factor autentication.
+  mail_subscriptions:
+    unsubscribe:
+      title: Desabonnar
+  migrations:
+    set_redirect: Configurar un redirection
   move_handler:
     carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat.
   notification_mailer:
@@ -57,12 +754,110 @@ ie:
       title: Nov petition de sequer
     mention:
       action: Responder
+    poll:
+      subject: Un balotation de %{name} ha finit
+  otp_authentication:
+    enable: Activar
+    setup: Configurar
+  pagination:
+    next: Seq
+    prev: Prec
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tu ja votat in ti-ci balotation
+      duplicate_options: contene duplicat elementes
+      duration_too_long: es tro distant in li futur
+      duration_too_short: es tro tost
+      expired: Li balotation ja finit
+      invalid_choice: Li option por quel tu votat ne existe
+      over_character_limit: ne posse esser plu long quam %{max} carácteres chascun
+      self_vote: On ne posse votar en su propri balotationes
+      too_few_options: deve haver plu quam un option
+      too_many_options: ne posse contener plu quam %{max} optiones
+  preferences:
+    other: Altri
+  privacy:
+    search: Sercha
+  relationships:
+    activity: Activitá de conto
+    dormant: Dormient
+    mutual: Reciproc
+    status: Statu del conto
+  sessions:
+    activity: Ultim activitá
+    browser: Navigator
+    browsers:
+      chrome: Chrome
+      electron: Electron
+      generic: Ínconosset navigator
+      unknown_browser: Ínconosset navigator
+    description: "%{browser} in %{platform}"
+    explanation: Tis-ci es li navigatores queles actualmen ha initiat sessiones a tui Mastodon-conto.
+    ip: IP
+    platforms:
+      unknown_platform: Ínconosset platform
+      windows: Windows
+    revoke: Revocar
+  settings:
+    account: Conto
+    appearance: Aspecte
   statuses:
+    attached:
+      description: 'Atachat: %{attached}'
+      image:
+        one: "%{count} image"
+        other: "%{count} images"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    default_language: Sam quam li lingue del interfacie
+    edited_at_html: Modificat ye %{date}
     pin_errors:
       direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores
       limit: Tu ja ha pinglat li maxim númere de postas
       ownership: On ne posse pinglar li posta de un altri person
       reblog: On ne posse pinglar un boost
+    poll:
+      total_people:
+        one: "%{count} person"
+        other: "%{count} persones"
+      total_votes:
+        one: "%{count} vote"
+        other: "%{count} votes"
+      vote: Votar
+    title: "%{name}: «%{quote}»"
+    visibilities:
+      public: Public
+      unlisted: Delistat
   statuses_cleanup:
+    exceptions: Exceptiones
     keep_pinned: Conservar pinglat postas
     keep_pinned_hint: Delete null de tui pinglat postas
+    keep_polls: Conservar balotationes
+    keep_polls_hint: Delete null de tui balotationes
+    min_age:
+      '1209600': 2 semanes
+      '31556952': 1 annu
+  time:
+    formats:
+      default: "%d.%m.%Y ye %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+  two_factor_authentication:
+    add: Adjunter
+  user_mailer:
+    suspicious_sign_in:
+      change_password: changear tui passa-parol
+    warning:
+      categories:
+        spam: Spam
+      reason: 'Rason:'
+      subject:
+        none: Admoniment por %{acct}
+    welcome:
+      subject: Benevenit a Mastodon
+  users:
+    seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
+  verification:
+    verification: Verification
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index eeaa3294e2..626d2da7ec 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1 +1,622 @@
+---
 lad:
+  about:
+    about_mastodon_html: 'La red sosyala del avenir: Sin reklamas, sin vijilansia korporativa, kon desen etiko, i desentralizasyon! Seas patron de tu enformasyon kon Mastodon!'
+    contact_missing: No espesifikado
+    contact_unavailable: No desponivle
+    hosted_on: Mastodon balabayado en %{domain}
+    title: Sovre mozotros
+  accounts:
+    follow: Sige
+    followers:
+      one: Suivante
+      other: Suivantes
+    following: Sigiendo
+    instance_actor_flash: Este kuento es un aktor virtual utilizado para reprezentar al sirvidor en si mezmo i no a dingun utilizador individual. Se utiliza para butos de la federasyon i no se deve suspender.
+    last_active: ultima koneksyon
+    link_verified_on: La propiedad de este atadijo fue verifikada el %{date}
+    nothing_here: No ay niente aki!
+    pin_errors:
+      following: Deves estar sigiendo a la persona a la ke keres achetar
+    posts_tab_heading: Publikasyones
+  admin:
+    account_actions:
+      action: Realiza aksion
+      title: Modera %{acct}
+    account_moderation_notes:
+      create: Kriya nota
+      created_msg: Nota de moderasyon kriyada kon sukseso!
+      destroyed_msg: Nota de moderasyon destruida kon sukseso!
+    accounts:
+      add_email_domain_block: Bloka domeno de posta
+      approve: Achetar
+      approved_msg: La solisitasyon de enrejistrasyon de %{username} achetada djustamente
+      are_you_sure: Estas siguro?
+      avatar: Imaje de profil
+      by_domain: Domeno
+      change_email:
+        changed_msg: Adreso de posta trokado kon sukseso!
+        current_email: Posta elektronika aktuala
+        label: Troka la posta elektronika
+        new_email: Mueva posta elektronika
+        submit: Troka la posta elektronika
+        title: Troka la posta elektronika de %{username}
+      change_role:
+        changed_msg: Rolo trokado kon sukseso!
+        label: Troka rolo
+        no_role: Sin rolo
+        title: Troka rolo para %{username}
+      confirm: Konfirma
+      confirmed: Konfirmado
+      confirming: Konfirmando
+      custom: Personalizado
+      delete: Efasa datos
+      deleted: Kitado
+      demote: Degrada
+      destroyed_msg: Los datos de %{username} estan agora en kola para ser supremir pishin
+      disable: Inkapasita
+      disable_sign_in_token_auth: Inkapasita la autentifikasyon por token de posta elektronika
+      disable_two_factor_authentication: Inkapasita autentifikasyon en dos pasos
+      disabled: Inkapasitada
+      display_name: Nombre amostrado
+      domain: Domeno
+      edit: Edita
+      email: Posta elektronika
+      email_status: Estatus de posta
+      enable: Kapasita
+      enable_sign_in_token_auth: Kapasita la autentifikasyon por token de posta elektronika
+      enabled: Kapasitada
+      enabled_msg: El kuento de %{username} fue kapasitado djustamente
+      followers: Suivantes
+      follows: Segimientos
+      header: Kavesera
+      inbox_url: URL del kuti de arivo
+      invite_request_text: Razones para unirse
+      invited_by: Envitado por
+      ip: IP
+      joined: Unido
+      location:
+        all: Todos
+        local: Lokal
+        remote: Remoto
+        title: Lokalizasyon
+      login_status: Estado de koneksyon kon kuento
+      media_attachments: Aneksos de multimedia
+      memorialize: Konvirtir en memorial
+      memorialized: Kuento komemorativo
+      memorialized_msg: "%{username} se konvirtido kon sukseso en un kuento komemorativo"
+      moderation:
+        active: Aktivo
+        all: Todos
+        disabled: Inkapasitado
+        pending: Asperando
+        silenced: Limitado
+        suspended: Suspendido
+        title: Moderasyon
+      moderation_notes: Notas de moderasyon
+      most_recent_activity: Aktivita mas reziente
+      most_recent_ip: IP mas muevo
+      no_account_selected: Dinguno kuento fue trokado komo dinguno fue eskojido
+      no_limits_imposed: Sin limites forsados
+      no_role_assigned: Dingun rolo apropyado
+      not_subscribed: No se esta abonado
+      pending: Revizion esta asperando
+      perform_full_suspension: Suspende
+      previous_strikes: Amonestamientos previos
+      previous_strikes_description_html:
+        one: Este kuento tiene <strong>un</strong> amonestamiento.
+        other: Este kuento tiene <strong>%{count}</strong> amonestamientos.
+      promote: Promosyonar
+      protocol: Protokol
+      public: Publiko
+      push_subscription_expires: Ekspirasyon del abonamiento PuSH
+      redownload: Arefreskar profil
+      redownloaded_msg: Se aktualizo djustamente el profil de %{username} dizde el orijin
+      reject: Refuza
+      rejected_msg: La solisitasyon de enrejistrasyon de %{username} a sido refuzada kon sukseso
+      remote_suspension_irreversible: Los datos de este kuento fueron irreversivlemente supremidos.
+      remote_suspension_reversible_hint_html: El kuento fue suspendido en este sirvidor i los datos seran totalmente supremidos el %{date}. Asta estonses el sirvidor remoto puede restaurar este kuento sin dingun efekto negativo. Si keres supremir todos los datos del kuento pishin, puedes fazerlo a kontinuasyon.
+      remove_avatar: Efasa imaje de profil
+      remove_header: Efasa kavesera
+      removed_avatar_msg: Se tiene supremido kon sukseso la imaje de profil de %{username}
+      removed_header_msg: Se tiene supremido kon sukseso la imaje de kavesera de %{username}
+      resend_confirmation:
+        already_confirmed: Este utilizador ya esta konfirmado
+        send: Reembia la posta elektronika de konfirmasyon
+        success: Posta elektronika de konfirmasyon embiada kon sukseso!
+      reset: Reinisya
+      reset_password: Reinisya kod
+      resubscribe: Reabona
+      role: Rolo
+      search: Bushka
+      search_same_email_domain: Otros utilizadores kon el mezmo domeno de posta
+      search_same_ip: Otros utilizadores kon el mezmo adreso IP
+      security: Sigurita
+      security_measures:
+        only_password: Solo kod
+        password_and_2fa: Kod i A2P
+      sensitive: Sensivle
+      sensitized: Markado komo sensivle
+      shared_inbox_url: URL de kuti partajado
+      show:
+        created_reports: Raportos embiados por este kuento
+        targeted_reports: Raportos embiados sovre este kuento
+      silence: Limita
+      silenced: Limitado
+      statuses: Publikasyones
+      strikes: Amonestamientos previos
+      subscribe: Abona
+      suspend: Suspende
+      suspended: Suspendido
+      suspension_irreversible: Los datos de este kuento fueron irreversivlemente supremidos. Puedes dezazer la suspensyon del kuento para fazerlo utilizavle, ama no rekuperaras los datos los kualos tenias mas antes.
+      suspension_reversible_hint_html: El kuento fue suspendido i los datos se supremiran kompletamente el %{date}. Asta estonses, el kuento puede ser restaurado sin dingun efekto negativo. Si keres supremir todos los datos del kuento pishin, puedes fazerlo a kontinuasyon.
+      title: Kuentos
+      unblock_email: Dezbloka adreso de posta
+      unblocked_email_msg: Tienes dezblokado el adreso de posta de %{username}
+      unconfirmed_email: Posta elektronika sin konfirmasyon
+      undo_sensitized: Dezmarka komo sensivle
+      undo_silenced: No limita
+      undo_suspension: Desuspende
+      unsilenced_msg: Se kito kon sukseso el limito del kuento %{username}
+      unsubscribe: Deabona
+      unsuspended_msg: Se kito kon sukseso la suspensyon del kuento de %{username}
+      username: Nombre de utilizador
+      view_domain: Ve rezumen del domeno
+      warn: Averte
+      web: Web
+      whitelisted: Permitido para la federasyon
+    action_logs:
+      action_types:
+        approve_appeal: Acheta apelasyon
+        approve_user: Acheta utilizador
+        assigned_to_self_report: Asinya raporto
+        change_email_user: Troka posta elektronika del utilizador
+        change_role_user: Troka rolo de utilizador
+        confirm_user: Konfirma utilizador
+        create_account_warning: Kriya avertensya
+        create_announcement: Kriya pregon
+        create_canonical_email_block: Kriya bloko de posta elektronika
+        create_custom_emoji: Kriya emoji personalizado
+        create_domain_allow: Kriya permiso de domeno
+        create_domain_block: Kriya bloko de domeno
+        create_email_domain_block: Kriya bloko de domeno de posta
+        create_ip_block: Kriya regla de IP
+        create_unavailable_domain: Kriya domeno no desponivle
+        create_user_role: Kriya rolo
+        demote_user: Degrada utilizador
+        destroy_announcement: Efasa pregon
+        destroy_canonical_email_block: Efasa bloko de posta elektronika
+        destroy_custom_emoji: Efasa emoji personalizado
+        destroy_domain_allow: Efasa permiso de domeno
+        destroy_domain_block: Efasa bloko de domeno
+        destroy_email_domain_block: Efasa bloko de domeno de posta
+        destroy_instance: Efasa domeno
+        destroy_ip_block: Efasa regla de IP
+        destroy_status: Efasa publikasyon
+        destroy_unavailable_domain: Efasa domeno no desponivle
+        destroy_user_role: Efasa rolo
+        disable_2fa_user: Inkapasita autentifikasyon en dos pasos
+        disable_custom_emoji: Inkapasita emoji personalizados
+        disable_sign_in_token_auth_user: Inkapasita la autentifikasyon por token de posta elektronika para el utilizador
+        disable_user: Inkapasita utilizador
+        enable_custom_emoji: Kapasita emoji personalizados
+        enable_sign_in_token_auth_user: Kapasita la autentifikasyon por token de posta para el utilizador
+        enable_user: Kapasita utilizador
+        memorialize_account: Transforma en kuento komemorativo
+        promote_user: Promove utilizador
+        reject_appeal: Refuza apelasyon
+        reject_user: Refuza utilizador
+        remove_avatar_user: Efasa imaje de profil
+        reopen_report: Reavre raporto
+        resend_user: Reembia posta de konfirmasyon
+        reset_password_user: Reinisya kod
+        resolve_report: Rezolve raporto
+        sensitive_account: Marka multimedia en tu kuento komo sensivle
+        silence_account: Limita kuento
+        suspend_account: Suspende kuento
+        unassigned_report: Dezasinya raporto
+        unblock_email_account: Dezbloka adreso de posta
+        unsensitive_account: Dezmarka multimedia en tu kuento komo sensivle
+        unsilence_account: No limita kuento
+        unsuspend_account: Desuspende kuento
+        update_announcement: Aktualiza pregon
+        update_custom_emoji: Aktualiza emoji personalizado
+        update_domain_block: Aktualiza bloko de domeno
+        update_ip_block: Aktualiza regla de IP
+        update_status: Aktualiza publikasyon
+        update_user_role: Aktualiza rolo
+      actions:
+        unsilence_account_html: "%{name} kito el limite del kuento de %{target}"
+        unsuspend_account_html: "%{name} reaktivo el kuento de %{target}"
+        update_announcement_html: "%{name} aktualizo el pregon %{target}"
+        update_custom_emoji_html: "%{name} aktualizo el emoji %{target}"
+        update_domain_block_html: "%{name} aktualizo el bloko de domeno para %{target}"
+        update_ip_block_html: "\"%{name} troko la regla de IP %{target}"
+        update_status_html: "%{name} aktualizo la publikasyon de %{target}"
+        update_user_role_html: "%{name} troko el rolo %{target}"
+      deleted_account: kuento supremido
+      empty: No se toparon rejistros.
+      filter_by_action: Filtra por aksion
+      filter_by_user: Filtra por utilizador
+      title: Log de revizyon
+    announcements:
+      destroyed_msg: Pregon supremido kon sukseso!
+      edit:
+        title: Edita pregon
+      empty: No se toparon pregones.
+      live: En bivo
+      new:
+        create: Kriya pregon
+        title: Muevo pregon
+      publish: Publika
+      published_msg: Pregon publikado kon sukseso!
+      scheduled_for: Programado para %{time}
+      scheduled_msg: Pregon programado para su publikasyon!
+      title: Pregones
+      unpublish: Retirar publikasyon
+      unpublished_msg: Pregon retirado kon sukseso!
+      updated_msg: Pregon aktualizado kon sukseso!
+    custom_emojis:
+      assign_category: Asinyar kategoria
+      by_domain: Domeno
+      copied_msg: Kopia lokala del emoji kriyada kon sukseso
+      copy: Kopia
+      copy_failed_msg: No se pudo realizar una kopia lokala de akel emoji
+      create_new_category: Kriya una mueva kategoria
+      created_msg: Emoji kriyado kon sukseso!
+      delete: Efasa
+      destroyed_msg: Emoji destruyido kon sukseso!
+      disable: Inkapasita
+      disabled: Inkapasitado
+      disabled_msg: Se inkapasito akel emoji kon sukseso
+      emoji: Emoji
+      enable: Kapasita
+      enabled: Kapasitado
+      enabled_msg: Se kapasito akel emoji kon sukseso
+      image_hint: PNG o GIF asta %{size}
+      list: Lista
+      listed: Listados
+      new:
+        title: Adjustar muevo emoji personalizado
+      no_emoji_selected: No se troko dingun emoji porke no eskojites dinguno
+      not_permitted: No tienes permiso para realizar esta aksyon
+    domain_blocks:
+      existing_domain_block_html: Ya tienes forsado limitos mas estriktos a %{name}, kale <a href="%{unblock_url}">dezblokarlo primero</a>.
+      export: Eksporto
+      import: Importo
+      new:
+        create: Kriya bloko
+        hint: El bloko de domeno no prevendra la kriyasyon de entradas de kuento en la baza de datos, ama aplikara retroaktiva i otomatikamente metodos de moderasyon espesifika en dichos kuentos.
+        severity:
+          desc_html: "<strong>Limitar</strong> ara las publikasyones del kuento invizivles a kualkiera ke no lo este sigiendo. <strong>Suspender</strong> supremira todo el kontenido, media, i datos del profil. Uza <strong>Dinguno</strong> si solo keres refuzar dosyas multimedia."
+          noop: Dinguno
+          silence: Limita
+          suspend: Suspende
+        title: Muevo bloko de domeno
+      no_domain_block_selected: Dingun bloko de domeno tiene sido trokado deke dingun tiene sido eskojido
+      not_permitted: No tienes permiso para egzekutar esta aksyon
+      obfuscate: Eskonde nombre de domeno
+      obfuscate_hint: Eskonde una parte del nombre de domeno en la lista si amostrar la lista de limitasyones de domeno esta kapasitado
+      private_comment: Komento privado
+      private_comment_hint: Komento sovre esta limitasyon de domeno para el uzo interno por parte de los moderadores.
+      public_comment: Komento publiko
+      public_comment_hint: Komento sovre esta limitasyon de domeno para el publiko en djeneral, si la publisita de la lista de limitasyones de domeno esta kapasitada.
+      reject_media: Refuza dosyas de multimedia
+      reject_media_hint: Efasa dosyas multimedia magazinadas lokalmente para abashar kualkiera en el avenir. No relevante para suspensiones
+      reject_reports: Refuza raportos
+      reject_reports_hint: Ignora todos los raportos de este domeno. No relevante para suspensiones
+      undo: Dezaz bloko de domeno
+      view: Ve domeno blokado
+    email_domain_blocks:
+      add_new: Adjustar muevo
+      attempts_over_week:
+        one: "\"%{count} prova durante la ultima semana"
+        other: "%{count} provas de enrejistrarse durante la ultima semana"
+      created_msg: Domeno de posta blokado kon sukseso
+      delete: Efasa
+      dns:
+        types:
+          mx: Defter MX
+      domain: Domeno
+      new:
+        create: Adjusta domeno
+        resolve: Rezolve domeno
+        title: Bloka muevo domeno de posta
+      no_email_domain_block_selected: No se tienen trokado blokos de domeno porke dinguno a sido eskojido
+      not_permitted: Sin permiso
+      resolved_dns_records_hint_html: El nombre de domeno rezolve los sigientes domenos MX, los kualos son responsavles en ultima instansya de achetar la posta elektronika. Blokar un domeno MX blokara los rejistros de kualkier adreso de posta elektronika ke utilize el mezmo domeno MX, inkluzo si el nombre de domeno vizivle es desferente. <strong>Tenga kudiado de no blokar los prinsipales domenos de posta elektronika.</strong>
+      resolved_through_html: Rezolvido por %{domain}
+      title: Domenos de posta blokados
+    export_domain_allows:
+      new:
+        title: Importa permisos de domeno
+      no_file: Dinguna dosya tiene sido eskojida
+    export_domain_blocks:
+      import:
+        description_html: Vas importar una lista de blokos de domenos. Por favor reviza esta lista kon atansion, espesialmente si no eres el kriyador de la lista.
+        existing_relationships_warning: Relasiones de segimiento existientes
+        private_comment_description_html: 'Para ayudarte a averiguar de ande vienen los blokos importados, blokos importados seran kriyados kon este komento privado: <q>%{comment}</q>'
+        private_comment_template: Importado de %{source} el %{date}
+        title: Importa blokos de domeno
+      invalid_domain_block: 'Uno o mas blokos de domeno fueron omitidos por razon de yerro(s): %{error}'
+      new:
+        title: Importa blokos de domeno
+      no_file: Dinguna dosya tiene sido eskojida
+    follow_recommendations:
+      description_html: "<strong>Las rekomendasyones de kuentos ayudan a los muevos utilizadores a topar presto kontenido enteresante</strong>. Kuando un utilizador no tiene enteraktuado kon otros lo sufisiente komo para djenerar rekomendasyones personalizadas de kuentos a las ke segir, en sus lugar se le rekomiendan estes kuentos. Se rekalkulan diariamente a partir de una mikstura de kuentos kon el mayor numero de enteraksyones rezientes i kon el mayor numero de suivantes lokales kon una lingua determinada."
+      language: Para la lingua
+    instances:
+      public_comment: Komento publiko
+      purge: Purga
+      purge_description_html: Si kreyes ke este domeno esta deskonektado, puedes efasar todos los rejistros de kuentos i los datos asosyados de este domeno de tu magazinaje. Esto puede levar un tiempo.
+      title: Federasyon
+      total_blocked_by_us: Blokado por mozotros
+      total_followed_by_them: Segidos por eyos
+      total_followed_by_us: Segidos por mozotros
+      total_reported: Raportos sovre eyos
+      total_storage: Aneksos de multimedia
+      totals_time_period_hint_html: Los totales amostrados a kontinuasyon inkluyen datos para todo el tiempo.
+    invites:
+      deactivate_all: Dezaktiva todos
+      filter:
+        all: Todos
+        available: Desponivles
+        expired: Kadukados
+        title: Filtra
+      title: Envitasyones
+    ip_blocks:
+      add_new: Kriya regla
+      created_msg: Mueva regla de IP adjustada kon sukseso
+      delete: Efasa
+      expires_in:
+        '1209600': 2 semanas
+        '15778476': 6 mezes
+        '2629746': 1 mez
+        '31556952': 1 anyo
+        '86400': 1 diya
+        '94670856': 3 anyos
+      new:
+        title: Kriya mueva regla de IP
+      no_ip_block_selected: No se tienen trokado reglas IP deke niguna fue eskojida
+      title: Reglas de IP
+    relationships:
+      title: Relasyones de %{acct}
+    relays:
+      add_new: Adjusta un muevo relevo
+      delete: Efasa
+      description_html: Un <strong>relevo de federasyon</strong> es un sirvidor intermedio ke enterkambia mabules de publikasyones publikas entre sirvidores ke se abonan i publikan en el. <strong>Puede ayudar a sirvidores chikos i medianos a diskuvrir kontenido del fediverso</strong>, ke de otra manera rekeriria ke los utilizadores lokales sigiesen manualmente a personas de sirvidores remotos.
+      disable: Inkapasita
+      disabled: Inkapasitado
+      enable: Kapasita
+      enable_hint: Una vez konektado, tu sirvidor se abonara a todas las publikasyones publikas de este relevo, i ampesara a embiar las publikasyones publikas de este sirvidor verso el.
+      enabled: Kapasitado
+      inbox_url: URL del relevo
+      pending: Asperando la achetasion del relevo
+      save_and_enable: Guadra i konekta
+      setup: Apareja una koneksyon de relevos
+      signatures_not_enabled: Los relevos no fonksionaran djustamente mientres el modo siguro o el modo de federasyon limitada esten kapasitados
+      status: Estado
+      title: Relevos
+    report_notes:
+      created_msg: Tienes kriyado djustamente la nota de denunsia!
+      destroyed_msg: Tienes efasado djustamente la nota de denunsia!
+    reports:
+      account:
+        notes:
+          one: "%{count} nota"
+          other: "%{count} notas"
+      action_log: Defter de revizyon
+      action_taken_by: Aksyon tomada por
+      actions:
+        delete_description_html: Los mesajes denunsiados seran supremidos i se enrejistrara un amonestamiento para ayudarte kon las futuras infraksyones por el mezmo kuento.
+        mark_as_sensitive_description_html: Las dosyas de multimedia en los mesajes enformados se markaran komo sensivles i se aplikara un amonestamiento para ayudarte kon las futuras infraksyones del mezmo kuento.
+        other_description_html: Ve mas opsiones para kontrolar el komporto del kuento i personalizar la komunikasyon del kuento raportado.
+        resolve_description_html: No se tomaran aksyones kontra el kuento denunsiado, no se enrejistrara el amonestamiento, i se serrara el raporto.
+        silence_description_html: El profil sera vizivle solo para akeyos ke ya lo sigan o lo bushken manualmente, limitando seriamente su alkanse. Siempre puede ser revertido.
+        suspend_description_html: El profil i todos sus kontenidos seran inaksesivles asta ke sean enfin supremidos. La enteraksion kon el kuento sera emposivle. Reversivle durante un tiempo de 30 diyas.
+      actions_description_html: Dechide kualas mizuras tomar para rezolver esta denunsia. Si tomas una aksion punitiva kontra el kuento denunsiada, se le embiara a dicho kuento un avizo por posta elektronika, ekseptado kuando se eskoja la kategoria <strong>Spam</strong>.
+      actions_description_remote_html: Dechide ke fazer para rezolver este raporto. Esto solo va afektar komo <strong>tu</strong> sirvidor komunike kon este kuento remoto i ke faze kon su kontenido.
+      add_to_report: Adjusta mas al raporto
+      are_you_sure: Estas siguro?
+      assign_to_self: Asinyamela a mi
+      assigned: Moderador asinyado
+      by_target_domain: Domeno del kuento raportado
+      cancel: Anula
+      category: Kategoria
+      category_description_html: La razon por la ke se raporto este kuento o kontenido sera mensyonada en las komuniksayones kon el kuento raportado
+      comment:
+        none: Dinguno
+      comment_description_html: 'Para dar mas enformasyon, %{name} eskrivio:'
+      confirm: Konfirma
+      confirm_action: Konfirma la aksyon de moderasyon kontra @%{acct}
+      created_at: Raportado
+      delete_and_resolve: Efasa publikasyones
+      forwarded: Reembiado
+      forwarded_to: Reembiado a %{domain}
+      mark_as_resolved: Marka komo rezolvido
+      mark_as_sensitive: Marka komo sensivle
+      mark_as_unresolved: Marka komo no rezolvido
+      no_one_assigned: Dinguno
+      notes:
+        create: Adjusta una nota
+        create_and_resolve: Rezolve kon una nota
+        create_and_unresolve: Reavre kon una nota
+        delete: Efasa
+        placeholder: Espesifika ke aksyones se tienen tomado o kualkier otro haber...
+        title: Notas
+      notes_description_html: Ve i desha notas a otros moderadores i a tu yo futuro
+      processed_msg: 'Raporto #%{id} prosesado kon sukseso'
+      quick_actions_description_html: 'Toma una aksion rapida o metete abasho para ver el kontenido denunsiado:'
+      remote_user_placeholder: el utilizador remoto de %{instance}
+      reopen: Reavre denunsia
+      report: 'Raporta #%{id}'
+      reported_account: Kuento raportado
+      reported_by: Raportado por
+      resolved: Rezolvido
+      resolved_msg: Tienes rezolvido la denunsia djustamente!
+      skip_to_actions: Ir direktamente a las aksyones
+      status: Estado
+      statuses: Kontenido raportado
+      statuses_description_html: El kontenido ofensivo se sitara en la komunikasyon kon el kuento raportado
+      summary:
+        action_preambles:
+          delete_html: 'Vas <strong>kitar</strong> algunas de las publikasyones de <strong>@%{acct}</strong>''''. Esto va:'
+          mark_as_sensitive_html: 'Vas <strong>markar</strong> algunas de las publikasyones de <strong>@%{acct}</strong> komo <strong>sensivles</strong>. Esto va:'
+          silence_html: 'Vas <strong>limitar</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
+          suspend_html: 'Vas <strong>suspender</strong> el kuento de <strong>@%{acct}</strong>''''. Esto va:'
+        actions:
+          delete_html: Kitar las publikasyones ofensivas
+          mark_as_sensitive_html: Markar los multimedios de la publikasyon komo sensivles
+          silence_html: Severamente limitar la vizivilita de <strong>@%{acct}</strong>, fazendo su profil i kontenido vizivles solo para las personas ke ya lo sigen o manualmente bushkan su profil
+          suspend_html: Suspender <strong>@%{acct}</strong>, faziendo su profil i kontenido inaksesivle i no disponivle para interaksiones
+        close_report: 'Markar raporto #%{id} komo rezolvido'
+        close_reports_html: Markar <strong>todos</strong> los raportos kontra <strong>@%{acct}</strong> komo rezolvidos
+        delete_data_html: Efasa el profil i kontenido de <strong>@%{acct}</strong> en 30 dias si no sea desuspendido en akel tiempo
+        preview_preamble_html: "<strong>@%{acct}</strong> resivira una avertensya komo esta:"
+        record_strike_html: Enrejistra un amonestamiento kontra <strong>@%{acct}</strong> para ke te ayude eskalar las violasyones de reglas de este kuento en el avenir
+        send_email_html: Embia un mesaj de avertensia a la posta elektronika de <strong>@%{acct}</strong>
+        warning_placeholder: Adisionalas, opsionalas razones la aksyon de moderasyon.
+      target_origin: Orijin del kuento raportado
+      title: Raportos
+      unassign: Dezasinyar
+      unknown_action_msg: 'Aksyon no konesida: %{action}'
+      unresolved: No rezolvido
+      updated_at: Aktualizado
+      view_profile: Ve profil
+    roles:
+      add_new: Adjusta rolo
+      assigned_users:
+        one: "%{count} utilizador"
+        other: "%{count} utilizadores"
+      categories:
+        administration: Administrasyon
+        devops: DevOps
+        invites: Envytasyones
+        moderation: Moderasyon
+        special: Espesial
+      delete: Efasa
+      description_html: Kon <strong>rolos de utilizador</strong>, puede personalizar las fonksiones i areas de Mastodon a las ke pueden akseder sus utilizadores.
+      edit: Edita rolo '%{name}'
+      everyone: Permisos predeterminados
+      everyone_full_description_html: Este es el <strong>rolo base</strong> ke afecta a <strong>todos los utilizadores</strong>, inkluzo akeyos sin un rolo asinyado. Todos los otros rolos eredan permisos de el.
+      permissions_count:
+        one: "%{count} permiso"
+        other: "%{count} permisos"
+      privileges:
+        administrator: Administrador
+        administrator_description: Los utilizadores kon este permiso saltaran todos los permisos
+        delete_user_data: Efasar datos de utilizador
+        delete_user_data_description: Permete a los utilizadores supremir los datos de otros utilizadores sin demora
+        invite_users: Envita a djente
+        invite_users_description: Permete a los utilizadores envitar a muevas personas al sirvidor
+        manage_announcements: Administra pregones
+        manage_announcements_description: Permete a los utilizadores gestionar pregones en el sirvidor
+        manage_appeals: Administra apelasiones
+        manage_appeals_description: Permete a los utilizadores revizar apelasiones kontra aksyones de moderasyon
+        manage_blocks: Administra blokos
+        manage_blocks_description: Permete a los utilizadores blokar los prokuradores de posta elektronika i los adresos IP
+        manage_custom_emojis: Administra emojis personalizados
+        manage_custom_emojis_description: Permete a los utilizadores editar emojis personalizados en el sirvidor
+        manage_federation: Administra federasyon
+        manage_federation_description: Permete a los utilizadores blokar o permeter la federasyon kon otros domenos, i kontrolar la entregabilita
+        manage_invites: Administra envitasyones
+        manage_invites_description: Permete a los utilizadores navegar i dezaktivar los atadijos de envitasyon
+        manage_reports: Administra raportos
+        manage_reports_description: Permete a los utilizadores revizar raportos i realizar aksyones de moderasyon bazadas en eyos
+        manage_roles: Administra rolos
+        manage_roles_description: Permete a los utilizadores administrar i asinyar rolos por debasho de los suyos
+        manage_rules: Administra reglas
+        manage_rules_description: Permete a los utilizadores trokar las reglas del sirvidor
+        manage_settings: Administra konfigurasyon
+    settings:
+      registrations:
+        title: Enrejistramientos
+      registrations_mode:
+        modes:
+          approved: Se rekiere achetasion para enrejistrarse
+          none: Permete a los utilizadores trokar la konfigurasyon del sitio
+          open: Kualkiera puede enrejistrarse
+      title: Konfigurasyon del sirvidor
+    site_uploads:
+      delete: Efasa dosya kargada
+      destroyed_msg: Dosya supremida kon sukseso!
+    software_updates:
+      documentation_link: Ambezate mas
+      type: Tipo
+      version: Versyon
+    statuses:
+      account: Autor
+      application: Aplikasyon
+      back_to_account: Retorna al kuento
+      back_to_report: Retorna a la pajina del raporto
+      batch:
+        remove_from_report: Kita del raporto
+        report: Raporto
+      deleted: Efasado
+      favourites: Favoritos
+      history: Estoria de versiones
+      in_reply_to: En repuesta a
+      language: Lingua
+      media:
+        title: Multimedia
+      metadata: Metadatos
+      no_status_selected: No se troko dinguna publikasyon al no eskojer dinguna
+      open: Avre publikasyon
+      original_status: Publikasyon orijinala
+      reblogs: Repartajasyones
+      status_changed: Publikasyon trokada
+      title: Publikasyones del kuento
+      trending: Trendes
+      visibility: Vizivilita
+      with_media: Kon multimedia
+    strikes:
+      actions:
+        delete_statuses: "%{name} supremio las publikasyones de %{target}"
+        disable: "%{name} konjelo el kuento de %{target}"
+        mark_statuses_as_sensitive: "%{name} tiene markado las publikasyones de %{target} komo sensivles"
+        none: "%{name} embio una avertensya a %{target}"
+        sensitive: "%{name} marko el kuento de %{target} komo sensivle"
+        silence: "%{name} limito el kuento de %{target}"
+        suspend: "%{name} suspendio el kuento de %{target}"
+      appeal_approved: Apelado
+      appeal_pending: Apelasyon pendiente
+      appeal_rejected: Apelasyon refuzada
+    system_checks:
+      database_schema_check:
+        message_html: Ay migrasyones asperando de la baza de datos. Por favor, egzekutalas para asigurarte de ke la aplikasyon fonksiona komo deveria
+      elasticsearch_preset:
+        action: Ve dokumentasyon
+      elasticsearch_preset_single_node:
+        action: Ve dokumentasyon
+      elasticsearch_running_check:
+        message_html: No se pudo konektar a Elasticsearch. Por favor, averigua ke esta egzekutandose, o dezaktiva la bushkeda de teksto kompleto
+      elasticsearch_version_check:
+        message_html: 'Versyon inkompativle de Elasticsearch: %{value}'
+        version_comparison: Elasticsearch %{running_version} se esta egzekutando ama ay menester de Elasticsearch %{required_version}
+      rules_check:
+        action: Administra reglas del sirvidor
+        message_html: No tienes definido dinguna regla del sirvidor.
+      sidekiq_process_check:
+        message_html: No ay dingun prosedura Sidekiq en egzekusion para la(s) kola(s) %{value}. Por favor, reviza tu konfigurasyon de Sidekiq
+      upload_check_privacy_error:
+        message_html: "<strong>Tu sirvidor de web es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Ve aki para mas enformasyon
+        message_html: "<strong>Tu magazinaje de objektos es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
+    tags:
+      review: Estado de revizion
+      updated_msg: Konfigurasyon de etiketas aktualizada kon sukseso
+    title: Administrasyon
+    trends:
+      allow: Permete
+      approved: Achetadas
+      disallow: No permete
+      links:
+        allow: Permete atadijo
+        allow_provider: Permete publikador
+        description_html: Estos son atadijos ke aktualmente estan siendo partajados muncho por los kuentos dizde las ke tu sirvidor ve los mesajes. Pueden ayudar a tus utilizadores a averiguar ke esta pasando en el mundo. Ningun atadijo se amostren publikamente asta ke autorice al domeno. Tamyen puede permeter o refuzar atadijos individuales.
+        disallow: Refuza atadijo
+        disallow_provider: Refuza publikador
+        no_link_selected: No se troko dingun atadijo porke no eskojites dinguno
+        publishers:
+          no_publisher_selected: No se troko dingun publikador porke no eskojites dinguno
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 256d80c881..ada775b862 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -9,15 +9,39 @@ ie:
         ends_at: Ínobligatori. Li proclamation va esser despublicat automaticmen ye ti-ci témpor
         scheduled_at: Lassar vacui por publicar li proclamation strax
         starts_at: Ínobligatori. In li casu que tui proclamation es ligat a un specific periode de témpor
-        text: Tu posse usar post-sintaxe. Ples considerar li spacie quel li proclamation va plenar sur li ecran del usator
+        text: Tu posse usar posta-sintaxe. Ples considerar li spacie quel li proclamation va plenar sur li ecran del usator
+      defaults:
+        current_password: Por securital rasones, ples introducter li passa-parol del actual conto
+        password: Usa adminim 8 carácteres
       form_admin_settings:
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+        theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
+        timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
+        trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
+      form_challenge:
+        current_password: Tu nu intra un area secur
     labels:
+      account:
+        fields:
+          value: Contenete
+      account_warning_preset:
+        title: Titul
+      admin_account_action:
+        type: Action
       announcement:
         all_day: Eveniment del tot die
         ends_at: Fine del eveniment
         scheduled_at: Planar publication
         starts_at: Comense del eveniment
         text: Proclamation
+      defaults:
+        confirm_new_password: Confirmar nov passa-parol
+        confirm_password: Confirmar passa-parol
+        current_password: Actual passa-parol
+        honeypot: "%{label} (ne plenar)"
+        locale: Lingue del interfacie
+        new_password: Nov passa-parol
+        note: Biografie
+        password: Passa-parol
       notification_emails:
         follow_request: Alqui petit sequer te
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index eeaa3294e2..4247487607 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -1 +1,230 @@
+---
 lad:
+  simple_form:
+    hints:
+      account:
+        display_name: Tu nombre para amostrar.
+      account_alias:
+        acct: Espesifika tu nombre de utilizador@domeno del kuento de ande keres migrar
+      account_migration:
+        acct: Espesifika el nombre de utilizador@domeno del kuento de kualo keres migrar
+      account_warning_preset:
+        text: Puedes kulanear sintaksa de publikasyones, komo adresos URL, etiketas i enmentaduras
+        title: Opsyonal. No es vizivle para el destinatario
+      admin_account_action:
+        include_statuses: El utilizador vera kualas publikasyones tienen kauzado la aksyon de moderasyon o avertensya
+        send_email_notification: El utilizador risivira una esplikasyon de lo kualo afito kon su kuento
+        text_html: Puedes kulanear sintaksa de publikasyones. Puede adjustar <a href="%{path}">konfigurasyones predefinidas de avertensya</a> para no pedrer tiempo
+        type_html: Eskoje lo ke vas fazer kon <strong>%{acct}</strong>
+        types:
+          disable: Evita ke el utilizador utilize su kuento, pero no supreme ni eskonde sus kontenidos.
+          none: Utiliza esto para embiar una avertensya al utilizador, sin ampesar ninguna otra aksyon.
+          sensitive: Forza ke todas las dosyas multimedia de este utilizador sean markados komo sensivles.
+          silence: Evita ke el utilizador pueda publikar kon vizivilita publika, i eskonde sus mesajes i avizos a personas ke no lo sigen. Serra todos los raportos kontra este kuento.
+          suspend: Evita kualseker interaksyon dizde o verso este kuento i supreme su kontenido. Reversivle en 30 diyas. Sierra todos los raportos kontra este kuento.
+        warning_preset_id: Opsyonal. Ainda puedes adjustar teksto personalizado al final de la konfigurasyon predefinida
+      announcement:
+        all_day: Kuando esta eskojido solo se amostraran las datas del rango de tiempo
+        ends_at: Opsyonal. El pregon dezaparesera otomatikamente en este momento
+        scheduled_at: Deshar en blanko para publikar el pregon pishin
+        starts_at: Opsyonal. En caso de ke tu pregon este atado a un intervalo de tiempo espesifiko
+        text: Puedes kulanear la sintaksa de publikasyones. Por favor nota el espasyo ke okupara el pregon en el ekran del utilizador
+      appeal:
+        text: Solo puedes apelar un amonestamiento una vez
+      defaults:
+        autofollow: Los utilizadores ke se enrejistren por la envitasyon te segiran otomatikamente
+        avatar: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        bot: Indika ke este kuento egzekuta prinsipalmente aksyones otomatizadas i podria no ser monitorizada
+        context: Uno o multiples kontekstos en los ke deve aplikarse el filtro
+        current_password: Por razones de sigurita por favor ingresa el kod del kuento aktual
+        current_username: Para konfirmar, por favor ingresa el nombre de utilizador del kuento aktual
+        digest: Solo embiado dempues de un eluengo periodo de inaktivita i solo si tienes recibido mesajes personales durante tu ausensya
+        email: Se te embiara konfirmasyon por posta elektronika
+        header: PNG, GIF o JPG. Maksimo %{size}. Sera eskalado a %{dimensions}px
+        inbox_url: Kopia el URL de la pajina prinsipala del relevo ke keres utilizar
+        irreversible: Las publikasyones filtradas dezapareseran irreversivlemente, inkluzo si este filtro es supremido mas adelante
+        locale: La lingua de la enterfaz de utilizador, posta i avizos arrepushados
+        password: Utiliza al manko 8 karakteres
+        phrase: Se aplikara sin importar las mayuskulas o los avizos de kontenido de una publikasyon
+        scopes: A los kualos APIs la aplikasyon tendra akseso. Si eskojes el alkanse de nivel mas alto, no kale eskojer las individualas.
+        setting_aggregate_reblogs: No amostra muevas repartajasyones para las publikasyones ke an sido resientemente repartajadas (solo afekta a las repartajasyones risividas resientemente)
+        setting_always_send_emails: Normalmente los avizos por posta elektronika no se embiaran kuando estes uzando Mastodon aktivamente
+        setting_default_sensitive: Tu muevo kontenido multimedia esta eskondido i puede ser amostrado kon un klik
+        setting_display_media_default: Eskonde kontenido multimedia markado komo sensivle
+        setting_display_media_hide_all: Siempre eskonde todo el kontenido multimedia
+        setting_display_media_show_all: Amostra siempre el kontenido de multimedia
+        setting_use_blurhash: Los gradientes se bazan en los kolores de las imajes eskondidas pero faziendo velados los peratim
+        setting_use_pending_items: Eskonde muevas publikasyones detras de un klik en lugar de desplazar otomatikamente la linya
+        whole_word: Kuando el biervo yave o fraza es solo alfanumerika, solo sera aplikado si konkorda kon todo el biervo
+      domain_allow:
+        domain: Este domeno podra obtener datos de este sirvidor i los datos entrantes seran prosesados i archivados
+      email_domain_block:
+        domain: Este puede ser el nombre de domeno ke aparese en el adreso de posta elektronika o el rejistro MX ke utiliza. Se komprovaran al registrarse.
+        with_dns_records: Se ara un intento de rezolver los rejistros DNS del domeno dado i los rizultados seran tamyen puestos en lista preta
+      featured_tag:
+        name: 'Aki estan algunas de las etiketas ke mas tienes utilizado resientemente:'
+      filters:
+        action: Eskoje kuala aksyon realizar kuando una publikasyon koensida kon el filtro
+        actions:
+          hide: Eskonde kompletamente el kontenido filtrado komo si no existiera
+          warn: Eskonde el kontenido filtrado detras de una avertensya enmentando el titolo del filtro
+      form_admin_settings:
+        activity_api_enabled: Numero de publikasyones publikadas lokalmente, utilizadores activos i enrejistrasyones muevas kada semana
+        backups_retention_period: Manten las dosyas de utilizador djeneradas durante el numero de diyas espesifikado.
+        bootstrap_timeline_accounts: Estos kuentos apareseran en la parte superior de las rekomendasiones de los muevos utilizadores.
+        closed_registrations_message: Amostrado kuando las enrejistrasyones estan serrados
+        content_cache_retention_period: Las publikasyones de otros sirvidores se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva. Esto puede ser irreversivle.
+        custom_css: Puedes aplikar estilos personalizados a la version web de Mastodon.
+        mascot: Reemplaza la ilustrasyon en la enterfaz web avanzada.
+        media_cache_retention_period: Las dosyas de multimedia abashadas se supremiran dempues del numero espesifikado de diyas kuando se establezka una valuta pozitiva, i se reabasharan basho demanda.
+        peers_api_enabled: Una lista de nombres de domeno ke este sirvidor tiene topado en el Fediverso. Aki no se inkluye dingun dato sovre si federas kon un sirvidor determinado, solo ke tu sirvidor lo konese. Esto es utilizado por los servisyos ke rekopilan estatistikas sovre la federasyon en un senso djeneral.
+        profile_directory: El katalogo de profiles lista a todos los utilizadores ke tienen optado por ke sus kuento pueda ser deskuvierto.
+        require_invite_text: Kuando las enrejistrasyones rekieren achetasyon manuala, faze obligatoria la entrada de teksto "Por ke keres unirte?" en lugar de ser opsyonal
+        site_contact_email: Komo la djente puede ponerse en kontakto kontigo para konsultas legales o de ayuda.
+        site_contact_username: Komo puede kontaktarte la djente en Mastodon.
+        site_extended_description: Kualseker enformasyon adisyonala ke pueda ser util para los vizitantes i tus utilizadores. Se puede estrukturar kon formato Markdown.
+        site_short_description: Una breve deskripsyon para ayudar a identifikar tu sirvidor de forma unika. Ken lo administra?
+        site_terms: Utiliza tu propia politika de privasita o deshala en blanko para kulanear la predeterminada Puede estrukturarse kon formato Markdown.
+        site_title: Komo puede referirse la djente a tu sirvidor ademas de por el nombre de domeno.
+        status_page_url: Adreso URL de la pajina ande la djente puede ver el estado de este sirvidor durante una insidensya
+        theme: El tema ke los vizitantes no enrejistrados i los muevos utilizadores ven.
+        thumbnail: Una imaje de aproksimadamente 2:1 se amostra djunto a la enformasyon de tu sirvidor.
+        timeline_preview: Los vizitantes no konektados podran navigar por los mesajes publikos mas resientes desponivles en el sirvidor.
+        trendable_by_default: Omite la revizyon manuala del kontenido en trend. Los elementos individuales ainda podran supremirse de los trendes.
+        trends: Los trendes amostran ke mesajes, etiketas i haberes estan ganando traksyon en tu sirvidor.
+        trends_as_landing_page: Amostra kontenido en trend para utilizadores i vizitantes en lugar de una deskripsyon de este sirvidor. Rekiere ke los trendes esten kapasitados.
+      form_challenge:
+        current_password: Estas entrando en un area siguro
+      imports:
+        data: Archivo CSV eksportado dizde otra instansya de Mastodon
+      invite_request:
+        text: Esto nos ayudara a revizar tu aplikasyon
+      ip_block:
+        comment: Opsyonal. Akodrate por ke tienes adjustado esta regla.
+        expires_in: Los adresos IP son un rekurso finito, a vezes se partajan i trokan. Por esta razon, no se rekomiendan blokos de IP indefinidos.
+        ip: Introduze un adreso IPv4 o IPv6. Puede blokar rangos kompletos uzando la sintaksa CIDR. Ten kuidado de no kedarte afuera!
+        severities:
+          no_access: Bloka akseso a todos los rekursos
+          sign_up_block: Las muevas enrejistrasyones se inkapasitaran
+          sign_up_requires_approval: Muevas enrejistrasyones rekeriran tu achetasyon
+        severity: Eskoje lo ke pasara kon las petisyones dizde este IP
+      rule:
+        text: Deskrive una norma o rekerensya para los utilizadores de este sirvidor. Aprova fazerla kurta i kolay
+      sessions:
+        otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:'
+        webauthn: Si es una yave USB, asigurete de insertarla y, si es necesario, pulsala.
+      tag:
+        name: Solo se puede trokar la kapitalizasyon de las letras, por enshemplo, para ke sea mas meldable
+      user:
+        chosen_languages: Kuando se marka, solo se amostraran las publikasyones en las linguas eskojidas en las linyas de tiempo publikas
+        role: El rolo kontrola kualos permisos tiene el utilizador
+      user_role:
+        color: Color ke se utilizara para el rolo a lo largo de la enterfaz de utilizador, komo RGB en formato heksadesimal
+        highlighted: Esto faze ke el rolo sea publikamente visible
+        name: Nombre publiko del rolo, si el rolo se establese para ke se amostre komo una insinya
+        permissions_as_keys: Los utilizadores kon este rolo tendran akseso a...
+        position: Un rolo mas alto deside la rezolusyon de konfliktos en algunas situasyones. Algunas aksyones solo pueden levarse por rolos kon menor priorita
+      webhook:
+        events: Eskoje evenimientos para embiar
+        url: Ande los evenimientos seran embiados
+    labels:
+      account:
+        fields:
+          name: Etiketa
+          value: Kontenido
+      account_alias:
+        acct: Alias del kuento viejo
+      account_migration:
+        acct: Alias del muevo kuento
+      account_warning_preset:
+        text: Teksto predefinido
+        title: Titolo
+      admin_account_action:
+        include_statuses: Inkluye en la posta elektronika las publikasyones raportadas
+        send_email_notification: Aviza al utilizador por posta elektronika
+        text: Avizo personalizado
+        type: Aksyon
+        types:
+          disable: Inkapasitar
+          none: Embia uma avertensya
+          sensitive: Sensivle
+          silence: Limita
+          suspend: Suspende
+        warning_preset_id: Kulanea un avizo predeterminado
+      announcement:
+        all_day: Evenimiento de todo el diya
+        ends_at: Fin del evenimiento
+        scheduled_at: Programar publikasyon
+        starts_at: Ampesijo del evenimiento
+        text: Pregon
+      appeal:
+        text: Esplika porke esta dechizyon deve ser revertida
+      defaults:
+        autofollow: Envita a segir tu kuento
+        avatar: Imaje de profil
+        bot: Este es un kuento otomatizado
+        chosen_languages: Filtra linguas
+        confirm_new_password: Konfirma muevo kod
+        confirm_password: Konfirma kod
+        context: Filtra kontekstos
+        current_password: Kod aktual
+        setting_use_blurhash: Amostra gradientes koloridos para kontenido multimedia eskondido
+        setting_use_pending_items: Modo lento
+        severity: Severita
+        sign_in_token_attempt: Kodiche de sigurita
+        title: Titolo
+        type: Tipo de importasyon
+        username: Nombre de uzador
+        username_or_email: Utilizador o posta
+        whole_word: Todo el biervo
+      email_domain_block:
+        with_dns_records: Inkluye los rejistros MX i los adresos IP del domeno
+      featured_tag:
+        name: Etiketa
+      filters:
+        actions:
+          hide: Eskonde kompletamente
+          warn: Eskonde kon una avertensya
+      form_admin_settings:
+        activity_api_enabled: Publika estatistikas adjustadas sovre la aktivita del utilizador kon la API
+        backups_retention_period: Periodo de retensyon de la dosya de utilizador
+        bootstrap_timeline_accounts: Rekomenda siempre estos kuentos a muevos utilizadores
+        closed_registrations_message: Mesaj personalizado kuando las enrejistrasyones no estan desponivles
+        content_cache_retention_period: Periodo de retensyon de kashe de kontenido
+        custom_css: CSS personalizado
+        mascot: Maskota personalizada (legado)
+        media_cache_retention_period: Periodo de retensyon de kashe multimedia
+        peers_api_enabled: Publika lista de sirvidores diskuviertos en la API
+        profile_directory: Kapasita katalogo de profiles
+        registrations_mode: Ken puede enrejistrarse
+        require_invite_text: Rekere una razon para unirse
+        show_domain_blocks: Amostra domenos blokados
+        show_domain_blocks_rationale: Amostra deke se blokaron los domenos
+        site_contact_email: Posta elektronika de kontakto
+        site_contact_username: Nombre de utilizador de kontakto
+        site_extended_description: Deskripsyon ekstendida
+        site_short_description: Deskripsyon del sirvidor
+        site_terms: Politika de privasita
+        site_title: Nombre del sirvidor
+        status_page_url: URL de pajina de estado
+        theme: Tema predeterminado
+        thumbnail: Minyatura del sirvidor
+        timeline_preview: Permite el akseso no autentifikado a las linyas de tiempo publikas
+        trendable_by_default: Permite trendes sin revizyon previa
+        trends: Kapasita trendes
+        trends_as_landing_page: Kulanea trendes komo la pajina prinsipala
+      interactions:
+        must_be_follower: Bloka avizos de personas ke no te sigen
+        must_be_following: Bloka avizos de personas a las kualas no siges
+        must_be_following_dm: Bloka mesajes direktos de personas a las kualas no siges
+      invite:
+        comment: Komento
+      invite_request:
+        text: Deke keres adjuntarte?
+      ip_block:
+        comment: Komento
+        ip: IP
+        severities:
+          no_access: Bloka akseso
+          sign_up_block: Bloka enrejistrasyones
+          sign_up_requires_approval: Limita enrejistrasyones

From 7b1d3907340d40bb60098b01bfb7b2e34ba9e7f1 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 19 Dec 2023 11:47:53 +0100
Subject: [PATCH 111/436] Fixes dropdown target without a `buttonRef` (edit
 history) (#28427)

---
 app/javascript/mastodon/components/dropdown_menu.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index de540b392b..d9cbcc32e5 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -257,7 +257,7 @@ class Dropdown extends PureComponent {
   };
 
   findTarget = () => {
-    return this.target?.buttonRef?.current;
+    return this.target?.buttonRef?.current ?? this.target;
   };
 
   componentWillUnmount = () => {

From c28976d89e79ff536efe5a4e82f43463f7e9c196 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Dec 2023 05:55:39 -0500
Subject: [PATCH 112/436] Handle negative offset param in `api/v2/search`
 (#28282)

---
 app/controllers/api/base_controller.rb      |  8 ++++++++
 app/controllers/api/v2/search_controller.rb |  1 +
 spec/requests/api/v2/search_spec.rb         | 22 ++++++++++++++++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index b3c60fcaf4..98fa1897ef 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -108,6 +108,10 @@ class Api::BaseController < ApplicationController
     render json: { error: 'Your login is currently disabled' }, status: 403 if current_user&.account&.unavailable?
   end
 
+  def require_valid_pagination_options!
+    render json: { error: 'Pagination values for `offset` and `limit` must be positive' }, status: 400 if pagination_options_invalid?
+  end
+
   def require_user!
     if !current_user
       render json: { error: 'This method requires an authenticated user' }, status: 422
@@ -136,6 +140,10 @@ class Api::BaseController < ApplicationController
 
   private
 
+  def pagination_options_invalid?
+    params.slice(:limit, :offset).values.map(&:to_i).any?(&:negative?)
+  end
+
   def respond_with_error(code)
     render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code
   end
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index 4339bee21e..3cfc6e7919 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -12,6 +12,7 @@ class Api::V2::SearchController < Api::BaseController
     before_action :query_pagination_error, if: :pagination_requested?
     before_action :remote_resolve_error, if: :remote_resolve_requested?
   end
+  before_action :require_valid_pagination_options!
 
   def index
     @search = Search.new(search_results)
diff --git a/spec/requests/api/v2/search_spec.rb b/spec/requests/api/v2/search_spec.rb
index d0778cba4d..13bcf17984 100644
--- a/spec/requests/api/v2/search_spec.rb
+++ b/spec/requests/api/v2/search_spec.rb
@@ -40,7 +40,7 @@ describe 'Search API' do
           end
         end
 
-        context 'with `offset`' do
+        context 'with valid `offset` value' do
           let(:params) { { q: 'test1', offset: 1 } }
 
           it 'returns http unauthorized' do
@@ -50,6 +50,26 @@ describe 'Search API' do
           end
         end
 
+        context 'with negative `offset` value' do
+          let(:params) { { q: 'test1', offset: '-100', type: 'accounts' } }
+
+          it 'returns http bad_request' do
+            get '/api/v2/search', headers: headers, params: params
+
+            expect(response).to have_http_status(400)
+          end
+        end
+
+        context 'with negative `limit` value' do
+          let(:params) { { q: 'test1', limit: '-100', type: 'accounts' } }
+
+          it 'returns http bad_request' do
+            get '/api/v2/search', headers: headers, params: params
+
+            expect(response).to have_http_status(400)
+          end
+        end
+
         context 'with following=true' do
           let(:params) { { q: 'test', type: 'accounts', following: 'true' } }
 

From b7bdcd4f395aaa1e85930940975439d10b570f40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 10:56:23 +0000
Subject: [PATCH 113/436] Update dependency @material-symbols/svg-600 to
 v0.14.3 (#28276)

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

diff --git a/yarn.lock b/yarn.lock
index f100a2ec34..a11316260f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2496,9 +2496,9 @@ __metadata:
   linkType: soft
 
 "@material-symbols/svg-600@npm:^0.14.0":
-  version: 0.14.1
-  resolution: "@material-symbols/svg-600@npm:0.14.1"
-  checksum: fb5252285bbeccc45a4b131e8b165470b5b57e146bc7ea586eb82e580037d1218f6dad5fee4e6822c357041ff547f34c9c7432cce0a811b14f7e41d8ae23009b
+  version: 0.14.3
+  resolution: "@material-symbols/svg-600@npm:0.14.3"
+  checksum: b9d1942790ee420d3464786fc7e748b3925d20c50aa34f2b289807badb85e49d52b4dcb36bed14c45e544a7d25fda81b33dd40d52aa134a6dea74b76805ea863
   languageName: node
   linkType: hard
 

From b5ac61b2c5cad94a680527b961def46aea0a1ad4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 19 Dec 2023 11:59:43 +0100
Subject: [PATCH 114/436] Change algorithm of follow recommendations (#28314)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .github/renovate.json5                        |  7 +-
 .../follow_recommendations_controller.rb      |  2 +-
 .../api/v1/suggestions_controller.rb          | 13 ++--
 .../api/v2/suggestions_controller.rb          | 12 +++-
 app/lib/potential_friendship_tracker.rb       | 31 ---------
 app/models/account_domain_block.rb            |  5 ++
 app/models/account_suggestions.rb             | 48 +++++++++----
 .../friends_of_friends_source.rb              | 37 ++++++++++
 .../account_suggestions/global_source.rb      | 34 ++--------
 .../past_interactions_source.rb               | 36 ----------
 .../account_suggestions/setting_source.rb     | 34 +++-------
 .../similar_profiles_source.rb                | 67 +++++++++++++++++++
 app/models/account_suggestions/source.rb      | 30 ++-------
 app/models/block.rb                           |  9 ++-
 app/models/concerns/account/associations.rb   |  1 +
 app/models/concerns/account/interactions.rb   | 13 ----
 app/models/concerns/account/search.rb         |  1 +
 app/models/follow.rb                          |  8 ++-
 app/models/follow_recommendation_filter.rb    |  7 +-
 app/models/follow_recommendation_mute.rb      | 26 +++++++
 .../follow_recommendation_suppression.rb      | 14 ----
 app/models/follow_request.rb                  |  5 ++
 app/models/mute.rb                            |  9 ++-
 app/models/preview_cards_status.rb            |  4 +-
 app/services/account_search_service.rb        |  5 ++
 app/services/favourite_service.rb             |  7 +-
 app/services/post_status_service.rb           |  3 -
 app/services/reblog_service.rb                |  8 +--
 .../follow_recommendations/show.html.haml     |  2 +
 .../follow_recommendations_scheduler.rb       | 50 --------------
 ...4923_create_follow_recommendation_mutes.rb | 14 ++++
 ...dd_languages_index_to_account_summaries.rb |  9 +++
 db/schema.rb                                  | 14 +++-
 spec/requests/api/v1/suggestions_spec.rb      | 22 +++---
 .../follow_recommendations_scheduler_spec.rb  |  2 -
 35 files changed, 297 insertions(+), 292 deletions(-)
 delete mode 100644 app/lib/potential_friendship_tracker.rb
 create mode 100644 app/models/account_suggestions/friends_of_friends_source.rb
 delete mode 100644 app/models/account_suggestions/past_interactions_source.rb
 create mode 100644 app/models/account_suggestions/similar_profiles_source.rb
 create mode 100644 app/models/follow_recommendation_mute.rb
 create mode 100644 db/migrate/20231211234923_create_follow_recommendation_mutes.rb
 create mode 100644 db/migrate/20231212073317_add_languages_index_to_account_summaries.rb

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index aca5228594..dab99829a1 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -102,9 +102,12 @@
     {
       // Group actions/*-artifact in the same PR
       matchManagers: ['github-actions'],
-      matchPackageNames: ['actions/download-artifact', 'actions/upload-artifact'],
+      matchPackageNames: [
+        'actions/download-artifact',
+        'actions/upload-artifact',
+      ],
       matchUpdateTypes: ['major'],
-      groupName: 'artifact actions (major)'
+      groupName: 'artifact actions (major)',
     },
     {
       // Update @types/* packages every week, with one grouped PR
diff --git a/app/controllers/admin/follow_recommendations_controller.rb b/app/controllers/admin/follow_recommendations_controller.rb
index 841e3cc7fb..a54e41bd8c 100644
--- a/app/controllers/admin/follow_recommendations_controller.rb
+++ b/app/controllers/admin/follow_recommendations_controller.rb
@@ -8,7 +8,7 @@ module Admin
       authorize :follow_recommendation, :show?
 
       @form     = Form::AccountBatch.new
-      @accounts = filtered_follow_recommendations
+      @accounts = filtered_follow_recommendations.page(params[:page])
     end
 
     def update
diff --git a/app/controllers/api/v1/suggestions_controller.rb b/app/controllers/api/v1/suggestions_controller.rb
index 9737ae5cb6..9ba1cef63c 100644
--- a/app/controllers/api/v1/suggestions_controller.rb
+++ b/app/controllers/api/v1/suggestions_controller.rb
@@ -3,22 +3,23 @@
 class Api::V1::SuggestionsController < Api::BaseController
   include Authorization
 
-  before_action -> { doorkeeper_authorize! :read }
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
   before_action :require_user!
+  before_action :set_suggestions
 
   def index
-    suggestions = suggestions_source.get(current_account, limit: limit_param(DEFAULT_ACCOUNTS_LIMIT))
-    render json: suggestions.map(&:account), each_serializer: REST::AccountSerializer
+    render json: @suggestions.get(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:offset].to_i).map(&:account), each_serializer: REST::AccountSerializer
   end
 
   def destroy
-    suggestions_source.remove(current_account, params[:id])
+    @suggestions.remove(params[:id])
     render_empty
   end
 
   private
 
-  def suggestions_source
-    AccountSuggestions::PastInteractionsSource.new
+  def set_suggestions
+    @suggestions = AccountSuggestions.new(current_account)
   end
 end
diff --git a/app/controllers/api/v2/suggestions_controller.rb b/app/controllers/api/v2/suggestions_controller.rb
index 35eb276c01..8516796e86 100644
--- a/app/controllers/api/v2/suggestions_controller.rb
+++ b/app/controllers/api/v2/suggestions_controller.rb
@@ -3,17 +3,23 @@
 class Api::V2::SuggestionsController < Api::BaseController
   include Authorization
 
-  before_action -> { doorkeeper_authorize! :read }
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
   before_action :require_user!
   before_action :set_suggestions
 
   def index
-    render json: @suggestions, each_serializer: REST::SuggestionSerializer
+    render json: @suggestions.get(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:offset].to_i), each_serializer: REST::SuggestionSerializer
+  end
+
+  def destroy
+    @suggestions.remove(params[:id])
+    render_empty
   end
 
   private
 
   def set_suggestions
-    @suggestions = AccountSuggestions.get(current_account, limit_param(DEFAULT_ACCOUNTS_LIMIT))
+    @suggestions = AccountSuggestions.new(current_account)
   end
 end
diff --git a/app/lib/potential_friendship_tracker.rb b/app/lib/potential_friendship_tracker.rb
deleted file mode 100644
index f5bc203465..0000000000
--- a/app/lib/potential_friendship_tracker.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class PotentialFriendshipTracker
-  EXPIRE_AFTER = 90.days.seconds
-  MAX_ITEMS    = 80
-
-  WEIGHTS = {
-    reply: 1,
-    favourite: 10,
-    reblog: 20,
-  }.freeze
-
-  class << self
-    include Redisable
-
-    def record(account_id, target_account_id, action)
-      return if account_id == target_account_id
-
-      key    = "interactions:#{account_id}"
-      weight = WEIGHTS[action]
-
-      redis.zincrby(key, weight, target_account_id)
-      redis.zremrangebyrank(key, 0, -MAX_ITEMS)
-      redis.expire(key, EXPIRE_AFTER)
-    end
-
-    def remove(account_id, target_account_id)
-      redis.zrem("interactions:#{account_id}", target_account_id)
-    end
-  end
-end
diff --git a/app/models/account_domain_block.rb b/app/models/account_domain_block.rb
index db2e37184f..753935d6af 100644
--- a/app/models/account_domain_block.rb
+++ b/app/models/account_domain_block.rb
@@ -19,6 +19,7 @@ class AccountDomainBlock < ApplicationRecord
   validates :domain, presence: true, uniqueness: { scope: :account_id }, domain: true
 
   after_commit :invalidate_domain_blocking_cache
+  after_commit :invalidate_follow_recommendations_cache
 
   private
 
@@ -26,4 +27,8 @@ class AccountDomainBlock < ApplicationRecord
     Rails.cache.delete("exclude_domains_for:#{account_id}")
     Rails.cache.delete(['exclude_domains', account_id, domain])
   end
+
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
 end
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index d1774e62fa..d62176c7ca 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -1,28 +1,48 @@
 # frozen_string_literal: true
 
 class AccountSuggestions
+  include DatabaseHelper
+
   SOURCES = [
     AccountSuggestions::SettingSource,
-    AccountSuggestions::PastInteractionsSource,
+    AccountSuggestions::FriendsOfFriendsSource,
+    AccountSuggestions::SimilarProfilesSource,
     AccountSuggestions::GlobalSource,
   ].freeze
 
-  def self.get(account, limit)
-    SOURCES.each_with_object([]) do |source_class, suggestions|
-      source_suggestions = source_class.new.get(
-        account,
-        skip_account_ids: suggestions.map(&:account_id),
-        limit: limit - suggestions.size
-      )
+  BATCH_SIZE = 40
 
-      suggestions.concat(source_suggestions)
+  def initialize(account)
+    @account = account
+  end
+
+  def get(limit, offset = 0)
+    with_read_replica do
+      account_ids_with_sources = Rails.cache.fetch("follow_recommendations/#{@account.id}", expires_in: 15.minutes) do
+        SOURCES.flat_map { |klass| klass.new.get(@account, limit: BATCH_SIZE) }.each_with_object({}) do |(account_id, source), h|
+          (h[account_id] ||= []).concat(Array(source).map(&:to_sym))
+        end.to_a.shuffle
+      end
+
+      # The sources deliver accounts that haven't yet been followed, are not blocked,
+      # and so on. Since we reset the cache on follows, blocks, and so on, we don't need
+      # a complicated query on this end.
+
+      account_ids  = account_ids_with_sources[offset, limit]
+      accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat).index_by(&:id)
+
+      account_ids.filter_map do |(account_id, source)|
+        next unless accounts_map.key?(account_id)
+
+        AccountSuggestions::Suggestion.new(
+          account: accounts_map[account_id],
+          source: source
+        )
+      end
     end
   end
 
-  def self.remove(account, target_account_id)
-    SOURCES.each do |source_class|
-      source = source_class.new
-      source.remove(account, target_account_id)
-    end
+  def remove(target_account_id)
+    FollowRecommendationMute.create(account_id: @account.id, target_account_id: target_account_id)
   end
 end
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
new file mode 100644
index 0000000000..77d4f635aa
--- /dev/null
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
+  def get(account, limit: 10)
+    Account.find_by_sql([<<~SQL.squish, { id: account.id, limit: limit }]).map { |row| [row.id, key] }
+      WITH first_degree AS (
+          SELECT target_account_id
+          FROM follows
+          JOIN accounts AS target_accounts ON follows.target_account_id = target_accounts.id
+          WHERE account_id = :id
+            AND NOT target_accounts.hide_collections
+      )
+      SELECT accounts.id, COUNT(*) AS frequency
+      FROM accounts
+      JOIN follows ON follows.target_account_id = accounts.id
+      JOIN account_stats ON account_stats.account_id = accounts.id
+      LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
+      WHERE follows.account_id IN (SELECT * FROM first_degree)
+        AND follows.target_account_id NOT IN (SELECT * FROM first_degree)
+        AND follows.target_account_id <> :id
+        AND accounts.discoverable
+        AND accounts.suspended_at IS NULL
+        AND accounts.silenced_at IS NULL
+        AND accounts.moved_to_account_id IS NULL
+        AND follow_recommendation_mutes.target_account_id IS NULL
+      GROUP BY accounts.id, account_stats.id
+      ORDER BY frequency DESC, account_stats.followers_count ASC
+      LIMIT :limit
+    SQL
+  end
+
+  private
+
+  def key
+    :friends_of_friends
+  end
+end
diff --git a/app/models/account_suggestions/global_source.rb b/app/models/account_suggestions/global_source.rb
index 651041d675..d68f285e4f 100644
--- a/app/models/account_suggestions/global_source.rb
+++ b/app/models/account_suggestions/global_source.rb
@@ -1,39 +1,13 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::GlobalSource < AccountSuggestions::Source
-  include Redisable
-
-  def key
-    :global
-  end
-
-  def get(account, skip_account_ids: [], limit: 40)
-    account_ids = account_ids_for_locale(I18n.locale.to_s.split(/[_-]/).first) - [account.id] - skip_account_ids
-
-    as_ordered_suggestions(
-      scope(account).where(id: account_ids),
-      account_ids
-    ).take(limit)
-  end
-
-  def remove(_account, _target_account_id)
-    nil
+  def get(account, limit: 10)
+    FollowRecommendation.localized(content_locale).joins(:account).merge(base_account_scope(account)).order(rank: :desc).limit(limit).pluck(:account_id, :reason)
   end
 
   private
 
-  def scope(account)
-    Account.searchable
-           .followable_by(account)
-           .not_excluded_by_account(account)
-           .not_domain_blocked_by_account(account)
-  end
-
-  def account_ids_for_locale(locale)
-    redis.zrevrange("follow_recommendations:#{locale}", 0, -1).map(&:to_i)
-  end
-
-  def to_ordered_list_key(account)
-    account.id
+  def content_locale
+    I18n.locale.to_s.split(/[_-]/).first
   end
 end
diff --git a/app/models/account_suggestions/past_interactions_source.rb b/app/models/account_suggestions/past_interactions_source.rb
deleted file mode 100644
index d169394f11..0000000000
--- a/app/models/account_suggestions/past_interactions_source.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class AccountSuggestions::PastInteractionsSource < AccountSuggestions::Source
-  include Redisable
-
-  def key
-    :past_interactions
-  end
-
-  def get(account, skip_account_ids: [], limit: 40)
-    account_ids = account_ids_for_account(account.id, limit + skip_account_ids.size) - skip_account_ids
-
-    as_ordered_suggestions(
-      scope.where(id: account_ids),
-      account_ids
-    ).take(limit)
-  end
-
-  def remove(account, target_account_id)
-    redis.zrem("interactions:#{account.id}", target_account_id)
-  end
-
-  private
-
-  def scope
-    Account.searchable
-  end
-
-  def account_ids_for_account(account_id, limit)
-    redis.zrevrange("interactions:#{account_id}", 0, limit).map(&:to_i)
-  end
-
-  def to_ordered_list_key(account)
-    account.id
-  end
-end
diff --git a/app/models/account_suggestions/setting_source.rb b/app/models/account_suggestions/setting_source.rb
index 6185732b4b..4b7275bf7a 100644
--- a/app/models/account_suggestions/setting_source.rb
+++ b/app/models/account_suggestions/setting_source.rb
@@ -1,32 +1,18 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::SettingSource < AccountSuggestions::Source
-  def key
-    :staff
-  end
-
-  def get(account, skip_account_ids: [], limit: 40)
-    return [] unless setting_enabled?
-
-    as_ordered_suggestions(
-      scope(account).where(setting_to_where_condition).where.not(id: skip_account_ids),
-      usernames_and_domains
-    ).take(limit)
-  end
-
-  def remove(_account, _target_account_id)
-    nil
+  def get(account, limit: 10)
+    if setting_enabled?
+      base_account_scope(account).where(setting_to_where_condition).limit(limit).pluck(:id).zip([key].cycle)
+    else
+      []
+    end
   end
 
   private
 
-  def scope(account)
-    Account.searchable
-           .followable_by(account)
-           .not_excluded_by_account(account)
-           .not_domain_blocked_by_account(account)
-           .where(locked: false)
-           .where.not(id: account.id)
+  def key
+    :featured
   end
 
   def usernames_and_domains
@@ -61,8 +47,4 @@ class AccountSuggestions::SettingSource < AccountSuggestions::Source
   def setting
     Setting.bootstrap_timeline_accounts
   end
-
-  def to_ordered_list_key(account)
-    [account.username.downcase, account.domain&.downcase]
-  end
 end
diff --git a/app/models/account_suggestions/similar_profiles_source.rb b/app/models/account_suggestions/similar_profiles_source.rb
new file mode 100644
index 0000000000..733c5f0bbc
--- /dev/null
+++ b/app/models/account_suggestions/similar_profiles_source.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class AccountSuggestions::SimilarProfilesSource < AccountSuggestions::Source
+  class QueryBuilder < AccountSearchService::QueryBuilder
+    def must_clauses
+      [
+        {
+          more_like_this: {
+            fields: %w(text text.stemmed),
+            like: @query.map { |id| { _index: 'accounts', _id: id } },
+          },
+        },
+
+        {
+          term: {
+            properties: 'discoverable',
+          },
+        },
+      ]
+    end
+
+    def must_not_clauses
+      [
+        {
+          terms: {
+            id: following_ids,
+          },
+        },
+
+        {
+          term: {
+            properties: 'bot',
+          },
+        },
+      ]
+    end
+
+    def should_clauses
+      {
+        term: {
+          properties: {
+            value: 'verified',
+            boost: 2,
+          },
+        },
+      }
+    end
+  end
+
+  def get(account, limit: 10)
+    recently_followed_account_ids = account.active_relationships.recent.limit(5).pluck(:target_account_id)
+
+    if Chewy.enabled? && !recently_followed_account_ids.empty?
+      QueryBuilder.new(recently_followed_account_ids, account).build.limit(limit).hits.pluck('_id').map(&:to_i).zip([key].cycle)
+    else
+      []
+    end
+  rescue Faraday::ConnectionFailed
+    []
+  end
+
+  private
+
+  def key
+    :similar_to_recently_followed
+  end
+end
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index 504d26a8bd..ee93a1342f 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -1,34 +1,18 @@
 # frozen_string_literal: true
 
 class AccountSuggestions::Source
-  def key
-    raise NotImplementedError
-  end
-
   def get(_account, **kwargs)
     raise NotImplementedError
   end
 
-  def remove(_account, target_account_id)
-    raise NotImplementedError
-  end
-
   protected
 
-  def as_ordered_suggestions(scope, ordered_list)
-    return [] if ordered_list.empty?
-
-    map = scope.index_by { |account| to_ordered_list_key(account) }
-
-    ordered_list.filter_map { |ordered_list_key| map[ordered_list_key] }.map do |account|
-      AccountSuggestions::Suggestion.new(
-        account: account,
-        source: key
-      )
-    end
-  end
-
-  def to_ordered_list_key(_account)
-    raise NotImplementedError
+  def base_account_scope(account)
+    Account.searchable
+           .followable_by(account)
+           .not_excluded_by_account(account)
+           .not_domain_blocked_by_account(account)
+           .where.not(id: account.id)
+           .joins("LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = #{account.id}").where(follow_recommendation_mutes: { target_account_id: nil })
   end
 end
diff --git a/app/models/block.rb b/app/models/block.rb
index 11156ebab3..5476542a5a 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -26,15 +26,20 @@ class Block < ApplicationRecord
   end
 
   before_validation :set_uri, only: :create
-  after_commit :remove_blocking_cache
+  after_commit :invalidate_blocking_cache
+  after_commit :invalidate_follow_recommendations_cache
 
   private
 
-  def remove_blocking_cache
+  def invalidate_blocking_cache
     Rails.cache.delete("exclude_account_ids_for:#{account_id}")
     Rails.cache.delete("exclude_account_ids_for:#{target_account_id}")
   end
 
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
+
   def set_uri
     self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
   end
diff --git a/app/models/concerns/account/associations.rb b/app/models/concerns/account/associations.rb
index 31902ae21a..2bb6fed5ad 100644
--- a/app/models/concerns/account/associations.rb
+++ b/app/models/concerns/account/associations.rb
@@ -64,6 +64,7 @@ module Account::Associations
     has_one :deletion_request, class_name: 'AccountDeletionRequest', inverse_of: :account, dependent: :destroy
 
     # Follow recommendations
+    has_one :follow_recommendation, inverse_of: :account, dependent: nil
     has_one :follow_recommendation_suppression, inverse_of: :account, dependent: :destroy
 
     # Account statuses cleanup policy
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 4ddec9bf49..351530c2f0 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -116,8 +116,6 @@ module Account::Interactions
 
     rel.save! if rel.changed?
 
-    remove_potential_friendship(other_account)
-
     rel
   end
 
@@ -131,13 +129,10 @@ module Account::Interactions
 
     rel.save! if rel.changed?
 
-    remove_potential_friendship(other_account)
-
     rel
   end
 
   def block!(other_account, uri: nil)
-    remove_potential_friendship(other_account)
     block_relationships.create_with(uri: uri)
                        .find_or_create_by!(target_account: other_account)
   end
@@ -148,8 +143,6 @@ module Account::Interactions
     mute.expires_in = duration.zero? ? nil : duration
     mute.save!
 
-    remove_potential_friendship(other_account)
-
     # When toggling a mute between hiding and allowing notifications, the mute will already exist, so the find_or_create_by! call will return the existing Mute without updating the hide_notifications attribute. Therefore, we check that hide_notifications? is what we want and set it if it isn't.
     mute.update!(hide_notifications: notifications) if mute.hide_notifications? != notifications
 
@@ -307,10 +300,4 @@ module Account::Interactions
       domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, id),
     })
   end
-
-  private
-
-  def remove_potential_friendship(other_account)
-    PotentialFriendshipTracker.remove(id, other_account.id)
-  end
 end
diff --git a/app/models/concerns/account/search.rb b/app/models/concerns/account/search.rb
index 40d87aaaa1..077e5d57b1 100644
--- a/app/models/concerns/account/search.rb
+++ b/app/models/concerns/account/search.rb
@@ -116,6 +116,7 @@ module Account::Search
     [].tap do |properties|
       properties << 'bot' if bot?
       properties << 'verified' if fields.any?(&:verified?)
+      properties << 'discoverable' if discoverable?
     end
   end
 
diff --git a/app/models/follow.rb b/app/models/follow.rb
index 108f5c5d51..4d1598dcad 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -44,10 +44,10 @@ class Follow < ApplicationRecord
 
   before_validation :set_uri, only: :create
   after_create :increment_cache_counters
-  after_create :invalidate_hash_cache
   after_destroy :remove_endorsements
   after_destroy :decrement_cache_counters
-  after_destroy :invalidate_hash_cache
+  after_commit :invalidate_follow_recommendations_cache
+  after_commit :invalidate_hash_cache
 
   private
 
@@ -74,4 +74,8 @@ class Follow < ApplicationRecord
 
     Rails.cache.delete("followers_hash:#{target_account_id}:#{account.synchronization_uri_prefix}")
   end
+
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
 end
diff --git a/app/models/follow_recommendation_filter.rb b/app/models/follow_recommendation_filter.rb
index 2fab975698..62a02eba5a 100644
--- a/app/models/follow_recommendation_filter.rb
+++ b/app/models/follow_recommendation_filter.rb
@@ -17,12 +17,9 @@ class FollowRecommendationFilter
 
   def results
     if params['status'] == 'suppressed'
-      Account.joins(:follow_recommendation_suppression).order(FollowRecommendationSuppression.arel_table[:id].desc).to_a
+      Account.includes(:account_stat).joins(:follow_recommendation_suppression).order(FollowRecommendationSuppression.arel_table[:id].desc)
     else
-      account_ids = redis.zrevrange("follow_recommendations:#{@language}", 0, -1).map(&:to_i)
-      accounts    = Account.where(id: account_ids).index_by(&:id)
-
-      account_ids.filter_map { |id| accounts[id] }
+      Account.includes(:account_stat).joins(:follow_recommendation).merge(FollowRecommendation.localized(@language).order(rank: :desc))
     end
   end
 end
diff --git a/app/models/follow_recommendation_mute.rb b/app/models/follow_recommendation_mute.rb
new file mode 100644
index 0000000000..d166d0a620
--- /dev/null
+++ b/app/models/follow_recommendation_mute.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: follow_recommendation_mutes
+#
+#  id                :bigint(8)        not null, primary key
+#  account_id        :bigint(8)        not null
+#  target_account_id :bigint(8)        not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
+class FollowRecommendationMute < ApplicationRecord
+  belongs_to :account
+  belongs_to :target_account, class_name: 'Account'
+
+  validates :target_account, uniqueness: { scope: :account_id }
+
+  after_commit :invalidate_follow_recommendations_cache
+
+  private
+
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
+end
diff --git a/app/models/follow_recommendation_suppression.rb b/app/models/follow_recommendation_suppression.rb
index e261a2fe35..59e94dc6b3 100644
--- a/app/models/follow_recommendation_suppression.rb
+++ b/app/models/follow_recommendation_suppression.rb
@@ -11,19 +11,5 @@
 #
 
 class FollowRecommendationSuppression < ApplicationRecord
-  include Redisable
-
   belongs_to :account
-
-  after_commit :remove_follow_recommendations, on: :create
-
-  private
-
-  def remove_follow_recommendations
-    redis.pipelined do |pipeline|
-      I18n.available_locales.each do |locale|
-        pipeline.zrem("follow_recommendations:#{locale}", account_id)
-      end
-    end
-  end
 end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index a5c23e09d4..3c5e8f96f0 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -45,10 +45,15 @@ class FollowRequest < ApplicationRecord
   end
 
   before_validation :set_uri, only: :create
+  after_commit :invalidate_follow_recommendations_cache
 
   private
 
   def set_uri
     self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
   end
+
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
 end
diff --git a/app/models/mute.rb b/app/models/mute.rb
index 8fc5422624..1d18b30eea 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -23,11 +23,16 @@ class Mute < ApplicationRecord
 
   validates :account_id, uniqueness: { scope: :target_account_id }
 
-  after_commit :remove_blocking_cache
+  after_commit :invalidate_blocking_cache
+  after_commit :invalidate_follow_recommendations_cache
 
   private
 
-  def remove_blocking_cache
+  def invalidate_blocking_cache
     Rails.cache.delete("exclude_account_ids_for:#{account_id}")
   end
+
+  def invalidate_follow_recommendations_cache
+    Rails.cache.delete("follow_recommendations/#{account_id}")
+  end
 end
diff --git a/app/models/preview_cards_status.rb b/app/models/preview_cards_status.rb
index 214eec22e5..5ff6352055 100644
--- a/app/models/preview_cards_status.rb
+++ b/app/models/preview_cards_status.rb
@@ -4,8 +4,8 @@
 #
 # Table name: preview_cards_statuses
 #
-#  preview_card_id :bigint(8)        not null
-#  status_id       :bigint(8)        not null
+#  preview_card_id :bigint(8)        not null, primary key
+#  status_id       :bigint(8)        not null, primary key
 #  url             :string
 #
 class PreviewCardsStatus < ApplicationRecord
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 7b85b09d8f..571a0fa57d 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -23,6 +23,7 @@ class AccountSearchService < BaseService
               query: {
                 bool: {
                   must: must_clauses,
+                  must_not: must_not_clauses,
                 },
               },
 
@@ -49,6 +50,10 @@ class AccountSearchService < BaseService
       end
     end
 
+    def must_not_clauses
+      []
+    end
+
     def should_clauses
       if @account && !@options[:following]
         [boost_following_query]
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 6fdc92a173..ded50187f7 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -20,7 +20,7 @@ class FavouriteService < BaseService
     Trends.statuses.register(status)
 
     create_notification(favourite)
-    bump_potential_friendship(account, status)
+    increment_statistics
 
     favourite
   end
@@ -37,11 +37,8 @@ class FavouriteService < BaseService
     end
   end
 
-  def bump_potential_friendship(account, status)
+  def increment_statistics
     ActivityTracker.increment('activity:interactions')
-    return if account.following?(status.account_id)
-
-    PotentialFriendshipTracker.record(account.id, status.account_id, :favourite)
   end
 
   def build_json(favourite)
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index ea27f374e7..8aa43ab245 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -178,9 +178,6 @@ class PostStatusService < BaseService
     return if !@status.reply? || @account.id == @status.in_reply_to_account_id
 
     ActivityTracker.increment('activity:interactions')
-    return if @account.following?(@status.in_reply_to_account_id)
-
-    PotentialFriendshipTracker.record(@account.id, @status.in_reply_to_account_id, :reply)
   end
 
   def status_attributes
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 6ec0944744..960315ed8b 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -33,7 +33,7 @@ class ReblogService < BaseService
     ActivityPub::DistributionWorker.perform_async(reblog.id)
 
     create_notification(reblog)
-    bump_potential_friendship(account, reblog)
+    increment_statistics
 
     reblog
   end
@@ -50,12 +50,8 @@ class ReblogService < BaseService
     end
   end
 
-  def bump_potential_friendship(account, reblog)
+  def increment_statistics
     ActivityTracker.increment('activity:interactions')
-
-    return if account.following?(reblog.reblog.account_id)
-
-    PotentialFriendshipTracker.record(account.id, reblog.reblog.account_id, :reblog)
   end
 
   def build_json(reblog)
diff --git a/app/views/admin/follow_recommendations/show.html.haml b/app/views/admin/follow_recommendations/show.html.haml
index dc65a72135..9c2063d3c5 100644
--- a/app/views/admin/follow_recommendations/show.html.haml
+++ b/app/views/admin/follow_recommendations/show.html.haml
@@ -38,3 +38,5 @@
         = nothing_here 'nothing-here--under-tabs'
       - else
         = render partial: 'account', collection: @accounts, locals: { f: f }
+
+= paginate @accounts
diff --git a/app/workers/scheduler/follow_recommendations_scheduler.rb b/app/workers/scheduler/follow_recommendations_scheduler.rb
index ea59ad986b..ea5aa8b539 100644
--- a/app/workers/scheduler/follow_recommendations_scheduler.rb
+++ b/app/workers/scheduler/follow_recommendations_scheduler.rb
@@ -2,61 +2,11 @@
 
 class Scheduler::FollowRecommendationsScheduler
   include Sidekiq::Worker
-  include Redisable
 
   sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
-  # The maximum number of accounts that can be requested in one page from the
-  # API is 80, and the suggestions API does not allow pagination. This number
-  # leaves some room for accounts being filtered during live access
-  SET_SIZE = 100
-
   def perform
-    # Maintaining a materialized view speeds-up subsequent queries significantly
     AccountSummary.refresh
     FollowRecommendation.refresh
-
-    fallback_recommendations = FollowRecommendation.order(rank: :desc).limit(SET_SIZE)
-
-    Trends.available_locales.each do |locale|
-      recommendations = if AccountSummary.safe.filtered.localized(locale).exists? # We can skip the work if no accounts with that language exist
-                          FollowRecommendation.localized(locale).order(rank: :desc).limit(SET_SIZE).map { |recommendation| [recommendation.rank, recommendation.account_id] }
-                        else
-                          []
-                        end
-
-      # Use language-agnostic results if there are not enough language-specific ones
-      missing = SET_SIZE - recommendations.size
-
-      if missing.positive? && fallback_recommendations.size.positive?
-        max_fallback_rank = fallback_recommendations.first.rank || 0
-
-        # Language-specific results should be above language-agnostic ones,
-        # otherwise language-agnostic ones will always overshadow them
-        recommendations.map! { |(rank, account_id)| [rank + max_fallback_rank, account_id] }
-
-        added = 0
-
-        fallback_recommendations.each do |recommendation|
-          next if recommendations.any? { |(_, account_id)| account_id == recommendation.account_id }
-
-          recommendations << [recommendation.rank, recommendation.account_id]
-          added += 1
-
-          break if added >= missing
-        end
-      end
-
-      redis.multi do |multi|
-        multi.del(key(locale))
-        multi.zadd(key(locale), recommendations)
-      end
-    end
-  end
-
-  private
-
-  def key(locale)
-    "follow_recommendations:#{locale}"
   end
 end
diff --git a/db/migrate/20231211234923_create_follow_recommendation_mutes.rb b/db/migrate/20231211234923_create_follow_recommendation_mutes.rb
new file mode 100644
index 0000000000..92cb16e17b
--- /dev/null
+++ b/db/migrate/20231211234923_create_follow_recommendation_mutes.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateFollowRecommendationMutes < ActiveRecord::Migration[7.1]
+  def change
+    create_table :follow_recommendation_mutes do |t|
+      t.references :account, null: false, foreign_key: { on_delete: :cascade }, index: false
+      t.references :target_account, null: false, foreign_key: { to_table: 'accounts', on_delete: :cascade }
+
+      t.timestamps
+    end
+
+    add_index :follow_recommendation_mutes, [:account_id, :target_account_id], unique: true
+  end
+end
diff --git a/db/migrate/20231212073317_add_languages_index_to_account_summaries.rb b/db/migrate/20231212073317_add_languages_index_to_account_summaries.rb
new file mode 100644
index 0000000000..8adaf792c3
--- /dev/null
+++ b/db/migrate/20231212073317_add_languages_index_to_account_summaries.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddLanguagesIndexToAccountSummaries < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction!
+
+  def change
+    add_index :account_summaries, [:account_id, :language, :sensitive], algorithm: :concurrently
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a0062c8cea..126ed8785a 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[7.0].define(version: 2023_10_06_183200) do
+ActiveRecord::Schema[7.1].define(version: 2023_12_12_073317) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -474,6 +474,15 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_06_183200) do
     t.index ["tag_id"], name: "index_featured_tags_on_tag_id"
   end
 
+  create_table "follow_recommendation_mutes", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "target_account_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "idx_on_account_id_target_account_id_a8c8ddf44e", unique: true
+    t.index ["target_account_id"], name: "index_follow_recommendation_mutes_on_target_account_id"
+  end
+
   create_table "follow_recommendation_suppressions", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.datetime "created_at", null: false
@@ -1209,6 +1218,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_06_183200) do
   add_foreign_key "favourites", "statuses", name: "fk_b0e856845e", on_delete: :cascade
   add_foreign_key "featured_tags", "accounts", on_delete: :cascade
   add_foreign_key "featured_tags", "tags", on_delete: :cascade
+  add_foreign_key "follow_recommendation_mutes", "accounts", column: "target_account_id", on_delete: :cascade
+  add_foreign_key "follow_recommendation_mutes", "accounts", on_delete: :cascade
   add_foreign_key "follow_recommendation_suppressions", "accounts", on_delete: :cascade
   add_foreign_key "follow_requests", "accounts", column: "target_account_id", name: "fk_9291ec025d", on_delete: :cascade
   add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
@@ -1341,6 +1352,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_06_183200) do
     WHERE ((accounts.suspended_at IS NULL) AND (accounts.silenced_at IS NULL) AND (accounts.moved_to_account_id IS NULL) AND (accounts.discoverable = true) AND (accounts.locked = false))
     GROUP BY accounts.id;
   SQL
+  add_index "account_summaries", ["account_id", "language", "sensitive"], name: "idx_on_account_id_language_sensitive_250461e1eb"
   add_index "account_summaries", ["account_id"], name: "index_account_summaries_on_account_id", unique: true
 
   create_view "global_follow_recommendations", materialized: true, sql_definition: <<-SQL
diff --git a/spec/requests/api/v1/suggestions_spec.rb b/spec/requests/api/v1/suggestions_spec.rb
index 42b7f86629..dc89613fc5 100644
--- a/spec/requests/api/v1/suggestions_spec.rb
+++ b/spec/requests/api/v1/suggestions_spec.rb
@@ -13,13 +13,12 @@ RSpec.describe 'Suggestions' do
       get '/api/v1/suggestions', headers: headers, params: params
     end
 
-    let(:bob)    { Fabricate(:account) }
-    let(:jeff)   { Fabricate(:account) }
+    let(:bob) { Fabricate(:account) }
+    let(:jeff) { Fabricate(:account) }
     let(:params) { {} }
 
     before do
-      PotentialFriendshipTracker.record(user.account_id, bob.id, :reblog)
-      PotentialFriendshipTracker.record(user.account_id, jeff.id, :favourite)
+      Setting.bootstrap_timeline_accounts = [bob, jeff].map(&:acct).join(',')
     end
 
     it_behaves_like 'forbidden for wrong scope', 'write'
@@ -65,17 +64,15 @@ RSpec.describe 'Suggestions' do
       delete "/api/v1/suggestions/#{jeff.id}", headers: headers
     end
 
-    let(:suggestions_source) { instance_double(AccountSuggestions::PastInteractionsSource, remove: nil) }
-    let(:bob)                { Fabricate(:account) }
-    let(:jeff)               { Fabricate(:account) }
+    let(:bob) { Fabricate(:account) }
+    let(:jeff) { Fabricate(:account) }
+    let(:scopes) { 'write' }
 
     before do
-      PotentialFriendshipTracker.record(user.account_id, bob.id, :reblog)
-      PotentialFriendshipTracker.record(user.account_id, jeff.id, :favourite)
-      allow(AccountSuggestions::PastInteractionsSource).to receive(:new).and_return(suggestions_source)
+      Setting.bootstrap_timeline_accounts = [bob, jeff].map(&:acct).join(',')
     end
 
-    it_behaves_like 'forbidden for wrong scope', 'write'
+    it_behaves_like 'forbidden for wrong scope', 'read'
 
     it 'returns http success' do
       subject
@@ -86,8 +83,7 @@ RSpec.describe 'Suggestions' do
     it 'removes the specified suggestion' do
       subject
 
-      expect(suggestions_source).to have_received(:remove).with(user.account, jeff.id.to_s).once
-      expect(suggestions_source).to_not have_received(:remove).with(user.account, bob.id.to_s)
+      expect(FollowRecommendationMute.exists?(account: user.account, target_account: jeff)).to be true
     end
 
     context 'without an authorization header' do
diff --git a/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb b/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
index 18d5260e42..246012e128 100644
--- a/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
+++ b/spec/workers/scheduler/follow_recommendations_scheduler_spec.rb
@@ -29,14 +29,12 @@ describe Scheduler::FollowRecommendationsScheduler do
 
       it 'creates recommendations' do
         expect { scheduled_run }.to change(FollowRecommendation, :count).from(0).to(target_accounts.size)
-        expect(redis.zrange('follow_recommendations:en', 0, -1)).to match_array(target_accounts.pluck(:id).map(&:to_s))
       end
     end
 
     context 'when there are no accounts to recommend' do
       it 'does not create follow recommendations' do
         expect { scheduled_run }.to_not change(FollowRecommendation, :count)
-        expect(redis.zrange('follow_recommendations:en', 0, -1)).to be_empty
       end
     end
   end

From 4075b4d7ee962642a50e0933882d769934c58760 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 13:39:59 +0100
Subject: [PATCH 115/436] Update dependency node to 20.10 (#28040)

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

diff --git a/.nvmrc b/.nvmrc
index 48ef2c10ba..d4c3d320cc 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.9
+20.10

From 5489d4c84c07b9fff56976d0de346ce24f344fda Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Dec 2023 13:54:02 +0100
Subject: [PATCH 116/436] Update dependency aws-sdk-s3 to v1.141.0 (#28116)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b33402b22..15bdb9b4f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,20 +131,20 @@ GEM
     attr_required (1.0.1)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.857.0)
-    aws-sdk-core (3.188.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-partitions (1.860.0)
+    aws-sdk-core (3.189.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.73.0)
+    aws-sdk-kms (1.74.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.140.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-s3 (1.141.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.7.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure-storage-blob (2.0.3)
       azure-storage-common (~> 2.0)

From c7c727994a04b0ce959d149593a2c732707e7ea5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 19 Dec 2023 08:10:33 -0500
Subject: [PATCH 117/436] Add spec for `CLI::Maintenance#fix_duplicates`
 (#28326)

---
 lib/mastodon/cli/maintenance.rb           |  2 +-
 spec/lib/mastodon/cli/maintenance_spec.rb | 73 +++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 2e5243468b..98067c6e34 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -546,7 +546,7 @@ module Mastodon::CLI
       if migrator_version < 2021_04_21_121431
         ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
       else
-        ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
+        ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
       end
     end
 
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index 02169b7a42..61331e6dba 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -52,5 +52,78 @@ describe Mastodon::CLI::Maintenance do
           .and raise_error(SystemExit)
       end
     end
+
+    context 'when requirements are met' do
+      before do
+        allow(ActiveRecord::Migrator).to receive(:current_version).and_return(2023_08_22_081029) # The latest migration before the cutoff
+        agree_to_backup_warning
+      end
+
+      context 'with duplicate accounts' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_account_username) { 'username' }
+        let(:duplicate_account_domain) { 'host.example' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating accounts',
+              'Restoring index_accounts_on_username_and_domain_lower',
+              'Reindexing textual indexes on accounts…',
+              'Finished!'
+            )
+            .and change(duplicate_accounts, :count).from(2).to(1)
+        end
+
+        def duplicate_accounts
+          Account.where(username: duplicate_account_username, domain: duplicate_account_domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :accounts, name: :index_accounts_on_username_and_domain_lower
+          Fabricate(:account, username: duplicate_account_username, domain: duplicate_account_domain)
+          Fabricate.build(:account, username: duplicate_account_username, domain: duplicate_account_domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate users' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_email) { 'duplicate@example.host' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating user records',
+              'Restoring users indexes',
+              'Finished!'
+            )
+            .and change(duplicate_users, :count).from(2).to(1)
+        end
+
+        def duplicate_users
+          User.where(email: duplicate_email)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :users, :email
+          Fabricate(:user, email: duplicate_email)
+          Fabricate.build(:user, email: duplicate_email).save(validate: false)
+        end
+      end
+
+      def agree_to_backup_warning
+        allow(cli.shell)
+          .to receive(:yes?)
+          .with('Continue? (Yes/No)')
+          .and_return(true)
+          .once
+      end
+    end
   end
 end

From 6fed0fcbaa1ac5866443e6af6424a78a78b78688 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 19 Dec 2023 16:17:22 +0100
Subject: [PATCH 118/436] Remove unneeded settings cleanup from specs (#28425)

---
 .../settings/branding_controller_spec.rb      |  8 ----
 .../api/v1/trends/links_controller_spec.rb    |  6 ---
 .../api/v1/trends/statuses_controller_spec.rb |  6 ---
 .../api/v1/trends/tags_controller_spec.rb     |  6 ---
 .../auth/registrations_controller_spec.rb     | 44 -------------------
 .../account_controller_concern_spec.rb        |  6 ---
 spec/helpers/application_helper_spec.rb       | 12 -----
 spec/helpers/instance_helper_spec.rb          |  6 ---
 spec/models/user_spec.rb                      | 34 ++------------
 spec/presenters/instance_presenter_spec.rb    | 24 ----------
 .../api/v1/instances/activity_spec.rb         |  6 ---
 .../api/v1/instances/domain_blocks_spec.rb    |  6 ---
 spec/requests/api/v1/instances/peers_spec.rb  |  6 ---
 spec/requests/cache_spec.rb                   | 20 ++-------
 spec/services/app_sign_up_service_spec.rb     |  7 +--
 15 files changed, 8 insertions(+), 189 deletions(-)

diff --git a/spec/controllers/admin/settings/branding_controller_spec.rb b/spec/controllers/admin/settings/branding_controller_spec.rb
index 435616022a..e30300b4e4 100644
--- a/spec/controllers/admin/settings/branding_controller_spec.rb
+++ b/spec/controllers/admin/settings/branding_controller_spec.rb
@@ -19,14 +19,6 @@ RSpec.describe Admin::Settings::BrandingController do
     end
 
     describe 'PUT #update' do
-      around do |example|
-        before = Setting.site_short_description
-        Setting.site_short_description = nil
-        example.run
-        Setting.site_short_description = before
-        Setting.new_setting_key = nil
-      end
-
       it 'cannot create a setting value for a non-admin key' do
         expect(Setting.new_setting_key).to be_blank
 
diff --git a/spec/controllers/api/v1/trends/links_controller_spec.rb b/spec/controllers/api/v1/trends/links_controller_spec.rb
index 12d4198aaf..bcaf066f16 100644
--- a/spec/controllers/api/v1/trends/links_controller_spec.rb
+++ b/spec/controllers/api/v1/trends/links_controller_spec.rb
@@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::LinksController do
   render_views
 
   describe 'GET #index' do
-    around do |example|
-      previous = Setting.trends
-      example.run
-      Setting.trends = previous
-    end
-
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
diff --git a/spec/controllers/api/v1/trends/statuses_controller_spec.rb b/spec/controllers/api/v1/trends/statuses_controller_spec.rb
index 69fdb270d5..25ab5f228a 100644
--- a/spec/controllers/api/v1/trends/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/trends/statuses_controller_spec.rb
@@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::StatusesController do
   render_views
 
   describe 'GET #index' do
-    around do |example|
-      previous = Setting.trends
-      example.run
-      Setting.trends = previous
-    end
-
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
diff --git a/spec/controllers/api/v1/trends/tags_controller_spec.rb b/spec/controllers/api/v1/trends/tags_controller_spec.rb
index 9311392cd9..c889f1c5b9 100644
--- a/spec/controllers/api/v1/trends/tags_controller_spec.rb
+++ b/spec/controllers/api/v1/trends/tags_controller_spec.rb
@@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::TagsController do
   render_views
 
   describe 'GET #index' do
-    around do |example|
-      previous = Setting.trends
-      example.run
-      Setting.trends = previous
-    end
-
     context 'when trends are disabled' do
       before { Setting.trends = false }
 
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index a9b24a1004..37172f8d24 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -6,12 +6,6 @@ RSpec.describe Auth::RegistrationsController do
   render_views
 
   shared_examples 'checks for enabled registrations' do |path|
-    around do |example|
-      registrations_mode = Setting.registrations_mode
-      example.run
-      Setting.registrations_mode = registrations_mode
-    end
-
     it 'redirects if it is in single user mode while it is open for registration' do
       Fabricate(:account)
       Setting.registrations_mode = 'open'
@@ -82,12 +76,6 @@ RSpec.describe Auth::RegistrationsController do
     end
 
     context 'with open registrations' do
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        example.run
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'returns http success' do
         Setting.registrations_mode = 'open'
         get :new
@@ -120,12 +108,6 @@ RSpec.describe Auth::RegistrationsController do
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
       end
 
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        example.run
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
@@ -146,12 +128,6 @@ RSpec.describe Auth::RegistrationsController do
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'false' } }
       end
 
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        example.run
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'does not create user' do
         subject
         user = User.find_by(email: 'test@example.com')
@@ -166,12 +142,6 @@ RSpec.describe Auth::RegistrationsController do
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
       end
 
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        example.run
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
@@ -194,12 +164,6 @@ RSpec.describe Auth::RegistrationsController do
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } }
       end
 
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        example.run
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
@@ -224,14 +188,6 @@ RSpec.describe Auth::RegistrationsController do
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } }
       end
 
-      around do |example|
-        registrations_mode = Setting.registrations_mode
-        require_invite_text = Setting.require_invite_text
-        example.run
-        Setting.require_invite_text = require_invite_text
-        Setting.registrations_mode = registrations_mode
-      end
-
       it 'redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 56ffcfb047..e3295204aa 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -11,12 +11,6 @@ describe AccountControllerConcern do
     end
   end
 
-  around do |example|
-    registrations_mode = Setting.registrations_mode
-    example.run
-    Setting.registrations_mode = registrations_mode
-  end
-
   before do
     routes.draw { get 'success' => 'anonymous#success' }
   end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 0a55770bad..ef1463e64c 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -292,12 +292,6 @@ describe ApplicationHelper do
   end
 
   describe 'title' do
-    around do |example|
-      site_title = Setting.site_title
-      example.run
-      Setting.site_title = site_title
-    end
-
     it 'returns site title on production environment' do
       Setting.site_title = 'site title'
       allow(Rails.env).to receive(:production?).and_return(true)
@@ -318,12 +312,6 @@ describe ApplicationHelper do
       allow(Rails.env).to receive(:production?).and_return(true)
     end
 
-    around do |example|
-      site_title = Setting.site_title
-      example.run
-      Setting.site_title = site_title
-    end
-
     context 'with a page_title content_for value' do
       it 'uses the value in the html title' do
         Setting.site_title = 'Site Title'
diff --git a/spec/helpers/instance_helper_spec.rb b/spec/helpers/instance_helper_spec.rb
index cdbce56598..7e39b7cb3d 100644
--- a/spec/helpers/instance_helper_spec.rb
+++ b/spec/helpers/instance_helper_spec.rb
@@ -4,12 +4,6 @@ require 'rails_helper'
 
 describe InstanceHelper do
   describe 'site_title' do
-    around do |example|
-      site_title = Setting.site_title
-      example.run
-      Setting.site_title = site_title
-    end
-
     it 'Uses the Setting.site_title value when it exists' do
       Setting.site_title = 'New site title'
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a2f8d2ca44..9111fd7c73 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -175,16 +175,8 @@ RSpec.describe User do
       let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) }
 
       context 'when the user is already approved' do
-        around do |example|
-          registrations_mode = Setting.registrations_mode
-          Setting.registrations_mode = 'approved'
-
-          example.run
-
-          Setting.registrations_mode = registrations_mode
-        end
-
         before do
+          Setting.registrations_mode = 'approved'
           user.approve!
         end
 
@@ -199,13 +191,8 @@ RSpec.describe User do
       end
 
       context 'when the user does not require explicit approval' do
-        around do |example|
-          registrations_mode = Setting.registrations_mode
+        before do
           Setting.registrations_mode = 'open'
-
-          example.run
-
-          Setting.registrations_mode = registrations_mode
         end
 
         it 'sets email to unconfirmed_email' do
@@ -219,13 +206,8 @@ RSpec.describe User do
       end
 
       context 'when the user requires explicit approval but is not approved' do
-        around do |example|
-          registrations_mode = Setting.registrations_mode
+        before do
           Setting.registrations_mode = 'approved'
-
-          example.run
-
-          Setting.registrations_mode = registrations_mode
         end
 
         it 'sets email to unconfirmed_email' do
@@ -243,16 +225,8 @@ RSpec.describe User do
   describe '#approve!' do
     subject { user.approve! }
 
-    around do |example|
-      registrations_mode = Setting.registrations_mode
-      Setting.registrations_mode = 'approved'
-
-      example.run
-
-      Setting.registrations_mode = registrations_mode
-    end
-
     before do
+      Setting.registrations_mode = 'approved'
       allow(TriggerWebhookWorker).to receive(:perform_async)
     end
 
diff --git a/spec/presenters/instance_presenter_spec.rb b/spec/presenters/instance_presenter_spec.rb
index 2a1d668ceb..516c7e9896 100644
--- a/spec/presenters/instance_presenter_spec.rb
+++ b/spec/presenters/instance_presenter_spec.rb
@@ -6,12 +6,6 @@ describe InstancePresenter do
   let(:instance_presenter) { described_class.new }
 
   describe '#description' do
-    around do |example|
-      site_description = Setting.site_short_description
-      example.run
-      Setting.site_short_description = site_description
-    end
-
     it 'delegates site_description to Setting' do
       Setting.site_short_description = 'Site desc'
       expect(instance_presenter.description).to eq 'Site desc'
@@ -19,12 +13,6 @@ describe InstancePresenter do
   end
 
   describe '#extended_description' do
-    around do |example|
-      site_extended_description = Setting.site_extended_description
-      example.run
-      Setting.site_extended_description = site_extended_description
-    end
-
     it 'delegates site_extended_description to Setting' do
       Setting.site_extended_description = 'Extended desc'
       expect(instance_presenter.extended_description).to eq 'Extended desc'
@@ -32,12 +20,6 @@ describe InstancePresenter do
   end
 
   describe '#email' do
-    around do |example|
-      site_contact_email = Setting.site_contact_email
-      example.run
-      Setting.site_contact_email = site_contact_email
-    end
-
     it 'delegates contact_email to Setting' do
       Setting.site_contact_email = 'admin@example.com'
       expect(instance_presenter.contact.email).to eq 'admin@example.com'
@@ -45,12 +27,6 @@ describe InstancePresenter do
   end
 
   describe '#account' do
-    around do |example|
-      site_contact_username = Setting.site_contact_username
-      example.run
-      Setting.site_contact_username = site_contact_username
-    end
-
     it 'returns the account for the site contact username' do
       Setting.site_contact_username = 'aaa'
       account = Fabricate(:account, username: 'aaa')
diff --git a/spec/requests/api/v1/instances/activity_spec.rb b/spec/requests/api/v1/instances/activity_spec.rb
index d1f92ef36e..4f2bc91ad6 100644
--- a/spec/requests/api/v1/instances/activity_spec.rb
+++ b/spec/requests/api/v1/instances/activity_spec.rb
@@ -4,12 +4,6 @@ require 'rails_helper'
 
 RSpec.describe 'Activity' do
   describe 'GET /api/v1/instance/activity' do
-    around do |example|
-      original = Setting.activity_api_enabled
-      example.run
-      Setting.activity_api_enabled = original
-    end
-
     context 'with activity api enabled' do
       before { Setting.activity_api_enabled = true }
 
diff --git a/spec/requests/api/v1/instances/domain_blocks_spec.rb b/spec/requests/api/v1/instances/domain_blocks_spec.rb
index 99b5e2b6aa..397ecff084 100644
--- a/spec/requests/api/v1/instances/domain_blocks_spec.rb
+++ b/spec/requests/api/v1/instances/domain_blocks_spec.rb
@@ -4,12 +4,6 @@ require 'rails_helper'
 
 RSpec.describe 'Domain Blocks' do
   describe 'GET /api/v1/instance/domain_blocks' do
-    around do |example|
-      original = Setting.show_domain_blocks
-      example.run
-      Setting.show_domain_blocks = original
-    end
-
     before do
       Fabricate(:domain_block)
     end
diff --git a/spec/requests/api/v1/instances/peers_spec.rb b/spec/requests/api/v1/instances/peers_spec.rb
index d3400ae8fd..1a7975f8b7 100644
--- a/spec/requests/api/v1/instances/peers_spec.rb
+++ b/spec/requests/api/v1/instances/peers_spec.rb
@@ -4,12 +4,6 @@ require 'rails_helper'
 
 RSpec.describe 'Peers' do
   describe 'GET /api/v1/instance/peers' do
-    around do |example|
-      original = Setting.peers_api_enabled
-      example.run
-      Setting.peers_api_enabled = original
-    end
-
     context 'with peers api enabled' do
       before { Setting.peers_api_enabled = true }
 
diff --git a/spec/requests/cache_spec.rb b/spec/requests/cache_spec.rb
index ce73d3af75..dbba228740 100644
--- a/spec/requests/cache_spec.rb
+++ b/spec/requests/cache_spec.rb
@@ -242,17 +242,11 @@ describe 'Caching behavior' do
     end
 
     describe '/api/v1/instance/domain_blocks' do
-      around do |example|
-        old_setting = Setting.show_domain_blocks
+      before do
         Setting.show_domain_blocks = show_domain_blocks
-
-        example.run
-
-        Setting.show_domain_blocks = old_setting
+        get '/api/v1/instance/domain_blocks'
       end
 
-      before { get '/api/v1/instance/domain_blocks' }
-
       context 'when set to be publicly-available' do
         let(:show_domain_blocks) { 'all' }
 
@@ -365,16 +359,8 @@ describe 'Caching behavior' do
     end
 
     describe '/api/v1/instance/domain_blocks' do
-      around do |example|
-        old_setting = Setting.show_domain_blocks
-        Setting.show_domain_blocks = show_domain_blocks
-
-        example.run
-
-        Setting.show_domain_blocks = old_setting
-      end
-
       before do
+        Setting.show_domain_blocks = show_domain_blocks
         get '/api/v1/instance/domain_blocks', headers: { 'Authorization' => "Bearer #{token.token}" }
       end
 
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index d5946cf9b0..0adb473f17 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -28,13 +28,8 @@ RSpec.describe AppSignUpService, type: :service do
     end
 
     context 'when registrations are closed' do
-      around do |example|
-        tmp = Setting.registrations_mode
+      before do
         Setting.registrations_mode = 'none'
-
-        example.run
-
-        Setting.registrations_mode = tmp
       end
 
       it 'raises an error', :aggregate_failures do

From 961d65aba6432d83e70a5e8ee720034b87064d02 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 20 Dec 2023 03:54:04 -0500
Subject: [PATCH 119/436] Add coverage to CLI Maintenance for duplicate users
 on `confirmation_token` and `reset_password_token` values (#28434)

---
 spec/lib/mastodon/cli/maintenance_spec.rb | 60 ++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index 61331e6dba..353bf08b68 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -89,7 +89,7 @@ describe Mastodon::CLI::Maintenance do
         end
       end
 
-      context 'with duplicate users' do
+      context 'with duplicate users on email' do
         before do
           prepare_duplicate_data
         end
@@ -117,6 +117,64 @@ describe Mastodon::CLI::Maintenance do
         end
       end
 
+      context 'with duplicate users on confirmation_token' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_confirmation_token) { '123ABC' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating user records',
+              'Unsetting confirmation token',
+              'Restoring users indexes',
+              'Finished!'
+            )
+            .and change(duplicate_users, :count).from(2).to(1)
+        end
+
+        def duplicate_users
+          User.where(confirmation_token: duplicate_confirmation_token)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :users, :confirmation_token
+          Fabricate(:user, confirmation_token: duplicate_confirmation_token)
+          Fabricate.build(:user, confirmation_token: duplicate_confirmation_token).save(validate: false)
+        end
+      end
+
+      context 'with duplicate users on reset_password_token' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_reset_password_token) { '123ABC' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating user records',
+              'Unsetting password reset token',
+              'Restoring users indexes',
+              'Finished!'
+            )
+            .and change(duplicate_users, :count).from(2).to(1)
+        end
+
+        def duplicate_users
+          User.where(reset_password_token: duplicate_reset_password_token)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :users, :reset_password_token
+          Fabricate(:user, reset_password_token: duplicate_reset_password_token)
+          Fabricate.build(:user, reset_password_token: duplicate_reset_password_token).save(validate: false)
+        end
+      end
+
       def agree_to_backup_warning
         allow(cli.shell)
           .to receive(:yes?)

From 9a24b124168b65cf93ab9f8372e415d692f2c62f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 09:54:21 +0100
Subject: [PATCH 120/436] Update dependency sass-loader to v10.5.1 (#28432)

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

diff --git a/yarn.lock b/yarn.lock
index a11316260f..764faff27a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14485,8 +14485,8 @@ __metadata:
   linkType: hard
 
 "sass-loader@npm:^10.2.0":
-  version: 10.5.0
-  resolution: "sass-loader@npm:10.5.0"
+  version: 10.5.1
+  resolution: "sass-loader@npm:10.5.1"
   dependencies:
     klona: "npm:^2.0.4"
     loader-utils: "npm:^2.0.0"
@@ -14505,7 +14505,7 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: be5da7784fd21c4f526cc3afaa1a765ba44cdc2f9798ecbac87b296ab44184ac5ba9bbda68a7a86f8cdcb6130acceefeb8912260fca14bdfc97f9dad02658400
+  checksum: 841448d02045b0c65595eab4cb701384b01a2adcb3594beacbb767b0cee5bd9d444027f4fc3a10acef3fe1c7eb6510fccffdee72a20e9877777789a5e349cb49
   languageName: node
   linkType: hard
 

From fecc07856ce3eeb6fa8dc15cb22283f4c60d10bb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:15:30 +0100
Subject: [PATCH 121/436] New Crowdin Translations (automated) (#28439)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ie.json  |  37 +
 app/javascript/mastodon/locales/lad.json |  49 ++
 config/locales/activerecord.lad.yml      |   8 +
 config/locales/devise.ie.yml             |   2 +
 config/locales/ie.yml                    | 561 ++++++++++++++-
 config/locales/lad.yml                   | 850 ++++++++++++++++++++++-
 config/locales/simple_form.ie.yml        |  34 +
 config/locales/simple_form.lad.yml       |  36 +
 8 files changed, 1571 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 966b272720..9f91bf2cef 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -140,6 +140,7 @@
   "compose.published.open": "Aperter",
   "compose.saved.body": "Posta conservat.",
   "compose_form.direct_message_warning_learn_more": "Aprender plu",
+  "compose_form.encryption_warning": "Postas in Mastodon ne es inciffrat de comense a fine. Ne posta quelcunc information sensitiv per Mastodon.",
   "compose_form.hashtag_warning": "Ti-ci posta ne va esser listat sur quelcunc hashtag pro que it ne es public. Solmen public postas posse esser serchat per hashtag.",
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
@@ -197,6 +198,7 @@
   "directory.new_arrivals": "Nov arivantes",
   "directory.recently_active": "Recentmen activ",
   "disabled_account_banner.account_settings": "Parametres del conto",
+  "disabled_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat.",
   "dismissable_banner.community_timeline": "Tis-ci es li postas max recent de gente con contos che {domain}.",
   "dismissable_banner.dismiss": "Demisser",
   "dismissable_banner.explore_links": "Tis-ci es li novas max distribuet che li social retage hodie. Novas plu nov, postat de plu diferent persones, es monstrat plu alt.",
@@ -321,6 +323,7 @@
   "interaction_modal.on_another_server": "Sur un servitor diferent",
   "interaction_modal.on_this_server": "Sur ti-ci servitor",
   "interaction_modal.sign_in": "Tu ne ha initiat session che ti-ci servitor. U logia tui conto?",
+  "interaction_modal.sign_in_hint": "Nota: To es li websitu u tu adheret. Si tu ne rememora, sercha li benevenit-email in tui inbuxe. Tu anc posse introducter tui plen usator-nómine! (p.ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favoritisar li posta de {name}",
   "interaction_modal.title.follow": "Sequer {name}",
   "interaction_modal.title.reblog": "Boostar li posta de {name}",
@@ -351,10 +354,17 @@
   "keyboard_shortcuts.profile": "Aperter profil del autor",
   "keyboard_shortcuts.reply": "Responder al posta",
   "keyboard_shortcuts.requests": "Aperter liste de seque-petitiones",
+  "keyboard_shortcuts.search": "Infocar sercha-barre",
+  "keyboard_shortcuts.spoilers": "Monstrar/celar CW camp",
+  "keyboard_shortcuts.start": "Aperter \"Qualmen comensar\" columne",
+  "keyboard_shortcuts.toggle_hidden": "Monstrar/celar text detra CW",
   "keyboard_shortcuts.toggle_sensitivity": "Monstrar/celar medie",
   "keyboard_shortcuts.toot": "Crear un nov posta",
+  "keyboard_shortcuts.unfocus": "Desinfocar text-area de composition/serchar",
   "keyboard_shortcuts.up": "Mover ad-supra in li liste",
   "lightbox.close": "Cluder",
+  "lightbox.compress": "Compresser vise-buxe de image",
+  "lightbox.expand": "Expander vise-buxe de image",
   "lightbox.next": "Sequent",
   "lightbox.previous": "Precedent",
   "limited_account_hint.action": "Monstrar profil totvez",
@@ -382,6 +392,7 @@
   "mute_modal.hide_notifications": "Celar notificationes de ti-ci usator?",
   "mute_modal.indefinite": "Índefinit",
   "navigation_bar.about": "Information",
+  "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
   "navigation_bar.blocks": "Bloccat usatores",
   "navigation_bar.bookmarks": "Marcatores",
   "navigation_bar.community_timeline": "Local témpor-linea",
@@ -399,6 +410,7 @@
   "navigation_bar.lists": "Listes",
   "navigation_bar.logout": "Exear",
   "navigation_bar.mutes": "Silentiat usatores",
+  "navigation_bar.opened_in_classic_interface": "Postas, contos e altri specific págines es customalmen apertet in li classic web-interfacie.",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Pinglat postas",
   "navigation_bar.preferences": "Preferenties",
@@ -421,12 +433,16 @@
   "notifications.clear_confirmation": "Vole tu vermen permanentmen aclarar omni tui notificationes?",
   "notifications.column_settings.admin.report": "Nov raportas:",
   "notifications.column_settings.admin.sign_up": "Nov registrationes:",
+  "notifications.column_settings.alert": "Notificationes sur li computator",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar omni categories",
+  "notifications.column_settings.filter_bar.category": "Rapid filtre-barre",
+  "notifications.column_settings.filter_bar.show_bar": "Monstrar filtre-barre",
   "notifications.column_settings.follow": "Nov sequitores:",
   "notifications.column_settings.follow_request": "Nov petitiones de sequer:",
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultates del balotation:",
+  "notifications.column_settings.push": "Notificationes push",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Monstrar in columne",
   "notifications.column_settings.sound": "Far son",
@@ -444,6 +460,12 @@
   "notifications.grant_permission": "Dar permission.",
   "notifications.group": "{count} notificationes",
   "notifications.mark_as_read": "Marcar omni notificationes quam leet",
+  "notifications.permission_denied": "Notificationes sur li computator es índisponibil pro que on ha previamen rejectet un petition por navigator-permissiones",
+  "notifications.permission_denied_alert": "Notificationes sur li computator ne posse esser activisat, pro que navigator-permission ha esset previamen rejectet",
+  "notifications.permission_required": "Notificationes sur li computator es índisponibil pro que li besonat permission ne ha esset dat.",
+  "notifications_permission_banner.enable": "Activisar notificationes sur li computator",
+  "notifications_permission_banner.how_to_control": "Por reciver notificationes quande Mastodon ne es apert, activisa notificationes sur li computator. Tu posse decider precisimen quel species de interactiones genera notificationes per li buton {icon} in-supra quande ili es activisat.",
+  "notifications_permission_banner.title": "Nequande preterlassa quocunc",
   "onboarding.action.back": "Retroear",
   "onboarding.actions.back": "Retroear",
   "onboarding.actions.go_to_explore": "Ear a vider lu populari",
@@ -474,9 +496,14 @@
   "onboarding.steps.follow_people.title": "Personalisar tui hemal témpor-linea",
   "onboarding.steps.publish_status.body": "Saluta li munde con text, images, videos o balotationes {emoji}",
   "onboarding.steps.publish_status.title": "Crear tui unesim posta",
+  "onboarding.steps.setup_profile.body": "Ascresce tui interactiones per haver un profil detalliat.",
   "onboarding.steps.setup_profile.title": "Personalisar tui profil",
   "onboarding.steps.share_profile.body": "Di tui amics qualmen trovar te che Mastodon",
   "onboarding.steps.share_profile.title": "Partir tui profil Mastodon",
+  "onboarding.tips.2fa": "<strong>Savet tu?</strong> Tu posse securisar tui conto per activisar 2-factor autentication in tui parametres de conto. Ti functiona con quelcunc aplication TOTP quel tu selecte, null númere de telefon besonat!",
+  "onboarding.tips.accounts_from_other_servers": "<strong>Savet tu?</strong> Pro que Mastodon es decentralisat, quelc profiles queles tu trova va esser logiat che servitores altri quam tui. Totvez tu posse interacter con les sin grates! Lor servitores es in li duesim demí de lor usator-nómines!",
+  "onboarding.tips.migration": "<strong>Savet tu?</strong> Si tu senti que {domain} ne es un bonissim servitor por te futurimen, tu posse mover te a un altri Mastodon-servitor sin perdir tui sequitores. Tu posse mem etablisser tui propri servitor!",
+  "onboarding.tips.verification": "<strong>Savet tu?</strong> Tu posse verificar tui conto per metter un ligament a tui Mastodon-profil in tui propri websitu e adjunter li websitu a tui profil. Null payament o documentes besonat!",
   "password_confirmation.exceeds_maxlength": "Confirmation de passa-parol transpassa li maxim longore de passa-paroles",
   "password_confirmation.mismatching": "Confirmation de passa-parol ne egala",
   "picture_in_picture.restore": "Restaurar",
@@ -600,6 +627,8 @@
   "status.admin_status": "Aperter ti-ci posta in li interfacie de moderation",
   "status.block": "Bloccar @{name}",
   "status.bookmark": "Marcar",
+  "status.cancel_reblog_private": "Desboostar",
+  "status.cannot_reblog": "Ti-ci posta ne posse esser boostat",
   "status.copy": "Copiar ligament al posta",
   "status.delete": "Deleter",
   "status.detailed_status": "Detalliat vise de conversation",
@@ -627,6 +656,10 @@
   "status.pin": "Pinglar sur profil",
   "status.pinned": "Pinglat posta",
   "status.read_more": "Leer plu",
+  "status.reblog": "Boostar",
+  "status.reblog_private": "Boostar con li original visibilitá",
+  "status.reblogged_by": "{name} boostat",
+  "status.reblogs.empty": "Ancor nequi ha boostat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
   "status.redraft": "Deleter & redacter",
   "status.remove_bookmark": "Remover marcator",
   "status.replied_to": "Respondet a {name}",
@@ -664,6 +697,9 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} persones}} durant li ultim {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Actualmen populari",
   "ui.beforeunload": "Tui íncomplet posta va esser perdit si tu lassa Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
   "upload_area.title": "Trenar & lassar cader por cargar",
   "upload_button.label": "Adjunter images, un video o un audio-file",
   "upload_error.limit": "Límite de medie-cargationes transpassat.",
@@ -679,6 +715,7 @@
   "upload_modal.apply": "Aplicar",
   "upload_modal.applying": "Aplicant…",
   "upload_modal.choose_image": "Selecter image",
+  "upload_modal.description_placeholder": "Li Europan lingues es membres del sam familie. Lor separat existentie es un mite",
   "upload_modal.detect_text": "Detecter text del image",
   "upload_modal.edit_media": "Redacter medie",
   "upload_modal.hint": "Clicca o trena li circul por selecter li focal punctu quel va esser sempre visibil in omni previse-images.",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index ffdc044412..1b501c710a 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -294,18 +294,25 @@
   "hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
   "hashtag.column_settings.tag_mode.none": "Dinguno de estos",
   "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
   "hashtag.follow": "Segir etiketa",
   "hashtag.unfollow": "Desegir etiketa",
+  "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
+  "home.actions.go_to_explore": "Ve los trendes",
+  "home.actions.go_to_suggestions": "Topa a djente para segir",
   "home.column_settings.basic": "Opsyones bazikas",
   "home.column_settings.show_reblogs": "Amostrar repartajasyones",
   "home.column_settings.show_replies": "Amostrar repuestas",
   "home.hide_announcements": "Eskonde pregones",
+  "home.pending_critical_update.body": "Por favor aktualiza tu sirvidor de Mastodon pishin!",
   "home.pending_critical_update.link": "Ve aktualizasyones",
   "home.show_announcements": "Amostra pregones",
   "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
   "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
   "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
   "interaction_modal.description.reply": "Kon un kuento en Mastodon, puedes arispondir a esta publikasyon.",
+  "interaction_modal.login.prompt": "Domeno del sirvidor de tu kuento, por enshemplo mastodon.social",
+  "interaction_modal.no_account_yet": "No tyenes kuento de Mastodon?",
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
   "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
@@ -356,6 +363,7 @@
   "lightbox.previous": "Anterior",
   "limited_account_hint.action": "Amostra el profil entanto",
   "limited_account_hint.title": "Este profil fue eskondido por los moderadores de {domain}.",
+  "link_preview.author": "Publikasyon de {name}",
   "lists.account.add": "Adjusta a lista",
   "lists.account.remove": "Kita de lista",
   "lists.delete": "Efasa lista",
@@ -377,6 +385,7 @@
   "mute_modal.hide_notifications": "Eskonder avizos de este utilizador?",
   "mute_modal.indefinite": "Indefinida",
   "navigation_bar.about": "Sovre mozotros",
+  "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
   "navigation_bar.blocks": "Utilizadores blokados",
   "navigation_bar.bookmarks": "Markadores",
   "navigation_bar.community_timeline": "Linya de tiempo lokala",
@@ -451,10 +460,25 @@
   "notifications_permission_banner.title": "Nunka te piedres niente",
   "onboarding.action.back": "Va atras",
   "onboarding.actions.back": "Va atras",
+  "onboarding.compose.template": "Ke haber, #Mastodon?",
+  "onboarding.follows.title": "Personaliza tu linya prinsipala",
   "onboarding.profile.display_name": "Nombre amostrado",
+  "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
+  "onboarding.profile.note": "Tu deskripsyon",
+  "onboarding.profile.save_and_continue": "Guadra i kontinua",
+  "onboarding.profile.title": "Konfigurasyon de profil",
+  "onboarding.profile.upload_avatar": "Karga imaje de profil",
+  "onboarding.profile.upload_header": "Karga kavesera de profil",
+  "onboarding.share.title": "Partaja tu profil",
+  "onboarding.start.skip": "No nesesitas ayudo para ampesar?",
+  "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
+  "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
+  "onboarding.steps.setup_profile.title": "Personaliza tu profil",
+  "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
   "picture_in_picture.restore": "Restora",
   "poll.closed": "Serrado",
   "poll.refresh": "Arefreska",
+  "poll.reveal": "Mira los rezultados",
   "poll.total_people": "{count, plural, one {# persona} other {# personas}}",
   "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Vota",
@@ -473,6 +497,7 @@
   "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
+  "recommended": "Rekomendado",
   "refresh": "Arefreska",
   "regeneration_indicator.label": "Eskargando…",
   "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!",
@@ -503,9 +528,11 @@
   "report.forward_hint": "Este kuento es de otro sirvidor. Embiar una kopia anonimizada del raporto ayi tamyen?",
   "report.mute": "Silensia",
   "report.mute_explanation": "No veras sus publikasyones. Ainda pueden segirte i no va saver ke le silensiates.",
+  "report.next": "Sigiente",
   "report.placeholder": "Otros komentos",
   "report.reasons.dislike": "No me plaze",
   "report.reasons.dislike_description": "\"No es algo ke kero ver",
+  "report.reasons.legal": "Es ilegal",
   "report.reasons.other": "Es otra koza",
   "report.reasons.other_description": "El problem no es de las otras kategorias",
   "report.reasons.spam": "Es spam",
@@ -537,8 +564,13 @@
   "search.quick_action.open_url": "Avre URL en Mastodon",
   "search.quick_action.status_search": "Publikasyones ke koresponden kon {x}",
   "search.search_or_paste": "Bushka o apega URL",
+  "search_popout.full_text_search_disabled_message": "No desponivle en {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Solo desponivle kuando estas konektado kon tu kuento.",
+  "search_popout.language_code": "kodiche ISO de lingua",
+  "search_popout.options": "Opsyones de bushkeda",
   "search_popout.quick_actions": "Aksiones rapidas",
   "search_popout.recent": "Bushkedas resientes",
+  "search_popout.user": "utilizador",
   "search_results.accounts": "Profiles",
   "search_results.all": "Todos",
   "search_results.hashtags": "Etiketas",
@@ -555,12 +587,29 @@
   "sign_in_banner.create_account": "Kriya kuento",
   "sign_in_banner.sign_in": "Konektate",
   "sign_in_banner.sso_redirect": "Konektate o enrejistrate",
+  "status.admin_account": "Avre la enterfaz de moderasyon para @{name}",
+  "status.admin_domain": "Avre la enterfaz de moderasyon para @{domain}",
+  "status.admin_status": "Avre esto en la enterfaz de moderasyon",
+  "status.block": "Bloka a @{name}",
+  "status.bookmark": "Marka",
+  "status.cancel_reblog_private": "No repartaja",
+  "status.cannot_reblog": "Esta publikasyon no se puede repartajar",
+  "status.copy": "Kopia atadijo de publikasyon",
+  "status.delete": "Efasa",
+  "status.direct": "Enmenta a @{name} en privado",
+  "status.direct_indicator": "Enmentadura privada",
+  "status.edit": "Edita",
+  "status.edited": "Editado {date}",
+  "status.embed": "Inkrusta",
+  "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
   "status.filtered": "Filtrado",
   "status.hide": "Eskonde publikasyon",
   "status.history.created": "{name} kriyo {date}",
   "status.history.edited": "{name} edito {date}",
   "status.load_more": "Eskarga mas",
+  "status.media.open": "Klika para avrir",
+  "status.media.show": "Klika para amostrar",
   "status.media_hidden": "Multimedia eskondidos",
   "status.mention": "Enmenta a @{name}",
   "status.more": "Mas",
diff --git a/config/locales/activerecord.lad.yml b/config/locales/activerecord.lad.yml
index 625d897d0b..71a63d1cd1 100644
--- a/config/locales/activerecord.lad.yml
+++ b/config/locales/activerecord.lad.yml
@@ -33,6 +33,10 @@ lad:
           attributes:
             data:
               malformed: tiene formato yerrado
+        status:
+          attributes:
+            reblog:
+              taken: de publikasyon ya existe
         user:
           attributes:
             email:
@@ -49,3 +53,7 @@ lad:
             position:
               elevated: no puede ser mas alto ke tu rolo aktual
               own_role: no se puede trokar kon tu rolo aktual
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: no puedes inkluir evenimientos a los kualos no estas autorizado
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 16d51dba16..cee5357c24 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -26,3 +26,5 @@ ie:
       send_paranoid_instructions: Si tui email-adresse existe in nor database, tu va reciver un ligament por recuperar li passa-parol a tui email-adresse in quelc minutes. Ples vider tui spam-emails si tu ne recivet ti email.
       updated: Tui passa-parol ha esset changeat successosimen. Tu nu ha apertet session.
       updated_not_active: Tui passa-parol ha esset changeat successosimen.
+    registrations:
+      signed_up: Benevenit! Tu ha successat registrar te.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 3a85602ba5..94df7d1454 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -119,6 +119,7 @@ ie:
       remote_suspension_reversible_hint_html: Li conto ha esset suspendet che su servitor, e li data va esser completmen removet ye %{date}. Til tande, li lontan servitor posse restaurar ti conto sin quelcunc mal efectes. Si tu vole remover omni data del conto ínmediatmen, tu posse far it in infra.
       remove_avatar: Remover li avatar
       removed_avatar_msg: Successosimen removet li avatar-image de %{username}
+      removed_header_msg: Successosimen removet li cap-image de %{username}
       resend_confirmation:
         already_confirmed: Ti usator ja esset confirmat
         send: Inviar li confirmation denov
@@ -280,6 +281,7 @@ ie:
         update_announcement_html: "%{name} actualisat li proclamation %{target}"
         update_custom_emoji_html: "%{name} actualisat emoji %{target}"
         update_domain_block_html: "%{name} actualisat li dominia-blocca de %{target}"
+        update_ip_block_html: "%{name} changeat regul por IP %{target}"
         update_status_html: "%{name} actualisat posta de %{target}"
         update_user_role_html: "%{name} changeat li rol %{target}"
       deleted_account: deletet conto
@@ -448,6 +450,7 @@ ie:
         title: Importar dominia-bloccas
       no_file: Null file selectet
     follow_recommendations:
+      description_html: "<strong>Seque-recomandationes auxilia nov usatores trovar interessant contenete</strong>. Quande un usator ne ha interactet con altres suficentmen por generar personalisat seque-recomandationes, ti contos es recomandat vicemen. Ili es recalculat dialmen de un mixtura de contos con li max mult recent interactiones e li max alt númeres de local sequitores por un specificat lingue."
       language: Por li lingue
       status: Statu
       suppress: Supresser seque-recomandation
@@ -465,9 +468,20 @@ ie:
       confirm_purge: Vole tu vermen permanentmen deleter data de ti dominia?
       content_policies:
         comment: Internal nota
+        policies:
+          reject_media: Rejecter medie
+          reject_reports: Rejecter raportes
+          silence: Limitar
+          suspend: Suspender
         policy: Politica
         reason: Visibil rason
         title: Politicas pri contenete
+      dashboard:
+        instance_accounts_dimension: Max sequet contos
+        instance_accounts_measure: inmagasinat contos
+        instance_followers_measure: nor sequitores ta
+        instance_follows_measure: lor sequitores ci
+        instance_languages_dimension: Max grand lingues
       delivery:
         unavailable: Índisponibil
       delivery_error_hint: Si liveration ne es possibil durant %{count} dies, it va esser marcat automaticmen quam ínliverabil.
@@ -586,37 +600,85 @@ ie:
       skip_to_actions: Ear rect al actiones
       status: Statu
       statuses: Contenete raportat
+      summary:
+        close_report: 'Marcar raporte #%{id} quam resoluet'
       title: Raportes
     roles:
       categories:
+        devops: DevOps
+        invites: Invitationes
         moderation: Moderation
+        special: Special
+      delete: Deleter
       privileges:
         administrator: Administrator
+        delete_user_data: Deleter Data de Usator
+        delete_user_data_description: Possibilisa que usatores mey deleter li data de altri usatores strax
+        invite_users: Invitar Usatores
         manage_announcements: Tractar proclamationes
         manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
+        manage_appeals: Gerer Apelles
+        manage_federation: Gerer Federation
+        manage_invites: Gerer Invitationes
+        manage_reports: Gerer Raportes
+        manage_roles: Gerer Roles
+        manage_taxonomies: Gerer Taxonomies
         manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
         manage_users: Gerer usatores
       title: Roles
     rules:
       add_new: Adjunter un regule
+      title: Regules del servitor
     settings:
       about:
         title: Pri
       appearance:
         title: Aspecte
+      discovery:
+        profile_directory: Profilarium
+        public_timelines: Public témpor-lineas
       domain_blocks:
         users: A local usatores qui ha initiat session
+      registrations:
+        title: Registrationes
+      registrations_mode:
+        modes:
+          none: Nequi posse registrar se
+          open: Quicunc posse registrar se
     site_uploads:
       delete: Deleter cargat file
       destroyed_msg: Cargat file successosimen deletet!
     software_updates:
-      type: Tip
+      type: Specie
       version: Version
     statuses:
       account: Autor
+      batch:
+        remove_from_report: Remover de raporte
+        report: Raportar
+      deleted: Deletet
+      favourites: Favorites
+      in_reply_to: Respondent a
       language: Lingue
       metadata: Metadata
+      open: Aperter posta
+      original_status: Original posta
       visibility: Visibilitá
+    strikes:
+      actions:
+        sensitive: "%{name} marcat li conto de %{target} quam sensitiv"
+        silence: "%{name} limitat li conto de %{target}"
+        suspend: "%{name} suspendet li conto de %{target}"
+      appeal_approved: Apellat
+      appeal_pending: Apelle pendent
+      appeal_rejected: Apelle rejectet
+    system_checks:
+      database_schema_check:
+        message_html: Hay pendent migrationes de database. Ples far les por far cert que li aplication functiona quam expectat
+      elasticsearch_preset:
+        action: Vider li documentation
+      elasticsearch_preset_single_node:
+        action: Vider li documentation
     title: Administration
     trends:
       approved: Aprobat
@@ -633,25 +695,137 @@ ie:
     webhooks:
       events: Evenimentes
       status: Statu
+  admin_mailer:
+    new_trends:
+      new_trending_links:
+        title: Populari ligamentes
+      new_trending_statuses:
+        title: Populari postas
+      new_trending_tags:
+        title: Populari hashtags
+  aliases:
+    add_new: Crear alias
+    created_msg: Successosimen creat un nov alias. Tu nu posse initiar li movement del antiqui conto.
+    deleted_msg: Successosimen removet li alias. Mover de ti-ta conto a ti-ci ne plu va esser possibil.
+    empty: Tu have null aliases.
+    hint_html: Si tu vole mover de un altri conto a ti-ci, ci tu posse crear un alias, quel es besonat ante que tu posse proceder a mover sequitores del antiqui conto a ti-ci. Ti-ci action, sol, es <strong>ínnociv e reversibil</strong>. <strong>Li conto-migration es initiat del antiqui conto</strong>.
+    remove: Desconexer alias
+  appearance:
+    advanced_web_interface: Avansat web-interfacie
+    advanced_web_interface_hint: 'Si tu vole usar li tot largore de tui ecran, li avansat web-interfacie permisse que tu mey configurar mult columnes diferent por vider tam mult information simultanmen quam tu vole: Hem, federat témpor-linea, quelcunc númere de listes e hashtags.'
+    animations_and_accessibility: Animationes e accessibilitá
+    confirmation_dialogs: Dialogs de confirmation
+    discovery: Decovriment
+    localization:
+      body: Mastodon es traductet de voluntarios.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Omnes posse contribuer.
+    sensitive_content: Sensitiv contenete
   application_mailer:
+    notification_preferences: Changear parametres pri email
     salutation: "%{name},"
+    settings: 'Changear parametres pri email: %{link}'
+    unsubscribe: Desabonnar
+    view: 'Vider:'
+    view_profile: Vider profil
+    view_status: Vider posta
+  applications:
+    created: Aplication successosimen creat
+    destroyed: Aplication successosimen deletet
+    logout: Exear
+    regenerate_token: Regenerar accesse-clave
+    token_regenerated: Accesse-clave successosimen regenerat
+    warning: Esse tre cuidosi pri ti-ci data. Nequande parti it a quicunc!
+    your_token: Tui accesse-clave
   auth:
+    apply_for_account: Solicitar un conto
+    captcha_confirmation:
+      help_html: Si tu have desfacilitá solver li CAPTCHA, tu posse contacter nos a %{email} e noi posse auxiliar te.
+      hint_html: Just un cose plu! Noi deve confirmar que tu es homan (por que noi posse impedir li spam!). Solue li CAPTCHA in-infra e clicca "Avansar".
+      title: Control de securitá
     confirmations:
+      awaiting_review: Tui email-adresse es confirmat! Li personale de %{domain} nu va tractar tui registration. Tu va reciver un email si ili aproba tui conto!
+      awaiting_review_title: On tracta tui registration
+      clicking_this_link: cliccar ti-ci ligament
+      login_link: intrar
+      proceed_to_login_html: Tu nu posse proceder a %{login_link}.
+      redirect_to_app_html: Tu deve har esset redirectet al aplication <strong>%{app_name}</strong>. Si to ne evenit, prova %{clicking_this_link} o retornar manualmen al aplication.
+      registration_complete: Tu ha completat tui registration che %{domain}!
       welcome_title: Benevenit, %{name}!
+      wrong_email_hint: Si ti email-adresse ne es corect, tu posse changear it in li parametres de conto.
     delete_account: Deleter li conto
+    delete_account_html: Si tu vole deleter tui conto, tu posse <a href="%{path}">proceder ci</a>. On va petir confirmation de te.
+    description:
+      prefix_invited_by_user: "@%{name} invita te adherer ti-ci servitor de Mastodon!"
+      prefix_sign_up: Adherer Mastodon hodie!
+      suffix: Med un conto, tu va posser sequer persones, postar actualisationes e exchangear missages con usatores de quelcunc Mastodon-servitor e plu!
+    didnt_get_confirmation: Ne recivet un confirmation-ligament?
+    dont_have_your_security_key: Ne have tui clave de securitá?
     forgot_password: Obliviat tu tui passa-parol?
     invalid_reset_password_token: Li clave por reiniciar li passa-parol es ínvalid o expirat. Ples demandar un nov.
+    link_to_otp: Introducte un 2-factor code de tui telefon o un code de recuperation
+    link_to_webauth: Usa tui aparate de clave de securitá
+    log_in_with: Intrar med
+    login: Intrar
+    logout: Exear
+    migrate_account: Mover te a un conto diferent
+    migrate_account_html: Si tu vole redirecter ti-ci conto a un altri, tu posse <a href="%{path}">configurar it ci</a>.
+    or_log_in_with: O intrar med
+    privacy_policy_agreement_html: Yo leet e consenti li <a href="%{privacy_policy_path}" target="_blank">politica pri privatie</a>
+    progress:
+      confirm: Confirmar email
+      details: Tui detallies
+      review: Nor revise
+      rules: Acceptar regules
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Adherer
+    registration_closed: "%{instance} ne accepta nov membres"
+    resend_confirmation: Reinviar ligament de confirmation
     reset_password: Reiniciar passa-parol
     rules:
       accept: Acceptar
       back: Retro
+      invited_by: 'Tu posse adherer %{domain} mersí al invitation quel tu recivet de:'
+      preamble: Tis es etablisset e infortiat del moderatores de %{domain}.
+      preamble_invited: Ante que tu procede, ples considerar li regules establisset del moderatores de %{domain}.
+      title: Quelc regules basic.
+      title_invited: Tu ha esset invitat.
     security: Securitá
     set_new_password: Establisser nov passa-parol
+    setup:
+      email_below_hint_html: Vider tui spam-emails, o petir un altre. Tu posse corectar tui email-adresse si it es íncorect.
+      email_settings_hint_html: Clicca li ligament quel noi inviat a te por verificar %{email}. Noi va atender ci.
+      link_not_received: Recivet null ligament?
+      new_confirmation_instructions_sent: Tu va reciver un nov email con li ligament de confirmation in quelc minutes!
+      title: Vider tui inbuxe
+    sign_in:
+      preamble_html: Aperter session med tui <strong>%{domain}</strong> detallies. Si tui conto logia che un diferent servitor, tu ne va posser intrar ci.
+      title: Aperter session che %{domain}
+    sign_up:
+      manual_review: Adhesiones a %{domain} es tractat manualmen de nor moderatores. Por auxiliar nos tractar tui aplication, scri un poc pri te e pro quo tu vole un conto che %{domain}.
+      preamble: Med un conto che ti-ci Mastodon-servitor, tu va posser sequer quelcunc altri person in li retage, sin egarda a u logia su conto.
+      title: Crear un conto che %{domain}.
+    status:
+      account_status: Statu del conto
+      confirming: Atendent li confirmation del email-adresse.
+      functional: Tui conto es completmen functional.
+      pending: Tu conto atende tractation de nor personale. Ti fórsan va durar quelc témpor. Tu va reciver un email si tui aplication es aprobat.
+      redirecting_to: Tui conto es ínactiv pro que it actualmen redirecte a %{acct}.
+      self_destruct: Pro que %{domain} va cluder bentost, tu have solmen limitat accesse a tui conto.
+      view_strikes: Vide anteyan admonimentes contra tui conto
+    too_fast: Formul inviat tro rapid, prova denov.
+    use_security_key: Usar clave de securitá
   challenge:
-    confirm: Continuar
+    confirm: Avansar
     hint_html: "<strong>Nota</strong>: On ne va petir tui passa-parol denov por li venient hor."
     invalid_password: Ínvalid passa-parol
     prompt: Confirmar passa-parol por avansar
+  crypto:
+    errors:
+      invalid_key: ne es un valid clave Ed25519 o Curve25519
+      invalid_signature: ne es un valid signatura Ed25519
   date:
     formats:
       default: "%d.%m.%Y"
@@ -659,73 +833,234 @@ ie:
   datetime:
     distance_in_words:
       about_x_hours: "%{count}h"
+      about_x_months: "%{count}me"
       about_x_years: "%{count}a"
       almost_x_years: "%{count}a"
+      half_a_minute: Just nu
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Just nu
+      over_x_years: "%{count}a"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}me"
       x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: Li information quel tu dat ne esset corect
     confirm_password: Introducte tui actual passa-parol por verificar tui identitá
+    confirm_username: Scri tu usator-nómine por confirmar li procedura
     proceed: Deleter li conto
+    success_msg: Tui conto esset successosimen deletet
+    warning:
+      before: 'Ante proceder, ples leer ti notas cuidosimen:'
+      caches: Contenete quel ha esset inmagasinat de altri servitores fórsan va persister
+      data_removal: Tui postas e altri data va esser permanentmen removet
+      email_change_html: Tui posse <a href="%{path}">changear tui email-adresse</a> sin deleter tui conto
+      email_contact_html: Si ancor it ne ariva, tu posse inviar un email a <a href="mailto:%{email}">%{email}</a> por auxilie
+      email_reconfirmation_html: Si tu ne recive li confirmation-email, tu posse <a href="%{path}">solicita it denov</a>
+      irreversible: Tu ne va posser restaurar o reactivisar tui conto
+      more_details_html: Por plu mult detallies, vide li <a href="%{terms_path}">politica pri privatie</a>.
+      username_available: Tui usator-nómine va retornar a esser disponibil
+      username_unavailable: Tui usator-nómine va restar índisponibil
   disputes:
     strikes:
+      action_taken: Action fat
       appeal: Apellar
+      appeal_approved: Ti admoniment ha esset apellat successosimen e nu es ínvalid
+      appeal_rejected: Li apelle ha esset rejectet
+      appeal_submitted_at: Apelle inviat
+      appealed_msg: Tui apelle ha esset inviat. Si it es aprobat, tu va esser notificat.
+      appeals:
+        submit: Inviar apelle
+      approve_appeal: Aprobar apelle
+      associated_report: Associat raporte
+      created_at: Date
+      description_html: Tis es li actiones fat contra tui conto e admonimentes misset a te del personale de %{instance}.
+      recipient: Adressat a
+      reject_appeal: Rejecter apelle
+      status: 'Posta #%{id}'
+      status_removed: Posta ja removet del sistema
+      title: "%{action} de %{date}"
+      title_actions:
+        delete_statuses: Removement de posta
+        disable: Gelation de conto
+        mark_statuses_as_sensitive: Marcation de postas quam sensitiv
+        none: Admoniment
+        sensitive: Marcation de conto quam sensitiv
+        silence: Limitation de conto
+        suspend: Suspension de conto
+      your_appeal_approved: Tui apelle ha esset aprobat
+      your_appeal_pending: Tu ha fat un apelle
+      your_appeal_rejected: Tui apelle ha esset rejectet
+  domain_validator:
+    invalid_domain: ne es un valid dominia-nómine
+  edit_profile:
+    basic_information: Basic information
+    hint_html: "<strong>Customisa ti quel gente vide sur tui public profil e apu tui postas.</strong> Altri persones es plu probabil sequer te e interacter con te si tu have un detalliat profil e un profil-image."
+    other: Altri
+  errors:
+    '400': Li demande quel tu inviat esset ínvalid o misformat.
+    '403': Tu ne have permission vider ti-ci págine.
+    '404': Li págine quel tu sercha ne es ci.
+    '406': Ti-ci págine ne es disponibil in li formate petit.
+    '410': Li págine quel tu serchat ne plu existe ci.
+    '422':
+      content: Verification de securitá fallit. Esque tu blocca cookies?
+      title: Verification de securitá fallit
+    '429': Tro mult demandes
+    '500':
+      content: Pardona nos, alquo errat in nor servitor.
+      title: Ti-ci págine ne es corect
+    '503': On ne posset servir li págine pro un falliment temporari del servitor.
+    noscript_html: Por usar li web-aplication de Mastodon, ples activisar JavaScript. Alternativmen, prova un del <a href="%{apps_path}">nativ aplicationes</a> por Mastodon por tui platform.
+  existing_username_validator:
+    not_found: ne posset trovar un local usator con ti usator-nómine
+    not_found_multiple: ne posset trovar %{usernames}
   exports:
     archive_takeout:
       date: Date
+      download: Descargar tui archive
+      hint_html: Tu posse petir un archive de tui <strong>postas e cargat medie</strong>. Li exportat data va esser in li formate ActivityPub, leibil de quelcunc programmatura concordant. Tu posse petir un archive chascun 7 dies.
+      in_progress: Compilant tui archive...
+      request: Petir tui archive
       size: Grandore
     blocks: Tu ha bloccat
     bookmarks: Marcatores
     csv: CSV
+    domain_blocks: Dominia-bloccas
     lists: Listes
     mutes: Tu silentia
+    storage: Inmagasination de medie
   featured_tags:
     add_new: Adjunter un nov
+    errors:
+      limit: Tu ja ha pinglat li maxim númere de hashtags
     hint_html: "<strong>Pinglar tui max important hashtags sur tui profil.</strong> Un bonissim maniere de mantener un registre de tui ovres e projectes, pinglat hashtags es monstrat prominentmen sur tui profil e permisse rapid accesse a tui propri postas."
   filters:
     contexts:
       account: Profiles
+      home: Hem e listes
+      notifications: Notificationes
+      public: Public témpor-lineas
       thread: Conversationes
+    edit:
+      add_keyword: Adjunter término
+      keywords: Términos
+      statuses: Individual postas
+      statuses_hint_html: Ti filtre aplica a selectet postas individual sin egarda a ca ili contene li términos in-infra. <a href="%{path}">Reviser o remover postas del filtre</a>.
+      title: Modificar filtre
+    errors:
+      deprecated_api_multiple_keywords: On ne posse changear ti parametres per ti-ci aplication pro que ili aplica a plu quam un filtrat término. Usa un aplication plu recent o li web-interfacie.
+      invalid_context: Null o ínvalid contextu dat
     index:
+      contexts: Filtres in %{contexts}
+      delete: Deleter
+      empty: Tu have null filtres.
+      expires_in: Expira in %{distance}
+      expires_on: Expira ye %{date}
+      keywords:
+        one: "%{count} término"
+        other: "%{count} términos"
+      statuses:
+        one: "%{count} posta"
+        other: "%{count} postas"
+      statuses_long:
+        one: "%{count} individual posta celat"
+        other: "%{count} individual postas celat"
       title: Filtres
     new:
       save: Conservar nov filtre
+      title: Adjunter nov filtre
+    statuses:
+      back_to_filter: Retornar al filtre
+      batch:
+        remove: Remover de filtre
+      index:
+        hint: Ti filtre aplica a selectet postas individual sin egarda a altri criteries. Tu posse adjunter plu postas a ti-ci filtre del web-interfacie.
+        title: Filtrat postas
   generic:
     all: Omni
+    all_items_on_page_selected_html:
+      one: "<strong>%{count}</strong> element in ti-ci págine es selectet."
+      other: Omni <strong>%{count}</strong> elementes in ti-ci págine es selectet.
+    all_matching_items_selected_html:
+      one: "<strong>%{count}</strong> element concordant tui sercha es selectet."
+      other: Omni <strong>%{count}</strong> elementes concordant tui sercha es selectet.
     cancel: Anullar
     changes_saved_msg: Modificationes conservat successosimen!
     confirm: Confirmar
     copy: Copiar
+    delete: Deleter
+    deselect: Desselecter omnis
     none: 'Null'
+    order_by: Ordinar per
     save_changes: Conservar changes
+    select_all_matching_items:
+      one: Selecter %{count} element concordant tui sercha.
+      other: Selecter omni %{count} elementes concordant tui sercha.
     today: hodie
+    validation_errors:
+      one: Alquo ancor ne es bon! Ples controlar li errore in-infra
+      other: Alquo ancor ne es bon! Ples controlar li %{count} errores in-infra
   imports:
     errors:
       empty: li file es vacui
+      incompatible_type: Íncompatibil con li selectet specie de importation
       invalid_csv_file: 'Ínvalid file CSV. Errore: %{error}'
       over_rows_processing_limit: contene plu quam %{count} lineas
       too_large: li file es tro grand
+    failures: Fallites
     imported: Importat
+    mismatched_types_warning: It apari que tu fórsan selectet li íncorect specie por ti importation, ples controlar denov.
     modes:
       merge: Coalescer
+      merge_long: Conservar existent registres e adjunter li novis
+      overwrite: Remplazzar
+      overwrite_long: Remplazzar existent registres per li novis
     overwrite_preambles:
+      blocking_html: Tu va <strong>remplazzar tui liste de bloccat contos</strong> per til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Tu va <strong>remplazzar tui marcatores</strong> per til <strong>%{total_items} postas</strong> de <strong>%{filename}</strong>.
+      domain_blocking_html: Tu va <strong>remplazzar tui liste de bloccat dominias</strong> per til <strong>%{total_items} dominias</strong> de <strong>%{filename}</strong>.
+      following_html: Tu va <strong>sequer</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong> e <strong>dessequer omni altri contos</strong>.
+      lists_html: Tu va <strong>remplazzar tui listes</strong> per li contenete de <strong>%{filename}</strong>. Til <strong>%{total_items} contos</strong> va esser adjuntet a nov listes.
       muting_html: Tu va <strong>remplazzar tui liste de silentiat contos</strong> per til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
     preambles:
+      blocking_html: Tu va <strong>bloccar</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Tu va adjunter til <strong>%{total_items} postas</strong> de <strong>%{filename}</strong> a tui <strong>marcatores</strong>.
+      domain_blocking_html: Tu va <strong>bloccar</strong> til <strong>%{total_items} dominias</strong> de <strong>%{filename}</strong>.
+      following_html: Tu va <strong>sequer</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+      lists_html: Tu va adjunter til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong> a tui <strong>listes</strong>. Nov listes va esser creat si ne hay un liste a quel adjunter.
       muting_html: Tu va <strong>silentiar</strong> til <strong>%{total_items} contos</strong> de <strong>%{filename}</strong>.
+    preface: Tu posse importar data quel tu ha exportat de un altri servitor, quam un liste del gente quem tu seque o blocca.
+    recent_imports: Recent importationes
     states:
       finished: Finit
+      in_progress: Progressent
+      scheduled: Planat
+      unconfirmed: Ínconfirmat
+    status: Statu
+    success: Tui data esset cargat successosimen e va esser tractat tam tost quam es possibil
+    time_started: Comensat ye
     titles:
-      lists: Importar listes
-      muting: Importation de silentiat contos
-    type: Tip de importation
+      blocking: Important bloccat contos
+      bookmarks: Important marcatores
+      domain_blocking: Important bloccat dominias
+      following: Important sequet contos
+      lists: Important listes
+      muting: Important silentiat contos
+    type: Specie de importation
     type_groups:
       constructive: Seques e marcatores
       destructive: Bloccas & silentias
     types:
       blocking: Liste de bloccas
       bookmarks: Marcatores
+      domain_blocking: Liste de dominia-bloccas
       following: Liste de sequetes
       lists: Listes
+      muting: Liste de silentiationes
     upload: Cargar
   invites:
+    delete: Desactivisar
     expired: Expirat
     expires_in:
       '1800': 30 minutes
@@ -735,13 +1070,50 @@ ie:
       '604800': 1 semane
       '86400': 1 die
     expires_in_prompt: Nequande
+    generate: Generar ligament de invitation
+    invalid: Ti-ci invitation ne es valid
+    invited_by: 'Tu esset invitat de:'
+    max_uses:
+      one: 1 use
+      other: "%{count} uses"
+    max_uses_prompt: Null límite
+    prompt: Generar e distribuer ligamentes a altres por dar accesse a ti-ci servitor
+    table:
+      expires_at: Expira
+      uses: Uses
+    title: Invitar gente
+  lists:
+    errors:
+      limit: Tu ha atinget li maxim númere de listes
   login_activities:
     authentication_methods:
+      otp: aplication de 2-factor autentication
       password: passa-parol
+      sign_in_token: code de securitá per email
+      webauthn: claves de securitá
     description_html: Si tu vide activitá quel tu ne conosse, considera changear tui passa-parol e activisar 2-factor autentication.
+    empty: Null historie de autentication disponibil
+    failed_sign_in_html: Fallit prova de apertion de session per %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Successosi apertion de session per %{method} de %{ip} (%{browser})
+    title: Historie de autentication
   mail_subscriptions:
     unsubscribe:
+      action: Yes, desabonnar
+      complete: Desabonnat
+      confirmation_html: Esque tu vermen vole desabonnar de reciver %{type} por Mastodon che %{domain} a tui email-adresse %{email}? Tu sempre posse reabonnar per tui <a href="%{settings_path}">parametres pri email-notificationes</a>.
+      emails:
+        notification_emails:
+          favourite: email-notificationes pri favoritisationes
+          follow: email-notificationes pri seques
+          follow_request: email-notificationes pri seque-petitiones
+          mention: email-notificationes pri mentiones
+          reblog: email-notificationes pri boosts
+      resubscribe_html: Si tu ha desabonnat errarimen, tu posse reabonnar per tui <a href="%{settings_path}">parametres pri email-notificationes</a>.
+      success_html: Tu ne plu va reciver %{type} por Mastodon che %{domain} a tui email-adresse %{email}.
       title: Desabonnar
+  media_attachments:
+    validations:
+      images_and_video: On ne posse atachar un video a un posta quel ja contene images
   migrations:
     set_redirect: Configurar un redirection
   move_handler:
@@ -754,13 +1126,34 @@ ie:
       title: Nov petition de sequer
     mention:
       action: Responder
+      title: Nov mention
     poll:
       subject: Un balotation de %{name} ha finit
+    reblog:
+      body: 'Tui posta esset boostat de %{name}:'
+      subject: "%{name} boostat tui posta"
+      title: Nov boost
+    status:
+      subject: "%{name} just postat"
+    update:
+      subject: "%{name} modificat un posta"
+  notifications:
+    administration_emails: Email-notificationes pri administration
+    email_events: Evenimentes por email-notificationes
+    email_events_hint: 'Selecte li evenimentes pri queles tu vole reciver notificationes:'
+    other_settings: Parametres pri altri notificationes
   otp_authentication:
+    code_hint: Inmetter li code generat de tui aplication de autentication por confirmar
+    description_html: Si tu activisa <strong>2-factor autentication</strong> per un aplication de autentication, aperter un session va postular que tu have possession de tui telefon, quel va generar codes por que tu mey inmetter les.
     enable: Activar
+    instructions_html: "<strong>Scande ti-ci code QR ad-in Google Authenticator o un simil aplication TOTP in tu telefon</strong>. Pos nu, ti aplication va generar codes queles tu va dever inmetter quande tu aperte un session."
+    manual_instructions: 'Si tu ne posse scander li code QR e besona inmetter it manualmen, vi li crud-text secrete:'
     setup: Configurar
+    wrong_code: Li inmettet code esset ínvalid! Esque li témpor del servitor e del aparate corect?
   pagination:
+    newer: Plu nov
     next: Seq
+    older: Plu old
     prev: Prec
     truncate: "&hellip;"
   polls:
@@ -777,33 +1170,128 @@ ie:
       too_many_options: ne posse contener plu quam %{max} optiones
   preferences:
     other: Altri
+    public_timelines: Public témpor-lineas
   privacy:
+    hint_html: "<strong>Customisa qualmen tu vole que tui profil e tui postas posse esser trovat.</strong> Mastodon have un varietá de manieres por auxiliar te atinger un auditorie plu grand quande activisat. Prende un moment por reviser ti parametres por far cert que ili concorda tui casu de usation."
+    privacy: Privatie
+    privacy_hint_html: Decide quant mult tu vole revelar por li beneficie de altres. Gente decovri interessant profiles e frisc aplicationes per vider li seques de altres e vider de quel aplicationes ili posta, ma tu fórsan prefere celar ti.
+    reach: Atingement
+    reach_hint_html: Decide ca tu vole esser decovrit e sequet de nov persones. Vole tu que tui postas mey aparir sur li págine "Explorar"? Vole tu que altri gente posse vider te in lor seque-recomandationes? Vole tu acceptar omni nov sequitores automaticmen, o manualmen tractar chascun?
     search: Sercha
+    search_hint_html: Decide qualmen tu vole esser trovat. Vole tu que gente trova te per ti pri quel tu ha postat publicmen? Vole tu que gente éxter Mastodon trova tui profil quande ili sercha li web? Ples memorar que complet exclusion de omni serchatores ne posse esser garantit por public information.
+    title: Privatie e atingement
+  privacy_policy:
+    title: Politica pri Privatie
+  reactions:
+    errors:
+      limit_reached: Límite de diferent reactiones atinget
+      unrecognized_emoji: ne es un reconosset emoji
   relationships:
     activity: Activitá de conto
+    confirm_follow_selected_followers: Esque tu vermen vole sequer selectet sequitores?
+    confirm_remove_selected_followers: Esque tu vermen vole remover selectet sequitores?
+    confirm_remove_selected_follows: Esque tu vermen vole remover selectet sequetes?
     dormant: Dormient
+    follow_failure: Ne posset sequer quelc del contos selectet.
+    follow_selected_followers: Sequer selectet sequitores
+    followers: Sequitores
+    following: Sequetes
+    invited: Invitat
+    last_active: Ultimmen activ
+    most_recent: Max recent
+    moved: Movet
     mutual: Reciproc
+    primary: Primari
+    relationship: Relation
+    remove_selected_domains: Remover omni sequitores del selectet dominias
+    remove_selected_followers: Remover selectet sequitores
+    remove_selected_follows: Dessequer selectet usatores
     status: Statu del conto
+  rss:
+    content_warning: 'Avise pri li contenete:'
+    descriptions:
+      account: Public postas de @%{acct}
+      tag: 'Public postas con li hashtag #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tu ha atinget li límite de %{limit} planat postas por hodie
+    over_total_limit: Tu ha atinget li límite de %{limit} planat postas
+    too_soon: Li planat date deve esser in li future
+  self_destruct:
+    lead_html: Ínfortunatmen, <strong>%{domain}</strong> va bentost permanentmen cluder. Si tu havet un conto ta, tu ne va posser continuar usar it, ma tu ancor posse demandar un archive de tui data.
+    title: Ti-ci servitor va cluder bentost
   sessions:
     activity: Ultim activitá
     browser: Navigator
     browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
       chrome: Chrome
+      edge: Microsoft Edge
       electron: Electron
+      firefox: Firefox
       generic: Ínconosset navigator
+      huawei_browser: Huawei Browser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
       unknown_browser: Ínconosset navigator
+      weibo: Weibo
+    current_session: Actual session
     description: "%{browser} in %{platform}"
     explanation: Tis-ci es li navigatores queles actualmen ha initiat sessiones a tui Mastodon-conto.
     ip: IP
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      kai_os: KaiOS
+      linux: Linux
+      mac: macOS
       unknown_platform: Ínconosset platform
       windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Revocar
+    revoke_success: Session successosimen revocat
+    title: Sessiones
+    view_authentication_history: Vider li historie de autentication por tui conto
   settings:
     account: Conto
+    account_settings: Parametres del conto
+    aliases: Aliases del conto
     appearance: Aspecte
+    authorized_apps: Autorisat aplicationes
+    back: Retornar a Mastodon
+    delete: Deletion de conto
+    development: Developation
+    edit_profile: Modificar profil
+    export: Exportation de data
+    featured_tags: Recomandat hashtags
+    import: Importar
+    import_and_export: Importation e exportation
+    migrate: Migration de conto
+    notifications: Notificationes
+    preferences: Preferenties
+    profile: Public profil
+    relationships: Sequetes e sequitores
+    statuses_cleanup: Automatisat deletion de postas
+    strikes: Admonimentes moderatori
+    two_factor_authentication: 2-factor autentication
+    webauthn_authentication: Claves de securitá
   statuses:
     attached:
+      audio:
+        one: "%{count} audio-file"
+        other: "%{count} audio-files"
       description: 'Atachat: %{attached}'
       image:
         one: "%{count} image"
@@ -811,6 +1299,7 @@ ie:
       video:
         one: "%{count} video"
         other: "%{count} videos"
+    boosted_from_html: Boostat de %{acct_link}
     default_language: Sam quam li lingue del interfacie
     edited_at_html: Modificat ye %{date}
     pin_errors:
@@ -839,25 +1328,87 @@ ie:
     min_age:
       '1209600': 2 semanes
       '31556952': 1 annu
+  strikes:
+    errors:
+      too_late: It es tro tard por apellar ti admoniment
+  tags:
+    does_not_match_previous_name: ne concorda li anteyan nómine
+  themes:
+    contrast: Mastodon (Alt contraste)
+    default: Mastodon (Obscur)
+    mastodon-light: Mastodon (Luminosi)
   time:
     formats:
       default: "%d.%m.%Y ye %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+      with_time_zone: "%d.%m.%Y ye %H:%M %Z"
+  translation:
+    errors:
+      quota_exceeded: Li servitor ha exhaustet nor quote por li servicie de traduction.
+      too_many_requests: Hay tro mult recent demandes al servicie de traduction.
   two_factor_authentication:
     add: Adjunter
+    disable: Desactivisar 2FA
+    disabled_success: 2-factor autentication successosimen desactivisat
+    edit: Modificar
+    enabled: 2-factor autentication es activisat
+    enabled_success: 2-factor autentication successosimen activisat
+    generate_recovery_codes: Generar codes de recuperation
+    lost_recovery_codes: Codes de recuperation lassa te recuperar accesse a tui conto si tu perdi tui telefon. Si tu ha perdit tui codes de recuperation, tu posse regenerar les ci. Tui antiqui codes de recuperation va esser ínvalidat.
+    methods: Metodes de 2-factor autentication
+    otp: Aplication de autentication
+    recovery_codes: Copiar tui codes de recuperation
+    recovery_codes_regenerated: Codes de recuperation successosimen regenerat
+    recovery_instructions_html: Si tu perdi accesse a tui telefon, tu posse usar un del codes de recuperation in-infra por reganiar accesse a tui conto. <strong>Mantener li securitá del codes de recuperation</strong>. Per exemple, tu fórsan va printar les e inmagasinar les con altri important documentes.
+    webauthn: Claves de securitá
   user_mailer:
+    appeal_approved:
+      action: Ear a tui conto
+      explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset aprobat. Tui conto retorna a esser in bon statu.
+      subject: Tui apelle de %{date} ha esset aprobat
+      title: Apelle aprobat
+    appeal_rejected:
+      explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset rejectet.
+      subject: Tui apelle de %{date} ha esset rejectet
+      title: Apelle rejectet
+    backup_ready:
+      explanation: Tu solicitat un complet archive de tui Mastodon-conto. Nu it es pret por descargar!
+      subject: Tui archive es pret por descargar
+      title: Descargar archive
     suspicious_sign_in:
       change_password: changear tui passa-parol
+      details: 'Vi li detallies del apertion de session:'
+      explanation: On detectet un intration a tui conto de un nov IP-adresse.
+      further_actions_html: Si to ne esset tu, on recomanda que tu %{action} strax e activisar 2-factor autentication por mantener tui conto secur.
+      subject: Tui conto ha esset accesset de un nov IP-adresse
+      title: Un nov intration
     warning:
+      appeal: Inviar un apelle
+      appeal_description: Si tu crede que ti es un error, tu posse inviar un apelle al personale de %{instance}.
       categories:
         spam: Spam
+        violation: Contenete viola li sequent regules del comunité
+      explanation:
+        delete_statuses: On judicat que quelc de tui postas viola un o plu del regules del comunité e pro to ha esset removet del moderatores del %{instance}.
+        disable: Tu ne plu posse usar tui conto, ma tui profil e altri data resta integri. Tu posse solicitar un archive de tui data, changear parametres del conto, o deleter tui conto.
+        mark_statuses_as_sensitive: Quelc de tui postas ha esset marcat quam sensitiv del moderatores de %{instance}. Ti significa que gente va dever cliccar li medie in li postas ante que un previse es monstrat. Tu self posse marcar medie quam sensitiv quande tu posta futurimen.
+        sensitive: Pos nu, omni tui cargat medie-files va esser marcat quam sensitiv e celat detra un avise que on deve cliccar por transpassar.
+        silence: Tu ancor posse usar tui conto, ma solmen gente qui ja seque te va posser vider tui postas in ti-ci servitor, e tu va esser excludet de utensiles de decovrition. Támen, altres ancor posse sequer te manualmen.
+        suspend: Tu ne plu posse usar tui conto, e tui profil e altri data nu es ínaccessibil. Tu ancor posse intrar por solicitar un archive de tui data til que li data es removet in circa 30 dies, ma noi va retener quelc basic data pri te por preventer te evitar li suspension.
       reason: 'Rason:'
+      statuses: 'Postas citat:'
       subject:
+        delete_statuses: Tui postas che %{acct} ha esset removet
+        disable: Tui conto %{acct} ha esset gelat
+        mark_statuses_as_sensitive: Tui postas che %{acct} ha esset marcat quam sensitiv
         none: Admoniment por %{acct}
+        sensitive: Tui postas che %{acct} ve esser marcat quam sensitiv pos nu
     welcome:
+      explanation: Vi quelc suggestiones por que tu mey comensar
       subject: Benevenit a Mastodon
   users:
     seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
   verification:
+    extra_instructions_html: '<strong>Nota</strong>: Li ligament in tui websitu posse esser ínvisibil. Li important parte es <code>rel="me"</code> quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un <code>link</code> element in li cap-section del págine vice <code>a</code>, ma li HTML code deve esser accessibil sin executer JavaScript.'
     verification: Verification
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 626d2da7ec..afa6d2930c 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -226,6 +226,56 @@ lad:
         update_status: Aktualiza publikasyon
         update_user_role: Aktualiza rolo
       actions:
+        approve_appeal_html: "%{name} acheto la solisitasyon de moderasyon de %{target}"
+        approve_user_html: "%{name} acheto el enrejistramiento de %{target}"
+        assigned_to_self_report_html: "%{name} asinyo el raporto %{target} a si mezmo"
+        change_email_user_html: "%{name} troko el adreso de posta elektronika del utilizador %{target}"
+        change_role_user_html: "%{name} troko el rolo de %{target}"
+        confirm_user_html: "%{name} konfirmo el adreso de posta elektronika del utilizador %{target}"
+        create_account_warning_html: "%{name} embio una avertensya a %{target}"
+        create_announcement_html: "%{name} kriyo un muevo pregon %{target}"
+        create_canonical_email_block_html: "%{name} bloko la posta elektronika kon el hash %{target}"
+        create_custom_emoji_html: "%{name} kargo el muevo emoji %{target}"
+        create_domain_allow_html: "%{name} perimitio la federasyon kon el domeno %{target}"
+        create_domain_block_html: "%{name} bloko el domeno %{target}"
+        create_email_domain_block_html: "%{name} bloko el domeno de posta elektronika %{target}"
+        create_ip_block_html: "%{name} kriyo una regla para IP %{target}"
+        create_unavailable_domain_html: "%{name} detuvo las entregas al domeno %{target}"
+        create_user_role_html: "%{name} kriyo el rolo %{target}"
+        demote_user_html: "%{name} degrado a %{target}"
+        destroy_announcement_html: "%{name} supremio el pregon %{target}"
+        destroy_canonical_email_block_html: "%{name} dezbloko la posta elektronika kon el hash %{target}"
+        destroy_custom_emoji_html: "%{name} supremio el emoji %{target}"
+        destroy_domain_allow_html: "%{name} bloko la federasyon kon el domeno %{target}"
+        destroy_domain_block_html: "%{name} dezbloko el domeno %{target}"
+        destroy_email_domain_block_html: "%{name} dezbloko el domeno de posta elektronika %{target}"
+        destroy_instance_html: "\"%{name} purgo el domeno %{target}"
+        destroy_ip_block_html: "%{name} supremio una regla para la IP %{target}"
+        destroy_status_html: "%{name} supremio una publikasyon de %{target}"
+        destroy_unavailable_domain_html: "%{name} reinisyo las entregas al domeno %{target}"
+        destroy_user_role_html: "%{name} supremio el rolo %{target}"
+        disable_2fa_user_html: "%{name} dezaktivo el rekerimiento en dos pasos para el utilizador %{target}"
+        disable_custom_emoji_html: "%{name} dezaktivo el emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} inkapasito la autentifikasyon por token de posta elektronika para %{target}"
+        disable_user_html: "%{name} inkapasito la koneksion kon el kuento para el utilizador %{target}"
+        enable_custom_emoji_html: "%{name} aktivo el emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} tiene kapasitado la autentifikasyon por token de posta elektronika para %{target}"
+        enable_user_html: "%{name} kapasito koneksion kon kuento para el utilizador %{target}"
+        memorialize_account_html: "%{name} konvirtio el kuento de %{target} en una pajina de bendicha memoria"
+        promote_user_html: "%{name} promosyon al utilizador %{target}"
+        reject_appeal_html: "%{name} refuzo la solisitasyon de moderasyon de %{target}"
+        reject_user_html: "%{name} refuzo el enrejistramiento de %{target}"
+        remove_avatar_user_html: "%{name} supremio la imaje de profil de %{target}"
+        reopen_report_html: "%{name} reavrio el raporto %{target}"
+        resend_user_html: "%{name} tiene reembiado la posta de konfirmasyon para %{target}"
+        reset_password_user_html: "%{name} reinisyo el kod del utilizador %{target}"
+        resolve_report_html: "%{name} rezolvio el raporto %{target}"
+        sensitive_account_html: "%{name} marko la multimedia de %{target} komo sensivle"
+        silence_account_html: "%{name} silensyo el kuento de %{target}"
+        suspend_account_html: "%{name} suspendio el kuento de %{target}"
+        unassigned_report_html: "%{name} dezasinyo el raporto %{target}"
+        unblock_email_account_html: "%{name} tiene dezblokado el adreso de posta de %{target}"
+        unsensitive_account_html: "%{name} dezmarko la multimedia de %{target} komo sensivle"
         unsilence_account_html: "%{name} kito el limite del kuento de %{target}"
         unsuspend_account_html: "%{name} reaktivo el kuento de %{target}"
         update_announcement_html: "%{name} aktualizo el pregon %{target}"
@@ -280,7 +330,61 @@ lad:
         title: Adjustar muevo emoji personalizado
       no_emoji_selected: No se troko dingun emoji porke no eskojites dinguno
       not_permitted: No tienes permiso para realizar esta aksyon
+      overwrite: Sobreskrive
+      title: Emojis personalizados
+      uncategorized: No kategorizado
+      unlist: No lista
+      unlisted: No listado
+      update_failed_msg: No se pudo aktualizar akel emoji
+      updated_msg: Emoji aktualizado kon sukseso!
+      upload: Karga
+    dashboard:
+      active_users: utilizadores aktivos
+      interactions: enteraksyones
+      media_storage: Magazinaje de multimedia
+      new_users: muevos utilizadores
+      opened_reports: raportos aviertos
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> apelasyon esta asperando"
+        other: "<strong>%{count}</strong> apelasiones estan asperando"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> raporto esta asperando"
+        other: "<strong>%{count}</strong> raportos estan asperando"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> etiketa esta asperando"
+        other: "<strong>%{count}</strong> etiketas estan asperando"
+      pending_users_html:
+        one: "<strong>%{count}</strong> utilizador esta asperando"
+        other: "<strong>%{count}</strong> utilizadores estan asperando"
+      resolved_reports: raportos rezolvidos
+      software: Programario
+      sources: Manaderos de rejistro
+      space: Uzo de magazinaje
+      title: Pano
+      top_languages: Linguas mas aktivas
+      top_servers: Sirvidores mas aktivos
+      website: Sitio internetiko
+    disputes:
+      appeals:
+        empty: No se toparon apelasiones.
+        title: Apelasiones
+    domain_allows:
+      add_new: Perimite federasyon kon el domeno
+      created_msg: Federasyon kon el domeno permitida kon sukseso
+      destroyed_msg: Federasyon kon el domeno proibida kon sukseso
+      export: Eksporto
+      import: Importo
+      undo: Proibe federasyon kon el domeno
     domain_blocks:
+      add_new: Adjusta muevo bloko de domeno
+      confirm_suspension:
+        cancel: Anula
+        confirm: Suspende
+      created_msg: El bloko de domeno esta siendo prosesado
+      destroyed_msg: El bloko de domeno se dezizo
+      domain: Domeno
+      edit: Edita muevo bloko de domeno
+      existing_domain_block: Ya impusites limitos mas estriktos a %{name}.
       existing_domain_block_html: Ya tienes forsado limitos mas estriktos a %{name}, kale <a href="%{unblock_url}">dezblokarlo primero</a>.
       export: Eksporto
       import: Importo
@@ -345,7 +449,69 @@ lad:
     follow_recommendations:
       description_html: "<strong>Las rekomendasyones de kuentos ayudan a los muevos utilizadores a topar presto kontenido enteresante</strong>. Kuando un utilizador no tiene enteraktuado kon otros lo sufisiente komo para djenerar rekomendasyones personalizadas de kuentos a las ke segir, en sus lugar se le rekomiendan estes kuentos. Se rekalkulan diariamente a partir de una mikstura de kuentos kon el mayor numero de enteraksyones rezientes i kon el mayor numero de suivantes lokales kon una lingua determinada."
       language: Para la lingua
+      status: Estado
+      suppress: Inkapasita rekomendasyon de kuentos
+      suppressed: Inkapasitada
+      title: Rekomendasyones de kuentos
+      unsuppress: Restora rekomendasyones de kuentos
     instances:
+      availability:
+        description_html:
+          one: Si el embio al domeno no reushe <strong>%{count} diya</strong>, no se aran mas provas de entrega a manko ke se risiva un embio <em>dizde</em> el domeno.
+          other: Si el embio al domeno no reushe <strong>%{count} diyas desferentes</strong>, no se aprovaran a entregar a manko ke se risiva un embio <em>dizde</em> el domeno.
+        failure_threshold_reached: Limito de provas no reushidas alkansado el %{date}.
+        failures_recorded:
+          one: Prova no reushida en %{count} diya.
+          other: Provas no reushidas en %{count} diyas desferentes.
+        no_failures_recorded: No ay provas no reushidas en el defter.
+        title: Disponivilita
+        warning: La ultima prova de koneksyon a este sirvidor no tuvo sukseso
+      back_to_all: Todos
+      back_to_limited: Limitados
+      back_to_warning: Avertensya
+      by_domain: Domeno
+      confirm_purge: Siguro ke keres supremir permanentemente los datos de este domeno?
+      content_policies:
+        comment: Nota interna
+        description_html: Puedes definir politikas de kontenido ke se aplikaran a todos los kuentos de este domeno i a kualkiera de sus subdomenos.
+        limited_federation_mode_description_html: Puedes eskojer si keres permitir federasyon kon este domeno.
+        policies:
+          reject_media: Refuza multimedia
+          reject_reports: Refuza raportos
+          silence: Limita
+          suspend: Suspende
+        policy: Politika
+        reason: Razon publika
+        title: Politikas de kontenido
+      dashboard:
+        instance_accounts_dimension: Kuentos mas segidos
+        instance_accounts_measure: kuentos magazinados
+        instance_followers_measure: muestros suivantes ayi
+        instance_follows_measure: sus suivantes aki
+        instance_languages_dimension: Linguas popularas
+        instance_media_attachments_measure: dosyas adjuntas guadradas
+        instance_reports_measure: raportos sovre eyos
+        instance_statuses_measure: mesajes magazinados
+      delivery:
+        all: Todos
+        clear: Alimpiar yerros de entrega
+        failing: Fayando
+        restart: Reinisyar entrega
+        stop: Detener entrega
+        unavailable: No desponivle
+      delivery_available: Entrega desponivle
+      delivery_error_days: Diyas de yerro de entrega
+      delivery_error_hint: Si la entrega no es posivle a lo longo de %{count} diyas, se markara otomatikamente komo no entregable.
+      destroyed_msg: Los datos de %{domain} estan agora en kola para sus iminente efasasyon.
+      empty: No se toparon domenos.
+      known_accounts:
+        one: "%{count} kuento konesido"
+        other: "%{count} kuentos konesidos"
+      moderation:
+        all: Todos
+        limited: Limitado
+        title: Moderasyon
+      private_comment: Komento privado
       public_comment: Komento publiko
       purge: Purga
       purge_description_html: Si kreyes ke este domeno esta deskonektado, puedes efasar todos los rejistros de kuentos i los datos asosyados de este domeno de tu magazinaje. Esto puede levar un tiempo.
@@ -528,8 +694,38 @@ lad:
         manage_rules: Administra reglas
         manage_rules_description: Permete a los utilizadores trokar las reglas del sirvidor
         manage_settings: Administra konfigurasyon
+        manage_settings_description: Permete a los utilizadores trokar la konfigurasyon del sitio
+        manage_taxonomies: Administra etiketas
+        manage_taxonomies_description: Permete a los utilizadores revizar el kontenido en trend i aktualizar la konfigurasyon de las etiketas
+        manage_user_access: Administra akseso de utilizadores
+        manage_user_access_description: Permete a los utilizadores dezaktivar la autentifikasyon en dos pasos de otros utilizadores, trokar sus adreso de posta elektronika i restableser sus kod
+        manage_users: Administra utilizadores
+        manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
+        manage_webhooks: Administrar webhooks
+        view_devops: DevOps
+      title: Rolos
+    rules:
+      add_new: Adjusta regla
+      delete: Efasa
+      edit: Edita regla
+      title: Reglas del sirvidor
     settings:
+      about:
+        manage_rules: Administra reglas del sirvidor
+        title: Sovre esto
+      appearance:
+        title: Aparensya
+      discovery:
+        follow_recommendations: Rekomendasyones de kuentos
+        profile_directory: Katalogo de profiles
+        public_timelines: Linyas de tiempo publikas
+        trends: Trendes
+      domain_blocks:
+        all: A todos
+        disabled: A dinguno
+        users: Para los utilizadores lokales ke entrado en su kuento
       registrations:
+        preamble: Kontrola ken puede kriyar un kuento en tu sirvidor.
         title: Enrejistramientos
       registrations_mode:
         modes:
@@ -542,6 +738,7 @@ lad:
       destroyed_msg: Dosya supremida kon sukseso!
     software_updates:
       documentation_link: Ambezate mas
+      title: Aktualizasyones desponivles
       type: Tipo
       version: Versyon
     statuses:
@@ -579,7 +776,7 @@ lad:
         silence: "%{name} limito el kuento de %{target}"
         suspend: "%{name} suspendio el kuento de %{target}"
       appeal_approved: Apelado
-      appeal_pending: Apelasyon pendiente
+      appeal_pending: Apelasyon asperando
       appeal_rejected: Apelasyon refuzada
     system_checks:
       database_schema_check:
@@ -620,3 +817,654 @@ lad:
         no_link_selected: No se troko dingun atadijo porke no eskojites dinguno
         publishers:
           no_publisher_selected: No se troko dingun publikador porke no eskojites dinguno
+        title: Atadijos en trend
+        usage_comparison: Partajado %{today} vezes oy, komparado kon %{yesterday} ayer
+      not_allowed_to_trend: Sin permiso para estar en trendes
+      only_allowed: Solo las permetidas
+      pending_review: Revizion esta asperando
+      preview_card_providers:
+        allowed: Los atadijos de este medio pueden ser trend
+        description_html: Estos son domenos dizde los ke los atadijos akoruto se partajan en sus sirvidor. Los atadijos no seran trend publikamente a menos ke se achete el domeno del atadijo. Sus achetasion (o refuzo) se ekstende a los subdomenos.
+        rejected: Los atadijos de este medio no pueden ser trend
+        title: Medios
+      rejected: Refuzadas
+      statuses:
+        allow: Permete publikasyon
+        allow_account: Permete al autor
+        description_html: Estas son publikasyones ke tu sirvidor konese ke estan siendo partajadas muncho i plazen a munchas personas en este momento. Puedes ayudar a tus utilizadores muevos i retornantes a topar mas djente a la ke segir. No ay mesajes ke se amostren publikamente asta ke aproves el autor i el autor permeta ke su kuento sea sugjerado a otros. Tamyen puedes permeter o refuzar mesajes individuales.
+        disallow: No permete publikasyon
+        disallow_account: No permete al autor
+        no_status_selected: No se troko dinguna publikasyon en trend porke no seleksionates dingunas
+        not_discoverable: El autor no tiene optado por ser detektable
+        shared_by:
+          one: Repartajado por o plaze a alguno una vez
+          other: Repartajado por o plaze a alguno %{friendly_count} vezes
+        title: Publikasyones en trend
+      tags:
+        current_score: Puntuasion aktuala %{score}
+        dashboard:
+          tag_accounts_measure: uzos unikos
+          tag_languages_dimension: Linguas popularas
+          tag_servers_dimension: Sirvidores prinsipales
+          tag_servers_measure: desferentes sirvidores
+          tag_uses_measure: uzos totales
+        description_html: Estas son etiketas ke estan aparesiendo en munchas publikasyones ke tu sirvidor ve. Pueden ayudar a tus utilizadores a averiguar de ke avla mas djente en estos momentos. No ay etiketas ke se amostren publikamente asta ke las achetes.
+        listable: Pueden ser rekomendadas
+        no_tag_selected: No se troko dinguna etiketa al no eskojer dinguna
+        not_listable: No seran rekomendadas
+        not_usable: No se pueden uzar
+        trendable: Pueden apareser en trendes
+        trending_rank: Trend n.º %{rank}
+        usable: Pueden uzarse
+        usage_comparison: Uzada %{today} vezes oy, komparado kon %{yesterday} ayer
+        used_by_over_week:
+          one: Uzada por una persona durante la ultima semana
+          other: Uzada por %{count} personas durante la ultima semana
+      title: Trendes
+      trending: En trend
+    warning_presets:
+      add_new: Adjusta muevo
+      delete: Efasa
+      edit_preset: Edita avizo predeterminado
+      empty: Ainda no tienes definido ningun avizo predeterminado.
+      title: Edita konfigurasyon predeterminada de avizos
+    webhooks:
+      add_new: Adjusta endpoint
+      delete: Efasa
+      description_html: Un <strong>webhook</strong> permete a Mastodon embiar <strong>avizos en tiempo real</strong> sovre los evenimientos eskojidos a tu propia aplikasyon, para ke tu aplikasyon pueda <strong>lanzar reaksyones otomatikamente</strong>.
+      disable: Inkapasita
+      disabled: Inkapasitado
+      edit: Edita endpoint
+      empty: Ainda no tienes ningun endpoint de webhook konfigurado.
+      enable: Kapasita
+      enabled: Aktivo
+      enabled_events:
+        one: 1 evenimiento kapasitado
+        other: "%{count} evenimientos kapasitados"
+      events: Evenimientos
+      new: Muevo webhook
+      rotate_secret: Rotar sekreto
+      secret: Firmando sekreto
+      status: Estado
+      title: Webhooks
+      webhook: Webhook
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: para supremir sus mesajes
+        disable: para konjelar su kuento
+        mark_statuses_as_sensitive: para markar sus mesajes komo sensivles
+        none: una avertensya
+        sensitive: para markar su kuento komo sensivle
+        silence: para limitar su kuento
+        suspend: para suspender su kuento
+      body: "%{target} esta apelando a una solisitasyon de moderasyon de %{action_taken_by} el %{date}, del tipo %{type}. Eyos eskrivieron:"
+      next_steps: Puedes achetar la apelasyon para dezazer la dechizyon de moderasyon, o ignorarla.
+      subject: "%{username} esta apelando a una dechizyon de moderasyon en %{instance}"
+    new_pending_account:
+      body: Los peratim del muevo kuento estan abashos. Puedes achetar o refuzar esta aplikasyon.
+      subject: Muevo kuento para revizion en %{instance} (%{username})
+    new_report:
+      body: "%{reporter} tiene raportado a %{target}"
+      body_remote: Alguno de %{domain} a raportado a %{target}
+      subject: Muevo raporto para la %{instance} (#%{id})
+    new_trends:
+      body: 'Los sigientes elementos nesesitan una revizion antes de ke se puedan amostrar publikamente:'
+      new_trending_links:
+        title: Atadijos en trend
+      new_trending_statuses:
+        title: Publikasyones en trend
+      new_trending_tags:
+        title: Etiketas en trend
+  appearance:
+    advanced_web_interface: Enterfaz web avanzada
+    sensitive_content: Kontenido sensivle
+  application_mailer:
+    salutation: "%{name},"
+    settings: 'Troka preferensyas de posta: %{link}'
+    unsubscribe: Dezabona
+    view: 'Mira:'
+    view_profile: Ve profil
+    view_status: Ve publikasyon
+  applications:
+    created: Aplikasyon kriyada kon sukseso
+    destroyed: Aplikasyon supremida kon sukseso
+    logout: Sal
+    regenerate_token: Redjenera token de akseso
+    token_regenerated: Token de akseso redjenerado kon sukseso
+    warning: Ten muncho kudiado kon estos datos. No los partajes kon dinguno!
+    your_token: Tu token de akseso
+  auth:
+    apply_for_account: Solisita un kuento
+    confirmations:
+      login_link: konektate kon kuento
+      welcome_title: Bienvenido, %{name}!
+      wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
+    delete_account: Efasa kuento
+    delete_account_html: Si keres supremir tu kuento, puedes <a href="%{path}">ir aki</a>. Seras pedido de una konfirmasyon.
+    description:
+      prefix_invited_by_user: "@%{name} te envita a unirte a este sirvidor de Mastodon!"
+      prefix_sign_up: Adjuntate a Mastodon oy!
+      suffix: Kon un kuento podras segir a djente, publikar haberes e enterkambiar mesajes kon utilizadores de kualkier sirvidor de Mastodon i mas!
+    didnt_get_confirmation: No risivites el atadijo de konfirmasyon?
+    dont_have_your_security_key: No tienes tu yave de sigurita?
+    forgot_password: Neglijates tu kod?
+    invalid_reset_password_token: El token de reinisyo de kod es malato o ekspiro. Por favor pide uno muevo.
+    link_to_otp: Introduse un kodiche de autorizasyon en dos pasos dizde tu telefon o un kodiche de rekuperasyon
+    link_to_webauth: Utiliza tu aparato de yave de sigurita
+    log_in_with: Konektate kon kuento kon
+    login: Konektate kon kuento
+    logout: Sal
+    migrate_account: Transferate a otro kuento
+    migrate_account_html: Si keres readresar este kuento a otra distinta, puedes <a href="%{path}">konfigurarlo aki</a>.
+    or_log_in_with: O konektate kon tu kuento kon
+    privacy_policy_agreement_html: Tengo meldado i acheto la <a href="%{privacy_policy_path}" target="_blank">politika de privasita</a>
+    progress:
+      confirm: Konfirma posta
+      details: Tus detalyos
+      rules: Acheta reglas
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Enrejistrate
+    registration_closed: "%{instance} no esta achetando a muevos miembros"
+    resend_confirmation: Reembia posta de konfirmasyon
+    reset_password: Reinisya kod
+    rules:
+      accept: Acheta
+      back: Atras
+      preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
+      title: Algunas reglas bazikas.
+    security: Sigurita
+    set_new_password: Establese muevo kod
+    setup:
+      email_below_hint_html: Mira en tu kuti de spam o solisita de muevo. Si el adreso de posta elektronika ke aparese aki es yerrado, puedes trokarlo aki.
+    sign_in:
+      preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
+      title: Konektate kon %{domain}
+    sign_up:
+      preamble: Kon un kuento en este sirvidor de Mastodon, podras segir a kualkier otra persona en la red, endependientemente del sirvidor en el ke se tope.
+      title: Kriya kuento de Mastodon en %{domain}.
+    status:
+      account_status: Estado del kuento
+      confirming: Bekleando konfirmasyon de posta elektronika.
+      functional: Tu kuento esta kompletamente funksyonal.
+      pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
+      redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
+      view_strikes: Ve amonestamientos pasados kontra tu kuento
+    too_fast: Formulario enviado demaziado rapido, aprovalo de muevo.
+    use_security_key: Uza la yave de sigurita
+  challenge:
+    confirm: Kontinua
+    hint_html: "<strong>Tip:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
+    invalid_password: Kod inkorekto
+    prompt: Konfirma kod para segir
+  crypto:
+    errors:
+      invalid_key: no es una yave Ed25519 o Curve25519 valida
+      invalid_signature: no es una firma Ed25519 valida
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%d %B %Y"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} o"
+      about_x_months: "%{count} me"
+      about_x_years: "%{count} a"
+      almost_x_years: "%{count} a"
+      half_a_minute: Agora
+      less_than_x_minutes: "%{count} m"
+      less_than_x_seconds: Agora
+      over_x_years: "%{count} a"
+      x_days: "%{count} d"
+      x_minutes: "%{count} m"
+      x_months: "%{count} me"
+      x_seconds: "%{count} s"
+  deletes:
+    proceed: Efasa kuento
+  disputes:
+    strikes:
+      action_taken: Aksyon tomada
+      appeal: Apela
+      appeal_submitted_at: Apelasyon embiada
+      appealed_msg: Tu apelasyon fue embiada. Si la achetamos, se te avizara.
+      appeals:
+        submit: Embia apelasyon
+      approve_appeal: Acheta apelasyon
+      associated_report: Raporto asosiado
+      created_at: Kon data
+      description_html: Estas son las aksyones emprendidas kontra tu kuento i las avertensyas ke te an sido enviadas por la taifa de %{instance}.
+      recipient: Dirijda a
+      reject_appeal: Refuza apelasyon
+      status: 'Publikasyon #%{id}'
+      status_removed: Publikasyon ya supremida del sistem
+      title: "%{action} del %{date}"
+      title_actions:
+        delete_statuses: Efasasyon de publikasyon
+        disable: Konjelasyon del kuento
+        mark_statuses_as_sensitive: Markamiento de los mesajes komo sensivles
+        none: Avertensya
+        sensitive: Markamiento del kuento komo sensivle
+        silence: Limitasyon de kuento
+        suspend: Suspensyon de kuento
+      your_appeal_approved: Tu apelasyon fue achetada
+      your_appeal_pending: Tienes enviado una apelasyon
+      your_appeal_rejected: Tu apelasyon fue refuzada
+  domain_validator:
+    invalid_domain: no es un nombre de domeno valido
+  edit_profile:
+    other: Otros
+  errors:
+    '400': La solisitasyon ke enviates no fue valida o fue malformada.
+    '403': No tienes permiso para ver esta pajina.
+    '404': La pajina ke bushkas no egziste.
+    '406': Esta pajina no esta desponivle en el formato solisitado.
+    '410': La pajina ke estavas bushkando no egziste mas.
+    '422':
+      content: Verifikasyon de sigurita no reushida. Estas blokando algunas cookies?
+      title: Verifikasyon de sigurita no reushida
+    '429': Demaziadas solisitasyones
+    '500':
+      content: Pardon, algo tiene fonksionado mal por muestra parte.
+      title: Esta pajina no es djusta
+    '503': La pajina no se tiene podido desbarkar por un yerro temporal del sirvidor.
+    noscript_html: Para uzar la aplikasyon web de Mastodon, por favor aktiva Javascript. Alternativamente, aprova alguna de las <a href="%{apps_path}">aplikasyones nativas</a> para Mastodon para tu platforma.
+  existing_username_validator:
+    not_found: no se pudo topar un utilizador lokal kon akel nombre de utilizador
+    not_found_multiple: no se pudo topar %{usernames}
+  exports:
+    archive_takeout:
+      date: Data
+      download: Abasha tu dosya
+      hint_html: Puedes solisitar una dosya de tus <strong>publikasyones i dosyas multimedia kargadas</strong>. Los datos eksportados estaran en formato ActivityPub, meldavles por kualkier programario kompativle. Puedes solisitar una dosya kada 7 diyas.
+      in_progress: Rekopilando tu dosya...
+      request: Solisita tu dosya
+      size: Boy
+    blocks: Personas a las kualas tienes blokado
+    bookmarks: Markadores
+    csv: CSV
+    domain_blocks: Blokos de domenos
+    lists: Listas
+    mutes: Silensias
+    storage: Magazinaje de multimedia
+  featured_tags:
+    add_new: Adjusta muevo
+  filters:
+    contexts:
+      account: Profiles
+      notifications: Avizos
+      public: Linyas de tiempo publikas
+    edit:
+      add_keyword: Adjusta biervo yave
+      keywords: Biervos yaves
+      statuses: Publikasyones individualas
+    index:
+      delete: Efasa
+      title: Filtros
+    new:
+      save: Guadra muevo filtro
+      title: Adjusta muevo filtro
+    statuses:
+      back_to_filter: Retorna al filtro
+      batch:
+        remove: Kita del filtro
+  generic:
+    all: Todos
+    cancel: Anula
+    confirm: Konfirma
+    copy: Kopia
+    delete: Efasa
+    none: Dinguno
+    save_changes: Guadra trokamientos
+    today: oy
+  imports:
+    errors:
+      invalid_csv_file: 'Dosya CSV no valida. Yerro: %{error}'
+      over_rows_processing_limit: kontiene mas de %{count} filas
+      too_large: Dosya es mas grande
+    imported: Importado
+    modes:
+      merge: Une
+      merge_long: Manten rejistros egzistentes i adjusta muevos
+      overwrite: Sobreskrive
+      overwrite_long: Mete muevos rejistros en vez de los aktuales
+    preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
+    states:
+      finished: Finalizado
+      scheduled: Programado
+      unconfirmed: Sin konfirmasyon
+    status: Estado
+    success: Tus datos se tienen kargado djustamente i seran prosesados pishin
+    types:
+      blocking: Lista de blokos
+      bookmarks: Markadores
+      lists: Listas
+    upload: Karga
+  invites:
+    delete: Dezaktiva
+    expires_in:
+      '1800': 30 minutos
+      '21600': 6 oras
+      '3600': 1 ora
+      '43200': 12 oras
+      '604800': 1 semana
+      '86400': 1 diya
+    expires_in_prompt: Nunkua
+    max_uses:
+      one: 1 uzo
+      other: "%{count} uzos"
+    max_uses_prompt: Sin limito
+    table:
+      expires_at: Kaduka
+      uses: Uzos
+    title: Envita a djente
+  lists:
+    errors:
+      limit: Tienes alkansado el karar maksimo de listas
+  login_activities:
+    authentication_methods:
+      otp: aplikasyon de autentifikasyon en dos pasos
+      password: kod
+      sign_in_token: kodiche de sigurita por posta elektronika
+      webauthn: yaves de sigurita
+    description_html: Si ves una aktivita ke no rekoneses, konsidera trokar tu kod i kapasitar la autentifikasyon en dos pasos.
+    empty: No ay estoria de autentifikasyon desponivle
+    failed_sign_in_html: Prova de inisiasyon de sesion no reushida kon %{method} de %{ip} (%{browser})
+    successful_sign_in_html: Prova de sesion reushida kon %{method} dizde %{ip} (%{browser})
+    title: Estoria de autentifikasyon
+  mail_subscriptions:
+    unsubscribe:
+      complete: Dezabonado
+      title: Dezabona
+  media_attachments:
+    validations:
+      images_and_video: No se puede adjuntar un video a un estado ke ya kontenga imajes
+      not_ready: No se pueden adjuntar dosyas ke no se tienen eskapado de prosesar. Aprovalo de muevo en un momento!
+      too_many: No se pueden adjuntar mas de 4 dosyas
+  migrations:
+    acct: Migrado a
+    cancel: Anula readreso
+    cancel_explanation: Al anular el readreso se reaktivara tu kuento aktual, ama no rekuperaras los suivantes ke ayan sido trasladados al otro kuento.
+    cancelled_msg: Tienes anulado el readreso djustamente.
+    errors:
+      already_moved: es el mezmo kuento al ke ya tienes migrado
+      missing_also_known_as: no es un alias de este kuento
+      move_to_self: no puede ser el kuento aktual
+      not_found: no se pudo topar
+      on_cooldown: Estas en tiempo de reutilizasyon
+    followers_count: Suivantes al momento de migrar
+    incoming_migrations: Migra de un kuento desferente
+    incoming_migrations_html: Para migrar de otro kuento a este, primero kale <a href="%{path}">kriyar un alias del kuento</a>.
+    moved_msg: Tu kuento agora se esta redirigiendo a %{acct} i tus suivantes se estan migrando.
+    not_redirecting: Tu kuento no se esta readresando a dinguna otro kuento aktualmente.
+    on_cooldown: Tienes migrado tu kuento rezientemente. Esta fonksyon estara desponivle de muevo en %{count} diyas.
+    past_migrations: Migrasyones pasadas
+    proceed_with_move: Migra suivantes
+    redirected_msg: Tu kuento agora readresa a %{acct}.
+    redirecting_to: Tu kuento se esta readresando a %{acct}.
+    set_redirect: Establese readreso
+    warning:
+      backreference_required: El muevo kuento deve ser konfigurado primero para fazer referensya a este
+      before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
+      cooldown: Dempues de migrar ay un periodo de aspera durante el kual no podras retornar a migrar
+      disabled_account: Tu kuento aktual no sera kompletamente utilizable dempues. Portanto, tendras akseso a la eksportasyon de datos ansi komo a la reaktivasyon.
+      followers: Esta aksion migrara a todos los suivantes del kuento aktual al muevo kuento
+      only_redirect_html: Alternativamente, solo puedes <a href="%{path}">poner un readreso en tu profil</a>.
+  moderation:
+    title: Moderasyon
+  notification_mailer:
+    follow:
+      title: Muevo suivante
+    follow_request:
+      title: Mueva solisitud de segimiento
+    mention:
+      action: Arisponde
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: MM
+          million: M
+          thousand: K
+  otp_authentication:
+    enable: Kapasita
+    instructions_html: "<strong>Eskanea este kodiche QR dizde Google Authenticator o una aplikasyon similar en tu telefon</strong>. A partir de agora, esta aplikasyon djenerara kodiches ke tendras ke ingresar kuando keras konektarte kon tu kuento."
+    manual_instructions: 'Si no puedes eskanear el kodiche QR i nesesitas introdusirlo manualmente, este es el sekreto en teksto plano:'
+    setup: Konfigura
+    wrong_code: El kodiche ingresado es malato! Es djusta la ora del aparato i el sirvidor?
+  pagination:
+    newer: Mas muevo
+    next: Sigiente
+    older: Mas viejo
+    prev: Anterior
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Ya tienes votado en esta anketa
+      duplicate_options: kontiene elementos duplikados
+      duration_too_long: esta demaziado leshos en el avenir
+      duration_too_short: es demaziado pronto
+      expired: La anketa ya tiene eskapado
+      invalid_choice: La opsyon de voto eskojida no egziste
+      over_character_limit: no puede trespasar %{max} karakteres kada uno
+      too_few_options: deve tener mas de un elemento
+      too_many_options: no puede kontener mas de %{max} elementos
+  preferences:
+    other: Otros
+    posting_defaults: Konfigurasyon predeterminada de publikasyones
+    public_timelines: Linyas de tiempo publikas
+  privacy:
+    privacy: Privasita
+    search: Bushkeda
+  privacy_policy:
+    title: Politika de privasita
+  reactions:
+    errors:
+      limit_reached: Limito de reaksyones desferentes alkansado
+      unrecognized_emoji: no es un emoji konesido
+  relationships:
+    activity: Aktivita del kuento
+    confirm_follow_selected_followers: Estas siguro ke keres segir a los suivantes eskojidos?
+    confirm_remove_selected_followers: Estas siguro ke keres kitar a los suivantes eskojidos?
+    confirm_remove_selected_follows: Estas siguro ke keres kitar los kuentos segidos a los kualos tienes eskojido?
+    dormant: Inaktivo
+    follow_failure: No se pudo segir algunos de los kuentos eskojidos.
+    follow_selected_followers: Sige a los suivantes eskojidos
+    followers: Suivantes
+    following: Segidos
+    invited: Envitados
+    last_active: Ultima aktivita
+    most_recent: Mas reziente
+    moved: Migrados
+    mutual: Mutual
+    primary: Prinsipal
+    relationship: Relasyon
+    status: Estado del kuento
+  rss:
+    content_warning: 'Avertensya de kontenido:'
+  sessions:
+    activity: Ultima aktivita
+    browsers:
+      alipay: Alipay
+      blackberry: BlackBerry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      huawei_browser: Huawei Browser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UC Browser
+      weibo: Weibo
+    current_session: Sesyon aktuala
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      kai_os: KaiOS
+      linux: Linux
+      mac: macOS
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Revoka
+    revoke_success: Sesion revokada kon sukseso
+    title: Sesiones
+    view_authentication_history: Ve estoria de autentifikasyon de tu kuento
+  settings:
+    account: Kuento
+    account_settings: Preferensyas de kuento
+    aliases: Aliases del kuento
+    appearance: Aparensya
+    authorized_apps: Aplikasyones autorizadas
+    back: Retorna a Mastodon
+    delete: Efasa kuento
+    development: Dezvelopamiento
+    edit_profile: Edita profil
+    export: Eksporta enformasyon
+    featured_tags: Etiketas avaliadas
+    import: Importo
+    import_and_export: Importo i eksporto
+    migrate: Migrasyon de kuento
+    notifications: Avizos
+    preferences: Preferensyas
+    profile: Profil publiko
+    relationships: Segidos i suivantes
+    statuses_cleanup: Efasasyon otomatika de publikasyones
+    strikes: Amonestamientos de moderasyon
+    two_factor_authentication: Autentifikasyon en dos pasos
+    webauthn_authentication: Yaves de sigurita
+  statuses:
+    attached:
+      audio:
+        one: "%{count} audio"
+        other: "%{count} audios"
+      description: 'Atamiento: %{attached}'
+      image:
+        one: "%{count} imaje"
+        other: "%{count} imajes"
+      video:
+        one: "%{count} video"
+        other: "%{count} videos"
+    boosted_from_html: Repartajado dizde %{acct_link}
+    content_warning: 'Avertensya de kontenido: %{warning}'
+    default_language: La mezma ke la lingua de la enterfaz
+    disallowed_hashtags:
+      one: 'kontenia una etiketa no permetida: %{tags}'
+      other: 'kontenia las etiketas no permetidas: %{tags}'
+    edited_at_html: Editado %{date}
+    errors:
+      in_reply_not_found: La publikasion a la ke aprovas arispondir no egziste.
+    open_in_web: Avre en web
+    over_character_limit: limito de karakteres de %{max} superado
+    pin_errors:
+      direct: Las publikasyones ke son vizivles solo para los utilizadores enmentados no pueden fiksarse
+      limit: Ya tienes fiksado el numero maksimo de publikasyones
+      ownership: La publikasyon de otra persona no puede fiksarse
+    poll:
+      vote: Vota
+    show_more: Amostra mas
+  statuses_cleanup:
+    min_age:
+      '1209600': 2 semanas
+      '15778476': 6 mezes
+      '2629746': 1 mez
+      '31556952': 1 anyo
+      '5259492': 2 mezes
+      '604800': 1 semana
+      '63113904': 2 anyos
+      '7889238': 3 mezes
+  stream_entries:
+    sensitive_content: Kontenido sensivle
+  strikes:
+    errors:
+      too_late: Es demaziado tadre para apelar este amonestamiento
+  tags:
+    does_not_match_previous_name: no koensida kon el nombre anterior
+  themes:
+    contrast: Mastodon (alto kontraste)
+    default: Mastodon (eskuro)
+    mastodon-light: Mastodon (klaro)
+  time:
+    formats:
+      default: "%d de %b del %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%d de %b del %Y, %H:%M %Z"
+  two_factor_authentication:
+    add: Adjusta
+    disable: Inkapasita autentifikasyon en dos pasos
+    disabled_success: Autentifikasyon de dos pasos inkapasitada djustamente
+    edit: Edita
+    enabled: Autentifikasyon de dos pasos esta kapasitada
+    enabled_success: Autentifikasyon de dos pasos kapasitada djustamente
+    generate_recovery_codes: Jenera kodiches de rekuperasyon
+    lost_recovery_codes: Los kodiches de rekuperasyon te permeten obtener akseso a tu kuento si piedres tu telefon. Si tienes pedrido tus kodiches de rekuperasyon, puedes redjenerarlos aki. Tus viejos kodiches de rekuperasyon se aran malatos.
+    methods: Metodos de autentifikasyon de dos pasos
+    otp: Aplikasyon de autentifikasyon
+    recovery_codes: Fazer kopias de sigurita de tus kodiches de rekuperasyon
+    recovery_codes_regenerated: Kodiches de rekupersayon redjenerados kon sukseso
+    recovery_instructions_html: Si piedres akseso a tu telefon, puedes uzar uno de los sigientes kodiches de rekuperasyon para obtener akseso a tu kuento. <strong>Mantenlos a salvo</strong>. Por enshemplo, puedes imprimirlos i guadrarlos kon otros dokumentos emportantes.
+    webauthn: Yaves de sigurita
+  user_mailer:
+    appeal_approved:
+      action: Va a tu kuento
+      explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
+      subject: Tu apelasyon del %{date} fue achetada
+      title: Apelasyon achetada
+    appeal_rejected:
+      explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
+      subject: Tu apelasyon del %{date} fue refuzada
+      title: Apelasyon refuzada
+    backup_ready:
+      explanation: Tienes solisitado una kopia kompleta de tu kuento de Mastodon. Ya esta pronta para abashar!
+      subject: Tu dosya esta pronta para abashar
+      title: Abasha dosya
+    suspicious_sign_in:
+      change_password: troka tu kod
+      details: 'Aki estan los peratim de la koneksyon kon tu kuento:'
+      explanation: Topimos una koneksyon kon tu kuento dizde un muevo adreso IP.
+      further_actions_html: Si no fuites tu, te rekomendamos ke %{action} pishin i kapasites la autentifikasyon en dos pasos para mantener tu kuento siguro.
+      subject: Tu kuento fue aksedido dizde un muevo adreso IP
+      title: Una mueva koneksyon kon tu kuento
+    warning:
+      appeal: Embia una apelasyon
+      appeal_description: Si kreyes ke esto es un yerro, puedes embiar una apelasyon a la taifa de %{instance}.
+      categories:
+        spam: Spam
+        violation: El kontenido viola las sigientes reglas de la komunita
+      explanation:
+        delete_statuses: Se tiene determinado ke algunos de tus mesajes violan una o mas reglas de la komunita i por tanto fueron supremidos por los moderadores de %{instance}.
+        disable: Ya no puedes uzar tu kuento, ama tu profil i el resto de datos permanesen intactos. Puedes solisitar una kopia de sigurita de tus datos, trokar la konfigurasyon de tu kuento o supremirlo.
+        mark_statuses_as_sensitive: Algunas de tus publikasyones an sido markados komo sensivles por los moderadores de %{instance}. Esto sinyifika ke la djente tendra ke pulsar los dosyas multimedia en las publikasyones antes de ke se amostre una vista previa. Puedes markar los dosyas multimedia komo sensivles tu mezmo kuando publikes en el avenir.
+        sensitive: A partir de agora todas los dosyas multimedia ke subas seran markados komo sensivles i eskondidos tras una avertensya.
+      reason: 'Razon:'
+      title:
+        none: Avertensya
+        silence: Kuento limitado
+        suspend: Kuento suspendido
+  users:
+    signed_in_as: 'Konektado komo:'
+  verification:
+    verification: Verifikasyon
+  webauthn_credentials:
+    add: Adjusta mueva yave de sigurita
+    delete: Efasa
+    invalid_credential: Yave de sigurita no valida
+    nickname_hint: Introduska el sovrenombre de tu mueva yave de sigurita
+    not_enabled: Ainda no tienes aktivado WebAuthn
+    not_supported: Este navigador no soporta yaves de sigurita
+    otp_required: Para uzar yaves de sigurita, por favor kapasite primero la autentifikasyon de dos pasos.
+    registered_on: Enrejistrado el %{date}
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index ada775b862..a94903b662 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -4,15 +4,47 @@ ie:
     hints:
       account:
         unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
+      admin_account_action:
+        send_email_notification: Li usator va reciver un explication de ti quel evenit con su conto
+        text_html: Ínobligatori. Tu posse usar posta-sintaxe. Tu posse <a href="%{path}">adjunter preconfigurationes de avises</a> por sparar témpor
+        type_html: Selecte quo far con <strong>%{acct}</strong>
+        types:
+          disable: Prevente li usator de usar su conto, ma ne delete o cela su contenete.
+          none: Usa ti por inviar un admoniment al usator, sin initiante quelcunc altri action.
+          sensitive: Fortiar que omni medie-atachamentes de ti usator essaye marcat quam sensitiv.
+          silence: Preventer li usator de posser postar con public visibilitá, e celar tui postas e notificationes de gente qui ne seque ti. Ti clude omni raportes contra ti conto.
+          suspend: Preventer omni interaction de o a ti-ci conto e deleter su contenete. Reversibil ante 30 dies ha passat. Ti clude omni raportes contra ti conto.
+        warning_preset_id: Ínobligatori. Tu ancor posse adjunter customisat textu al fine del preconfiguration
       announcement:
         all_day: Si ti-ci es marcat, solmen li dates del periode de témpor va esser monstrat
         ends_at: Ínobligatori. Li proclamation va esser despublicat automaticmen ye ti-ci témpor
         scheduled_at: Lassar vacui por publicar li proclamation strax
         starts_at: Ínobligatori. In li casu que tui proclamation es ligat a un specific periode de témpor
         text: Tu posse usar posta-sintaxe. Ples considerar li spacie quel li proclamation va plenar sur li ecran del usator
+      appeal:
+        text: Tu posse apellar un admoniment solmen un vez
       defaults:
+        autofollow: Persones qui adherer per li invitation va sequer te automaticmen
+        avatar: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        bot: Dir a altres que li conto primarimen far automatic actiones e que fórsan null homan vigila it
+        context: Un o multiplic contextus u li filtre deve aplicar
         current_password: Por securital rasones, ples introducter li passa-parol del actual conto
+        current_username: Por confirmar, ples inmetter li usator-nómine del actual conto
+        digest: Misset solmen pos un long periode de ínactivitá e solmen si tu ha recivet quelcunc missages personal in tui inbuxe
+        email: On va misser te un email de confirmation
+        header: PNG, GIF o JPEG. Admaxim %{size}. Li grandore va esser contraet a %{dimensions}px
+        inbox_url: Copiar li URL del initial págine del relé quel tu vole usar
+        irreversible: Filtrat postas va desaparir ínreversibilmen, mem si li filtre es removet plu tard
+        locale: Li lingue del usator-interfacie, emails e notificationes push
         password: Usa adminim 8 carácteres
+        phrase: Va aplicar sin egarda a ca li lítteres in li posta o su contenete-avise es majuscules o minuscules
+        scopes: Queles API li aplication va esser permisset accesser. Si tu selecte un capabilitá del max alt nivelle, tu ne deve selecter li individualis.
+        setting_aggregate_reblogs: Ne monstrar nov boosts por postas queles ha esset recentmen boostat (afecta solmen boostas recivet futurimen)
+        setting_always_send_emails: Generalmen notificationes per email ne va esser misset quande tu activmen usa Mastodon
+        setting_default_sensitive: Sensitiv medie es customarimen celat e posse esser revelat con un clicca
+        setting_display_media_default: Celar medie marcat quam sensitiv
+        setting_display_media_hide_all: Sempre celar medie
+        setting_display_media_show_all: Sempre monstrar medie
       form_admin_settings:
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
@@ -43,5 +75,7 @@ ie:
         new_password: Nov passa-parol
         note: Biografie
         password: Passa-parol
+      form_admin_settings:
+        registrations_mode: Qui posse registrar se
       notification_emails:
         follow_request: Alqui petit sequer te
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 4247487607..33fe877db1 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -168,6 +168,19 @@ lad:
         confirm_password: Konfirma kod
         context: Filtra kontekstos
         current_password: Kod aktual
+        display_name: Nombre amostrado
+        email: Adreso de posta elektronika
+        expires_in: Kaduka dempues de
+        header: Imaje de kavesera
+        new_password: Muevo kod
+        note: Deskripsyon
+        otp_attempt: Kodiche de dos pasos
+        password: Kod
+        setting_default_language: Lingua de publikasyones
+        setting_default_privacy: Privasita de publikasyones
+        setting_display_media_default: Predeterminado
+        setting_display_media_hide_all: Eskonde todo
+        setting_display_media_show_all: Amostra todo
         setting_use_blurhash: Amostra gradientes koloridos para kontenido multimedia eskondido
         setting_use_pending_items: Modo lento
         severity: Severita
@@ -228,3 +241,26 @@ lad:
           no_access: Bloka akseso
           sign_up_block: Bloka enrejistrasyones
           sign_up_requires_approval: Limita enrejistrasyones
+        severity: Regla
+      notification_emails:
+        follow: Alguno te ampeso a segir
+        follow_request: Alguno tiene solisitado segirte
+        mention: Alguno te enmento
+        reblog: Alguno repartajo tu publikasyon
+      rule:
+        text: Regla
+      tag:
+        name: Etiketa
+      user:
+        role: Rolo
+      user_role:
+        name: Nombre
+        permissions_as_keys: Permisos
+        position: Priorita
+      webhook:
+        events: Evenimientos kapasitados
+    'no': 'No'
+    recommended: Rekomendado
+    required:
+      mark: "*"
+    'yes': Si

From ac04e62a0ea7467abc6c6552cac2113489bf6aee Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Dec 2023 10:44:01 +0100
Subject: [PATCH 122/436] Remove unused route definitions (#28430)

---
 config/routes/api.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/routes/api.rb b/config/routes/api.rb
index ebfa60a690..0fe9f69abc 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -301,10 +301,6 @@ namespace :api, format: false do
       resources :statuses, only: [:show, :destroy]
     end
 
-    namespace :accounts do
-      resources :relationships, only: :index
-    end
-
     namespace :admin do
       resources :accounts, only: [:index]
     end

From d29b1cca2e1dd9f38a12086ca8010fafbb0cac33 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 20 Dec 2023 15:35:59 +0100
Subject: [PATCH 123/436] Fix `friends_of_friends` sometimes suggesting
 already-followed accounts (#28433)

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

diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 77d4f635aa..28d0ab99b3 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -16,7 +16,7 @@ class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
       JOIN account_stats ON account_stats.account_id = accounts.id
       LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id
       WHERE follows.account_id IN (SELECT * FROM first_degree)
-        AND follows.target_account_id NOT IN (SELECT * FROM first_degree)
+        AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
         AND follows.target_account_id <> :id
         AND accounts.discoverable
         AND accounts.suspended_at IS NULL

From 01f0a6ca4fbb4d53c01f8be353a9ebfeb98f1739 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 21 Dec 2023 09:32:25 +0100
Subject: [PATCH 124/436] Fix profile setup showing default avatar in web UI
 (#28453)

---
 app/javascript/mastodon/features/onboarding/profile.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
index 09e6b2c6c6..daaef6065c 100644
--- a/app/javascript/mastodon/features/onboarding/profile.jsx
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -26,6 +26,8 @@ const messages = defineMessages({
   uploadAvatar: { id: 'onboarding.profile.upload_avatar', defaultMessage: 'Upload profile picture' },
 });
 
+const nullIfMissing = path => path.endsWith('missing.png') ? null : path;
+
 export const Profile = () => {
   const account = useAppSelector(state => state.getIn(['accounts', me]));
   const [displayName, setDisplayName] = useState(account.get('display_name'));
@@ -61,8 +63,8 @@ export const Profile = () => {
     setHeader(e.target?.files?.[0]);
   }, [setHeader]);
 
-  const avatarPreview = useMemo(() => avatar ? URL.createObjectURL(avatar) : account.get('avatar'), [avatar, account]);
-  const headerPreview = useMemo(() => header ? URL.createObjectURL(header) : account.get('header'), [header, account]);
+  const avatarPreview = useMemo(() => avatar ? URL.createObjectURL(avatar) : nullIfMissing(account.get('avatar')), [avatar, account]);
+  const headerPreview = useMemo(() => header ? URL.createObjectURL(header) : nullIfMissing(account.get('header')), [header, account]);
 
   const handleSubmit = useCallback(() => {
     setIsSaving(true);

From 2463b53363a621c1e18223bda5c47a663707a22c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 03:51:03 -0500
Subject: [PATCH 125/436] More duplicates in cli maintenance spec, misc bug
 fixes (#28449)

---
 lib/mastodon/cli/maintenance.rb           |  40 +-
 spec/lib/mastodon/cli/maintenance_spec.rb | 426 +++++++++++++++++++++-
 2 files changed, 443 insertions(+), 23 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 98067c6e34..7b3a9852a6 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -40,6 +40,10 @@ module Mastodon::CLI
     class BulkImport < ApplicationRecord; end
     class SoftwareUpdate < ApplicationRecord; end
 
+    class DomainBlock < ApplicationRecord
+      scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) }
+    end
+
     class PreviewCard < ApplicationRecord
       self.inheritance_column = false
     end
@@ -249,19 +253,7 @@ module Mastodon::CLI
 
       say 'Deduplicating user records…'
 
-      # Deduplicating email
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
-        ref_user = users.shift
-        say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
-        say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
-        say 'Please reach out to them and set another address with `tootctl account modify` or delete them.', :yellow
-
-        users.each_with_index do |user, index|
-          user.update!(email: "#{index} " + user.email)
-        end
-      end
-
+      deduplicate_users_process_email
       deduplicate_users_process_confirmation_token
       deduplicate_users_process_remember_token
       deduplicate_users_process_password_token
@@ -280,6 +272,20 @@ module Mastodon::CLI
       ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
     end
 
+    def deduplicate_users_process_email
+      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
+        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
+        ref_user = users.shift
+        say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
+        say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
+        say 'Please reach out to them and set another address with `tootctl account modify` or delete them.', :yellow
+
+        users.each_with_index do |user, index|
+          user.update!(email: "#{index} " + user.email)
+        end
+      end
+    end
+
     def deduplicate_users_process_confirmation_token
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
         users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
@@ -571,7 +577,7 @@ module Mastodon::CLI
 
       say 'Deduplicating webhooks…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
-        Webhooks.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        Webhook.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
       end
 
       say 'Restoring webhooks indexes…'
@@ -604,11 +610,7 @@ module Mastodon::CLI
 
       say 'Please chose the one to keep unchanged, other ones will be automatically renamed.'
 
-      ref_id = ask('Account to keep unchanged:') do |q|
-        q.required true
-        q.default 0
-        q.convert :int
-      end
+      ref_id = ask('Account to keep unchanged:', required: true, default: 0).to_i
 
       accounts.delete_at(ref_id)
 
diff --git a/spec/lib/mastodon/cli/maintenance_spec.rb b/spec/lib/mastodon/cli/maintenance_spec.rb
index 353bf08b68..ca492bbf69 100644
--- a/spec/lib/mastodon/cli/maintenance_spec.rb
+++ b/spec/lib/mastodon/cli/maintenance_spec.rb
@@ -62,6 +62,7 @@ describe Mastodon::CLI::Maintenance do
       context 'with duplicate accounts' do
         before do
           prepare_duplicate_data
+          choose_local_account_to_keep
         end
 
         let(:duplicate_account_username) { 'username' }
@@ -71,21 +72,37 @@ describe Mastodon::CLI::Maintenance do
           expect { subject }
             .to output_results(
               'Deduplicating accounts',
+              'Multiple local accounts were found for',
               'Restoring index_accounts_on_username_and_domain_lower',
               'Reindexing textual indexes on accounts…',
               'Finished!'
             )
-            .and change(duplicate_accounts, :count).from(2).to(1)
+            .and change(duplicate_remote_accounts, :count).from(2).to(1)
+            .and change(duplicate_local_accounts, :count).from(2).to(1)
         end
 
-        def duplicate_accounts
+        def duplicate_remote_accounts
           Account.where(username: duplicate_account_username, domain: duplicate_account_domain)
         end
 
+        def duplicate_local_accounts
+          Account.where(username: duplicate_account_username, domain: nil)
+        end
+
         def prepare_duplicate_data
           ActiveRecord::Base.connection.remove_index :accounts, name: :index_accounts_on_username_and_domain_lower
-          Fabricate(:account, username: duplicate_account_username, domain: duplicate_account_domain)
-          Fabricate.build(:account, username: duplicate_account_username, domain: duplicate_account_domain).save(validate: false)
+          _remote_account = Fabricate(:account, username: duplicate_account_username, domain: duplicate_account_domain)
+          _remote_account_dupe = Fabricate.build(:account, username: duplicate_account_username, domain: duplicate_account_domain).save(validate: false)
+          _local_account = Fabricate(:account, username: duplicate_account_username, domain: nil)
+          _local_account_dupe = Fabricate.build(:account, username: duplicate_account_username, domain: nil).save(validate: false)
+        end
+
+        def choose_local_account_to_keep
+          allow(cli.shell)
+            .to receive(:ask)
+            .with(/Account to keep unchanged/, anything)
+            .and_return('0')
+            .once
         end
       end
 
@@ -175,6 +192,407 @@ describe Mastodon::CLI::Maintenance do
         end
       end
 
+      context 'with duplicate account_domain_blocks' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_domain) { 'example.host' }
+        let(:account) { Fabricate(:account) }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Removing duplicate account domain blocks',
+              'Restoring account domain blocks indexes',
+              'Finished!'
+            )
+            .and change(duplicate_account_domain_blocks, :count).from(2).to(1)
+        end
+
+        def duplicate_account_domain_blocks
+          AccountDomainBlock.where(account: account, domain: duplicate_domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :account_domain_blocks, [:account_id, :domain]
+          Fabricate(:account_domain_block, account: account, domain: duplicate_domain)
+          Fabricate.build(:account_domain_block, account: account, domain: duplicate_domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate announcement_reactions' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:account) { Fabricate(:account) }
+        let(:announcement) { Fabricate(:announcement) }
+        let(:name) { Fabricate(:custom_emoji).shortcode }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Removing duplicate announcement reactions',
+              'Restoring announcement_reactions indexes',
+              'Finished!'
+            )
+            .and change(duplicate_announcement_reactions, :count).from(2).to(1)
+        end
+
+        def duplicate_announcement_reactions
+          AnnouncementReaction.where(account: account, announcement: announcement, name: name)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :announcement_reactions, [:account_id, :announcement_id, :name]
+          Fabricate(:announcement_reaction, account: account, announcement: announcement, name: name)
+          Fabricate.build(:announcement_reaction, account: account, announcement: announcement, name: name).save(validate: false)
+        end
+      end
+
+      context 'with duplicate conversations' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:uri) { 'https://example.host/path' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating conversations',
+              'Restoring conversations indexes',
+              'Finished!'
+            )
+            .and change(duplicate_conversations, :count).from(2).to(1)
+        end
+
+        def duplicate_conversations
+          Conversation.where(uri: uri)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :conversations, :uri
+          Fabricate(:conversation, uri: uri)
+          Fabricate.build(:conversation, uri: uri).save(validate: false)
+        end
+      end
+
+      context 'with duplicate custom_emojis' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_shortcode) { 'wowzers' }
+        let(:duplicate_domain) { 'example.host' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating custom_emojis',
+              'Restoring custom_emojis indexes',
+              'Finished!'
+            )
+            .and change(duplicate_custom_emojis, :count).from(2).to(1)
+        end
+
+        def duplicate_custom_emojis
+          CustomEmoji.where(shortcode: duplicate_shortcode, domain: duplicate_domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :custom_emojis, [:shortcode, :domain]
+          Fabricate(:custom_emoji, shortcode: duplicate_shortcode, domain: duplicate_domain)
+          Fabricate.build(:custom_emoji, shortcode: duplicate_shortcode, domain: duplicate_domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate custom_emoji_categories' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:duplicate_name) { 'name_value' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating custom_emoji_categories',
+              'Restoring custom_emoji_categories indexes',
+              'Finished!'
+            )
+            .and change(duplicate_custom_emoji_categories, :count).from(2).to(1)
+        end
+
+        def duplicate_custom_emoji_categories
+          CustomEmojiCategory.where(name: duplicate_name)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :custom_emoji_categories, :name
+          Fabricate(:custom_emoji_category, name: duplicate_name)
+          Fabricate.build(:custom_emoji_category, name: duplicate_name).save(validate: false)
+        end
+      end
+
+      context 'with duplicate domain_allows' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:domain) { 'example.host' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating domain_allows',
+              'Restoring domain_allows indexes',
+              'Finished!'
+            )
+            .and change(duplicate_domain_allows, :count).from(2).to(1)
+        end
+
+        def duplicate_domain_allows
+          DomainAllow.where(domain: domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :domain_allows, :domain
+          Fabricate(:domain_allow, domain: domain)
+          Fabricate.build(:domain_allow, domain: domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate domain_blocks' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:domain) { 'example.host' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating domain_blocks',
+              'Restoring domain_blocks indexes',
+              'Finished!'
+            )
+            .and change(duplicate_domain_blocks, :count).from(2).to(1)
+        end
+
+        def duplicate_domain_blocks
+          DomainBlock.where(domain: domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :domain_blocks, :domain
+          Fabricate(:domain_block, domain: domain)
+          Fabricate.build(:domain_block, domain: domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate email_domain_blocks' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:domain) { 'example.host' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating email_domain_blocks',
+              'Restoring email_domain_blocks indexes',
+              'Finished!'
+            )
+            .and change(duplicate_email_domain_blocks, :count).from(2).to(1)
+        end
+
+        def duplicate_email_domain_blocks
+          EmailDomainBlock.where(domain: domain)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :email_domain_blocks, :domain
+          Fabricate(:email_domain_block, domain: domain)
+          Fabricate.build(:email_domain_block, domain: domain).save(validate: false)
+        end
+      end
+
+      context 'with duplicate media_attachments' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:shortcode) { 'codenam' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating media_attachments',
+              'Restoring media_attachments indexes',
+              'Finished!'
+            )
+            .and change(duplicate_media_attachments, :count).from(2).to(1)
+        end
+
+        def duplicate_media_attachments
+          MediaAttachment.where(shortcode: shortcode)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :media_attachments, :shortcode
+          Fabricate(:media_attachment, shortcode: shortcode)
+          Fabricate.build(:media_attachment, shortcode: shortcode).save(validate: false)
+        end
+      end
+
+      context 'with duplicate preview_cards' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:url) { 'https://example.host/path' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating preview_cards',
+              'Restoring preview_cards indexes',
+              'Finished!'
+            )
+            .and change(duplicate_preview_cards, :count).from(2).to(1)
+        end
+
+        def duplicate_preview_cards
+          PreviewCard.where(url: url)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :preview_cards, :url
+          Fabricate(:preview_card, url: url)
+          Fabricate.build(:preview_card, url: url).save(validate: false)
+        end
+      end
+
+      context 'with duplicate statuses' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:uri) { 'https://example.host/path' }
+        let(:account) { Fabricate(:account) }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating statuses',
+              'Restoring statuses indexes',
+              'Finished!'
+            )
+            .and change(duplicate_statuses, :count).from(2).to(1)
+        end
+
+        def duplicate_statuses
+          Status.where(uri: uri)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :statuses, :uri
+          Fabricate(:status, account: account, uri: uri)
+          duplicate = Fabricate.build(:status, account: account, uri: uri)
+          duplicate.save(validate: false)
+          Fabricate(:status_pin, account: account, status: duplicate)
+          Fabricate(:status, in_reply_to_id: duplicate.id)
+          Fabricate(:status, reblog_of_id: duplicate.id)
+        end
+      end
+
+      context 'with duplicate tags' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:name) { 'tagname' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating tags',
+              'Restoring tags indexes',
+              'Finished!'
+            )
+            .and change(duplicate_tags, :count).from(2).to(1)
+        end
+
+        def duplicate_tags
+          Tag.where(name: name)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :tags, name: 'index_tags_on_name_lower_btree'
+          Fabricate(:tag, name: name)
+          Fabricate.build(:tag, name: name).save(validate: false)
+        end
+      end
+
+      context 'with duplicate webauthn_credentials' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:external_id) { '123_123_123' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating webauthn_credentials',
+              'Restoring webauthn_credentials indexes',
+              'Finished!'
+            )
+            .and change(duplicate_webauthn_credentials, :count).from(2).to(1)
+        end
+
+        def duplicate_webauthn_credentials
+          WebauthnCredential.where(external_id: external_id)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :webauthn_credentials, :external_id
+          Fabricate(:webauthn_credential, external_id: external_id)
+          Fabricate.build(:webauthn_credential, external_id: external_id).save(validate: false)
+        end
+      end
+
+      context 'with duplicate webhooks' do
+        before do
+          prepare_duplicate_data
+        end
+
+        let(:url) { 'https://example.host/path' }
+
+        it 'runs the deduplication process' do
+          expect { subject }
+            .to output_results(
+              'Deduplicating webhooks',
+              'Restoring webhooks indexes',
+              'Finished!'
+            )
+            .and change(duplicate_webhooks, :count).from(2).to(1)
+        end
+
+        def duplicate_webhooks
+          Webhook.where(url: url)
+        end
+
+        def prepare_duplicate_data
+          ActiveRecord::Base.connection.remove_index :webhooks, :url
+          Fabricate(:webhook, url: url)
+          Fabricate.build(:webhook, url: url).save(validate: false)
+        end
+      end
+
       def agree_to_backup_warning
         allow(cli.shell)
           .to receive(:yes?)

From 9e5ddc1745bf729888dc2b11300955c715e95008 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:09:00 +0100
Subject: [PATCH 126/436] New Crowdin Translations (automated) (#28451)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/lad.json |  28 +++++
 app/javascript/mastodon/locales/tr.json  |   4 +-
 config/locales/devise.ie.yml             |  10 ++
 config/locales/ie.yml                    |  38 +++++++
 config/locales/lad.yml                   | 135 +++++++++++++++++++++++
 config/locales/simple_form.ie.yml        |  18 +++
 config/locales/simple_form.lad.yml       |   9 ++
 config/locales/tr.yml                    |   2 +-
 8 files changed, 241 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 1b501c710a..c776a91ee7 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -77,6 +77,10 @@
   "admin.dashboard.retention.average": "Media",
   "admin.dashboard.retention.cohort": "Mez de enrejistrasyon",
   "admin.dashboard.retention.cohort_size": "Muevos utilizadores",
+  "admin.impact_report.instance_accounts": "Profiles de kuentos esto efasaria",
+  "admin.impact_report.instance_followers": "Suivantes a los kualos nuestros utilizadores perderian",
+  "admin.impact_report.instance_follows": "Suivantes a los kualos sus utilizadores perderian",
+  "admin.impact_report.title": "Rezumen de impakto",
   "alert.rate_limited.message": "Por favor aprova dempues de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Trafiko limitado",
   "alert.unexpected.message": "Afito un yerro no asperado.",
@@ -220,6 +224,7 @@
   "emoji_button.search_results": "Rizultados de bushkeda",
   "emoji_button.symbols": "Simbolos",
   "emoji_button.travel": "Viajes i lugares",
+  "empty_column.account_hides_collections": "Este utilizador desidio no mostrar esta enformasyon",
   "empty_column.account_suspended": "Kuento suspendido",
   "empty_column.account_timeline": "No ay publikasyones aki!",
   "empty_column.account_unavailable": "Profil no desponivle",
@@ -294,6 +299,8 @@
   "hashtag.column_settings.tag_mode.any": "Kualsekera de estos",
   "hashtag.column_settings.tag_mode.none": "Dinguno de estos",
   "hashtag.column_settings.tag_toggle": "Inkluir etiketas adisionalas en esta kolumna",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} partisipante} other {{counter} partisipantes}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
   "hashtag.follow": "Segir etiketa",
   "hashtag.unfollow": "Desegir etiketa",
@@ -303,18 +310,23 @@
   "home.column_settings.basic": "Opsyones bazikas",
   "home.column_settings.show_reblogs": "Amostrar repartajasyones",
   "home.column_settings.show_replies": "Amostrar repuestas",
+  "home.explore_prompt.body": "Tu linya prinsipala es una mikstura de publikasyones kon etiketas a las kualas eskojites a segir, la djente a la kuala eskojites a segir i las publikasyones ke eyos repartajan. Si esta demaziado trankila, puedes:",
+  "home.explore_prompt.title": "Esta es tu baza prinsipala en Mastodon.",
   "home.hide_announcements": "Eskonde pregones",
   "home.pending_critical_update.body": "Por favor aktualiza tu sirvidor de Mastodon pishin!",
   "home.pending_critical_update.link": "Ve aktualizasyones",
+  "home.pending_critical_update.title": "Aktualizasyon de seguridad kritika esta desponivle!",
   "home.show_announcements": "Amostra pregones",
   "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
   "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
   "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
   "interaction_modal.description.reply": "Kon un kuento en Mastodon, puedes arispondir a esta publikasyon.",
+  "interaction_modal.login.action": "Va a tu sirvidor",
   "interaction_modal.login.prompt": "Domeno del sirvidor de tu kuento, por enshemplo mastodon.social",
   "interaction_modal.no_account_yet": "No tyenes kuento de Mastodon?",
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
+  "interaction_modal.sign_in": "No estas konektado kon este sirvidor. Ande tyenes tu kuento?",
   "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
   "interaction_modal.title.follow": "Sige a {name}",
   "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
@@ -369,6 +381,7 @@
   "lists.delete": "Efasa lista",
   "lists.edit": "Edita lista",
   "lists.edit.submit": "Troka titolo",
+  "lists.exclusive": "Eskonder estas publikasyones de linya prinsipala",
   "lists.new.create": "Adjusta lista",
   "lists.new.title_placeholder": "Titolo de mueva lista",
   "lists.replies_policy.followed": "Kualseker utilizardo segido",
@@ -403,6 +416,7 @@
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Salir",
   "navigation_bar.mutes": "Utilizadores silensiados",
+  "navigation_bar.opened_in_classic_interface": "Publikasyones, kuentos i otras pajinas espesifikas se avren kon preferensyas predeterminadas en la enterfaz web klasika.",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Publikasyones fiksadas",
   "navigation_bar.preferences": "Preferensyas",
@@ -460,17 +474,24 @@
   "notifications_permission_banner.title": "Nunka te piedres niente",
   "onboarding.action.back": "Va atras",
   "onboarding.actions.back": "Va atras",
+  "onboarding.actions.go_to_explore": "Va a los trendes",
+  "onboarding.actions.go_to_home": "Va a tu linya prinsipala",
   "onboarding.compose.template": "Ke haber, #Mastodon?",
   "onboarding.follows.title": "Personaliza tu linya prinsipala",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
   "onboarding.profile.note": "Tu deskripsyon",
+  "onboarding.profile.note_hint": "Puedes @enmentar a otra djente o #etiketas…",
   "onboarding.profile.save_and_continue": "Guadra i kontinua",
   "onboarding.profile.title": "Konfigurasyon de profil",
   "onboarding.profile.upload_avatar": "Karga imaje de profil",
   "onboarding.profile.upload_header": "Karga kavesera de profil",
+  "onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}",
+  "onboarding.share.next_steps": "Posivles sigientes pasos:",
   "onboarding.share.title": "Partaja tu profil",
   "onboarding.start.skip": "No nesesitas ayudo para ampesar?",
+  "onboarding.start.title": "Lo logrates!",
+  "onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
   "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
   "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
@@ -515,6 +536,7 @@
   "reply_indicator.cancel": "Anula",
   "report.block": "Bloka",
   "report.block_explanation": "No veras sus publikasyones. No podra ver tus publikasyones ni segirte. Podra saver ke le blokates.",
+  "report.categories.legal": "Legal",
   "report.categories.other": "Otros",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El kontenido viola una o mas reglas del sirvidor",
@@ -552,6 +574,7 @@
   "report.unfollow": "Desegir a @{name}",
   "report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
+  "report_notification.categories.legal": "Legal",
   "report_notification.categories.other": "Otros",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Violasion de reglas",
@@ -570,6 +593,7 @@
   "search_popout.options": "Opsyones de bushkeda",
   "search_popout.quick_actions": "Aksiones rapidas",
   "search_popout.recent": "Bushkedas resientes",
+  "search_popout.specific_date": "dato espesifiko",
   "search_popout.user": "utilizador",
   "search_results.accounts": "Profiles",
   "search_results.all": "Todos",
@@ -596,10 +620,12 @@
   "status.cannot_reblog": "Esta publikasyon no se puede repartajar",
   "status.copy": "Kopia atadijo de publikasyon",
   "status.delete": "Efasa",
+  "status.detailed_status": "Vista de konversasyon detalyada",
   "status.direct": "Enmenta a @{name} en privado",
   "status.direct_indicator": "Enmentadura privada",
   "status.edit": "Edita",
   "status.edited": "Editado {date}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
@@ -637,6 +663,7 @@
   "status.show_more": "Amostra mas",
   "status.show_more_all": "Amostra mas para todo",
   "status.show_original": "Amostra orijinal",
+  "status.title.with_attachments": "{user} publiko {attachmentCount, plural, one {un anekso} other {{attachmentCount} aneksos}}",
   "status.translate": "Trezlada",
   "status.translated_from_with": "Trezladado dizde {lang} kon {provider}",
   "status.uncached_media_warning": "Vista previa no desponivle",
@@ -685,6 +712,7 @@
   "upload_modal.preview_label": "Vista previa ({ratio})",
   "upload_progress.label": "Kargando...",
   "upload_progress.processing": "Prosesando…",
+  "username.taken": "Akel nombre de utilizador ya esta en uzo. Aprova otruno",
   "video.close": "Serra video",
   "video.download": "Abasha dosya",
   "video.exit_fullscreen": "Sal de ekran kompleto",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 8eb09bb7cb..e6389b05a5 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -45,7 +45,7 @@
   "account.joined_short": "Katıldı",
   "account.languages": "Abone olunan dilleri değiştir",
   "account.link_verified_on": "Bu bağlantının sahipliği {date} tarihinde denetlendi",
-  "account.locked_info": "Bu hesabın gizlilik durumu gizli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini manuel olarak onaylıyor.",
+  "account.locked_info": "Bu hesabın gizlilik durumu gizli olarak ayarlanmış. Sahibi, onu kimin takip edebileceğini elle onaylıyor.",
   "account.media": "Medya",
   "account.mention": "@{name} kişisinden bahset",
   "account.moved_to": "{name} yeni hesabının artık şu olduğunu belirtti:",
@@ -345,7 +345,7 @@
   "keyboard_shortcuts.down": "Listede aşağıya inmek için",
   "keyboard_shortcuts.enter": "gönderiyi aç",
   "keyboard_shortcuts.favourite": "Gönderiyi favorilerine ekle",
-  "keyboard_shortcuts.favourites": "Favoriler listeni aç",
+  "keyboard_shortcuts.favourites": "Gözde listeni aç",
   "keyboard_shortcuts.federated": "Federe akışı aç",
   "keyboard_shortcuts.heading": "Klavye kısayolları",
   "keyboard_shortcuts.home": "Ana akışı aç",
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index cee5357c24..0cf0fbe1fe 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -2,8 +2,16 @@
 ie:
   devise:
     failure:
+      already_authenticated: Tu ha ja intrat.
+      inactive: Tui conto ancor ne ha esset activat.
       invalid: Ínvalid %{authentication_keys} o passa-parol.
+      last_attempt: Hay solmen un prova ante que tui conto deveni serrat.
+      locked: Tui conto es serrat.
       not_found_in_database: Ínvalid %{authentication_keys} o passa-parol.
+      pending: Tui conto es ancor sub revision.
+      timeout: Tui session ha expirat. Ples reintrar denov por continuar.
+      unauthenticated: Tu deve intrar o registrar te ante continuar.
+      unconfirmed: Tu deve confirmar tui e-posta ante continuar.
     mailer:
       email_changed:
         extra: Si tu ne changeat tui email-adresse, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto.
@@ -20,6 +28,8 @@ ie:
         title: Reiniciar passa-parol
       two_factor_disabled:
         explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+    omniauth_callbacks:
+      failure: Ne posset autenticar te de %{kind} pro "%{reason}".
     passwords:
       no_token: Tu ne posse accessar ti-ci págine sin venir de un email pri reiniciar li passa-parol. Si tu ha venit de un email pri reiniciar li passa-parol, ples far cert que tu usat li complet URL providet.
       send_instructions: Si tui email-adresse existe in nor database, tu va reciver un ligament por recuperar li passa-parol a tui email-adresse in quelc minutes. Ples vider tui spam-emails si tu ne recivet ti email.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 94df7d1454..c9eef75204 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -329,6 +329,7 @@ ie:
         title: Adjunter nov customisat emoji
       no_emoji_selected: Null emoji esset changeat pro que null esset selectet
       not_permitted: Tu ne es permisset far ti action
+      overwrite: Remplazzar
       shortcode_hint: Adminim 2 carácteres, solmen lítteres, ciffres e sublineas
       title: Customisat emoji
       uncategorized: Íncategorisat
@@ -433,6 +434,7 @@ ie:
         title: Bloccar nov email-dominia
       no_email_domain_block_selected: Null email-dominia-bloccas esset changeat pro que null esset selectet
       not_permitted: Ne permisset
+      resolved_through_html: Resoluet per %{domain}
       title: Bloccat email-dominias
     export_domain_allows:
       new:
@@ -459,6 +461,7 @@ ie:
       unsuppress: Restaurar seque-recomandation
     instances:
       availability:
+        no_failures_recorded: Null fallimentes registrat.
         title: Disponibilitá
         warning: Li ultim prova conexer a ti servitor ha esset ínsuccessosi
       back_to_all: Omni
@@ -601,15 +604,36 @@ ie:
       status: Statu
       statuses: Contenete raportat
       summary:
+        action_preambles:
+          delete_html: 'Tu va <strong>remover</strong> alcun postas de <strong>@%{acct}</strong>''. To va:'
+          mark_as_sensitive_html: 'Tu va <strong>marcar</strong> alcun postas de <strong>@%{acct}</strong> quam <strong>sensitiv</strong>. To va:'
+          silence_html: 'Tu va <strong>limitar</strong> li conto de <strong>@%{acct}</strong>. To va:'
+          suspend_html: 'Tu va <strong>suspender</strong> li conto de <strong>@%{acct}</strong>. To va:'
         close_report: 'Marcar raporte #%{id} quam resoluet'
       title: Raportes
+      unassign: Ínassignar
+      unknown_action_msg: 'Ínconosset action: %{action}'
+      unresolved: Ínresoluet
+      updated_at: Actualisat
+      view_profile: Vider profil
     roles:
+      add_new: Adjunter un rol
+      assigned_users:
+        one: "%{count} usator"
+        other: "%{count} usatores"
       categories:
+        administration: Administration
         devops: DevOps
         invites: Invitationes
         moderation: Moderation
         special: Special
       delete: Deleter
+      description_html: Con <strong>roles por usatores</strong>, tu posse customisar li functiones e locs de Mastodon in queles tui usatores posse accesser.
+      edit: Modificar rol '%{name}'
+      everyone: Permissiones predefinit
+      permissions_count:
+        one: "%{count} permission"
+        other: "%{count} permissiones"
       privileges:
         administrator: Administrator
         delete_user_data: Deleter Data de Usator
@@ -618,26 +642,39 @@ ie:
         manage_announcements: Tractar proclamationes
         manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
         manage_appeals: Gerer Apelles
+        manage_blocks: Gerer Bloccas
+        manage_custom_emojis: Gerer Customisat Emojis
         manage_federation: Gerer Federation
         manage_invites: Gerer Invitationes
         manage_reports: Gerer Raportes
         manage_roles: Gerer Roles
+        manage_rules: Gerer Regules
+        manage_settings: Gerer Parametres
         manage_taxonomies: Gerer Taxonomies
         manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
         manage_users: Gerer usatores
+        manage_webhooks: Gerer Web-crocs
+        view_devops: DevOps
       title: Roles
     rules:
       add_new: Adjunter un regule
+      delete: Deleter
+      edit: Redacter regul
+      empty: Ancor null regules de servitor ha esset definit.
       title: Regules del servitor
     settings:
       about:
+        manage_rules: Gerer regules de servitor
         title: Pri
       appearance:
         title: Aspecte
       discovery:
         profile_directory: Profilarium
         public_timelines: Public témpor-lineas
+        title: Decovriment
       domain_blocks:
+        all: Ad omnes
+        disabled: A necun
         users: A local usatores qui ha initiat session
       registrations:
         title: Registrationes
@@ -645,6 +682,7 @@ ie:
         modes:
           none: Nequi posse registrar se
           open: Quicunc posse registrar se
+      title: Parametres del servitor
     site_uploads:
       delete: Deleter cargat file
       destroyed_msg: Cargat file successosimen deletet!
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index afa6d2930c..36364feba2 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -306,6 +306,7 @@ lad:
       unpublish: Retirar publikasyon
       unpublished_msg: Pregon retirado kon sukseso!
       updated_msg: Pregon aktualizado kon sukseso!
+    critical_update_pending: Aktualizasyon kritika esta asperando
     custom_emojis:
       assign_category: Asinyar kategoria
       by_domain: Domeno
@@ -331,6 +332,7 @@ lad:
       no_emoji_selected: No se troko dingun emoji porke no eskojites dinguno
       not_permitted: No tienes permiso para realizar esta aksyon
       overwrite: Sobreskrive
+      shortcode: Kodiche kurto
       title: Emojis personalizados
       uncategorized: No kategorizado
       unlist: No lista
@@ -380,6 +382,7 @@ lad:
       confirm_suspension:
         cancel: Anula
         confirm: Suspende
+        title: Konfirma bloko de domeno para %{domain}
       created_msg: El bloko de domeno esta siendo prosesado
       destroyed_msg: El bloko de domeno se dezizo
       domain: Domeno
@@ -702,6 +705,7 @@ lad:
         manage_users: Administra utilizadores
         manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
         manage_webhooks: Administrar webhooks
+        view_dashboard: Ve pano
         view_devops: DevOps
       title: Rolos
     rules:
@@ -715,10 +719,17 @@ lad:
         title: Sovre esto
       appearance:
         title: Aparensya
+      branding:
+        title: Marka
+      content_retention:
+        title: Retensyon de kontenido
       discovery:
         follow_recommendations: Rekomendasyones de kuentos
         profile_directory: Katalogo de profiles
         public_timelines: Linyas de tiempo publikas
+        publish_discovered_servers: Publika sirvidores diskuviertos
+        publish_statistics: Publika estatistikas
+        title: Diskuvrimiento
         trends: Trendes
       domain_blocks:
         all: A todos
@@ -737,7 +748,9 @@ lad:
       delete: Efasa dosya kargada
       destroyed_msg: Dosya supremida kon sukseso!
     software_updates:
+      critical_update: Kritiko – por favor aktualiza pishin
       documentation_link: Ambezate mas
+      release_notes: Notas sovre la versyon
       title: Aktualizasyones desponivles
       type: Tipo
       version: Versyon
@@ -795,6 +808,10 @@ lad:
         message_html: No tienes definido dinguna regla del sirvidor.
       sidekiq_process_check:
         message_html: No ay dingun prosedura Sidekiq en egzekusion para la(s) kola(s) %{value}. Por favor, reviza tu konfigurasyon de Sidekiq
+      software_version_critical_check:
+        action: Amostra aktualizasyones desponivles
+      software_version_patch_check:
+        action: Amostra aktualizasyones desponivles
       upload_check_privacy_error:
         message_html: "<strong>Tu sirvidor de web es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
       upload_check_privacy_error_object_storage:
@@ -852,7 +869,9 @@ lad:
         listable: Pueden ser rekomendadas
         no_tag_selected: No se troko dinguna etiketa al no eskojer dinguna
         not_listable: No seran rekomendadas
+        not_trendable: No aperesera en trendes
         not_usable: No se pueden uzar
+        title: Etiketas en trend
         trendable: Pueden apareser en trendes
         trending_rank: Trend n.º %{rank}
         usable: Pueden uzarse
@@ -901,6 +920,8 @@ lad:
       body: "%{target} esta apelando a una solisitasyon de moderasyon de %{action_taken_by} el %{date}, del tipo %{type}. Eyos eskrivieron:"
       next_steps: Puedes achetar la apelasyon para dezazer la dechizyon de moderasyon, o ignorarla.
       subject: "%{username} esta apelando a una dechizyon de moderasyon en %{instance}"
+    new_critical_software_updates:
+      subject: Ay aktualizasyones kritikas de Mastodon desponivles para %{instance}!
     new_pending_account:
       body: Los peratim del muevo kuento estan abashos. Puedes achetar o refuzar esta aplikasyon.
       subject: Muevo kuento para revizion en %{instance} (%{username})
@@ -908,6 +929,9 @@ lad:
       body: "%{reporter} tiene raportado a %{target}"
       body_remote: Alguno de %{domain} a raportado a %{target}
       subject: Muevo raporto para la %{instance} (#%{id})
+    new_software_updates:
+      body: Ay mueva versyon de Mastodon, kizas keras aktualizar!
+      subject: Ay muevas versyones de Mastodon desponivles para %{instance}!
     new_trends:
       body: 'Los sigientes elementos nesesitan una revizion antes de ke se puedan amostrar publikamente:'
       new_trending_links:
@@ -916,10 +940,20 @@ lad:
         title: Publikasyones en trend
       new_trending_tags:
         title: Etiketas en trend
+  aliases:
+    add_new: Kriya un alias
+    empty: No tienes aliases.
+    remove: Dezata alias
   appearance:
     advanced_web_interface: Enterfaz web avanzada
+    animations_and_accessibility: Animasyones i aksesivilita
+    confirmation_dialogs: Dialogos de konfirmasyon
+    discovery: Diskuvrimiento
+    localization:
+      guide_link_text: Todos pueden kontribuir.
     sensitive_content: Kontenido sensivle
   application_mailer:
+    notification_preferences: Troka preferensyas de posta
     salutation: "%{name},"
     settings: 'Troka preferensyas de posta: %{link}'
     unsubscribe: Dezabona
@@ -936,7 +970,11 @@ lad:
     your_token: Tu token de akseso
   auth:
     apply_for_account: Solisita un kuento
+    captcha_confirmation:
+      title: Kontrolo de sigurita
     confirmations:
+      awaiting_review_title: Estamos revizando tu enrejistramiento
+      clicking_this_link: klikando en este atadijo
       login_link: konektate kon kuento
       welcome_title: Bienvenido, %{name}!
       wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
@@ -962,6 +1000,7 @@ lad:
     progress:
       confirm: Konfirma posta
       details: Tus detalyos
+      review: Muestra revizyon
       rules: Acheta reglas
     providers:
       cas: CAS
@@ -975,10 +1014,12 @@ lad:
       back: Atras
       preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
       title: Algunas reglas bazikas.
+      title_invited: Fuites envitado.
     security: Sigurita
     set_new_password: Establese muevo kod
     setup:
       email_below_hint_html: Mira en tu kuti de spam o solisita de muevo. Si el adreso de posta elektronika ke aparese aki es yerrado, puedes trokarlo aki.
+      link_not_received: No risivites un atadijo?
     sign_in:
       preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
       title: Konektate kon %{domain}
@@ -1023,6 +1064,8 @@ lad:
       x_seconds: "%{count} s"
   deletes:
     proceed: Efasa kuento
+    warning:
+      username_unavailable: Tu nombre de utilizador no estara desponivle
   disputes:
     strikes:
       action_taken: Aksyon tomada
@@ -1054,6 +1097,7 @@ lad:
   domain_validator:
     invalid_domain: no es un nombre de domeno valido
   edit_profile:
+    basic_information: Enformasyon bazika
     other: Otros
   errors:
     '400': La solisitasyon ke enviates no fue valida o fue malformada.
@@ -1093,14 +1137,27 @@ lad:
   filters:
     contexts:
       account: Profiles
+      home: Prinsipyo i listas
       notifications: Avizos
       public: Linyas de tiempo publikas
+      thread: Konversasyones
     edit:
       add_keyword: Adjusta biervo yave
       keywords: Biervos yaves
       statuses: Publikasyones individualas
+      title: Edita filtro
     index:
       delete: Efasa
+      empty: No tyenes filtros.
+      keywords:
+        one: "%{count} biervo yave"
+        other: "%{count} biervos yave"
+      statuses:
+        one: "%{count} publikasyon"
+        other: "%{count} publikasyones"
+      statuses_long:
+        one: "%{count} publikasyon individuala eskondida"
+        other: "%{count} publikasyones individualas eskondidas"
       title: Filtros
     new:
       save: Guadra muevo filtro
@@ -1109,17 +1166,22 @@ lad:
       back_to_filter: Retorna al filtro
       batch:
         remove: Kita del filtro
+      index:
+        title: Publikasyones filtradas
   generic:
     all: Todos
     cancel: Anula
+    changes_saved_msg: Trokamientos guadrados kon reusho!
     confirm: Konfirma
     copy: Kopia
     delete: Efasa
+    deselect: Deseleksyonar todo
     none: Dinguno
     save_changes: Guadra trokamientos
     today: oy
   imports:
     errors:
+      empty: Dosya CSV vaziya
       invalid_csv_file: 'Dosya CSV no valida. Yerro: %{error}'
       over_rows_processing_limit: kontiene mas de %{count} filas
       too_large: Dosya es mas grande
@@ -1130,19 +1192,35 @@ lad:
       overwrite: Sobreskrive
       overwrite_long: Mete muevos rejistros en vez de los aktuales
     preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
+    recent_imports: Importasyones resyentes
     states:
       finished: Finalizado
       scheduled: Programado
       unconfirmed: Sin konfirmasyon
     status: Estado
     success: Tus datos se tienen kargado djustamente i seran prosesados pishin
+    time_started: Ampesado el
+    titles:
+      bookmarks: Importando markadores
+      domain_blocking: Importando domenos blokados
+      following: Importando kuentos segidos
+      lists: Importando listas
+      muting: Importando kuentos silensyados
+    type: Tipo de importasyon
+    type_groups:
+      constructive: Segidores i markadores
+      destructive: Blokos i silensyos
     types:
       blocking: Lista de blokos
       bookmarks: Markadores
+      domain_blocking: Lista de domenos blokados
+      following: Lista de segidos
       lists: Listas
+      muting: Lista de silensyados
     upload: Karga
   invites:
     delete: Dezaktiva
+    expired: Kadukado
     expires_in:
       '1800': 30 minutos
       '21600': 6 oras
@@ -1151,6 +1229,8 @@ lad:
       '604800': 1 semana
       '86400': 1 diya
     expires_in_prompt: Nunkua
+    invalid: Esta envitasyon no es valida
+    invited_by: 'Fuites envitado por:'
     max_uses:
       one: 1 uzo
       other: "%{count} uzos"
@@ -1214,12 +1294,31 @@ lad:
   moderation:
     title: Moderasyon
   notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} se enrejistro"
+    favourite:
+      title: Muevo favorito
     follow:
+      body: "%{name} te esta sigiendo!"
+      subject: "%{name} te esta sigiendo"
       title: Muevo suivante
     follow_request:
+      subject: 'Segidor esta asperando: %{name}'
       title: Mueva solisitud de segimiento
     mention:
       action: Arisponde
+      body: 'Fuites enmentado por %{name} en:'
+      subject: Fuites enmentado por %{name}
+      title: Mueva enmentadura
+    reblog:
+      title: Mueva repartajasyon
+    status:
+      subject: "%{name} publiko algo"
+    update:
+      subject: "%{name} edito una publikasyon"
+  notifications:
+    other_settings: Otras preferensyas de avizos
   number:
     human:
       decimal_units:
@@ -1227,7 +1326,9 @@ lad:
         units:
           billion: MM
           million: M
+          quadrillion: Ku
           thousand: K
+          trillion: T
   otp_authentication:
     enable: Kapasita
     instructions_html: "<strong>Eskanea este kodiche QR dizde Google Authenticator o una aplikasyon similar en tu telefon</strong>. A partir de agora, esta aplikasyon djenerara kodiches ke tendras ke ingresar kuando keras konektarte kon tu kuento."
@@ -1249,6 +1350,7 @@ lad:
       expired: La anketa ya tiene eskapado
       invalid_choice: La opsyon de voto eskojida no egziste
       over_character_limit: no puede trespasar %{max} karakteres kada uno
+      self_vote: No puedes votar en tus propias anketas
       too_few_options: deve tener mas de un elemento
       too_many_options: no puede kontener mas de %{max} elementos
   preferences:
@@ -1286,6 +1388,7 @@ lad:
     content_warning: 'Avertensya de kontenido:'
   sessions:
     activity: Ultima aktivita
+    browser: Navigador
     browsers:
       alipay: Alipay
       blackberry: BlackBerry
@@ -1293,6 +1396,7 @@ lad:
       edge: Microsoft Edge
       electron: Electron
       firefox: Firefox
+      generic: Navigador deskonosido
       huawei_browser: Huawei Browser
       ie: Internet Explorer
       micro_messenger: MicroMessenger
@@ -1303,6 +1407,7 @@ lad:
       qq: QQ Browser
       safari: Safari
       uc_browser: UC Browser
+      unknown_browser: Navigador deskonosido
       weibo: Weibo
     current_session: Sesyon aktuala
     ip: IP
@@ -1374,9 +1479,30 @@ lad:
       limit: Ya tienes fiksado el numero maksimo de publikasyones
       ownership: La publikasyon de otra persona no puede fiksarse
     poll:
+      total_people:
+        one: "%{count} persona"
+        other: "%{count} personas"
+      total_votes:
+        one: "%{count} voto"
+        other: "%{count} votos"
       vote: Vota
     show_more: Amostra mas
+    show_newer: Amostra mas muevos
+    show_older: Amostra mas viejos
+    show_thread: Amostra diskusyon
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      direct: Direkto
+      private: Solo suivantes
+      private_long: Solo amostra a tus segidores
+      public: Publiko
+      public_long: Todos pueden ver
+      unlisted: No listado
   statuses_cleanup:
+    enabled: Otomatikamente efasa publikasyones viejas
+    exceptions: Eksepsiones
+    ignore_favs: Ignora favoritos
+    ignore_reblogs: Ignora repartajasyones
     min_age:
       '1209600': 2 semanas
       '15778476': 6 mezes
@@ -1451,14 +1577,23 @@ lad:
         mark_statuses_as_sensitive: Algunas de tus publikasyones an sido markados komo sensivles por los moderadores de %{instance}. Esto sinyifika ke la djente tendra ke pulsar los dosyas multimedia en las publikasyones antes de ke se amostre una vista previa. Puedes markar los dosyas multimedia komo sensivles tu mezmo kuando publikes en el avenir.
         sensitive: A partir de agora todas los dosyas multimedia ke subas seran markados komo sensivles i eskondidos tras una avertensya.
       reason: 'Razon:'
+      subject:
+        none: Avertensya para %{acct}
       title:
+        delete_statuses: Publikasyones efasadas
+        mark_statuses_as_sensitive: Publikasyones markadas komo sensivles
         none: Avertensya
         silence: Kuento limitado
         suspend: Kuento suspendido
+    welcome:
+      final_action: Ampesa a publikar
+      subject: Bienvenido a Mastodon
   users:
+    invalid_otp_token: Kodiche de dos pasos no valido
     signed_in_as: 'Konektado komo:'
   verification:
     verification: Verifikasyon
+    verified_links: Tus atadijos verifikados
   webauthn_credentials:
     add: Adjusta mueva yave de sigurita
     delete: Efasa
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index a94903b662..ff1587be8f 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -47,6 +47,7 @@ ie:
         setting_display_media_show_all: Sempre monstrar medie
       form_admin_settings:
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+        site_contact_username: Qualmen li gente posse atinger te sur Mastodon.
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
         timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
@@ -67,15 +68,32 @@ ie:
         starts_at: Comense del eveniment
         text: Proclamation
       defaults:
+        chosen_languages: Filtrar lingues
         confirm_new_password: Confirmar nov passa-parol
         confirm_password: Confirmar passa-parol
+        context: Filtrar contextus
         current_password: Actual passa-parol
+        data: Data
+        display_name: Nómine a monstrar
+        email: E-posta
+        expires_in: Expirar pos
         honeypot: "%{label} (ne plenar)"
         locale: Lingue del interfacie
         new_password: Nov passa-parol
         note: Biografie
         password: Passa-parol
+        setting_default_language: Lingue in quel postar
+        setting_default_privacy: Privatie de postada
+        setting_default_sensitive: Sempre marcar medie quam sensitiv
+        setting_display_media_default: Predefinitiones
+        setting_display_media_hide_all: Celar omno
+        setting_display_media_show_all: Monstrar omno
+        setting_theme: Tema de situ
+        setting_trends: Monstrar li hodial tendenties
+        setting_unfollow_modal: Monstrar dialog de confirmation ante dessequer alquem
+        setting_use_pending_items: Mode lent
       form_admin_settings:
         registrations_mode: Qui posse registrar se
+        theme: Predefenit tema
       notification_emails:
         follow_request: Alqui petit sequer te
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index 33fe877db1..e0b8eab876 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -168,14 +168,18 @@ lad:
         confirm_password: Konfirma kod
         context: Filtra kontekstos
         current_password: Kod aktual
+        data: Datos
         display_name: Nombre amostrado
         email: Adreso de posta elektronika
         expires_in: Kaduka dempues de
+        fields: Datos adisyonales
         header: Imaje de kavesera
+        locale: Lingua de enterfaz
         new_password: Muevo kod
         note: Deskripsyon
         otp_attempt: Kodiche de dos pasos
         password: Kod
+        phrase: Biervo yave o fraza
         setting_default_language: Lingua de publikasyones
         setting_default_privacy: Privasita de publikasyones
         setting_display_media_default: Predeterminado
@@ -247,6 +251,8 @@ lad:
         follow_request: Alguno tiene solisitado segirte
         mention: Alguno te enmento
         reblog: Alguno repartajo tu publikasyon
+        software_updates:
+          label: Mueva version de Mastodon esta desponivle
       rule:
         text: Regla
       tag:
@@ -259,8 +265,11 @@ lad:
         position: Priorita
       webhook:
         events: Evenimientos kapasitados
+        url: URL de Endpoint
     'no': 'No'
+    not_recommended: No rekomendado
     recommended: Rekomendado
     required:
       mark: "*"
+      text: rekerido
     'yes': Si
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 098719eb7a..568607e70d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1272,7 +1272,7 @@ tr:
         remove: Filtreden kaldır
       index:
         hint: Bu filtre diğer ölçütlerden bağımsız olarak tekil gönderileri seçmek için uygulanıyor. Web arayüzünü kullanarak bu filtreye daha fazla gönderi ekleyebilirsiniz.
-        title: Filtrelenmiş gönderiler
+        title: Süzgeçlenmiş gönderiler
   generic:
     all: Tümü
     all_items_on_page_selected_html:

From 87e2bd02ac3accd198f43d30723bc3027fb4bffd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:13:10 +0100
Subject: [PATCH 127/436] Update dependency irb to v1.11.0 (#28442)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 15bdb9b4f8..cc262f8e1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -376,8 +376,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
-    io-console (0.6.0)
-    irb (1.10.1)
+    io-console (0.7.1)
+    irb (1.11.0)
       rdoc
       reline (>= 0.3.8)
     jmespath (1.6.2)
@@ -540,7 +540,7 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.1.1.1)
+    psych (5.1.2)
       stringio
     public_suffix (5.0.4)
     puma (6.4.0)
@@ -614,7 +614,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.6.1)
       rdf (~> 3.2)
-    rdoc (6.6.1)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)

From c753b1ad35ae84c21c0474bdb052833b2bd4463a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 04:18:38 -0500
Subject: [PATCH 128/436] Clean up of `RSpec/LetSetup` within `spec/models`
 (#28444)

---
 .rubocop_todo.yml                         | 3 ---
 spec/models/account_spec.rb               | 1 +
 spec/models/canonical_email_block_spec.rb | 2 +-
 spec/models/user_spec.rb                  | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 030f311101..bb2715f96e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -63,11 +63,8 @@ RSpec/LetSetup:
     - 'spec/lib/activitypub/activity/delete_spec.rb'
     - 'spec/lib/vacuum/applications_vacuum_spec.rb'
     - 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
-    - 'spec/models/account_spec.rb'
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
-    - 'spec/models/canonical_email_block_spec.rb'
     - 'spec/models/status_spec.rb'
-    - 'spec/models/user_spec.rb'
     - 'spec/services/account_statuses_cleanup_service_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
     - 'spec/services/activitypub/fetch_remote_status_service_spec.rb'
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 522549125f..87aa8bc754 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -954,6 +954,7 @@ RSpec.describe Account do
 
       it 'returns every usable non-suspended account' do
         expect(described_class.searchable).to contain_exactly(silenced_local, silenced_remote, local_account, remote_account)
+        expect(described_class.searchable).to_not include(suspended_local, suspended_remote, unconfirmed, unapproved)
       end
 
       it 'does not mess with previously-applied scopes' do
diff --git a/spec/models/canonical_email_block_spec.rb b/spec/models/canonical_email_block_spec.rb
index 0acff82377..c63483f968 100644
--- a/spec/models/canonical_email_block_spec.rb
+++ b/spec/models/canonical_email_block_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe CanonicalEmailBlock do
   end
 
   describe '.block?' do
-    let!(:canonical_email_block) { Fabricate(:canonical_email_block, email: 'foo@bar.com') }
+    before { Fabricate(:canonical_email_block, email: 'foo@bar.com') }
 
     it 'returns true for the same email' do
       expect(described_class.block?('foo@bar.com')).to be true
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 9111fd7c73..ab5bd39b7b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -422,6 +422,7 @@ RSpec.describe User do
 
     it 'deactivates all sessions' do
       expect(user.session_activations.count).to eq 0
+      expect { session_activation.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it 'revokes all access tokens' do
@@ -430,6 +431,7 @@ RSpec.describe User do
 
     it 'removes push subscriptions' do
       expect(Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count).to eq 0
+      expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 

From f32d672d2ffc33fc4b07a6e36f5d9dcbc3f26e4c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 04:28:41 -0500
Subject: [PATCH 129/436] Clean up of `RSpec/LetSetup` within
 `spec/controllers` (#28446)

---
 .rubocop_todo.yml                             |  5 ----
 .../follower_accounts_controller_spec.rb      |  7 +++++
 .../following_accounts_controller_spec.rb     |  7 +++++
 ...authorized_applications_controller_spec.rb |  4 +++
 .../oauth/tokens_controller_spec.rb           |  4 +++
 .../settings/imports_controller_spec.rb       | 26 ++++++++++---------
 6 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bb2715f96e..f834c55620 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -55,11 +55,6 @@ RSpec/LetSetup:
     - 'spec/controllers/auth/confirmations_controller_spec.rb'
     - 'spec/controllers/auth/passwords_controller_spec.rb'
     - 'spec/controllers/auth/sessions_controller_spec.rb'
-    - 'spec/controllers/follower_accounts_controller_spec.rb'
-    - 'spec/controllers/following_accounts_controller_spec.rb'
-    - 'spec/controllers/oauth/authorized_applications_controller_spec.rb'
-    - 'spec/controllers/oauth/tokens_controller_spec.rb'
-    - 'spec/controllers/settings/imports_controller_spec.rb'
     - 'spec/lib/activitypub/activity/delete_spec.rb'
     - 'spec/lib/vacuum/applications_vacuum_spec.rb'
     - 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index cb8c2a0e5b..dd78c96c05 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -48,6 +48,13 @@ describe FollowerAccountsController do
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
+          expect(body_as_json)
+            .to include(
+              orderedItems: contain_exactly(
+                include(follow_from_bob.account.username),
+                include(follow_from_chris.account.username)
+              )
+            )
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_present
         end
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 095528ed07..7bb78fb420 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -48,6 +48,13 @@ describe FollowingAccountsController do
 
         it 'returns followers' do
           expect(response).to have_http_status(200)
+          expect(body_as_json)
+            .to include(
+              orderedItems: contain_exactly(
+                include(follow_of_bob.target_account.username),
+                include(follow_of_chris.target_account.username)
+              )
+            )
           expect(body['totalItems']).to eq 2
           expect(body['partOf']).to be_present
         end
diff --git a/spec/controllers/oauth/authorized_applications_controller_spec.rb b/spec/controllers/oauth/authorized_applications_controller_spec.rb
index b54610604c..b46b944d0e 100644
--- a/spec/controllers/oauth/authorized_applications_controller_spec.rb
+++ b/spec/controllers/oauth/authorized_applications_controller_spec.rb
@@ -63,5 +63,9 @@ describe Oauth::AuthorizedApplicationsController do
     it 'removes subscriptions for the application\'s access tokens' do
       expect(Web::PushSubscription.where(user: user).count).to eq 0
     end
+
+    it 'removes the web_push_subscription' do
+      expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
   end
 end
diff --git a/spec/controllers/oauth/tokens_controller_spec.rb b/spec/controllers/oauth/tokens_controller_spec.rb
index 973393bcf2..dd2d8ca70c 100644
--- a/spec/controllers/oauth/tokens_controller_spec.rb
+++ b/spec/controllers/oauth/tokens_controller_spec.rb
@@ -20,5 +20,9 @@ RSpec.describe Oauth::TokensController do
     it 'removes web push subscription for token' do
       expect(Web::PushSubscription.where(access_token: access_token).count).to eq 0
     end
+
+    it 'removes the web_push_subscription' do
+      expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
   end
 end
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index 1e7b758931..89ec39e54d 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe Settings::ImportsController do
     it 'assigns the expected imports', :aggregate_failures do
       expect(response).to have_http_status(200)
       expect(assigns(:recent_imports)).to eq [import]
+      expect(assigns(:recent_imports)).to_not include(other_import)
       expect(response.headers['Cache-Control']).to include('private, no-store')
     end
   end
@@ -138,6 +139,7 @@ RSpec.describe Settings::ImportsController do
       let(:bulk_import) { Fabricate(:bulk_import, account: user.account, type: import_type, state: :finished) }
 
       before do
+        rows.each { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
         bulk_import.update(total_items: bulk_import.rows.count, processed_items: bulk_import.rows.count, imported_items: 0)
       end
 
@@ -152,11 +154,11 @@ RSpec.describe Settings::ImportsController do
     context 'with follows' do
       let(:import_type) { 'following' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'acct' => 'foo@bar' },
           { 'acct' => 'user@bar', 'show_reblogs' => false, 'notify' => true, 'languages' => %w(fr de) },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "Account address,Show boosts,Notify on new posts,Languages\nfoo@bar,true,false,\nuser@bar,false,true,\"fr, de\"\n"
@@ -165,11 +167,11 @@ RSpec.describe Settings::ImportsController do
     context 'with blocks' do
       let(:import_type) { 'blocking' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'acct' => 'foo@bar' },
           { 'acct' => 'user@bar' },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "foo@bar\nuser@bar\n"
@@ -178,11 +180,11 @@ RSpec.describe Settings::ImportsController do
     context 'with mutes' do
       let(:import_type) { 'muting' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'acct' => 'foo@bar' },
           { 'acct' => 'user@bar', 'hide_notifications' => false },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "Account address,Hide notifications\nfoo@bar,true\nuser@bar,false\n"
@@ -191,11 +193,11 @@ RSpec.describe Settings::ImportsController do
     context 'with domain blocks' do
       let(:import_type) { 'domain_blocking' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'domain' => 'bad.domain' },
           { 'domain' => 'evil.domain' },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "bad.domain\nevil.domain\n"
@@ -204,11 +206,11 @@ RSpec.describe Settings::ImportsController do
     context 'with bookmarks' do
       let(:import_type) { 'bookmarks' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'uri' => 'https://foo.com/1' },
           { 'uri' => 'https://foo.com/2' },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "https://foo.com/1\nhttps://foo.com/2\n"
@@ -217,11 +219,11 @@ RSpec.describe Settings::ImportsController do
     context 'with lists' do
       let(:import_type) { 'lists' }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'list_name' => 'Amigos', 'acct' => 'user@example.com' },
           { 'list_name' => 'Frenemies', 'acct' => 'user@org.org' },
-        ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
+        ]
       end
 
       include_examples 'export failed rows', "Amigos,user@example.com\nFrenemies,user@org.org\n"

From 5976d3702ff067fb0ed972fbc5f01a0f46b01bd7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 21 Dec 2023 10:44:09 +0100
Subject: [PATCH 130/436] Change "Follow" to "Follow back" and "Mutual" when
 appropriate in web UI (#28452)

---
 .../features/account/components/header.jsx    | 20 +++++++++++++++----
 app/javascript/mastodon/locales/en.json       |  3 ++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 29b46cb43d..ab9526f66a 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -35,6 +35,8 @@ import FollowRequestNoteContainer from '../containers/follow_request_note_contai
 const messages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
+  followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
+  mutual: { id: 'account.mutual', defaultMessage: 'Mutual' },
   cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
   requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
@@ -82,6 +84,18 @@ const titleFromAccount = account => {
   return `${prefix} (@${acct})`;
 };
 
+const messageForFollowButton = relationship => {
+  if (relationship.get('following') && relationship.get('followed_by')) {
+    return messages.mutual;
+  } else if (!relationship.get('following') && relationship.get('followed_by')) {
+    return messages.followBack;
+  } else if (relationship.get('following')) {
+    return messages.unfollow;
+  } else {
+    return messages.follow;
+  }
+};
+
 const dateFormatOptions = {
   month: 'short',
   day: 'numeric',
@@ -253,9 +267,7 @@ class Header extends ImmutablePureComponent {
     let info = [];
     let menu = [];
 
-    if (me !== account.get('id') && account.getIn(['relationship', 'followed_by'])) {
-      info.push(<span key='followed_by' className='relationship-tag'><FormattedMessage id='account.follows_you' defaultMessage='Follows you' /></span>);
-    } else if (me !== account.get('id') && account.getIn(['relationship', 'blocking'])) {
+    if (me !== account.get('id') && account.getIn(['relationship', 'blocking'])) {
       info.push(<span key='blocked' className='relationship-tag'><FormattedMessage id='account.blocked' defaultMessage='Blocked' /></span>);
     }
 
@@ -281,7 +293,7 @@ class Header extends ImmutablePureComponent {
       } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = <Button text={intl.formatMessage(messages.cancel_follow_request)} title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />;
       } else if (!account.getIn(['relationship', 'blocking'])) {
-        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(account.getIn(['relationship', 'following']) ? messages.unfollow : messages.follow)} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
+        actionBtn = <Button disabled={account.getIn(['relationship', 'blocked_by'])} className={classNames({ 'button--destructive': account.getIn(['relationship', 'following']) })} text={intl.formatMessage(messageForFollowButton(account.get('relationship')))} onClick={signedIn ? this.props.onFollow : this.props.onInteractionModal} />;
       } else if (account.getIn(['relationship', 'blocking'])) {
         actionBtn = <Button text={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />;
       }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 05d7d16564..be7209d04a 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "No posts",
   "account.featured_tags.title": "{name}'s featured hashtags",
   "account.follow": "Follow",
+  "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
   "account.in_memoriam": "In Memoriam.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
+  "account.mutual": "Mutual",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",

From cd64a5b2ec93416437850481b0ec8fc1ba43871f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 05:10:18 -0500
Subject: [PATCH 131/436] Clean up of `RSpec/LetSetup` within `api/` (#28448)

---
 .rubocop_todo.yml                             |  5 --
 .../v1/accounts/statuses_controller_spec.rb   |  3 +-
 .../api/v1/filters_controller_spec.rb         |  5 ++
 .../api/v2/admin/accounts_controller_spec.rb  | 64 +++++++++++++------
 .../v2/filters/keywords_controller_spec.rb    |  4 ++
 .../v2/filters/statuses_controller_spec.rb    |  4 ++
 6 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f834c55620..8bee220d72 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -47,11 +47,6 @@ RSpec/ExampleLength:
 
 RSpec/LetSetup:
   Exclude:
-    - 'spec/controllers/api/v1/accounts/statuses_controller_spec.rb'
-    - 'spec/controllers/api/v1/filters_controller_spec.rb'
-    - 'spec/controllers/api/v2/admin/accounts_controller_spec.rb'
-    - 'spec/controllers/api/v2/filters/keywords_controller_spec.rb'
-    - 'spec/controllers/api/v2/filters/statuses_controller_spec.rb'
     - 'spec/controllers/auth/confirmations_controller_spec.rb'
     - 'spec/controllers/auth/passwords_controller_spec.rb'
     - 'spec/controllers/auth/sessions_controller_spec.rb'
diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index 0e4fa93017..df71e94ace 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -10,11 +10,11 @@ describe Api::V1::Accounts::StatusesController do
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
-    Fabricate(:status, account: user.account)
   end
 
   describe 'GET #index' do
     it 'returns expected headers', :aggregate_failures do
+      Fabricate(:status, account: user.account)
       get :index, params: { account_id: user.account.id, limit: 1 }
 
       expect(response).to have_http_status(200)
@@ -30,7 +30,6 @@ describe Api::V1::Accounts::StatusesController do
     end
 
     context 'with exclude replies' do
-      let!(:older_statuses) { user.account.statuses.destroy_all }
       let!(:status) { Fabricate(:status, account: user.account) }
       let!(:status_self_reply) { Fabricate(:status, account: user.account, thread: status) }
 
diff --git a/spec/controllers/api/v1/filters_controller_spec.rb b/spec/controllers/api/v1/filters_controller_spec.rb
index 8d5408cf54..b0f64ccf41 100644
--- a/spec/controllers/api/v1/filters_controller_spec.rb
+++ b/spec/controllers/api/v1/filters_controller_spec.rb
@@ -15,10 +15,15 @@ RSpec.describe Api::V1::FiltersController do
   describe 'GET #index' do
     let(:scopes) { 'read:filters' }
     let!(:filter) { Fabricate(:custom_filter, account: user.account) }
+    let!(:custom_filter_keyword) { Fabricate(:custom_filter_keyword, custom_filter: filter) }
 
     it 'returns http success' do
       get :index
       expect(response).to have_http_status(200)
+      expect(body_as_json)
+        .to contain_exactly(
+          include(id: custom_filter_keyword.id.to_s)
+        )
     end
   end
 
diff --git a/spec/controllers/api/v2/admin/accounts_controller_spec.rb b/spec/controllers/api/v2/admin/accounts_controller_spec.rb
index 18b3950140..349f4d2528 100644
--- a/spec/controllers/api/v2/admin/accounts_controller_spec.rb
+++ b/spec/controllers/api/v2/admin/accounts_controller_spec.rb
@@ -34,28 +34,56 @@ RSpec.describe Api::V2::Admin::AccountsController do
     it_behaves_like 'forbidden for wrong scope', 'write:statuses'
     it_behaves_like 'forbidden for wrong role', ''
 
-    [
-      [{ status: 'active', origin: 'local', permissions: 'staff' }, [:admin_account]],
-      [{ by_domain: 'example.org', origin: 'remote' }, [:remote_account]],
-      [{ status: 'suspended' }, [:suspended_remote, :suspended_account]],
-      [{ status: 'disabled' }, [:disabled_account]],
-      [{ status: 'pending' }, [:pending_account]],
-    ].each do |params, expected_results|
-      context "when called with #{params.inspect}" do
-        let(:params) { params }
+    context 'when called with status active and origin local and permissions staff' do
+      let(:params) { { status: 'active', origin: 'local', permissions: 'staff' } }
 
-        it "returns the correct accounts (#{expected_results.inspect})" do
-          expect(response).to have_http_status(200)
-
-          expect(body_json_ids).to eq(expected_results.map { |symbol| send(symbol).id })
-        end
-
-        def body_json_ids
-          body_as_json.map { |a| a[:id].to_i }
-        end
+      it 'returns the correct accounts' do
+        expect(response).to have_http_status(200)
+        expect(body_json_ids).to eq([admin_account.id])
       end
     end
 
+    context 'when called with by_domain value and origin remote' do
+      let(:params) { { by_domain: 'example.org', origin: 'remote' } }
+
+      it 'returns the correct accounts' do
+        expect(response).to have_http_status(200)
+        expect(body_json_ids).to include(remote_account.id)
+        expect(body_json_ids).to_not include(other_remote_account.id)
+      end
+    end
+
+    context 'when called with status suspended' do
+      let(:params) { { status: 'suspended' } }
+
+      it 'returns the correct accounts' do
+        expect(response).to have_http_status(200)
+        expect(body_json_ids).to include(suspended_remote.id, suspended_account.id)
+      end
+    end
+
+    context 'when called with status disabled' do
+      let(:params) { { status: 'disabled' } }
+
+      it 'returns the correct accounts' do
+        expect(response).to have_http_status(200)
+        expect(body_json_ids).to include(disabled_account.id)
+      end
+    end
+
+    context 'when called with status pending' do
+      let(:params) { { status: 'pending' } }
+
+      it 'returns the correct accounts' do
+        expect(response).to have_http_status(200)
+        expect(body_json_ids).to include(pending_account.id)
+      end
+    end
+
+    def body_json_ids
+      body_as_json.map { |a| a[:id].to_i }
+    end
+
     context 'with limit param' do
       let(:params) { { limit: 1 } }
 
diff --git a/spec/controllers/api/v2/filters/keywords_controller_spec.rb b/spec/controllers/api/v2/filters/keywords_controller_spec.rb
index 5321f787a1..9f25237bcf 100644
--- a/spec/controllers/api/v2/filters/keywords_controller_spec.rb
+++ b/spec/controllers/api/v2/filters/keywords_controller_spec.rb
@@ -22,6 +22,10 @@ RSpec.describe Api::V2::Filters::KeywordsController do
     it 'returns http success' do
       get :index, params: { filter_id: filter.id }
       expect(response).to have_http_status(200)
+      expect(body_as_json)
+        .to contain_exactly(
+          include(id: keyword.id.to_s)
+        )
     end
 
     context "when trying to access another's user filters" do
diff --git a/spec/controllers/api/v2/filters/statuses_controller_spec.rb b/spec/controllers/api/v2/filters/statuses_controller_spec.rb
index 5c2a623954..d9df803971 100644
--- a/spec/controllers/api/v2/filters/statuses_controller_spec.rb
+++ b/spec/controllers/api/v2/filters/statuses_controller_spec.rb
@@ -22,6 +22,10 @@ RSpec.describe Api::V2::Filters::StatusesController do
     it 'returns http success' do
       get :index, params: { filter_id: filter.id }
       expect(response).to have_http_status(200)
+      expect(body_as_json)
+        .to contain_exactly(
+          include(id: status_filter.id.to_s)
+        )
     end
 
     context "when trying to access another's user filters" do

From c99f88e1a8ac1bbd4967e65c12717862a7dd00fd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 06:19:56 -0500
Subject: [PATCH 132/436] Clean up of `RSpec/LetSetup` within `spec/lib`
 (#28447)

---
 .rubocop_todo.yml                            | 3 ---
 spec/lib/activitypub/activity/delete_spec.rb | 4 ++++
 spec/lib/vacuum/applications_vacuum_spec.rb  | 8 ++++----
 spec/lib/vacuum/preview_cards_vacuum_spec.rb | 4 ++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8bee220d72..645faa6048 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -50,9 +50,6 @@ RSpec/LetSetup:
     - 'spec/controllers/auth/confirmations_controller_spec.rb'
     - 'spec/controllers/auth/passwords_controller_spec.rb'
     - 'spec/controllers/auth/sessions_controller_spec.rb'
-    - 'spec/lib/activitypub/activity/delete_spec.rb'
-    - 'spec/lib/vacuum/applications_vacuum_spec.rb'
-    - 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
     - 'spec/models/status_spec.rb'
     - 'spec/services/account_statuses_cleanup_service_spec.rb'
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index 3a73b3726c..aec2c71e58 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -50,6 +50,10 @@ RSpec.describe ActivityPub::Activity::Delete do
       it 'sends delete activity to followers of rebloggers' do
         expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
       end
+
+      it 'deletes the reblog' do
+        expect { reblog.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
   end
 
diff --git a/spec/lib/vacuum/applications_vacuum_spec.rb b/spec/lib/vacuum/applications_vacuum_spec.rb
index 57a222aafc..df5c860602 100644
--- a/spec/lib/vacuum/applications_vacuum_spec.rb
+++ b/spec/lib/vacuum/applications_vacuum_spec.rb
@@ -13,11 +13,11 @@ RSpec.describe Vacuum::ApplicationsVacuum do
     let!(:unused_app)      { Fabricate(:application, created_at: 1.month.ago) }
     let!(:recent_app)      { Fabricate(:application, created_at: 1.hour.ago) }
 
-    let!(:active_access_token) { Fabricate(:access_token, application: app_with_token) }
-    let!(:active_access_grant) { Fabricate(:access_grant, application: app_with_grant) }
-    let!(:user) { Fabricate(:user, created_by_application: app_with_signup) }
-
     before do
+      Fabricate(:access_token, application: app_with_token)
+      Fabricate(:access_grant, application: app_with_grant)
+      Fabricate(:user, created_by_application: app_with_signup)
+
       subject.perform
     end
 
diff --git a/spec/lib/vacuum/preview_cards_vacuum_spec.rb b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
index c1b7f7e9c5..9dbdf0bc2f 100644
--- a/spec/lib/vacuum/preview_cards_vacuum_spec.rb
+++ b/spec/lib/vacuum/preview_cards_vacuum_spec.rb
@@ -30,5 +30,9 @@ RSpec.describe Vacuum::PreviewCardsVacuum do
     it 'does not delete attached preview cards' do
       expect(new_preview_card.reload).to be_persisted
     end
+
+    it 'does not delete orphaned preview cards in the retention period' do
+      expect(orphaned_preview_card.reload).to be_persisted
+    end
   end
 end

From efd16f3c2cf12c41bb39b6378007ef8f72e60652 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 06:20:12 -0500
Subject: [PATCH 133/436] Clean up of `RSpec/LetSetup` within
 `spec/services/activitypub` (#28445)

---
 .rubocop_todo.yml                                          | 4 ----
 spec/services/account_statuses_cleanup_service_spec.rb     | 7 +++++++
 .../activitypub/fetch_remote_status_service_spec.rb        | 1 -
 spec/services/activitypub/process_account_service_spec.rb  | 2 +-
 .../activitypub/process_collection_service_spec.rb         | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 645faa6048..6b6a4a89e9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -52,11 +52,7 @@ RSpec/LetSetup:
     - 'spec/controllers/auth/sessions_controller_spec.rb'
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
     - 'spec/models/status_spec.rb'
-    - 'spec/services/account_statuses_cleanup_service_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
-    - 'spec/services/activitypub/fetch_remote_status_service_spec.rb'
-    - 'spec/services/activitypub/process_account_service_spec.rb'
-    - 'spec/services/activitypub/process_collection_service_spec.rb'
     - 'spec/services/batched_remove_status_service_spec.rb'
     - 'spec/services/block_domain_service_spec.rb'
     - 'spec/services/bulk_import_service_spec.rb'
diff --git a/spec/services/account_statuses_cleanup_service_spec.rb b/spec/services/account_statuses_cleanup_service_spec.rb
index f7a88a9172..0ac113f105 100644
--- a/spec/services/account_statuses_cleanup_service_spec.rb
+++ b/spec/services/account_statuses_cleanup_service_spec.rb
@@ -39,6 +39,13 @@ describe AccountStatusesCleanupService, type: :service do
         it 'actually deletes the statuses' do
           subject.call(account_policy, 10)
           expect(Status.find_by(id: [very_old_status.id, old_status.id, another_old_status.id])).to be_nil
+          expect { recent_status.reload }.to_not raise_error
+        end
+
+        it 'preserves recent and unrelated statuses' do
+          subject.call(account_policy, 10)
+          expect { unrelated_status.reload }.to_not raise_error
+          expect { recent_status.reload }.to_not raise_error
         end
       end
 
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 826b67d884..3c64feaeec 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
   subject { described_class.new }
 
   let!(:sender) { Fabricate(:account, domain: 'foo.bar', uri: 'https://foo.bar') }
-  let!(:recipient) { Fabricate(:account) }
 
   let(:existing_status) { nil }
 
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 09eb5ddee3..58dd2badbb 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
   end
 
   context 'when account is not suspended' do
-    subject { described_class.new.call('alice', 'example.com', payload) }
+    subject { described_class.new.call(account.username, account.domain, payload) }
 
     let!(:account) { Fabricate(:account, username: 'alice', domain: 'example.com') }
 
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index df526daf34..f4a2b8fec6 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -242,7 +242,8 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
         it 'does not process forged payload' do
           allow(ActivityPub::Activity).to receive(:factory)
 
-          subject.call(json, forwarder)
+          expect { subject.call(json, forwarder) }
+            .to_not change(actor.reload.statuses, :count)
 
           expect(ActivityPub::Activity).to_not have_received(:factory).with(
             hash_including(

From 9251779d755c62dca9326df82687c4b62e2abb8a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 21 Dec 2023 09:23:53 -0500
Subject: [PATCH 134/436] Fix `RSpec/LetSetup` cop in spec/services (#28459)

---
 .rubocop_todo.yml                             | 13 ----
 .../batched_remove_status_service_spec.rb     |  2 +-
 spec/services/block_domain_service_spec.rb    | 16 ++--
 spec/services/bulk_import_service_spec.rb     | 10 ++-
 spec/services/delete_account_service_spec.rb  | 73 +++++++++----------
 spec/services/import_service_spec.rb          |  2 +-
 spec/services/notify_service_spec.rb          |  9 ++-
 spec/services/remove_status_service_spec.rb   | 14 ++--
 spec/services/report_service_spec.rb          |  3 +-
 spec/services/resolve_account_service_spec.rb |  3 +-
 spec/services/suspend_account_service_spec.rb |  2 +-
 spec/services/unallow_domain_service_spec.rb  |  1 +
 .../unsuspend_account_service_spec.rb         |  2 +-
 .../scheduler/user_cleanup_scheduler_spec.rb  | 11 ++-
 14 files changed, 74 insertions(+), 87 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6b6a4a89e9..afd5305304 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -53,19 +53,6 @@ RSpec/LetSetup:
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
     - 'spec/models/status_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
-    - 'spec/services/batched_remove_status_service_spec.rb'
-    - 'spec/services/block_domain_service_spec.rb'
-    - 'spec/services/bulk_import_service_spec.rb'
-    - 'spec/services/delete_account_service_spec.rb'
-    - 'spec/services/import_service_spec.rb'
-    - 'spec/services/notify_service_spec.rb'
-    - 'spec/services/remove_status_service_spec.rb'
-    - 'spec/services/report_service_spec.rb'
-    - 'spec/services/resolve_account_service_spec.rb'
-    - 'spec/services/suspend_account_service_spec.rb'
-    - 'spec/services/unallow_domain_service_spec.rb'
-    - 'spec/services/unsuspend_account_service_spec.rb'
-    - 'spec/workers/scheduler/user_cleanup_scheduler_spec.rb'
 
 RSpec/MultipleExpectations:
   Max: 8
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 8201c9d51f..991a852f0e 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
   let!(:jeff)   { Fabricate(:account) }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
-  let(:status_alice_hello) { PostStatusService.new.call(alice, text: 'Hello @bob@example.com') }
+  let(:status_alice_hello) { PostStatusService.new.call(alice, text: "Hello @#{bob.pretty_acct}") }
   let(:status_alice_other) { PostStatusService.new.call(alice, text: 'Another status') }
 
   before do
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 36dce9d196..fc3a1397d9 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -21,19 +21,19 @@ RSpec.describe BlockDomainService, type: :service do
     end
 
     it 'removes remote accounts from that domain' do
-      expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true
+      expect(bad_account.reload.suspended?).to be true
     end
 
     it 'records suspension date appropriately' do
-      expect(Account.find_remote('badguy666', 'evil.org').suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
+      expect(bad_account.reload.suspended_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
     it 'keeps already-banned accounts banned' do
-      expect(Account.find_remote('badguy', 'evil.org').suspended?).to be true
+      expect(already_banned_account.reload.suspended?).to be true
     end
 
     it 'does not overwrite suspension date of already-banned accounts' do
-      expect(Account.find_remote('badguy', 'evil.org').suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
+      expect(already_banned_account.reload.suspended_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
     it 'removes the remote accounts\'s statuses and media attachments' do
@@ -53,19 +53,19 @@ RSpec.describe BlockDomainService, type: :service do
     end
 
     it 'silences remote accounts from that domain' do
-      expect(Account.find_remote('badguy666', 'evil.org').silenced?).to be true
+      expect(bad_account.reload.silenced?).to be true
     end
 
     it 'records suspension date appropriately' do
-      expect(Account.find_remote('badguy666', 'evil.org').silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
+      expect(bad_account.reload.silenced_at).to eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
     it 'keeps already-banned accounts banned' do
-      expect(Account.find_remote('badguy', 'evil.org').silenced?).to be true
+      expect(already_banned_account.reload.silenced?).to be true
     end
 
     it 'does not overwrite suspension date of already-banned accounts' do
-      expect(Account.find_remote('badguy', 'evil.org').silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
+      expect(already_banned_account.reload.silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
     it 'leaves the domains status and attachments, but clears media' do
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index 3a3f95ccc6..f703650c37 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -271,14 +271,15 @@ RSpec.describe BulkImportService do
       let(:import_type) { 'domain_blocking' }
       let(:overwrite)   { false }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'domain' => 'blocked.com' },
           { 'domain' => 'to_block.com' },
-        ].map { |data| import.rows.create!(data: data) }
+        ]
       end
 
       before do
+        rows.each { |data| import.rows.create!(data: data) }
         account.block_domain!('alreadyblocked.com')
         account.block_domain!('blocked.com')
       end
@@ -298,14 +299,15 @@ RSpec.describe BulkImportService do
       let(:import_type) { 'domain_blocking' }
       let(:overwrite)   { true }
 
-      let!(:rows) do
+      let(:rows) do
         [
           { 'domain' => 'blocked.com' },
           { 'domain' => 'to_block.com' },
-        ].map { |data| import.rows.create!(data: data) }
+        ]
       end
 
       before do
+        rows.each { |data| import.rows.create!(data: data) }
         account.block_domain!('alreadyblocked.com')
         account.block_domain!('blocked.com')
       end
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index a2c57f1c1e..f04ba9cf14 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -28,74 +28,69 @@ RSpec.describe DeleteAccountService, type: :service do
     let!(:account_note) { Fabricate(:account_note, account: account) }
 
     it 'deletes associated owned and target records and target notifications' do
-      expect { subject }
-        .to delete_associated_owned_records
-        .and delete_associated_target_records
-        .and delete_associated_target_notifications
+      subject
+
+      expect_deletion_of_associated_owned_records
+      expect_deletion_of_associated_target_records
+      expect_deletion_of_associated_target_notifications
     end
 
-    def delete_associated_owned_records
-      change do
-        [
-          account.statuses,
-          account.media_attachments,
-          account.notifications,
-          account.favourites,
-          account.active_relationships,
-          account.passive_relationships,
-          account.polls,
-          account.account_notes,
-        ].map(&:count)
-      end.from([2, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
+    def expect_deletion_of_associated_owned_records
+      expect { status.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { status_with_mention.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { mention.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { media_attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { favourite.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { active_relationship.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { passive_relationship.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { poll.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { poll_vote.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { account_note.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    def delete_associated_target_records
-      change(account_pins_for_account, :count).from(1).to(0)
+    def expect_deletion_of_associated_target_records
+      expect { endorsement.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    def account_pins_for_account
-      AccountPin.where(target_account: account)
-    end
-
-    def delete_associated_target_notifications
-      change do
-        %w(
-          poll favourite status mention follow
-        ).map { |type| Notification.where(type: type).count }
-      end.from([1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0])
+    def expect_deletion_of_associated_target_notifications
+      expect { favourite_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { follow_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { mention_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { poll_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { status_notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
   describe '#call on local account' do
     before do
-      stub_request(:post, 'https://alice.com/inbox').to_return(status: 201)
-      stub_request(:post, 'https://bob.com/inbox').to_return(status: 201)
+      stub_request(:post, remote_alice.inbox_url).to_return(status: 201)
+      stub_request(:post, remote_bob.inbox_url).to_return(status: 201)
     end
 
     let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', domain: 'alice.com', protocol: :activitypub) }
     let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', domain: 'bob.com', protocol: :activitypub) }
 
     include_examples 'common behavior' do
-      let!(:account) { Fabricate(:account) }
-      let!(:local_follower) { Fabricate(:account) }
+      let(:account) { Fabricate(:account) }
+      let(:local_follower) { Fabricate(:account) }
 
       it 'sends a delete actor activity to all known inboxes' do
         subject
-        expect(a_request(:post, 'https://alice.com/inbox')).to have_been_made.once
-        expect(a_request(:post, 'https://bob.com/inbox')).to have_been_made.once
+        expect(a_request(:post, remote_alice.inbox_url)).to have_been_made.once
+        expect(a_request(:post, remote_bob.inbox_url)).to have_been_made.once
       end
     end
   end
 
   describe '#call on remote account' do
     before do
-      stub_request(:post, 'https://alice.com/inbox').to_return(status: 201)
-      stub_request(:post, 'https://bob.com/inbox').to_return(status: 201)
+      stub_request(:post, account.inbox_url).to_return(status: 201)
     end
 
     include_examples 'common behavior' do
-      let!(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub, domain: 'bob.com') }
-      let!(:local_follower) { Fabricate(:account) }
+      let(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub, domain: 'bob.com') }
+      let(:local_follower) { Fabricate(:account) }
 
       it 'sends expected activities to followed and follower inboxes' do
         subject
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 3936b2363f..d67da66caf 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -190,7 +190,7 @@ RSpec.describe ImportService, type: :service do
 
     # Make sure to not actually go to the remote server
     before do
-      stub_request(:post, 'https://թութ.հայ/inbox').to_return(status: 200)
+      stub_request(:post, nare.inbox_url).to_return(status: 200)
     end
 
     it 'follows the listed account' do
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 8fcb586580..50055dafc7 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -67,9 +67,10 @@ RSpec.describe NotifyService, type: :service do
 
       context 'when the message chain is initiated by recipient, but is not direct message' do
         let(:reply_to) { Fabricate(:status, account: recipient) }
-        let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
 
+        before { Fabricate(:mention, account: sender, status: reply_to) }
+
         it 'does not notify' do
           expect { subject }.to_not change(Notification, :count)
         end
@@ -77,10 +78,11 @@ RSpec.describe NotifyService, type: :service do
 
       context 'when the message chain is initiated by recipient, but without a mention to the sender, even if the sender sends multiple messages in a row' do
         let(:reply_to) { Fabricate(:status, account: recipient) }
-        let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
         let(:dummy_reply) { Fabricate(:status, account: sender, visibility: :direct, thread: reply_to) }
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
 
+        before { Fabricate(:mention, account: sender, status: reply_to) }
+
         it 'does not notify' do
           expect { subject }.to_not change(Notification, :count)
         end
@@ -88,9 +90,10 @@ RSpec.describe NotifyService, type: :service do
 
       context 'when the message chain is initiated by the recipient with a mention to the sender' do
         let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
-        let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
 
+        before { Fabricate(:mention, account: sender, status: reply_to) }
+
         it 'does notify' do
           expect { subject }.to change(Notification, :count)
         end
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 7754ae8004..08ce0b0456 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -12,15 +12,15 @@ RSpec.describe RemoveStatusService, type: :service do
   let!(:bill)   { Fabricate(:account, username: 'bill', protocol: :activitypub, domain: 'example2.com', inbox_url: 'http://example2.com/inbox') }
 
   before do
-    stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
-    stub_request(:post, 'http://example2.com/inbox').to_return(status: 200)
+    stub_request(:post, hank.inbox_url).to_return(status: 200)
+    stub_request(:post, bill.inbox_url).to_return(status: 200)
 
     jeff.follow!(alice)
     hank.follow!(alice)
   end
 
   context 'when removed status is not a reblog' do
-    let!(:status) { PostStatusService.new.call(alice, text: 'Hello @bob@example.com ThisIsASecret') }
+    let!(:status) { PostStatusService.new.call(alice, text: "Hello @#{bob.pretty_acct} ThisIsASecret") }
 
     before do
       FavouriteService.new.call(jeff, status)
@@ -39,7 +39,7 @@ RSpec.describe RemoveStatusService, type: :service do
 
     it 'sends Delete activity to followers' do
       subject.call(status)
-      expect(a_request(:post, 'http://example.com/inbox').with(
+      expect(a_request(:post, hank.inbox_url).with(
                body: hash_including({
                  'type' => 'Delete',
                  'object' => {
@@ -53,7 +53,7 @@ RSpec.describe RemoveStatusService, type: :service do
 
     it 'sends Delete activity to rebloggers' do
       subject.call(status)
-      expect(a_request(:post, 'http://example2.com/inbox').with(
+      expect(a_request(:post, bill.inbox_url).with(
                body: hash_including({
                  'type' => 'Delete',
                  'object' => {
@@ -78,7 +78,7 @@ RSpec.describe RemoveStatusService, type: :service do
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, 'http://example.com/inbox').with(
+      expect(a_request(:post, hank.inbox_url).with(
                body: hash_including({
                  'type' => 'Undo',
                  'object' => hash_including({
@@ -96,7 +96,7 @@ RSpec.describe RemoveStatusService, type: :service do
 
     it 'sends Undo activity to followers' do
       subject.call(status)
-      expect(a_request(:post, 'http://example.com/inbox').with(
+      expect(a_request(:post, hank.inbox_url).with(
                body: hash_including({
                  'type' => 'Undo',
                  'object' => hash_including({
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index d3bcd5d31c..2a919f6405 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -156,9 +156,8 @@ RSpec.describe ReportService, type: :service do
       -> {  described_class.new.call(source_account, target_account) }
     end
 
-    let!(:other_report) { Fabricate(:report, target_account: target_account) }
-
     before do
+      Fabricate(:report, target_account: target_account)
       ActionMailer::Base.deliveries.clear
       source_account.user.settings['notification_emails.report'] = true
       source_account.user.save
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 9f5fdca297..3c4b182e29 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe ResolveAccountService, type: :service do
       let!(:remote_account) { Fabricate(:account, username: 'foo', domain: 'ap.example.com', protocol: 'activitypub') }
 
       context 'when domain is banned' do
-        let!(:domain_block) { Fabricate(:domain_block, domain: 'ap.example.com', severity: :suspend) }
+        before { Fabricate(:domain_block, domain: 'ap.example.com', severity: :suspend) }
 
         it 'does not return an account' do
           expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
@@ -214,6 +214,7 @@ RSpec.describe ResolveAccountService, type: :service do
       expect(account.domain).to eq 'ap.example.com'
       expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
       expect(account.uri).to eq 'https://ap.example.com/users/foo'
+      expect(status.reload.account).to eq(account)
     end
   end
 
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index c258995b7e..b309ce511e 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -46,9 +46,9 @@ RSpec.describe SuspendAccountService, type: :service do
       let!(:account)         { Fabricate(:account) }
       let!(:remote_follower) { Fabricate(:account, uri: 'https://alice.com', inbox_url: 'https://alice.com/inbox', protocol: :activitypub, domain: 'alice.com') }
       let!(:remote_reporter) { Fabricate(:account, uri: 'https://bob.com', inbox_url: 'https://bob.com/inbox', protocol: :activitypub, domain: 'bob.com') }
-      let!(:report)          { Fabricate(:report, account: remote_reporter, target_account: account) }
 
       before do
+        Fabricate(:report, account: remote_reporter, target_account: account)
         remote_follower.follow!(account)
       end
 
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index 19d40e7e86..d96e354187 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -27,6 +27,7 @@ RSpec.describe UnallowDomainService, type: :service do
       end
 
       it 'removes remote accounts from that domain' do
+        expect { already_banned_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
         expect(Account.where(domain: 'evil.org').exists?).to be false
       end
 
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index 2f737c6215..211c39e6c7 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -39,9 +39,9 @@ RSpec.describe UnsuspendAccountService, type: :service do
       let!(:account)         { Fabricate(:account) }
       let!(:remote_follower) { Fabricate(:account, uri: 'https://alice.com', inbox_url: 'https://alice.com/inbox', protocol: :activitypub, domain: 'alice.com') }
       let!(:remote_reporter) { Fabricate(:account, uri: 'https://bob.com', inbox_url: 'https://bob.com/inbox', protocol: :activitypub, domain: 'bob.com') }
-      let!(:report)          { Fabricate(:report, account: remote_reporter, target_account: account) }
 
       before do
+        Fabricate(:report, account: remote_reporter, target_account: account)
         remote_follower.follow!(account)
       end
 
diff --git a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
index 9909795008..8fda246ba8 100644
--- a/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/user_cleanup_scheduler_spec.rb
@@ -18,12 +18,11 @@ describe Scheduler::UserCleanupScheduler do
       confirmed_user.update!(confirmed_at: 1.day.ago)
     end
 
-    it 'deletes the old unconfirmed user' do
-      expect { subject.perform }.to change { User.exists?(old_unconfirmed_user.id) }.from(true).to(false)
-    end
-
-    it "deletes the old unconfirmed user's account" do
-      expect { subject.perform }.to change { Account.exists?(old_unconfirmed_user.account_id) }.from(true).to(false)
+    it 'deletes the old unconfirmed user, their account, and the moderation note' do
+      expect { subject.perform }
+        .to change { User.exists?(old_unconfirmed_user.id) }.from(true).to(false)
+        .and change { Account.exists?(old_unconfirmed_user.account_id) }.from(true).to(false)
+      expect { moderation_note.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it 'does not delete the new unconfirmed user or their account' do

From 1c041356a1c264347a787b0370163df7753ef3da Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 21 Dec 2023 21:19:18 +0100
Subject: [PATCH 135/436] Fix error on viewing a profile when unlogged (#28465)

---
 app/javascript/mastodon/features/account/components/header.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index ab9526f66a..97f68c2217 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -85,6 +85,8 @@ const titleFromAccount = account => {
 };
 
 const messageForFollowButton = relationship => {
+  if(!relationship) return messages.follow;
+
   if (relationship.get('following') && relationship.get('followed_by')) {
     return messages.mutual;
   } else if (!relationship.get('following') && relationship.get('followed_by')) {

From 43547cd21000101c0fc1486cdd431ce164741de7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 08:41:21 +0100
Subject: [PATCH 136/436] Update dependency debug to v1.9.1 (#28466)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index cc262f8e1a..9b78ca733e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,7 +220,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
-    debug (1.9.0)
+    debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.1.0)

From e70a65761ad3bc0931ab9c30d541895bc70df9ab Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Dec 2023 08:58:20 +0100
Subject: [PATCH 137/436] New Crowdin Translations (automated) (#28467)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json      |   1 -
 app/javascript/mastodon/locales/an.json      |   1 -
 app/javascript/mastodon/locales/ar.json      |   1 -
 app/javascript/mastodon/locales/ast.json     |   1 -
 app/javascript/mastodon/locales/be.json      |   3 +-
 app/javascript/mastodon/locales/bg.json      |   1 -
 app/javascript/mastodon/locales/bn.json      |   1 -
 app/javascript/mastodon/locales/br.json      |   1 -
 app/javascript/mastodon/locales/ca.json      |   3 +-
 app/javascript/mastodon/locales/ckb.json     |   1 -
 app/javascript/mastodon/locales/co.json      |   1 -
 app/javascript/mastodon/locales/cs.json      |   1 -
 app/javascript/mastodon/locales/cy.json      |   1 -
 app/javascript/mastodon/locales/da.json      |   3 +-
 app/javascript/mastodon/locales/de.json      |   3 +-
 app/javascript/mastodon/locales/el.json      |   1 -
 app/javascript/mastodon/locales/en-GB.json   |   1 -
 app/javascript/mastodon/locales/eo.json      |   1 -
 app/javascript/mastodon/locales/es-AR.json   |   3 +-
 app/javascript/mastodon/locales/es-MX.json   |   3 +-
 app/javascript/mastodon/locales/es.json      |   3 +-
 app/javascript/mastodon/locales/et.json      |   1 -
 app/javascript/mastodon/locales/eu.json      |   3 +-
 app/javascript/mastodon/locales/fa.json      |   1 -
 app/javascript/mastodon/locales/fi.json      |   3 +-
 app/javascript/mastodon/locales/fil.json     |   1 -
 app/javascript/mastodon/locales/fo.json      |   3 +-
 app/javascript/mastodon/locales/fr-QC.json   |   3 +-
 app/javascript/mastodon/locales/fr.json      |   3 +-
 app/javascript/mastodon/locales/fy.json      |   3 +-
 app/javascript/mastodon/locales/ga.json      |   1 -
 app/javascript/mastodon/locales/gd.json      |   1 -
 app/javascript/mastodon/locales/gl.json      |   1 -
 app/javascript/mastodon/locales/he.json      |   3 +-
 app/javascript/mastodon/locales/hi.json      |   1 -
 app/javascript/mastodon/locales/hr.json      |   1 -
 app/javascript/mastodon/locales/hu.json      |   3 +-
 app/javascript/mastodon/locales/hy.json      |   1 -
 app/javascript/mastodon/locales/id.json      |   1 -
 app/javascript/mastodon/locales/ie.json      |   1 -
 app/javascript/mastodon/locales/ig.json      |   1 -
 app/javascript/mastodon/locales/io.json      |   1 -
 app/javascript/mastodon/locales/is.json      |   1 -
 app/javascript/mastodon/locales/it.json      |   3 +-
 app/javascript/mastodon/locales/ja.json      |   1 -
 app/javascript/mastodon/locales/ka.json      |   1 -
 app/javascript/mastodon/locales/kab.json     |   1 -
 app/javascript/mastodon/locales/kk.json      |   1 -
 app/javascript/mastodon/locales/ko.json      |   3 +-
 app/javascript/mastodon/locales/ku.json      |   1 -
 app/javascript/mastodon/locales/kw.json      |   1 -
 app/javascript/mastodon/locales/lad.json     |   6 +-
 app/javascript/mastodon/locales/lt.json      |   3 +-
 app/javascript/mastodon/locales/lv.json      |   1 -
 app/javascript/mastodon/locales/mk.json      |   1 -
 app/javascript/mastodon/locales/ml.json      |   1 -
 app/javascript/mastodon/locales/mr.json      |   1 -
 app/javascript/mastodon/locales/ms.json      |   1 -
 app/javascript/mastodon/locales/my.json      |   1 -
 app/javascript/mastodon/locales/nl.json      |   3 +-
 app/javascript/mastodon/locales/nn.json      |   3 +-
 app/javascript/mastodon/locales/no.json      |   1 -
 app/javascript/mastodon/locales/oc.json      |   1 -
 app/javascript/mastodon/locales/pa.json      |   1 -
 app/javascript/mastodon/locales/pl.json      |   3 +-
 app/javascript/mastodon/locales/pt-BR.json   |   1 -
 app/javascript/mastodon/locales/pt-PT.json   |   3 +-
 app/javascript/mastodon/locales/ro.json      |   1 -
 app/javascript/mastodon/locales/ru.json      |   1 -
 app/javascript/mastodon/locales/sa.json      |   1 -
 app/javascript/mastodon/locales/sc.json      |   1 -
 app/javascript/mastodon/locales/sco.json     |   1 -
 app/javascript/mastodon/locales/si.json      |   1 -
 app/javascript/mastodon/locales/sk.json      |   1 -
 app/javascript/mastodon/locales/sl.json      |   3 +-
 app/javascript/mastodon/locales/sq.json      |   1 -
 app/javascript/mastodon/locales/sr-Latn.json |   1 -
 app/javascript/mastodon/locales/sr.json      |   2 +-
 app/javascript/mastodon/locales/sv.json      |   3 +-
 app/javascript/mastodon/locales/ta.json      |   1 -
 app/javascript/mastodon/locales/te.json      |   1 -
 app/javascript/mastodon/locales/th.json      |   2 +-
 app/javascript/mastodon/locales/tr.json      |   3 +-
 app/javascript/mastodon/locales/tt.json      |   1 -
 app/javascript/mastodon/locales/uk.json      |   2 +-
 app/javascript/mastodon/locales/ur.json      |   1 -
 app/javascript/mastodon/locales/uz.json      |   1 -
 app/javascript/mastodon/locales/vi.json      |   1 -
 app/javascript/mastodon/locales/zgh.json     |   1 -
 app/javascript/mastodon/locales/zh-CN.json   |   3 +-
 app/javascript/mastodon/locales/zh-HK.json   |   3 +-
 app/javascript/mastodon/locales/zh-TW.json   |   3 +-
 config/locales/ie.yml                        | 170 +++++++++++++++++++
 config/locales/lad.yml                       |  76 +++++++++
 config/locales/simple_form.ie.yml            |  19 +++
 config/locales/simple_form.it.yml            |   4 +-
 config/locales/simple_form.lad.yml           |  25 +++
 97 files changed, 356 insertions(+), 94 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d3cc40c60c..6c37cdf5ca 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -30,7 +30,6 @@
   "account.followers.empty": "Hierdie gebruiker het nog nie volgers nie.",
   "account.following": "Volg",
   "account.follows.empty": "Die gebruiker volg nog niemand.",
-  "account.follows_you": "Volg jou",
   "account.go_to_profile": "Gaan na profiel",
   "account.hide_reblogs": "Versteek plasings wat deur @{name} aangestuur is",
   "account.joined_short": "Aangesluit",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index b2134551bf..23899b1007 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -35,7 +35,6 @@
   "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Seguindo}}",
   "account.follows.empty": "Este usuario encara no sigue a dengún.",
-  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir ta lo perfil",
   "account.hide_reblogs": "Amagar retutz de @{name}",
   "account.joined_short": "S'unió",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 979bc9a701..c0d07cc648 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -37,7 +37,6 @@
   "account.following": "الاشتراكات",
   "account.following_counter": "{count, plural, zero{لا يُتابِع أحدًا} one {يُتابِعُ واحد} two{يُتابِعُ اِثنان} few{يُتابِعُ {counter}} many{يُتابِعُ {counter}} other {يُتابِعُ {counter}}}",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
-  "account.follows_you": "يُتابِعُك",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",
   "account.hide_reblogs": "إخفاء المعاد نشرها مِن @{name}",
   "account.in_memoriam": "في الذكرى.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 98f622c293..c4238edcd4 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -38,7 +38,6 @@
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural,one {Sigue a {counter}} other {Sigue a {counter}}}",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
-  "account.follows_you": "Síguete",
   "account.go_to_profile": "Dir al perfil",
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index f94a8b79ff..773af40343 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Няма допісаў",
   "account.featured_tags.title": "Тэгі, выбраныя {name}",
   "account.follow": "Падпісацца",
+  "account.follow_back": "Падпісацца ў адказ",
   "account.followers": "Падпісчыкі",
   "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
   "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
   "account.following": "Падпіскі",
   "account.following_counter": "{count, plural, one {{counter} падпіска} few {{counter} падпіскі} many {{counter} падпісак} other {{counter} падпіскі}}",
   "account.follows.empty": "Карыстальнік ні на каго не падпісаны.",
-  "account.follows_you": "Падпісаны на вас",
   "account.go_to_profile": "Перайсці да профілю",
   "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
   "account.in_memoriam": "У памяць.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Не апавяшчаць",
   "account.mute_short": "Ігнараваць",
   "account.muted": "Ігнаруецца",
+  "account.mutual": "Узаемныя",
   "account.no_bio": "Апісанне адсутнічае.",
   "account.open_original_page": "Адкрыць арыгінальную старонку",
   "account.posts": "Допісы",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index f57d868c7a..8a6d6040d6 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -38,7 +38,6 @@
   "account.following": "Последвано",
   "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
   "account.follows.empty": "Потребителят още никого не следва.",
-  "account.follows_you": "Следва ви",
   "account.go_to_profile": "Към профила",
   "account.hide_reblogs": "Скриване на подсилвания от @{name}",
   "account.in_memoriam": "В памет на.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index b6e4fbb965..fe3d2a627c 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -37,7 +37,6 @@
   "account.following": "অনুসরণ করা হচ্ছে",
   "account.following_counter": "{count, plural,one {{counter} জনকে অনুসরণ} other {{counter} জনকে অনুসরণ}}",
   "account.follows.empty": "এই সদস্য কাউকে এখনো ফলো করেন না.",
-  "account.follows_you": "আপনাকে ফলো করে",
   "account.go_to_profile": "প্রোফাইলে যান",
   "account.hide_reblogs": "@{name}'র সমর্থনগুলি লুকিয়ে ফেলুন",
   "account.in_memoriam": "স্মৃতিতে.",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 39cd732419..bea8b27b77 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -36,7 +36,6 @@
   "account.following": "Koumanantoù",
   "account.following_counter": "{count, plural, one{{counter} C'houmanant} two{{counter} Goumanant} other {{counter} a Goumanant}}",
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
-  "account.follows_you": "Ho heuilh",
   "account.go_to_profile": "Gwelet ar profil",
   "account.hide_reblogs": "Kuzh skignadennoù gant @{name}",
   "account.joined_short": "Amañ abaoe",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 5ae49325f6..86f1fb4765 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "No hi ha tuts",
   "account.featured_tags.title": "etiquetes destacades de {name}",
   "account.follow": "Segueix",
+  "account.follow_back": "Segueix",
   "account.followers": "Seguidors",
   "account.followers.empty": "A aquest usuari encara no el segueix ningú.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} Seguidors}}",
   "account.following": "Seguint",
   "account.following_counter": "{count, plural, other {{counter} Seguint-ne}}",
   "account.follows.empty": "Aquest usuari encara no segueix ningú.",
-  "account.follows_you": "Et segueix",
   "account.go_to_profile": "Vés al perfil",
   "account.hide_reblogs": "Amaga els impulsos de @{name}",
   "account.in_memoriam": "En Memòria.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silencia les notificacions",
   "account.mute_short": "Silencia",
   "account.muted": "Silenciat",
+  "account.mutual": "Mutu",
   "account.no_bio": "No s'ha proporcionat cap descripció.",
   "account.open_original_page": "Obre la pàgina original",
   "account.posts": "Tuts",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 7e96418329..f1cafd1ac4 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -36,7 +36,6 @@
   "account.following": "بەدوادا",
   "account.following_counter": "{count, plural, one {{counter} شوێنکەوتوو} other {{counter} شوێنکەوتوو}}",
   "account.follows.empty": "ئەم بەکارهێنەرە تا ئێستا شوێن کەس نەکەوتووە.",
-  "account.follows_you": "شوێنت دەکەوێت",
   "account.go_to_profile": "بڕۆ بۆ پڕۆفایلی",
   "account.hide_reblogs": "داشاردنی بووستەکان لە @{name}",
   "account.joined_short": "بەشداری کردووە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index d4bb2f82ba..9f90c3d211 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -19,7 +19,6 @@
   "account.followers_counter": "{count, plural, one {{counter} Abbunatu} other {{counter} Abbunati}}",
   "account.following_counter": "{count, plural, one {{counter} Abbunamentu} other {{counter} Abbunamenti}}",
   "account.follows.empty": "St'utilizatore ùn seguita nisunu.",
-  "account.follows_you": "Vi seguita",
   "account.hide_reblogs": "Piattà spartere da @{name}",
   "account.link_verified_on": "A prupietà di stu ligame hè stata verificata u {date}",
   "account.locked_info": "U statutu di vita privata di u contu hè chjosu. U pruprietariu esamina manualmente e dumande d'abbunamentu.",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 16bf5020c5..e18cabcec1 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -38,7 +38,6 @@
   "account.following": "Sledujete",
   "account.following_counter": "{count, plural, one {{counter} Sledovaný} few {{counter} Sledovaní} many {{counter} Sledovaných} other {{counter} Sledovaných}}",
   "account.follows.empty": "Tento uživatel zatím nikoho nesleduje.",
-  "account.follows_you": "Sleduje vás",
   "account.go_to_profile": "Přejít na profil",
   "account.hide_reblogs": "Skrýt boosty od @{name}",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 4ecf48735e..17133631a5 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -37,7 +37,6 @@
   "account.following": "Yn dilyn",
   "account.following_counter": "{count, plural, one {Yn dilyn: {counter}} other {Yn dilyn: {counter}}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
-  "account.follows_you": "Yn eich dilyn chi",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
   "account.in_memoriam": "Er Cof.",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 04fc43734f..3bc830ad27 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Ingen indlæg",
   "account.featured_tags.title": "{name}s fremhævede hashtags",
   "account.follow": "Følg",
+  "account.follow_back": "Følg tilbage",
   "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}}",
   "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} Følges} other {{counter} Følges}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
-  "account.follows_you": "Følger dig",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul boosts fra @{name}",
   "account.in_memoriam": "Til minde om.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Slå lyden fra for notifikationer",
   "account.mute_short": "Skjul (mute)",
   "account.muted": "Skjult (muted)",
+  "account.mutual": "Fælles",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.open_original_page": "Åbn oprindelig side",
   "account.posts": "Indlæg",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cf545e48c1..ddcbc58cee 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Keine Beiträge",
   "account.featured_tags.title": "Von {name} vorgestellte Hashtags",
   "account.follow": "Folgen",
+  "account.follow_back": "Ebenfalls folgen",
   "account.followers": "Follower",
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
   "account.following": "Folge ich",
   "account.following_counter": "{count, plural, one {{counter} Folge ich} other {{counter} Folge ich}}",
   "account.follows.empty": "Dieses Profil folgt noch niemandem.",
-  "account.follows_you": "Folgt dir",
   "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
   "account.in_memoriam": "Zum Andenken.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Benachrichtigungen stummschalten",
   "account.mute_short": "Stummschalten",
   "account.muted": "Stummgeschaltet",
+  "account.mutual": "Gegenseitig",
   "account.no_bio": "Keine Beschreibung verfügbar.",
   "account.open_original_page": "Ursprüngliche Seite öffnen",
   "account.posts": "Beiträge",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 02ce7120a3..83a986ba4e 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -36,7 +36,6 @@
   "account.following": "Ακολουθείτε",
   "account.following_counter": "{count, plural, one {{counter} Ακολουθεί} other {{counter} Ακολουθούν}}",
   "account.follows.empty": "Αυτός ο χρήστης δεν ακολουθεί κανέναν ακόμα.",
-  "account.follows_you": "Σε ακολουθεί",
   "account.go_to_profile": "Μετάβαση στο προφίλ",
   "account.hide_reblogs": "Απόκρυψη ενισχύσεων από @{name}",
   "account.in_memoriam": "Εις μνήμην.",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 1a67fecb60..37e5efa5ba 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -38,7 +38,6 @@
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
-  "account.follows_you": "Follows you",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 2678d83a50..4daa699dcf 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -38,7 +38,6 @@
   "account.following": "Sekvatoj",
   "account.following_counter": "{count, plural, one {{counter} Sekvato} other {{counter} Sekvatoj}}",
   "account.follows.empty": "La uzanto ankoraŭ ne sekvas iun ajn.",
-  "account.follows_you": "Sekvas vin",
   "account.go_to_profile": "Iri al profilo",
   "account.hide_reblogs": "Kaŝi diskonigojn de @{name}",
   "account.in_memoriam": "Memore.",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 4573f4ab9d..eb6c0f3e4f 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Sin mensajes",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {Siguiendo a {counter}}}",
   "account.follows.empty": "Todavía este usuario no sigue a nadie.",
-  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar adhesiones de @{name}",
   "account.in_memoriam": "Cuenta conmemorativa.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
+  "account.mutual": "Mutuo",
   "account.no_bio": "Sin descripción provista.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Mensajes",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 0d26afef23..fab5f6ec96 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {{counter} Siguiendo}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
-  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar retoots de @{name}",
   "account.in_memoriam": "En memoria.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
+  "account.mutual": "Mutuo",
   "account.no_bio": "Sin biografía.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index bbc8bcc759..0d6149f5f5 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidores}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, other {Siguiendo a {counter}}}",
   "account.follows.empty": "Este usuario todavía no sigue a nadie.",
-  "account.follows_you": "Te sigue",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "Cuenta conmemorativa.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
+  "account.mutual": "Mutuo",
   "account.no_bio": "Sin biografía.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index a41aa02f80..c397334109 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -38,7 +38,6 @@
   "account.following": "Jälgib",
   "account.following_counter": "{count, plural, one {{counter} jälgitav} other {{counter} jälgitavat}}",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
-  "account.follows_you": "Jälgib sind",
   "account.go_to_profile": "Mine profiilile",
   "account.hide_reblogs": "Peida @{name} jagamised",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 26ed7add1e..c75f697e4c 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Bidalketarik ez",
   "account.featured_tags.title": "{name} erabiltzailearen nabarmendutako traolak",
   "account.follow": "Jarraitu",
+  "account.follow_back": "Jarraitu bueltan",
   "account.followers": "Jarraitzaileak",
   "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
   "account.followers_counter": "{count, plural, one {Jarraitzaile {counter}} other {{counter} jarraitzaile}}",
   "account.following": "Jarraitzen",
   "account.following_counter": "{count, plural, one {{counter} jarraitzen} other {{counter} jarraitzen}}",
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
-  "account.follows_you": "Jarraitzen dizu",
   "account.go_to_profile": "Joan profilera",
   "account.hide_reblogs": "Ezkutatu @{name} erabiltzailearen bultzadak",
   "account.in_memoriam": "Oroimenezkoa.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Mututu jakinarazpenak",
   "account.mute_short": "Mututu",
   "account.muted": "Mutututa",
+  "account.mutual": "Elkarrekikoa",
   "account.no_bio": "Ez da deskribapenik eman.",
   "account.open_original_page": "Ireki jatorrizko orria",
   "account.posts": "Bidalketa",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 8e8930bfea..a93d0f6617 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -38,7 +38,6 @@
   "account.following": "پی می‌گیرید",
   "account.following_counter": "{count, plural, one {{counter} پی‌گرفته} other {{counter} پی‌گرفته}}",
   "account.follows.empty": "این کاربر هنوز پی‌گیر کسی نیست.",
-  "account.follows_you": "پی‌گیرتان است",
   "account.go_to_profile": "رفتن به نمایه",
   "account.hide_reblogs": "نهفتن تقویت‌های ‎@{name}",
   "account.in_memoriam": "به یادبود.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index e99de4d03a..dab7eac1e9 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Ei julkaisuja",
   "account.featured_tags.title": "Käyttäjän {name} esillä pidettävät aihetunnisteet",
   "account.follow": "Seuraa",
+  "account.follow_back": "Seuraa takaisin",
   "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}}",
   "account.following": "Seuratut",
   "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
-  "account.follows_you": "Seuraa sinua",
   "account.go_to_profile": "Avaa profiili",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Mykistä ilmoitukset",
   "account.mute_short": "Mykistä",
   "account.muted": "Mykistetty",
+  "account.mutual": "Molemmat",
   "account.no_bio": "Kuvausta ei ole annettu.",
   "account.open_original_page": "Avaa alkuperäinen sivu",
   "account.posts": "Julkaisut",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index bc76358875..ec27c8f60e 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -31,7 +31,6 @@
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
   "account.following": "Sinusundan",
   "account.follows.empty": "Wala pang sinusundan ang tagagamit na ito.",
-  "account.follows_you": "Sinusunod ka",
   "account.go_to_profile": "Pumunta sa profile",
   "account.hide_reblogs": "Itago ang mga pagpapalakas mula sa {name}",
   "account.in_memoriam": "Sa Alaala Ni.",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 45fafd15dc..9259f20154 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Einki uppslag",
   "account.featured_tags.title": "Tvíkrossar hjá {name}",
   "account.follow": "Fylg",
+  "account.follow_back": "Fylg aftur",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ongar fylgjarar enn.",
   "account.followers_counter": "{count, plural, one {{counter} Fylgjari} other {{counter} Fylgjarar}}",
   "account.following": "Fylgir",
   "account.following_counter": "{count, plural, one {{counter} fylgir} other {{counter} fylgja}}",
   "account.follows.empty": "Hesin brúkari fylgir ongum enn.",
-  "account.follows_you": "Fylgir tær",
   "account.go_to_profile": "Far til vanga",
   "account.hide_reblogs": "Fjal lyft frá @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Sløkk fráboðanir",
   "account.mute_short": "Doyv",
   "account.muted": "Sløkt/ur",
+  "account.mutual": "Sínamillum",
   "account.no_bio": "Lýsing vantar.",
   "account.open_original_page": "Opna upprunasíðuna",
   "account.posts": "Uppsløg",
diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-QC.json
index e2067cc460..f2d99412d2 100644
--- a/app/javascript/mastodon/locales/fr-QC.json
+++ b/app/javascript/mastodon/locales/fr-QC.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Aucune publication",
   "account.featured_tags.title": "Hashtags inclus de {name}",
   "account.follow": "Suivre",
+  "account.follow_back": "S'abonner en retour",
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
   "account.following": "Abonné·e",
   "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
-  "account.follows_you": "Vous suit",
   "account.go_to_profile": "Voir ce profil",
   "account.hide_reblogs": "Masquer les boosts de @{name}",
   "account.in_memoriam": "En souvenir de",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Rendre les notifications muettes",
   "account.mute_short": "Rendre muet",
   "account.muted": "Masqué·e",
+  "account.mutual": "Mutuel",
   "account.no_bio": "Description manquante.",
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Publications",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 7db4bf7bc4..774702f98c 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Aucun message",
   "account.featured_tags.title": "Les hashtags en vedette de {name}",
   "account.follow": "Suivre",
+  "account.follow_back": "S'abonner en retour",
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
   "account.following": "Abonnements",
   "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
-  "account.follows_you": "Vous suit",
   "account.go_to_profile": "Aller au profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.in_memoriam": "En mémoire de.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Désactiver les alertes",
   "account.mute_short": "Mettre en sourdine",
   "account.muted": "Masqué·e",
+  "account.mutual": "Mutuel",
   "account.no_bio": "Aucune description fournie.",
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Messages",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 2ec4a53bfd..ea42ef91c0 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Gjin berjochten",
   "account.featured_tags.title": "Utljochte hashtags fan {name}",
   "account.follow": "Folgje",
+  "account.follow_back": "Weromfolgje",
   "account.followers": "Folgers",
   "account.followers.empty": "Noch net ien folget dizze brûker.",
   "account.followers_counter": "{count, plural, one {{counter} folger} other {{counter} folgers}}",
   "account.following": "Folgjend",
   "account.following_counter": "{count, plural, one {{counter} folgjend} other {{counter} folgjend}}",
   "account.follows.empty": "Dizze brûker folget noch net ien.",
-  "account.follows_you": "Folget jo",
   "account.go_to_profile": "Gean nei profyl",
   "account.hide_reblogs": "Boosts fan @{name} ferstopje",
   "account.in_memoriam": "Yn memoriam.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Meldingen negearje",
   "account.mute_short": "Negearje",
   "account.muted": "Negearre",
+  "account.mutual": "Jimme folgje inoar",
   "account.no_bio": "Gjin omskriuwing opjûn.",
   "account.open_original_page": "Orizjinele side iepenje",
   "account.posts": "Berjochten",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index ee6b44c884..f0f9c55549 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -35,7 +35,6 @@
   "account.following": "Ag leanúint",
   "account.following_counter": "{count, plural, one {Ag leanúint cúntas amháin} other {Ag leanúint {counter} cúntas}}",
   "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
-  "account.follows_you": "Do do leanúint",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
   "account.in_memoriam": "Cuimhneachán.",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 91333c1a0a..11d83d6ceb 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -37,7 +37,6 @@
   "account.following": "A’ leantainn",
   "account.following_counter": "{count, plural, one {A’ leantainn {counter}} two {A’ leantainn {counter}} few {A’ leantainn {counter}} other {A’ leantainn {counter}}}",
   "account.follows.empty": "Chan eil an cleachdaiche seo a’ leantainn neach sam bith fhathast.",
-  "account.follows_you": "Gad leantainn",
   "account.go_to_profile": "Tadhail air a’ phròifil",
   "account.hide_reblogs": "Falaich na brosnachaidhean o @{name}",
   "account.in_memoriam": "Mar chuimhneachan.",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 08d7d49776..bfd20a4673 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -38,7 +38,6 @@
   "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {{counter} Seguindo} other {{counter} Seguindo}}",
   "account.follows.empty": "Esta usuaria aínda non segue a ninguén.",
-  "account.follows_you": "Séguete",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Agochar promocións de @{name}",
   "account.in_memoriam": "Lembranzas.",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index dda92c5c9a..658e16b856 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "אין חצרוצים",
   "account.featured_tags.title": "התגיות המועדפות של {name}",
   "account.follow": "לעקוב",
+  "account.follow_back": "החזרת עוקב",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
   "account.following": "נעקבים",
   "account.following_counter": "{count, plural,one {עוקב אחרי {counter}}other {עוקב אחרי {counter}}}",
   "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
-  "account.follows_you": "במעקב אחריך",
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
   "account.in_memoriam": "פרופיל זכרון.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "השתקת התראות",
   "account.mute_short": "השתקה",
   "account.muted": "מושתק",
+  "account.mutual": "הדדיים",
   "account.no_bio": "לא סופק תיאור.",
   "account.open_original_page": "לפתיחת העמוד המקורי",
   "account.posts": "פוסטים",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 387941b5e4..76d7c1d381 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -37,7 +37,6 @@
   "account.following": "फॉलोइंग",
   "account.following_counter": "{count, plural, one {{counter} निम्नलिखित} other {{counter} निम्नलिखित}}",
   "account.follows.empty": "यह यूज़र् अभी तक किसी को फॉलो नहीं करता है।",
-  "account.follows_you": "आपको फॉलो करता है",
   "account.go_to_profile": "प्रोफाइल में जाएँ",
   "account.hide_reblogs": "@{name} के बूस्ट छुपाएं",
   "account.in_memoriam": "याद में",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 6da7d6cd8d..654991a0f9 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -28,7 +28,6 @@
   "account.following": "Pratim",
   "account.following_counter": "{count, plural, one {{counter} praćeni} few{{counter} praćena} other {{counter} praćenih}}",
   "account.follows.empty": "Korisnik/ca još ne prati nikoga.",
-  "account.follows_you": "Prati te",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij boostove od @{name}",
   "account.in_memoriam": "U sjećanje.",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 386b15811a..0d50e36feb 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Nincs bejegyzés",
   "account.featured_tags.title": "{name} kiemelt hashtagjei",
   "account.follow": "Követés",
+  "account.follow_back": "Viszontkövetés",
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
   "account.followers_counter": "{count, plural, one {{counter} Követő} other {{counter} Követő}}",
   "account.following": "Követve",
   "account.following_counter": "{count, plural, one {{counter} Követett} other {{counter} Követett}}",
   "account.follows.empty": "Ez a felhasználó még senkit sem követ.",
-  "account.follows_you": "Követ téged",
   "account.go_to_profile": "Ugrás a profilhoz",
   "account.hide_reblogs": "@{name} megtolásainak elrejtése",
   "account.in_memoriam": "Emlékünkben.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Értesítések némítása",
   "account.mute_short": "Némítás",
   "account.muted": "Némítva",
+  "account.mutual": "Kölcsönös",
   "account.no_bio": "Leírás nincs megadva.",
   "account.open_original_page": "Eredeti oldal megnyitása",
   "account.posts": "Bejegyzések",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index f2548c7d3a..835105218d 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -32,7 +32,6 @@
   "account.following": "Հետեւած",
   "account.following_counter": "{count, plural, one {{counter} Հետեւած} other {{counter} Հետեւած}}",
   "account.follows.empty": "Այս օգտատէրը դեռ ոչ մէկի չի հետեւում։",
-  "account.follows_you": "Հետեւում է քեզ",
   "account.go_to_profile": "Գնալ անձնական հաշիւ",
   "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
   "account.joined_short": "Միացել է",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 8ecf36125d..5af20a97f7 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -37,7 +37,6 @@
   "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, other {{counter} Mengikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti siapa pun.",
-  "account.follows_you": "Mengikuti Anda",
   "account.go_to_profile": "Buka profil",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
   "account.in_memoriam": "Mengenang.",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 9f91bf2cef..a7cf1caab4 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -38,7 +38,6 @@
   "account.following": "Sequent",
   "account.following_counter": "{count, plural, one {{counter} Sequent} other {{counter} Sequent}}",
   "account.follows.empty": "Ti-ci usator ancor ne seque quemcunc.",
-  "account.follows_you": "Seque te",
   "account.go_to_profile": "Ear a profil",
   "account.hide_reblogs": "Celar boosts de @{name}",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index c24d28eea9..f163567f17 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -6,7 +6,6 @@
   "account.follow": "Soro",
   "account.followers": "Ndị na-eso",
   "account.following": "Na-eso",
-  "account.follows_you": "Na-eso gị",
   "account.mute": "Mee ogbi @{name}",
   "account.unfollow": "Kwụsị iso",
   "account_note.placeholder": "Click to add a note",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index ba44408935..233b768457 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -37,7 +37,6 @@
   "account.following": "Sequata",
   "account.following_counter": "{count, plural, one {{counter} Sequas} other {{counter} Sequanti}}",
   "account.follows.empty": "Ca uzanto ne sequa irgu til nun.",
-  "account.follows_you": "Sequas tu",
   "account.go_to_profile": "Irez al profilo",
   "account.hide_reblogs": "Celez repeti de @{name}",
   "account.in_memoriam": "Memorige.",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 0df1a5e753..46e83b4dbf 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -38,7 +38,6 @@
   "account.following": "Fylgist með",
   "account.following_counter": "{count, plural, one {Fylgist með: {counter}} other {Fylgist með: {counter}}}",
   "account.follows.empty": "Þessi notandi fylgist ennþá ekki með neinum.",
-  "account.follows_you": "Fylgir þér",
   "account.go_to_profile": "Fara í notandasnið",
   "account.hide_reblogs": "Fela endurbirtingar fyrir @{name}",
   "account.in_memoriam": "Minning.",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index fa659506a1..4fb4d88cbc 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Nessun post",
   "account.featured_tags.title": "Hashtag in evidenza di {name}",
   "account.follow": "Segui",
+  "account.follow_back": "Segui a tua volta",
   "account.followers": "Follower",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
   "account.following": "Seguiti",
   "account.following_counter": "{count, plural, one {{counter} Seguiti} other {{counter} Seguiti}}",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
-  "account.follows_you": "Ti segue",
   "account.go_to_profile": "Vai al profilo",
   "account.hide_reblogs": "Nascondi potenziamenti da @{name}",
   "account.in_memoriam": "In memoria.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silenzia notifiche",
   "account.mute_short": "Silenzia",
   "account.muted": "Mutato",
+  "account.mutual": "Reciproco",
   "account.no_bio": "Nessuna descrizione fornita.",
   "account.open_original_page": "Apri la pagina originale",
   "account.posts": "Post",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 5ad9d6dc94..3246415759 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -38,7 +38,6 @@
   "account.following": "フォロー中",
   "account.following_counter": "{counter} フォロー",
   "account.follows.empty": "まだ誰もフォローしていません。",
-  "account.follows_you": "フォローされています",
   "account.go_to_profile": "プロフィールページへ",
   "account.hide_reblogs": "@{name}さんからのブーストを非表示",
   "account.in_memoriam": "故人を偲んで。",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 875ac3c195..9d977e9331 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -15,7 +15,6 @@
   "account.featured_tags.last_status_never": "პოსტები არ არის",
   "account.follow": "გაყოლა",
   "account.followers": "მიმდევრები",
-  "account.follows_you": "მოგყვებათ",
   "account.hide_reblogs": "დაიმალოს ბუსტები @{name}-სგან",
   "account.media": "მედია",
   "account.mention": "ასახელეთ @{name}",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index e9d4b57de8..08c70a9405 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -22,7 +22,6 @@
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
-  "account.follows_you": "Yeṭṭafaṛ-ik",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 189d792e38..e0e047ba14 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -34,7 +34,6 @@
   "account.following": "Жазылым",
   "account.following_counter": "{count, plural, one {{counter} жазылым} other {{counter} жазылым}}",
   "account.follows.empty": "Бұл қолданушы әлі ешкімге жазылмаған.",
-  "account.follows_you": "Сізге жазылған",
   "account.go_to_profile": "Профиліне өту",
   "account.hide_reblogs": "@{name} бустарын жасыру",
   "account.joined_short": "Қосылған",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4606916c1d..5746ab67a5 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "게시물 없음",
   "account.featured_tags.title": "{name} 님의 추천 해시태그",
   "account.follow": "팔로우",
+  "account.follow_back": "맞팔로우",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
   "account.followers_counter": "{counter} 팔로워",
   "account.following": "팔로잉",
   "account.following_counter": "{counter} 팔로잉",
   "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
-  "account.follows_you": "나를 팔로우합니다",
   "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
   "account.in_memoriam": "고인의 계정입니다.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "알림 뮤트",
   "account.mute_short": "뮤트",
   "account.muted": "뮤트됨",
+  "account.mutual": "상호 팔로우",
   "account.no_bio": "제공된 설명이 없습니다.",
   "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index b940542677..7d8603cae1 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -36,7 +36,6 @@
   "account.following": "Dişopîne",
   "account.following_counter": "{count, plural, one {{counter} Dişopîne} other {{counter} Dişopîne}}",
   "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
-  "account.follows_you": "Te dişopîne",
   "account.go_to_profile": "Biçe bo profîlê",
   "account.hide_reblogs": "Bilindkirinên ji @{name} veşêre",
   "account.in_memoriam": "Di bîranînê de.",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index ca08ca836e..8f384fe125 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -20,7 +20,6 @@
   "account.followers_counter": "{count, plural, one {{counter} Holyer} other {{counter} Holyer}}",
   "account.following_counter": "{count, plural, one {Ow holya {counter}} other {Ow holya {counter}}}",
   "account.follows.empty": "Ny wra'n devnydhyer ma holya nagonan hwath.",
-  "account.follows_you": "Y'th hol",
   "account.hide_reblogs": "Kudha kenerthow a @{name}",
   "account.link_verified_on": "Perghenogeth an kolm ma a veu checkys dhe {date}",
   "account.locked_info": "Studh privetter an akont ma yw alhwedhys. An perghen a wra dasweles dre leuv piw a yll aga holya.",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index c776a91ee7..c54ed2a7e9 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "\"No ay publikasyones",
   "account.featured_tags.title": "Etiketas avaliadas de {name}",
   "account.follow": "Sige",
+  "account.follow_back": "Sige tamyen",
   "account.followers": "Suivantes",
   "account.followers.empty": "Por agora dingun no sige a este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
   "account.following": "Sigiendo",
   "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
   "account.follows.empty": "Este utilizador ainda no sige a ningun.",
-  "account.follows_you": "Te sige",
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
   "account.in_memoriam": "De bendicha memoria.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silensia avizos de @{name}",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
+  "account.mutual": "Mutual",
   "account.no_bio": "No ay deskripsion.",
   "account.open_original_page": "Avre pajina orijnala",
   "account.posts": "Publikasyones",
@@ -478,6 +479,7 @@
   "onboarding.actions.go_to_home": "Va a tu linya prinsipala",
   "onboarding.compose.template": "Ke haber, #Mastodon?",
   "onboarding.follows.title": "Personaliza tu linya prinsipala",
+  "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
   "onboarding.profile.note": "Tu deskripsyon",
@@ -555,6 +557,7 @@
   "report.reasons.dislike": "No me plaze",
   "report.reasons.dislike_description": "\"No es algo ke kero ver",
   "report.reasons.legal": "Es ilegal",
+  "report.reasons.legal_description": "Kreyes ke esta violando la ley de tu paiz o el paiz del sirvidor",
   "report.reasons.other": "Es otra koza",
   "report.reasons.other_description": "El problem no es de las otras kategorias",
   "report.reasons.spam": "Es spam",
@@ -611,6 +614,7 @@
   "sign_in_banner.create_account": "Kriya kuento",
   "sign_in_banner.sign_in": "Konektate",
   "sign_in_banner.sso_redirect": "Konektate o enrejistrate",
+  "sign_in_banner.text": "Konektate para segir prefiles o etiketas, partajar publikasyones, arispondir a eyas i markar ke te plazen. Puedes tambyen enteraktuar dizde tu kuento en un sirvidor desferente.",
   "status.admin_account": "Avre la enterfaz de moderasyon para @{name}",
   "status.admin_domain": "Avre la enterfaz de moderasyon para @{domain}",
   "status.admin_status": "Avre esto en la enterfaz de moderasyon",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 58c80e4117..82f1669b1a 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Nėra įrašų",
   "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
   "account.follow": "Sekti",
+  "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
   "account.followers_counter": "{count, plural, one {{counter} sekėjas (-a)} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Seka",
   "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
   "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
-  "account.follows_you": "Seka tave",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Nutildyti pranešimus",
   "account.mute_short": "Nutildyti",
   "account.muted": "Nutildytas",
+  "account.mutual": "Abipusis",
   "account.no_bio": "Nėra pateikto aprašymo.",
   "account.open_original_page": "Atidaryti originalinį puslapį",
   "account.posts": "Įrašai",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 63ec6275ba..c06a1d9368 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -37,7 +37,6 @@
   "account.following": "Seko",
   "account.following_counter": "{count, plural, one {{counter} sekojamais} other {{counter} sekojamie}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
-  "account.follows_you": "Seko tev",
   "account.go_to_profile": "Doties uz profilu",
   "account.hide_reblogs": "Slēpt @{name} izceltas ziņas",
   "account.in_memoriam": "Piemiņai.",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 371218bbfe..bdef3f4a5f 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -25,7 +25,6 @@
   "account.followers": "Следбеници",
   "account.followers.empty": "Никој не го следи овој корисник сеуште.",
   "account.follows.empty": "Корисникот не следи никој сеуште.",
-  "account.follows_you": "Те следи тебе",
   "account.hide_reblogs": "Сокриј буст од @{name}",
   "account.link_verified_on": "Сопстевноста на овај линк беше проверен на {date}",
   "account.locked_info": "Статусот на приватност на овај корисник е сетиран како заклучен. Корисникот одлучува кој можи да го следи него.",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index b00cedc6fc..11636646b2 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -26,7 +26,6 @@
   "account.following": "പിന്തുടരുന്നു",
   "account.following_counter": "{count, plural, one {{counter} പിന്തുടരുന്നു} other {{counter} പിന്തുടരുന്നു}}",
   "account.follows.empty": "ഈ ഉപയോക്താവ് ആരേയും ഇതുവരെ പിന്തുടരുന്നില്ല.",
-  "account.follows_you": "നിങ്ങളെ പിന്തുടരുന്നു",
   "account.go_to_profile": "പ്രൊഫൈലിലേക്ക് പോകാം",
   "account.hide_reblogs": "@{name} ബൂസ്റ്റ് ചെയ്തവ മറയ്കുക",
   "account.joined_short": "ജോയിൻ ചെയ്‌തിരിക്കുന്നു",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 75b75375b7..7f5b7d6524 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -35,7 +35,6 @@
   "account.following": "अनुसरण",
   "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "हा वापरकर्ता अजूनपर्यंत कोणाचा अनुयायी नाही.",
-  "account.follows_you": "तुमचा अनुयायी आहे",
   "account.go_to_profile": "प्रोफाइल वर जा",
   "account.hide_reblogs": "@{name} पासून सर्व बूस्ट लपवा",
   "account.joined_short": "सामील झाले",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 724e07ae76..50a48db1ea 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -37,7 +37,6 @@
   "account.following": "Mengikuti",
   "account.following_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
-  "account.follows_you": "Mengikuti anda",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
   "account.in_memoriam": "Dalam Memoriam.",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 917419d172..3ca03b616a 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -38,7 +38,6 @@
   "account.following": "စောင့်ကြည့်နေသည်",
   "account.following_counter": "{count, plural, one {စောင့်ကြည့်ထားသူ {counter}} other {စောင့်ကြည့်ထားသူများ {counter}}}",
   "account.follows.empty": "ဤသူသည် မည်သူ့ကိုမျှ စောင့်ကြည့်ခြင်း မရှိသေးပါ။",
-  "account.follows_you": "သင့်ကို စောင့်ကြည့်နေသည်",
   "account.go_to_profile": "ပရိုဖိုင်းသို့ သွားရန်",
   "account.hide_reblogs": "@{name} ၏ မျှဝေမှုကို ဝှက်ထားရန်",
   "account.in_memoriam": "အမှတ်တရ",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 295b420fd4..86617d4a54 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Geen berichten",
   "account.featured_tags.title": "Uitgelichte hashtags van {name}",
   "account.follow": "Volgen",
+  "account.follow_back": "Terugvolgen",
   "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}}",
   "account.following": "Volgend",
   "account.following_counter": "{count, plural, one {{counter} volgend} other {{counter} volgend}}",
   "account.follows.empty": "Deze gebruiker volgt nog niemand of heeft deze verborgen.",
-  "account.follows_you": "Volgt jou",
   "account.go_to_profile": "Ga naar profiel",
   "account.hide_reblogs": "Boosts van @{name} verbergen",
   "account.in_memoriam": "In memoriam.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Meldingen negeren",
   "account.mute_short": "Negeren",
   "account.muted": "Genegeerd",
+  "account.mutual": "Jullie volgen elkaar",
   "account.no_bio": "Geen beschrijving opgegeven.",
   "account.open_original_page": "Originele pagina openen",
   "account.posts": "Berichten",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 4750b1adc3..3ef2f80eaf 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Ingen innlegg",
   "account.featured_tags.title": "{name} sine framheva emneknaggar",
   "account.follow": "Fylg",
+  "account.follow_back": "Følg tilbake",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
   "account.following": "Fylgjer",
   "account.following_counter": "{count, plural, one {Fylgjer {counter}} other {Fylgjer {counter}}}",
   "account.follows.empty": "Denne brukaren fylgjer ikkje nokon enno.",
-  "account.follows_you": "Fylgjer deg",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul framhevingar frå @{name}",
   "account.in_memoriam": "Til minne om.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Demp varslingar",
   "account.mute_short": "Demp",
   "account.muted": "Målbunden",
+  "account.mutual": "Felles",
   "account.no_bio": "Inga skildring er gjeven.",
   "account.open_original_page": "Opne originalsida",
   "account.posts": "Tut",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 1739d4aa31..29eaeddff5 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -38,7 +38,6 @@
   "account.following": "Følger",
   "account.following_counter": "{count, plural, one {{counter} som følges} other {{counter} som følges}}",
   "account.follows.empty": "Denne brukeren følger ikke noen enda.",
-  "account.follows_you": "Følger deg",
   "account.go_to_profile": "Gå til profil",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
   "account.in_memoriam": "Til minne om.",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 3812057fb0..833bfe6ace 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -34,7 +34,6 @@
   "account.following": "Abonat",
   "account.following_counter": "{count, plural, one {{counter} Abonaments} other {{counter} Abonaments}}",
   "account.follows.empty": "Aqueste utilizaire sèc pas degun pel moment.",
-  "account.follows_you": "Vos sèc",
   "account.go_to_profile": "Anar al perfil",
   "account.hide_reblogs": "Rescondre los partatges de @{name}",
   "account.in_memoriam": "En Memòria.",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 708d8c3e98..132b695cda 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -18,7 +18,6 @@
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
-  "account.follows_you": "ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "account.media": "ਮੀਡੀਆ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
   "account.posts": "ਪੋਸਟਾਂ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index dc77f8f4e0..9a3710da71 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Brak postów",
   "account.featured_tags.title": "Polecane hasztagi {name}",
   "account.follow": "Obserwuj",
+  "account.follow_back": "Obserwuj wzajemnie",
   "account.followers": "Obserwujący",
   "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
   "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
   "account.following": "Obserwowani",
   "account.following_counter": "{count, plural, one {{counter} obserwowany} few {{counter} obserwowanych} many {{counter} obserwowanych} other {{counter} obserwowanych}}",
   "account.follows.empty": "Ten użytkownik nie obserwuje jeszcze nikogo.",
-  "account.follows_you": "Obserwuje Cię",
   "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
   "account.in_memoriam": "Ku pamięci.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Wycisz powiadomienia",
   "account.mute_short": "Wycisz",
   "account.muted": "Wyciszony",
+  "account.mutual": "Przyjaciele",
   "account.no_bio": "Brak opisu.",
   "account.open_original_page": "Otwórz stronę oryginalną",
   "account.posts": "Wpisy",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index e7975dd76e..482cc8ee73 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -38,7 +38,6 @@
   "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {segue {counter}} other {segue {counter}}}",
   "account.follows.empty": "Nada aqui.",
-  "account.follows_you": "te segue",
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Ocultar boosts de @{name}",
   "account.in_memoriam": "Em memória.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index d5055b0dc5..a6d0ffee9a 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Sem publicações",
   "account.featured_tags.title": "#Etiquetas destacadas por {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "A seguir",
   "account.following_counter": "{count, plural, other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
-  "account.follows_you": "Segue-te",
   "account.go_to_profile": "Ir para o perfil",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
   "account.in_memoriam": "Em Memória.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificações",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciada",
+  "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
   "account.posts": "Publicações",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 5355f9935a..88dbfa4b8e 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -36,7 +36,6 @@
   "account.following": "Urmăriți",
   "account.following_counter": "{count, plural, one {Un abonament} few {{counter} abonamente} other {{counter} de abonamente}}",
   "account.follows.empty": "Momentan acest utilizator nu are niciun abonament.",
-  "account.follows_you": "Este abonat la tine",
   "account.go_to_profile": "Mergi la profil",
   "account.hide_reblogs": "Ascunde distribuirile de la @{name}",
   "account.joined_short": "Înscris",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index f0c48236b9..37a8328c98 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -38,7 +38,6 @@
   "account.following": "Подписки",
   "account.following_counter": "{count, plural, one {{counter} подписка} many {{counter} подписок} other {{counter} подписки}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
-  "account.follows_you": "Подписан(а) на вас",
   "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
   "account.in_memoriam": "В Памяти.",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 59379343b9..051ec5d6f8 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -36,7 +36,6 @@
   "account.following": "अनुसरति",
   "account.following_counter": "{count, plural, one {{counter} अनुसृतः} two {{counter} अनुसृतौ} other {{counter} अनुसृताः}}",
   "account.follows.empty": "न कोऽप्यनुसृतो वर्तते",
-  "account.follows_you": "त्वामनुसरति",
   "account.go_to_profile": "प्रोफायिलं गच्छ",
   "account.hide_reblogs": "@{name} मित्रस्य प्रकाशनानि छिद्यन्ताम्",
   "account.in_memoriam": "स्मृत्याम्",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 7f29525e73..89e951f77d 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -30,7 +30,6 @@
   "account.following": "Sighende",
   "account.following_counter": "{count, plural, one {Sighende a {counter}} other {Sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
-  "account.follows_you": "Ti sighit",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
   "account.in_memoriam": "In memoriam.",
   "account.joined_short": "At aderidu",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 28dac9c2a2..0378cd2926 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -35,7 +35,6 @@
   "account.following": "Follaein",
   "account.following_counter": "{count, plural, one {{counter} Follaein} other {{counter} Follaein}}",
   "account.follows.empty": "This uiser disnae follae oniebody yit.",
-  "account.follows_you": "Follaes ye",
   "account.go_to_profile": "Gang tae profile",
   "account.hide_reblogs": "Dinnae shaw heezes fae @{name}",
   "account.joined_short": "Jynt",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 835f699b82..c2d2a41cc5 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -26,7 +26,6 @@
   "account.following": "අනුගමන",
   "account.following_counter": "{count, plural, one {අනුගමන {counter}} other {අනුගමන {counter}}}",
   "account.follows.empty": "තවමත් කිසිවෙක් අනුගමනය නොකරයි.",
-  "account.follows_you": "ඔබව අනුගමනය කරයි",
   "account.go_to_profile": "පැතිකඩට යන්න",
   "account.joined_short": "එක් වූ දිනය",
   "account.link_verified_on": "මෙම සබැඳියේ අයිතිය {date} දී පරීක්‍ෂා කෙරිණි",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 0eb4041988..02425d73e0 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -38,7 +38,6 @@
   "account.following": "Sledujem",
   "account.following_counter": "{count, plural, one {{counter} Sledovaných} other {{counter} Sledujúcich}}",
   "account.follows.empty": "Tento používateľ ešte nikoho nesleduje.",
-  "account.follows_you": "Sleduje ťa",
   "account.go_to_profile": "Prejdi na profil",
   "account.hide_reblogs": "Skry zdieľania od @{name}",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 4ef2681f9a..b3998b9110 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Ni objav",
   "account.featured_tags.title": "Izpostavljeni ključniki {name}",
   "account.follow": "Sledi",
+  "account.follow_back": "Sledi nazaj",
   "account.followers": "Sledilci",
   "account.followers.empty": "Nihče ne sledi temu uporabniku.",
   "account.followers_counter": "{count, plural, one {ima {counter} sledilca} two {ima {counter} sledilca} few {ima {counter} sledilce} other {ima {counter} sledilcev}}",
   "account.following": "Sledim",
   "account.following_counter": "{count, plural, one {sledi {count} osebi} two {sledi {count} osebama} few {sledi {count} osebam} other {sledi {count} osebam}}",
   "account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
-  "account.follows_you": "Vam sledi",
   "account.go_to_profile": "Pojdi na profil",
   "account.hide_reblogs": "Skrij izpostavitve od @{name}",
   "account.in_memoriam": "V spomin.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Utišaj obvestila",
   "account.mute_short": "Utišaj",
   "account.muted": "Utišan",
+  "account.mutual": "Vzajemno",
   "account.no_bio": "Ni opisa.",
   "account.open_original_page": "Odpri izvirno stran",
   "account.posts": "Objave",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 710224e1cb..48eac1487e 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -38,7 +38,6 @@
   "account.following": "Ndjekje",
   "account.following_counter": "{count, plural, one {{counter} i Ndjekur} other {{counter} të Ndjekur}}",
   "account.follows.empty": "Ky përdorues ende s’ndjek kënd.",
-  "account.follows_you": "Ju ndjek",
   "account.go_to_profile": "Kalo te profili",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
   "account.in_memoriam": "In Memoriam.",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 35bb8f9929..59ad0ae84e 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -38,7 +38,6 @@
   "account.following": "Prati",
   "account.following_counter": "{count, plural, one {{counter} prati} few {{counter} prati} other {{counter} prati}}",
   "account.follows.empty": "Ovaj korisnik još uvek nikog ne prati.",
-  "account.follows_you": "Prati vas",
   "account.go_to_profile": "Idi na profil",
   "account.hide_reblogs": "Sakrij podržavanja @{name}",
   "account.in_memoriam": "U znak sećanja na.",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 552c04d13f..79786b8d44 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -38,7 +38,6 @@
   "account.following": "Прати",
   "account.following_counter": "{count, plural, one {{counter} прати} few {{counter} прати} other {{counter} прати}}",
   "account.follows.empty": "Овај корисник још увек никог не прати.",
-  "account.follows_you": "Прати вас",
   "account.go_to_profile": "Иди на профил",
   "account.hide_reblogs": "Сакриј подржавања од @{name}",
   "account.in_memoriam": "У знак сећања на.",
@@ -53,6 +52,7 @@
   "account.mute_notifications_short": "Искључи обавештења",
   "account.mute_short": "Искључи",
   "account.muted": "Игнорисан",
+  "account.mutual": "Заједнички",
   "account.no_bio": "Нема описа.",
   "account.open_original_page": "Отвори оригиналну страницу",
   "account.posts": "Објаве",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 8a07da72d8..d3ca776bd9 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Inga inlägg",
   "account.featured_tags.title": "{name}s utvalda hashtaggar",
   "account.follow": "Följ",
+  "account.follow_back": "Följ tillbaka",
   "account.followers": "Följare",
   "account.followers.empty": "Ingen följer denna användare än.",
   "account.followers_counter": "{count, plural, one {{counter} följare} other {{counter} följare}}",
   "account.following": "Följer",
   "account.following_counter": "{count, plural, one {{counter} följd} other {{counter} följda}}",
   "account.follows.empty": "Denna användare följer inte någon än.",
-  "account.follows_you": "Följer dig",
   "account.go_to_profile": "Gå till profilen",
   "account.hide_reblogs": "Dölj boostar från @{name}",
   "account.in_memoriam": "Till minne av.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Stäng av aviseringsljud",
   "account.mute_short": "Tysta",
   "account.muted": "Tystad",
+  "account.mutual": "Ömsesidig",
   "account.no_bio": "Ingen beskrivning angiven.",
   "account.open_original_page": "Öppna den ursprungliga sidan",
   "account.posts": "Inlägg",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index ce9042e62b..6b2332d5b8 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -25,7 +25,6 @@
   "account.following": "பின்தொடரும்",
   "account.following_counter": "{count, plural,one {{counter} சந்தா} other {{counter} சந்தாக்கள்}}",
   "account.follows.empty": "இந்த பயனர் இதுவரை யாரையும் பின்தொடரவில்லை.",
-  "account.follows_you": "உங்களைப் பின்தொடர்கிறார்",
   "account.hide_reblogs": "இருந்து ஊக்கியாக மறை @{name}",
   "account.link_verified_on": "இந்த இணைப்பை உரிமையாளர் சரிபார்க்கப்பட்டது {date}",
   "account.locked_info": "இந்தக் கணக்கு தனியுரிமை நிலை பூட்டப்பட்டுள்ளது. அவர்களைப் பின்தொடர்பவர் யார் என்பதை உரிமையாளர் கைமுறையாக மதிப்பாய்வு செய்கிறார்.",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index f21c0ef57a..3c231871fa 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -12,7 +12,6 @@
   "account.followers": "అనుచరులు",
   "account.followers.empty": "ఈ వినియోగదారుడిని ఇంకా ఎవరూ అనుసరించడంలేదు.",
   "account.follows.empty": "ఈ వినియోగదారి ఇంకా ఎవరినీ అనుసరించడంలేదు.",
-  "account.follows_you": "మిమ్మల్ని అనుసరిస్తున్నారు",
   "account.hide_reblogs": "@{name} నుంచి బూస్ట్ లను దాచిపెట్టు",
   "account.link_verified_on": "ఈ లంకె యొక్క యాజమాన్యం {date}న పరీక్షించబడింది",
   "account.locked_info": "ఈ ఖాతా యొక్క గోప్యత స్థితి లాక్ చేయబడి వుంది. ఈ ఖాతాను ఎవరు అనుసరించవచ్చో యజమానే నిర్ణయం తీసుకుంటారు.",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 67b920393a..d14e37517d 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "ไม่มีโพสต์",
   "account.featured_tags.title": "แฮชแท็กที่น่าสนใจของ {name}",
   "account.follow": "ติดตาม",
+  "account.follow_back": "ติดตามกลับ",
   "account.followers": "ผู้ติดตาม",
   "account.followers.empty": "ยังไม่มีใครติดตามผู้ใช้นี้",
   "account.followers_counter": "{count, plural, other {{counter} ผู้ติดตาม}}",
   "account.following": "กำลังติดตาม",
   "account.following_counter": "{count, plural, other {{counter} กำลังติดตาม}}",
   "account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
-  "account.follows_you": "ติดตามคุณ",
   "account.go_to_profile": "ไปยังโปรไฟล์",
   "account.hide_reblogs": "ซ่อนการดันจาก @{name}",
   "account.in_memoriam": "เพื่อระลึกถึง",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e6389b05a5..e85db817b9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "Gönderi yok",
   "account.featured_tags.title": "{name} kişisinin öne çıkan etiketleri",
   "account.follow": "Takip et",
+  "account.follow_back": "Geri takip et",
   "account.followers": "Takipçi",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
   "account.followers_counter": "{count, plural, one {{counter} Takipçi} other {{counter} Takipçi}}",
   "account.following": "Takip Ediliyor",
   "account.following_counter": "{count, plural, one {{counter} Takip Edilen} other {{counter} Takip Edilen}}",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
-  "account.follows_you": "Seni takip ediyor",
   "account.go_to_profile": "Profile git",
   "account.hide_reblogs": "@{name} kişisinin boostlarını gizle",
   "account.in_memoriam": "Hatırasına.",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "Bildirimleri sessize al",
   "account.mute_short": "Sessize al",
   "account.muted": "Susturuldu",
+  "account.mutual": "Karşılıklı",
   "account.no_bio": "Herhangi bir açıklama belirtilmedi.",
   "account.open_original_page": "Asıl sayfayı aç",
   "account.posts": "Gönderiler",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 6727f3e59a..47fe60bd25 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -35,7 +35,6 @@
   "account.following": "Язылулар",
   "account.following_counter": "{count, plural, one {{counter} язылу} other {{counter} язылу}}",
   "account.follows.empty": "Беркемгә дә язылмаган әле.",
-  "account.follows_you": "Сезгә язылган",
   "account.go_to_profile": "Профильгә күчү",
   "account.hide_reblogs": "Скрывать көчен нче @{name}",
   "account.in_memoriam": "Истәлегенә.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 58a14c0ed2..92eacaad14 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -38,7 +38,6 @@
   "account.following": "Ви стежите",
   "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
-  "account.follows_you": "Підписується на вас",
   "account.go_to_profile": "Перейти до профілю",
   "account.hide_reblogs": "Сховати поширення від @{name}",
   "account.in_memoriam": "Пам'ятник.",
@@ -53,6 +52,7 @@
   "account.mute_notifications_short": "Не сповіщати",
   "account.mute_short": "Ігнорувати",
   "account.muted": "Приховується",
+  "account.mutual": "Взаємно",
   "account.no_bio": "Немає опису.",
   "account.open_original_page": "Відкрити оригінальну сторінку",
   "account.posts": "Дописи",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 8fc3aff030..563b2dedf8 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -32,7 +32,6 @@
   "account.following": "فالو کر رہے ہیں",
   "account.following_counter": "{count, plural, one {{counter} پیروی کر رہے ہیں} other {{counter} پیروی کر رہے ہیں}}",
   "account.follows.empty": "\"یہ صارف ہنوز کسی کی پیروی نہیں کرتا ہے\".",
-  "account.follows_you": "آپ کا پیروکار ہے",
   "account.go_to_profile": "پروفائل پر جائیں",
   "account.hide_reblogs": "@{name} سے فروغ چھپائیں",
   "account.in_memoriam": "یادگار میں۔",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 026cc115c1..8eeee42a5e 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -35,7 +35,6 @@
   "account.following": "Kuzatish",
   "account.following_counter": "{count, plural, one {{counter} ga Muxlis} other {{counter} larga muxlis}}",
   "account.follows.empty": "Bu foydalanuvchi hali hech kimni kuzatmagan.",
-  "account.follows_you": "Sizga obuna",
   "account.go_to_profile": "Profilga o'tish",
   "account.hide_reblogs": "@{name} dan boostlarni yashirish",
   "account.joined_short": "Qo'shilgan",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9ac90b407e..721c7cd4ad 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -38,7 +38,6 @@
   "account.following": "Đang theo dõi",
   "account.following_counter": "{count, plural, one {{counter} Theo dõi} other {{counter} Theo dõi}}",
   "account.follows.empty": "Người này chưa theo dõi ai.",
-  "account.follows_you": "Đang theo dõi bạn",
   "account.go_to_profile": "Xem hồ sơ",
   "account.hide_reblogs": "Ẩn tút @{name} đăng lại",
   "account.in_memoriam": "Tưởng Niệm.",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 5896a25b02..008a9636db 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -12,7 +12,6 @@
   "account.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "account.follow": "ⴹⴼⵕ",
   "account.followers": "ⵉⵎⴹⴼⴰⵕⵏ",
-  "account.follows_you": "ⴹⴼⵕⵏ ⴽⵯⵏ",
   "account.media": "ⴰⵙⵏⵖⵎⵉⵙ",
   "account.mute": "ⵥⵥⵉⵥⵏ @{name}",
   "account.muted": "ⵉⵜⵜⵓⵥⵉⵥⵏ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1678fd7293..575e0c7aeb 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "暂无嘟文",
   "account.featured_tags.title": "{name} 的精选标签",
   "account.follow": "关注",
+  "account.follow_back": "回关",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "被 {counter} 人关注",
   "account.following": "正在关注",
   "account.following_counter": "正在关注 {counter} 人",
   "account.follows.empty": "此用户目前未关注任何人。",
-  "account.follows_you": "关注了你",
   "account.go_to_profile": "前往个人资料页",
   "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
   "account.in_memoriam": "谨此悼念。",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "关闭通知",
   "account.mute_short": "隐藏",
   "account.muted": "已隐藏",
+  "account.mutual": "互相关注",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 263c707993..cd0845b6e2 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "暫無文章",
   "account.featured_tags.title": "{name} 的精選標籤",
   "account.follow": "關注",
+  "account.follow_back": "追蹤對方",
   "account.followers": "追蹤者",
   "account.followers.empty": "尚未有人追蹤這位使用者。",
   "account.followers_counter": "有 {count, plural,one {{counter} 個} other {{counter} 個}}追蹤者",
   "account.following": "正在追蹤",
   "account.following_counter": "正在追蹤 {count, plural,one {{counter}}other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未追蹤任何人。",
-  "account.follows_you": "追蹤你",
   "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏 @{name} 的轉推",
   "account.in_memoriam": "謹此悼念。",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "靜音通知",
   "account.mute_short": "靜音",
   "account.muted": "靜音",
+  "account.mutual": "互相追蹤",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打開原始頁面",
   "account.posts": "帖文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 8484e00c83..9983936953 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -32,13 +32,13 @@
   "account.featured_tags.last_status_never": "沒有嘟文",
   "account.featured_tags.title": "{name} 的推薦主題標籤",
   "account.follow": "跟隨",
+  "account.follow_back": "跟隨回去",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
   "account.followers_counter": "被 {count, plural, other {{counter} 人}}跟隨",
   "account.following": "跟隨中",
   "account.following_counter": "正在跟隨 {count,plural,other {{counter} 人}}",
   "account.follows.empty": "這位使用者尚未跟隨任何人。",
-  "account.follows_you": "跟隨了您",
   "account.go_to_profile": "前往個人檔案",
   "account.hide_reblogs": "隱藏來自 @{name} 的轉嘟",
   "account.in_memoriam": "謹此悼念。",
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "靜音推播通知",
   "account.mute_short": "靜音",
   "account.muted": "已靜音",
+  "account.mutual": "互相跟隨",
   "account.no_bio": "無個人檔案描述",
   "account.open_original_page": "檢視原始頁面",
   "account.posts": "嘟文",
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c9eef75204..6013923e3f 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -485,8 +485,16 @@ ie:
         instance_followers_measure: nor sequitores ta
         instance_follows_measure: lor sequitores ci
         instance_languages_dimension: Max grand lingues
+        instance_statuses_measure: salvat postas
       delivery:
+        all: Omni
+        clear: Aclarar errores de liveration
+        failing: Fallint
+        restart: Recomensar liveration
+        stop: Haltar liveration
         unavailable: Índisponibil
+      delivery_available: Liveration es disponibil
+      delivery_error_days: Dies de errores de liveration
       delivery_error_hint: Si liveration ne es possibil durant %{count} dies, it va esser marcat automaticmen quam ínliverabil.
       destroyed_msg: Data de %{domain} es nu in li linea por iminent deletion.
       empty: Null dominias trovat.
@@ -564,6 +572,9 @@ ie:
         other_description_html: Vider plu optiones por controlar li conduida del conto e customisar comunication al raportat conto.
         resolve_description_html: Null action va esser fat contra li raportat conto, null admoniment registrat, e li raporte va esser cludet.
         silence_description_html: Li conto va esser visibil nur a tis qui ja seque it o qui sercha it manualmen, limitante severimen su atingement. Ti sempre posse esser revertet. Ti clude omni raportes contra ti conto.
+        suspend_description_html: Ti-ci conto e omni contenete va esser ínaccessibil e finalmen deletet, e interacter con it va esser ínpossibil. Reversibil til que 30 dies ha passat. Clude omni raportes contra ti conto.
+      actions_description_html: Decider quel action a far por soluer ti raporte. Si tu fa un punitiv action contra li raportat conto, li usator va reciver un notification per email, except in li casu que li <strong>Spam</strong> categorie es selectet.
+      actions_description_remote_html: Decider quel action a far por soluer ti raporte. It va afecter solmen qualmen <strong>vor</strong> servitor comunica con ti lontan conto e tractar su contenete.
       add_to_report: Adjunter plu al raporte
       are_you_sure: Es tu cert?
       assign_to_self: Assignar it a me
@@ -579,6 +590,9 @@ ie:
       confirm_action: Confirmar moderatori action contra @%{acct}
       created_at: Raportat
       delete_and_resolve: Deleter postas
+      forwarded: Reinviat
+      forwarded_replies_explanation: Ti-ci raporte es de un lontan usator e pri lontan contenete. It ha esset reinviat a vos pro que li raportat contenete es un response a un de tui usatores.
+      forwarded_to: Misset anc a %{domain}
       mark_as_resolved: Marcar quam soluet
       mark_as_sensitive: Marcar quam sensitiv
       mark_as_unresolved: Marcar quam ínsoluet
@@ -603,13 +617,26 @@ ie:
       skip_to_actions: Ear rect al actiones
       status: Statu
       statuses: Contenete raportat
+      statuses_description_html: Ofensiv contenete va esser citat in comunication con li raportat conto
       summary:
         action_preambles:
           delete_html: 'Tu va <strong>remover</strong> alcun postas de <strong>@%{acct}</strong>''. To va:'
           mark_as_sensitive_html: 'Tu va <strong>marcar</strong> alcun postas de <strong>@%{acct}</strong> quam <strong>sensitiv</strong>. To va:'
           silence_html: 'Tu va <strong>limitar</strong> li conto de <strong>@%{acct}</strong>. To va:'
           suspend_html: 'Tu va <strong>suspender</strong> li conto de <strong>@%{acct}</strong>. To va:'
+        actions:
+          delete_html: Remover li ofendent postas
+          mark_as_sensitive_html: Marcar li medie del ofendent postas quam sensitiv
+          silence_html: Severimen limitar li atingement de <strong>@%{acct}</strong> per far su profil e contenete visibil solmen a persones qui ja seque ilu o qui sercha su profil manualmen
+          suspend_html: Suspender <strong>@%{acct}</strong>, fante su profil e contenete ínaccessibil e ínpossibil con quel interacter
         close_report: 'Marcar raporte #%{id} quam resoluet'
+        close_reports_html: Marcar <strong>omni</strong> raportes contra <strong>@%{acct}</strong> quam soluet
+        delete_data_html: Deleter li profil e contenete de <strong>@%{acct}</strong> 30 dies pos nu, except si ilu es dessuspendet ante tande
+        preview_preamble_html: "<strong>@%{acct}</strong> va reciver un admoniment con li sequent contenete:"
+        record_strike_html: Registrar un admoniment contra <strong>@%{acct}</strong> por auxiliar vos tractar futur violationes de ti-ci conto
+        send_email_html: Misser un admoniment-email a <strong>@%{acct}</strong>
+        warning_placeholder: Ínobligatori additional rason por li moderatori action.
+      target_origin: Orígine del conto raportat
       title: Raportes
       unassign: Ínassignar
       unknown_action_msg: 'Ínconosset action: %{action}'
@@ -639,21 +666,29 @@ ie:
         delete_user_data: Deleter Data de Usator
         delete_user_data_description: Possibilisa que usatores mey deleter li data de altri usatores strax
         invite_users: Invitar Usatores
+        invite_users_description: Permisse que usatores invita novones al servitor
         manage_announcements: Tractar proclamationes
         manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
         manage_appeals: Gerer Apelles
         manage_blocks: Gerer Bloccas
+        manage_blocks_description: Permisse que usatores blocca provisores de e-posta e IP-adresses
         manage_custom_emojis: Gerer Customisat Emojis
+        manage_custom_emojis_description: Permisse que usatores gere customisat emojis sur li servitor
         manage_federation: Gerer Federation
+        manage_federation_description: Permisse que usatores sive blocca sive permisse federation con altri domenes, e controla liverabilitá
         manage_invites: Gerer Invitationes
         manage_reports: Gerer Raportes
         manage_roles: Gerer Roles
         manage_rules: Gerer Regules
+        manage_rules_description: Permisse que usatores changea regules del servitor
         manage_settings: Gerer Parametres
+        manage_settings_description: Permisse que usatores changea parametres del situ
         manage_taxonomies: Gerer Taxonomies
+        manage_user_access: Gerer Usator-Accesse
         manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
         manage_users: Gerer usatores
         manage_webhooks: Gerer Web-crocs
+        view_audit_log_description: Permisse que usatores vide li historie de administrativ actiones sur li servitor
         view_devops: DevOps
       title: Roles
     rules:
@@ -667,43 +702,76 @@ ie:
         manage_rules: Gerer regules de servitor
         title: Pri
       appearance:
+        preamble: Customisar li interfacie web de Mastodon.
         title: Aspecte
       discovery:
+        follow_recommendations: Seque-recomandationes
+        preamble: Exposir interessant contenete es importantissim por incorporar nov usatores qui fórsan conosse nequi che Mastodon. Decider qualmen diferent utensiles de decovrition functiona che vor servitor.
         profile_directory: Profilarium
         public_timelines: Public témpor-lineas
+        publish_discovered_servers: Publicar decovrit servitores
+        publish_statistics: Publicar statisticas
         title: Decovriment
+        trends: Tendenties
       domain_blocks:
         all: Ad omnes
         disabled: A necun
         users: A local usatores qui ha initiat session
       registrations:
+        preamble: Decider qui posse crear un conto che vor servitor.
         title: Registrationes
       registrations_mode:
         modes:
+          approved: Aprobation besonat por adhesion
           none: Nequi posse registrar se
           open: Quicunc posse registrar se
+      security:
+        authorized_fetch: Postular autentication de federat servitores
+        authorized_fetch_hint: Postular autentication de federat servitores possibilisa plu strict infortiament de ambi usatori e servitori bloccas. Támen, ti fórsan va limitar li potentie de vor servitor, reducter li atingement de vor responses, e possibilmen introducter problemas de compatibilitá con quelc federat servicies. Additionalmen, ti ne va preventer dedicat actores de accesser vor public postas e contos.
+        authorized_fetch_overridden_hint: Tu actualmen ne posse changear ti parametre pro que it es controlat de un environmental variabile.
+        federation_authentication: Infortiation de federational autentication
       title: Parametres del servitor
     site_uploads:
       delete: Deleter cargat file
       destroyed_msg: Cargat file successosimen deletet!
     software_updates:
+      critical_update: Critic — ples actualisar rapidmen
+      description: On recomanda que vu actualisa vor Mastodon-servitor regularimen por profiter del max recent fixes e facultates. In plu, quelcvez it es critic actualisar Mastodon promptmen por evitar problemas de securitá. Pro ti rasones, Mastodon questiona chascun 30 minutes ca hay actualisationes, e va notificar vos secun vor parametres pri email-notificationes.
+      documentation_link: Aprender plu
+      title: Actualisationes disponibil
       type: Specie
       version: Version
     statuses:
       account: Autor
+      application: Aplication
+      back_to_account: Retornar al págine del conto
+      back_to_report: Retornar al págine del raporte
       batch:
         remove_from_report: Remover de raporte
         report: Raportar
       deleted: Deletet
       favourites: Favorites
+      history: Historie de versiones
       in_reply_to: Respondent a
       language: Lingue
+      media:
+        title: Medie
       metadata: Metadata
+      no_status_selected: Null postas esset changeat pro que null esset selectet
       open: Aperter posta
       original_status: Original posta
+      reblogs: Boosts
+      status_changed: Posta modificat
+      title: Postas del conto
+      trending: Populari
       visibility: Visibilitá
+      with_media: Con medie
     strikes:
       actions:
+        delete_statuses: "%{name} deletet li postas de %{target}"
+        disable: "%{name} gelat li conto de %{target}"
+        mark_statuses_as_sensitive: "%{name} marcat li postas de %{target} quam sensitiv"
+        none: "%{name} misset un admoniment a %{target}"
         sensitive: "%{name} marcat li conto de %{target} quam sensitiv"
         silence: "%{name} limitat li conto de %{target}"
         suspend: "%{name} suspendet li conto de %{target}"
@@ -717,20 +785,81 @@ ie:
         action: Vider li documentation
       elasticsearch_preset_single_node:
         action: Vider li documentation
+      rules_check:
+        action: Gerer regules de servitor
+      software_version_critical_check:
+        message_html: Un critical actualisation por Mastodon es disposibil, ples actualisar tam rapidmen possibil.
+      software_version_patch_check:
+        action: Vider actualisationes disponibil
     title: Administration
     trends:
+      allow: Permisser
       approved: Aprobat
+      disallow: Despermisser
+      links:
+        allow: Permisser ligament
+        allow_provider: Permisser editor
+        description_html: Ci hay ligamentes actualmen partit per mult contos sur queles tui servitor vide postas. It posse auxiliar tui usatores saver to quo eveni in li munde. Null ligamentes es monstrat publicmen ante que tu aproba li publicator. Tu posse anc aprobar o rejecter índividual ligamentes.
+        disallow: Despermisser ligament
+        disallow_provider: Despermisser editor
+        no_link_selected: Null ligamentes esset changeat pro que null esset selectet
+        publishers:
+          no_publisher_selected: Null editores esset changeat pro que necun esset selectet
+        title: Ligamentes in tendentie
+        usage_comparison: Partit %{today} vezes hodie, in comparation a %{yesterday} yer
+      not_allowed_to_trend: Ne permisset esser in tendentie
+      pending_review: Sub inspection
+      preview_card_providers:
+        allowed: Ligamentes de ti-ci editor posse esser in tendentie
+        description_html: Tis es dominias de queles ligamentes es sovente distribuet che vor servitor. Ligamentes ne va intrar li tendenties publicmen except si li dominia del ligament es aprobat. Vor aprobation (o rejection) aplica anc a subdominias.
+        rejected: Ligamentes de ti publicator ne va intrar li tendenties
+        title: Editores
+      rejected: Rejectet
       statuses:
+        allow: Permisser posta
+        allow_account: Permisser autor
+        description_html: Tis es postas queles vor servitor conosse queles on actualmen distribue e favoritisa mult. It posse auxiliar vor nov e retornant usatores por trovar plu persones por sequer. Null postas es monstrat publicmen til que vu aproba li autor, e li autor permisse que su conto es suggestet a altres. Vu anc posse permisser o rejecter individual postas.
+        disallow: Despermisser posta
+        disallow_account: Despermisser autor
+        no_status_selected: Null populari postas esset changeat pro que null esset selectet
+        not_discoverable: Autor ne ha consentit esser decovribil
         shared_by:
           one: Partit o favoritisat un vez
           other: Partit e favoritisat %{friendly_count} vezes
+        title: Populari postas
       tags:
+        current_score: Actual puntes %{score}
+        dashboard:
+          tag_accounts_measure: unic usationes
+          tag_languages_dimension: Max usat lingues
+          tag_servers_dimension: Max populari servitores
+          tag_servers_measure: diferent servitores
+          tag_uses_measure: total usationes
+        description_html: Vi hashtags actualmen aparient in mult postas queles vor servitor vide. It posse auxiliar vor usatores decovrir pri quel gente parla nu. Null hashtags es monstrat til que vu aproba les.
         listable: Suggestibil
+        no_tag_selected: Null hashtags esset changeat pro que null esset selectet
         not_listable: Ne suggestibil
+        not_trendable: Ne va aparir in tendenties
         not_usable: Prohibit
+        peaked_on_and_decaying: Atinget su cime ye %{date}, nu deperient
+        title: Populari hashtags
+        trendable: Posse aparir in tendenties
+        trending_rank: 'Tendentie #%{rank}'
         usable: Permisset
         usage_comparison: 'Usat hodie: %{today} vez(es), yer: %{yesterday}'
+        used_by_over_week:
+          one: Usat de un person durant li ultim semane
+          other: Usat de %{count} persones durant li ultim semane
+      title: Tendenties
+      trending: Populari
+    warning_presets:
+      add_new: Adjunter un nov
+      delete: Deleter
+      edit_preset: Modificar prefiguration de avise
+      empty: Vu ancor ha definit null prefigurationes de avise.
+      title: Modificar prefigurationes de avise
     webhooks:
+      enabled: Activ
       events: Evenimentes
       status: Statu
   admin_mailer:
@@ -741,6 +870,7 @@ ie:
         title: Populari postas
       new_trending_tags:
         title: Populari hashtags
+      subject: Nov tendenties a inspecter sur %{instance}
   aliases:
     add_new: Crear alias
     created_msg: Successosimen creat un nov alias. Tu nu posse initiar li movement del antiqui conto.
@@ -1153,6 +1283,7 @@ ie:
     validations:
       images_and_video: On ne posse atachar un video a un posta quel ja contene images
   migrations:
+    acct: Translocat a
     set_redirect: Configurar un redirection
   move_handler:
     carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat.
@@ -1180,6 +1311,13 @@ ie:
     email_events: Evenimentes por email-notificationes
     email_events_hint: 'Selecte li evenimentes pri queles tu vole reciver notificationes:'
     other_settings: Parametres pri altri notificationes
+  number:
+    human:
+      decimal_units:
+        units:
+          billion: B
+          million: M
+          thousand: m
   otp_authentication:
     code_hint: Inmetter li code generat de tui aplication de autentication por confirmar
     description_html: Si tu activisa <strong>2-factor autentication</strong> per un aplication de autentication, aperter un session va postular que tu have possession de tui telefon, quel va generar codes por que tu mey inmetter les.
@@ -1340,6 +1478,7 @@ ie:
     boosted_from_html: Boostat de %{acct_link}
     default_language: Sam quam li lingue del interfacie
     edited_at_html: Modificat ye %{date}
+    open_in_web: Aperter in web
     pin_errors:
       direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores
       limit: Tu ja ha pinglat li maxim númere de postas
@@ -1353,16 +1492,30 @@ ie:
         one: "%{count} vote"
         other: "%{count} votes"
       vote: Votar
+    show_more: Monstrar plu
+    show_newer: Monstrar plu nov
+    show_older: Monstrar plu old
     title: "%{name}: «%{quote}»"
     visibilities:
+      private_long: Monstrar solmen a sequitores
       public: Public
+      public_long: Omnes posse vider
       unlisted: Delistat
+      unlisted_long: Omnes posse vider, ma ne listat sur public témpor-lineas
   statuses_cleanup:
+    enabled: Automaticmen deleter old postas
+    enabled_hint: Deleter automaticmen tui postas quande ili atinge un cert etá, except si ili concorda con un del exceptiones ci infra
     exceptions: Exceptiones
+    explanation: Deletion de postas es un operation expensiv, e pro to es efectuat lentmen quande li servitor ne es ocupat. Pro to, on posse deleter tui postas un cert témpor pos atinger un cert etá.
+    ignore_favs: Ignorar favorites
+    interaction_exceptions: Exceptiones basat sur interactiones
+    keep_direct: Retener missages direct
+    keep_direct_hint: Ne delete quelcunc de tui direct missages
     keep_pinned: Conservar pinglat postas
     keep_pinned_hint: Delete null de tui pinglat postas
     keep_polls: Conservar balotationes
     keep_polls_hint: Delete null de tui balotationes
+    keep_self_fav: Retener postas favorit de te
     min_age:
       '1209600': 2 semanes
       '31556952': 1 annu
@@ -1442,11 +1595,28 @@ ie:
         mark_statuses_as_sensitive: Tui postas che %{acct} ha esset marcat quam sensitiv
         none: Admoniment por %{acct}
         sensitive: Tui postas che %{acct} ve esser marcat quam sensitiv pos nu
+      title:
+        delete_statuses: Postas efaciat
+        sensitive: Conto marcat quam sensitiv
+        silence: Conto limitat
+        suspend: Conto suspendet
     welcome:
+      edit_profile_action: Configuration de profil
       explanation: Vi quelc suggestiones por que tu mey comensar
+      final_action: Comensar postar
       subject: Benevenit a Mastodon
+      title: Benevenit, %{name}!
   users:
     seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
   verification:
     extra_instructions_html: '<strong>Nota</strong>: Li ligament in tui websitu posse esser ínvisibil. Li important parte es <code>rel="me"</code> quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un <code>link</code> element in li cap-section del págine vice <code>a</code>, ma li HTML code deve esser accessibil sin executer JavaScript.'
+    here_is_how: Vide qualmen
     verification: Verification
+    verified_links: Tui verificat ligamentes
+  webauthn_credentials:
+    add: Adjunter nov clave de securitá
+    create:
+      error: Un problema evenit durant li adjuntion de tui clave de securitá. Ples provar denov.
+      success: Tui clave de securitá esset adjuntet con successe.
+    delete: Deleter
+    delete_confirmation: Vole tu vermen deleter ti-ci clave de securitá?
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 36364feba2..471b830a3e 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -718,6 +718,7 @@ lad:
         manage_rules: Administra reglas del sirvidor
         title: Sovre esto
       appearance:
+        preamble: Personaliza la enterfaz web de Mastodon.
         title: Aparensya
       branding:
         title: Marka
@@ -753,6 +754,8 @@ lad:
       release_notes: Notas sovre la versyon
       title: Aktualizasyones desponivles
       type: Tipo
+      types:
+        major: Versyon prinsipala
       version: Versyon
     statuses:
       account: Autor
@@ -976,6 +979,7 @@ lad:
       awaiting_review_title: Estamos revizando tu enrejistramiento
       clicking_this_link: klikando en este atadijo
       login_link: konektate kon kuento
+      proceed_to_login_html: Agora puedes ir a %{login_link}.
       welcome_title: Bienvenido, %{name}!
       wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
     delete_account: Efasa kuento
@@ -1064,12 +1068,15 @@ lad:
       x_seconds: "%{count} s"
   deletes:
     proceed: Efasa kuento
+    success_msg: Tu kuento fue efasado kon reusho
     warning:
+      before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
       username_unavailable: Tu nombre de utilizador no estara desponivle
   disputes:
     strikes:
       action_taken: Aksyon tomada
       appeal: Apela
+      appeal_rejected: La apelasyon fue refuzada
       appeal_submitted_at: Apelasyon embiada
       appealed_msg: Tu apelasyon fue embiada. Si la achetamos, se te avizara.
       appeals:
@@ -1134,6 +1141,8 @@ lad:
     storage: Magazinaje de multimedia
   featured_tags:
     add_new: Adjusta muevo
+    errors:
+      limit: Tienes alkansado el karar maksimo de etiketas
   filters:
     contexts:
       account: Profiles
@@ -1147,8 +1156,11 @@ lad:
       statuses: Publikasyones individualas
       title: Edita filtro
     index:
+      contexts: Filtros en %{contexts}
       delete: Efasa
       empty: No tyenes filtros.
+      expires_in: Kaduka en %{distance}
+      expires_on: Kaduka en %{date}
       keywords:
         one: "%{count} biervo yave"
         other: "%{count} biervos yave"
@@ -1177,6 +1189,7 @@ lad:
     delete: Efasa
     deselect: Deseleksyonar todo
     none: Dinguno
+    order_by: Ordena por
     save_changes: Guadra trokamientos
     today: oy
   imports:
@@ -1201,6 +1214,7 @@ lad:
     success: Tus datos se tienen kargado djustamente i seran prosesados pishin
     time_started: Ampesado el
     titles:
+      blocking: Importando kuentos blokados
       bookmarks: Importando markadores
       domain_blocking: Importando domenos blokados
       following: Importando kuentos segidos
@@ -1229,6 +1243,7 @@ lad:
       '604800': 1 semana
       '86400': 1 diya
     expires_in_prompt: Nunkua
+    generate: Djenera un atadijo de envitasyon
     invalid: Esta envitasyon no es valida
     invited_by: 'Fuites envitado por:'
     max_uses:
@@ -1255,7 +1270,15 @@ lad:
     title: Estoria de autentifikasyon
   mail_subscriptions:
     unsubscribe:
+      action: Si, dezabona
       complete: Dezabonado
+      emails:
+        notification_emails:
+          favourite: avizos de favoritos por posta
+          follow: avizos de segidores por posta
+          follow_request: avizos de solisitasyones de segimyento por posta
+          mention: avizos de enmentaduras por posta
+          reblog: avizos de repartajasyones por posta
       title: Dezabona
   media_attachments:
     validations:
@@ -1295,15 +1318,21 @@ lad:
     title: Moderasyon
   notification_mailer:
     admin:
+      report:
+        subject: "%{name} embio un raporto"
       sign_up:
         subject: "%{name} se enrejistro"
     favourite:
+      body: 'Tu publikasyon fue favoritada por %{name}:'
+      subject: A %{name} le plaze tu publikasyon
       title: Muevo favorito
     follow:
       body: "%{name} te esta sigiendo!"
       subject: "%{name} te esta sigiendo"
       title: Muevo suivante
     follow_request:
+      action: Administra solisitudes de segimiento
+      body: "%{name} tiene solisitado segirte"
       subject: 'Segidor esta asperando: %{name}'
       title: Mueva solisitud de segimiento
     mention:
@@ -1311,13 +1340,19 @@ lad:
       body: 'Fuites enmentado por %{name} en:'
       subject: Fuites enmentado por %{name}
       title: Mueva enmentadura
+    poll:
+      subject: Una anketa de %{name} eskapo
     reblog:
+      body: 'Tu publikasyon fue repartajada por %{name}:'
+      subject: "%{name} repartajo tu publikasyon"
       title: Mueva repartajasyon
     status:
       subject: "%{name} publiko algo"
     update:
       subject: "%{name} edito una publikasyon"
   notifications:
+    administration_emails: Avizos de administrasyon por posta
+    email_events: Evenimyentos para avizos por posta
     other_settings: Otras preferensyas de avizos
   number:
     human:
@@ -1383,9 +1418,16 @@ lad:
     mutual: Mutual
     primary: Prinsipal
     relationship: Relasyon
+    remove_selected_followers: Kita a los suivantes eskojidos
+    remove_selected_follows: Desige a los utilizadores eskojidos
     status: Estado del kuento
   rss:
     content_warning: 'Avertensya de kontenido:'
+    descriptions:
+      account: Publikasyones publikas de @%{acct}
+      tag: 'Publikasyones publikas etiketadas kon #%{hashtag}'
+  self_destruct:
+    title: Este sirvidor esta serrando
   sessions:
     activity: Ultima aktivita
     browser: Navigador
@@ -1410,6 +1452,7 @@ lad:
       unknown_browser: Navigador deskonosido
       weibo: Weibo
     current_session: Sesyon aktuala
+    description: "%{browser} en %{platform}"
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1421,6 +1464,7 @@ lad:
       kai_os: KaiOS
       linux: Linux
       mac: macOS
+      unknown_platform: Platforma deskonesida
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
@@ -1478,6 +1522,7 @@ lad:
       direct: Las publikasyones ke son vizivles solo para los utilizadores enmentados no pueden fiksarse
       limit: Ya tienes fiksado el numero maksimo de publikasyones
       ownership: La publikasyon de otra persona no puede fiksarse
+      reblog: No se puede fixar una repartajasyon
     poll:
       total_people:
         one: "%{count} persona"
@@ -1503,6 +1548,18 @@ lad:
     exceptions: Eksepsiones
     ignore_favs: Ignora favoritos
     ignore_reblogs: Ignora repartajasyones
+    keep_direct: Manten enmentaduras privadas
+    keep_direct_hint: No efasa dingunos mesajes privados
+    keep_media: Manten publikasyones kon atamientos
+    keep_media_hint: No efasa tus publikasyones kon atamientos de multimedia
+    keep_pinned: Manten publikasyones fiksadas
+    keep_pinned_hint: No efasa tus publikasyones fiksadas
+    keep_polls: Manten anketas
+    keep_polls_hint: No efasa tus anketas
+    keep_self_bookmark: Manten publikasyones kon markadores
+    keep_self_bookmark_hint: No efasa tus publikasyones kon tus markadores
+    keep_self_fav: Manten publikasyones ke te plazen
+    keep_self_fav_hint: No efasa las tus publikasyones kualas markates komo favoritas
     min_age:
       '1209600': 2 semanas
       '15778476': 6 mezes
@@ -1512,6 +1569,8 @@ lad:
       '604800': 1 semana
       '63113904': 2 anyos
       '7889238': 3 mezes
+    min_favs: Manten publikasyones favoritadas a lo manko
+    min_reblogs: Manten publikasyones repartajadas a lo manko
   stream_entries:
     sensitive_content: Kontenido sensivle
   strikes:
@@ -1577,18 +1636,30 @@ lad:
         mark_statuses_as_sensitive: Algunas de tus publikasyones an sido markados komo sensivles por los moderadores de %{instance}. Esto sinyifika ke la djente tendra ke pulsar los dosyas multimedia en las publikasyones antes de ke se amostre una vista previa. Puedes markar los dosyas multimedia komo sensivles tu mezmo kuando publikes en el avenir.
         sensitive: A partir de agora todas los dosyas multimedia ke subas seran markados komo sensivles i eskondidos tras una avertensya.
       reason: 'Razon:'
+      statuses: 'Publikasyones relevantes:'
       subject:
+        delete_statuses: Tus publikasyones en %{acct} tienen sido efasadas
+        disable: Tu kuento %{acct} tiene sido konjelado
+        mark_statuses_as_sensitive: Tus publikasyones en %{acct} tienen sido markadas komo sensivles
         none: Avertensya para %{acct}
+        sensitive: Tus publikasyones en %{acct} seran markadas komo sensivles dizde agora
+        silence: Tu kuento %{acct} tiene sido limitado
+        suspend: Tu kuento %{acct} tiene sido suspendido
       title:
         delete_statuses: Publikasyones efasadas
+        disable: Kuento konjelado
         mark_statuses_as_sensitive: Publikasyones markadas komo sensivles
         none: Avertensya
+        sensitive: Kuento markado komo sensivle
         silence: Kuento limitado
         suspend: Kuento suspendido
     welcome:
+      edit_profile_action: Konfigurasyon de profil
       final_action: Ampesa a publikar
       subject: Bienvenido a Mastodon
+      title: Bienvenido, %{name}!
   users:
+    follow_limit_reached: No puedes segir a mas de %{limit} personas
     invalid_otp_token: Kodiche de dos pasos no valido
     signed_in_as: 'Konektado komo:'
   verification:
@@ -1596,7 +1667,12 @@ lad:
     verified_links: Tus atadijos verifikados
   webauthn_credentials:
     add: Adjusta mueva yave de sigurita
+    create:
+      success: Tu yave de sigurita fue adjustada kon sukseso.
     delete: Efasa
+    delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita?
+    destroy:
+      success: Tu yave de sigurita fue efasada kon sukseso.
     invalid_credential: Yave de sigurita no valida
     nickname_hint: Introduska el sovrenombre de tu mueva yave de sigurita
     not_enabled: Ainda no tienes aktivado WebAuthn
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index ff1587be8f..672ff9d003 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -4,6 +4,9 @@ ie:
     hints:
       account:
         unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
+      account_warning_preset:
+        text: Tu posse usar posta-sintaxe, quam URLs, hashtags e mentiones
+        title: Ínobligatori. Ne visibil al recipiente
       admin_account_action:
         send_email_notification: Li usator va reciver un explication de ti quel evenit con su conto
         text_html: Ínobligatori. Tu posse usar posta-sintaxe. Tu posse <a href="%{path}">adjunter preconfigurationes de avises</a> por sparar témpor
@@ -53,14 +56,25 @@ ie:
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
       form_challenge:
         current_password: Tu nu intra un area secur
+      ip_block:
+        severities:
+          sign_up_block: Nov registrationes ne va esser possibil
+          sign_up_requires_approval: Nov registrationes va besonar tui aprobation
+      webhook:
+        events: Selecter evenimentes a misser
+        url: Ad u misser evenimentes
     labels:
       account:
         fields:
           value: Contenete
+        indexable: Includer public postas in resultates de sercha
       account_warning_preset:
+        text: Textu prefigurat
         title: Titul
       admin_account_action:
+        send_email_notification: Notificar li usator per e-posta
         type: Action
+        warning_preset_id: Usar un prefiguration de avise
       announcement:
         all_day: Eveniment del tot die
         ends_at: Fine del eveniment
@@ -95,5 +109,10 @@ ie:
       form_admin_settings:
         registrations_mode: Qui posse registrar se
         theme: Predefenit tema
+        trends: Possibilisar tendenties
+        trends_as_landing_page: Usar tendenties quam frontispicie
       notification_emails:
         follow_request: Alqui petit sequer te
+        trending_tag: Nov tendentie besonant inspection
+      tag:
+        trendable: Permisse que ti-ci hashtag apari sub tendenties
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 9ad4323504..731379835a 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -6,7 +6,7 @@ it:
         discoverable: I tuoi post pubblici e il tuo profilo potrebbero essere presenti o consigliati in varie aree di Mastodon e il tuo profilo potrebbe essere suggerito ad altri utenti.
         display_name: Il tuo nome completo o il tuo soprannome.
         fields: La tua homepage, i pronomi, l'età, tutto quello che vuoi.
-        indexable: I tuoi post pubblici potrebbero apparire nei risultati di ricerca su Mastodon. Le persone che hanno interagito con i tuoi post potrebbero essere in grado di cercarli indipendentemente.
+        indexable: I tuoi post pubblici potrebbero apparire nei risultati di ricerca su Mastodon. Le persone che hanno interagito con i tuoi post potrebbero essere in grado di cercarli anche se non hai attivato questa impostazione.
         note: 'Puoi @menzionare altre persone o usare gli #hashtags.'
         show_collections: Le persone saranno in grado di navigare attraverso i tuoi seguaci e seguaci. Le persone che segui vedranno che li seguirai indipendentemente dalle tue impostazioni.
         unlocked: Le persone saranno in grado di seguirti senza richiedere l'approvazione. Deseleziona se vuoi controllare le richieste di seguirti e scegli se accettare o rifiutare nuovi follower.
@@ -122,7 +122,7 @@ it:
         webauthn: Se si tratta di una chiavetta USB assicurati di inserirla e, se necessario, toccarla.
       settings:
         indexable: La pagina del tuo profilo potrebbe apparire nei risultati di ricerca su Google, Bing e altri.
-        show_application: Sarai sempre in grado di vedere quale app ha pubblicato il tuo post indipendentemente.
+        show_application: Tu sarai sempre in grado di vedere quale app ha pubblicato il tuo post anche se hai attivato questa impostazione.
       tag:
         name: Puoi cambiare solo il minuscolo/maiuscolo delle lettere, ad esempio, per renderlo più leggibile
       user:
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index e0b8eab876..aeac5f1c58 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -4,6 +4,9 @@ lad:
     hints:
       account:
         display_name: Tu nombre para amostrar.
+        fields: Tu deskripsyon, pronombres, edad, todo lo ke keras.
+        note: 'Puedes @enmentar a otra djente o #etiketas.'
+        show_collections: Otra djente podra ver tus segidos i suivantes. Personas a las kualas siges siempre podran ver que las estas sigiendo.
       account_alias:
         acct: Espesifika tu nombre de utilizador@domeno del kuento de ande keres migrar
       account_migration:
@@ -55,6 +58,7 @@ lad:
         setting_display_media_show_all: Amostra siempre el kontenido de multimedia
         setting_use_blurhash: Los gradientes se bazan en los kolores de las imajes eskondidas pero faziendo velados los peratim
         setting_use_pending_items: Eskonde muevas publikasyones detras de un klik en lugar de desplazar otomatikamente la linya
+        username: Solo puedes uzar letras, shifras i sulinyados
         whole_word: Kuando el biervo yave o fraza es solo alfanumerika, solo sera aplikado si konkorda kon todo el biervo
       domain_allow:
         domain: Este domeno podra obtener datos de este sirvidor i los datos entrantes seran prosesados i archivados
@@ -113,6 +117,8 @@ lad:
       sessions:
         otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:'
         webauthn: Si es una yave USB, asigurete de insertarla y, si es necesario, pulsala.
+      settings:
+        show_application: Tu siempre podras ver dizde kuala aplikasyon publikates tu publikasyon.
       tag:
         name: Solo se puede trokar la kapitalizasyon de las letras, por enshemplo, para ke sea mas meldable
       user:
@@ -132,6 +138,9 @@ lad:
         fields:
           name: Etiketa
           value: Kontenido
+        indexable: Inkluye publikasyones publikas en los rezultados de bushkeda
+        show_collections: Amostra tus segidos i suivantes en el profil
+        unlocked: Otomatikamente acheta muevos suivantes
       account_alias:
         acct: Alias del kuento viejo
       account_migration:
@@ -175,16 +184,23 @@ lad:
         fields: Datos adisyonales
         header: Imaje de kavesera
         locale: Lingua de enterfaz
+        max_uses: Maksimo numero de uzos
         new_password: Muevo kod
         note: Deskripsyon
         otp_attempt: Kodiche de dos pasos
         password: Kod
         phrase: Biervo yave o fraza
+        setting_aggregate_reblogs: Agrupa repartajasyones en linyas
+        setting_always_send_emails: Siempre embia avizos por posta
+        setting_auto_play_gif: Siempre reproduse los GIFs animados
         setting_default_language: Lingua de publikasyones
         setting_default_privacy: Privasita de publikasyones
         setting_display_media_default: Predeterminado
         setting_display_media_hide_all: Eskonde todo
         setting_display_media_show_all: Amostra todo
+        setting_reduce_motion: Reduse el movimyento en animasyones
+        setting_system_font_ui: Uza el font predeterminado del sistem
+        setting_trends: Amostra los trendes de oy
         setting_use_blurhash: Amostra gradientes koloridos para kontenido multimedia eskondido
         setting_use_pending_items: Modo lento
         severity: Severita
@@ -247,14 +263,23 @@ lad:
           sign_up_requires_approval: Limita enrejistrasyones
         severity: Regla
       notification_emails:
+        favourite: A alguno le plaze tu publikasyon
         follow: Alguno te ampeso a segir
         follow_request: Alguno tiene solisitado segirte
         mention: Alguno te enmento
+        pending_account: Muevo kuento nesesita revizyon
         reblog: Alguno repartajo tu publikasyon
+        report: Muevo raporto fue embiado
         software_updates:
+          all: Avizame de kada aktualizasyon
+          critical: Avizame solo de aktualizasyones kritikas
           label: Mueva version de Mastodon esta desponivle
+          none: Nunkua avizame de aktualizasyones (no rekomendado)
+          patch: Avizame de aktualizasyones de yerros
       rule:
         text: Regla
+      settings:
+        indexable: Inkluye la pajina de profil en los bushkadores
       tag:
         name: Etiketa
       user:

From 513d35969ef8d11ea494fb049094868b833bcff8 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Dec 2023 03:03:59 -0500
Subject: [PATCH 138/436] Fix `RSpec/LetSetup` cop in auth controller specs
 (#28464)

---
 .rubocop_todo.yml                                  |  3 ---
 .../auth/confirmations_controller_spec.rb          |  6 ++++--
 spec/controllers/auth/passwords_controller_spec.rb |  2 ++
 spec/controllers/auth/sessions_controller_spec.rb  | 14 ++++++--------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index afd5305304..384f80923f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -47,9 +47,6 @@ RSpec/ExampleLength:
 
 RSpec/LetSetup:
   Exclude:
-    - 'spec/controllers/auth/confirmations_controller_spec.rb'
-    - 'spec/controllers/auth/passwords_controller_spec.rb'
-    - 'spec/controllers/auth/sessions_controller_spec.rb'
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
     - 'spec/models/status_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb
index 58bc38f548..15403e8ea1 100644
--- a/spec/controllers/auth/confirmations_controller_spec.rb
+++ b/spec/controllers/auth/confirmations_controller_spec.rb
@@ -41,8 +41,9 @@ describe Auth::ConfirmationsController do
         get :show, params: { confirmation_token: 'foobar' }
       end
 
-      it 'redirects to login' do
+      it 'redirects to login and confirms user' do
         expect(response).to redirect_to(new_user_session_path)
+        expect(user.reload.confirmed_at).to_not be_nil
       end
     end
 
@@ -87,8 +88,9 @@ describe Auth::ConfirmationsController do
         get :show, params: { confirmation_token: 'foobar' }
       end
 
-      it 'redirects to login' do
+      it 'redirects to login and confirms email' do
         expect(response).to redirect_to(new_user_session_path)
+        expect(user.reload.unconfirmed_email).to be_nil
       end
 
       it 'does not queue up bootstrapping of home timeline' do
diff --git a/spec/controllers/auth/passwords_controller_spec.rb b/spec/controllers/auth/passwords_controller_spec.rb
index e7f7ab4676..d70490abcf 100644
--- a/spec/controllers/auth/passwords_controller_spec.rb
+++ b/spec/controllers/auth/passwords_controller_spec.rb
@@ -70,6 +70,7 @@ describe Auth::PasswordsController do
 
       it 'deactivates all sessions' do
         expect(user.session_activations.count).to eq 0
+        expect { session_activation.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
 
       it 'revokes all access tokens' do
@@ -78,6 +79,7 @@ describe Auth::PasswordsController do
 
       it 'removes push subscriptions' do
         expect(Web::PushSubscription.where(user: user).or(Web::PushSubscription.where(access_token: access_token)).count).to eq 0
+        expect { web_push_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index f341d75b79..212cc4d5e5 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -123,9 +123,8 @@ RSpec.describe Auth::SessionsController do
         let(:previous_ip) { '1.2.3.4' }
         let(:current_ip)  { '4.3.2.1' }
 
-        let!(:previous_login) { Fabricate(:login_activity, user: user, ip: previous_ip) }
-
         before do
+          Fabricate(:login_activity, user: user, ip: previous_ip)
           allow(controller.request).to receive(:remote_ip).and_return(current_ip)
           user.update(current_sign_in_at: 1.month.ago)
           post :create, params: { user: { email: user.email, password: user.password } }
@@ -328,12 +327,6 @@ RSpec.describe Auth::SessionsController do
           Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
         end
 
-        let!(:recovery_codes) do
-          codes = user.generate_otp_backup_codes!
-          user.save
-          return codes
-        end
-
         let!(:webauthn_credential) do
           user.update(webauthn_id: WebAuthn.generate_user_id)
           public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
@@ -356,6 +349,11 @@ RSpec.describe Auth::SessionsController do
 
         let(:fake_credential) { fake_client.get(challenge: challenge, sign_count: sign_count) }
 
+        before do
+          user.generate_otp_backup_codes!
+          user.save
+        end
+
         context 'when using email and password' do
           before do
             post :create, params: { user: { email: user.email, password: user.password } }

From e6e217fedd13251db166010814a6ae0cdba2ad96 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Dec 2023 03:32:27 -0500
Subject: [PATCH 139/436] Clean up `tagged_with_*` Status specs, fix
 `RSpec/LetSetup` cop (#28462)

---
 .rubocop_todo.yml          |  1 -
 spec/models/status_spec.rb | 69 ++++++++++++++++++++++++++++----------
 spec/rails_helper.rb       |  1 +
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 384f80923f..11bacb3b1d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -48,7 +48,6 @@ RSpec/ExampleLength:
 RSpec/LetSetup:
   Exclude:
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
-    - 'spec/models/status_spec.rb'
     - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
 
 RSpec/MultipleExpectations:
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 938d0546df..284576ceda 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -265,17 +265,29 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_all_tags.id)
-        expect(described_class.tagged_with([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_with_all_tags.id)
-        expect(described_class.tagged_with([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id, status_with_all_tags.id)
+        expect(described_class.tagged_with([tag_cats.id]))
+          .to include(status_with_tag_cats, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with([tag_dogs.id]))
+          .to include(status_with_tag_dogs, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with([tag_zebras.id]))
+          .to include(status_tagged_with_zebras, status_with_all_tags)
+          .and not_include(status_without_tags)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_tag_dogs.id, status_with_all_tags.id)
-        expect(described_class.tagged_with([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_tagged_with_zebras.id, status_with_all_tags.id)
-        expect(described_class.tagged_with([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_tagged_with_zebras.id, status_with_all_tags.id)
+        expect(described_class.tagged_with([tag_cats.id, tag_dogs.id]))
+          .to include(status_with_tag_cats, status_with_tag_dogs, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with([tag_cats.id, tag_zebras.id]))
+          .to include(status_with_tag_cats, status_tagged_with_zebras, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with([tag_dogs.id, tag_zebras.id]))
+          .to include(status_with_tag_dogs, status_tagged_with_zebras, status_with_all_tags)
+          .and not_include(status_without_tags)
       end
     end
   end
@@ -292,17 +304,26 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with_all([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_all_tags.id)
-        expect(described_class.tagged_with_all([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_with_all_tags.id)
-        expect(described_class.tagged_with_all([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id)
+        expect(described_class.tagged_with_all([tag_cats.id]))
+          .to include(status_with_tag_cats, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with_all([tag_dogs.id]))
+          .to include(status_with_tag_dogs, status_with_all_tags)
+          .and not_include(status_without_tags)
+        expect(described_class.tagged_with_all([tag_zebras.id]))
+          .to include(status_tagged_with_zebras)
+          .and not_include(status_without_tags)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with_all([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_all_tags.id)
-        expect(described_class.tagged_with_all([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to eq []
-        expect(described_class.tagged_with_all([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to eq []
+        expect(described_class.tagged_with_all([tag_cats.id, tag_dogs.id]))
+          .to include(status_with_all_tags)
+        expect(described_class.tagged_with_all([tag_cats.id, tag_zebras.id]))
+          .to eq []
+        expect(described_class.tagged_with_all([tag_dogs.id, tag_zebras.id]))
+          .to eq []
       end
     end
   end
@@ -319,17 +340,29 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with_none([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_tagged_with_zebras.id, status_without_tags.id)
-        expect(described_class.tagged_with_none([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_tagged_with_zebras.id, status_without_tags.id)
-        expect(described_class.tagged_with_none([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_tag_dogs.id, status_without_tags.id)
+        expect(described_class.tagged_with_none([tag_cats.id]))
+          .to include(status_with_tag_dogs, status_tagged_with_zebras, status_without_tags)
+          .and not_include(status_with_all_tags)
+        expect(described_class.tagged_with_none([tag_dogs.id]))
+          .to include(status_with_tag_cats, status_tagged_with_zebras, status_without_tags)
+          .and not_include(status_with_all_tags)
+        expect(described_class.tagged_with_none([tag_zebras.id]))
+          .to include(status_with_tag_cats, status_with_tag_dogs, status_without_tags)
+          .and not_include(status_with_all_tags)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(described_class.tagged_with_none([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id, status_without_tags.id)
-        expect(described_class.tagged_with_none([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_without_tags.id)
-        expect(described_class.tagged_with_none([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_without_tags.id)
+        expect(described_class.tagged_with_none([tag_cats.id, tag_dogs.id]))
+          .to include(status_tagged_with_zebras, status_without_tags)
+          .and not_include(status_with_all_tags)
+        expect(described_class.tagged_with_none([tag_cats.id, tag_zebras.id]))
+          .to include(status_with_tag_dogs, status_without_tags)
+          .and not_include(status_with_all_tags)
+        expect(described_class.tagged_with_none([tag_dogs.id, tag_zebras.id]))
+          .to include(status_with_tag_cats, status_without_tags)
+          .and not_include(status_with_all_tags)
       end
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0e68fbe121..c9352a4d5d 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -153,6 +153,7 @@ RSpec::Sidekiq.configure do |config|
 end
 
 RSpec::Matchers.define_negated_matcher :not_change, :change
+RSpec::Matchers.define_negated_matcher :not_include, :include
 
 def request_fixture(name)
   Rails.root.join('spec', 'fixtures', 'requests', name).read

From a4d49c236d1c3bd53dc944ba1062d4d7e76007ce Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Dec 2023 07:57:29 -0500
Subject: [PATCH 140/436] Fix `RSpec/LetSetup` cop in
 ap/fetch_featured_collection_service (#28461)

---
 .rubocop_todo.yml                                                | 1 -
 .../activitypub/fetch_featured_collection_service_spec.rb        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 11bacb3b1d..6dcdb3b835 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -48,7 +48,6 @@ RSpec/ExampleLength:
 RSpec/LetSetup:
   Exclude:
     - 'spec/models/account_statuses_cleanup_policy_spec.rb'
-    - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
 
 RSpec/MultipleExpectations:
   Max: 8
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index 466da891a8..a98108cea3 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -87,6 +87,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
         'https://example.com/account/pinned/unknown-inlined',
         'https://example.com/account/pinned/unknown-reachable'
       )
+      expect(actor.pinned_statuses).to_not include(known_status)
     end
   end
 

From 2bf84b93d43a33e53f27893f62f3f1774294bd1b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Dec 2023 16:10:39 +0100
Subject: [PATCH 141/436] Fix media attachment order of remote posts (#28469)

---
 app/lib/activitypub/activity/create.rb       |  5 ++++-
 app/models/status.rb                         |  4 +++-
 spec/lib/activitypub/activity/create_spec.rb | 10 ++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index fedfa39dee..f6262899a8 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -110,6 +110,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   def process_status_params
     @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
 
+    attachment_ids = process_attachments.take(4).map(&:id)
+
     @params = {
       uri: @status_parser.uri,
       url: @status_parser.url || @status_parser.uri,
@@ -125,7 +127,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       visibility: @status_parser.visibility,
       thread: replied_to_status,
       conversation: conversation_from_uri(@object['conversation']),
-      media_attachment_ids: process_attachments.take(4).map(&:id),
+      media_attachment_ids: attachment_ids,
+      ordered_media_attachment_ids: attachment_ids,
       poll: process_poll,
     }
   end
diff --git a/app/models/status.rb b/app/models/status.rb
index 4bdadae068..3faa507000 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -277,7 +277,9 @@ class Status < ApplicationRecord
 
   def ordered_media_attachments
     if ordered_media_attachment_ids.nil?
-      media_attachments
+      # NOTE: sort Ruby-side to avoid hitting the database when the status is
+      # not persisted to database yet
+      media_attachments.sort_by(&:id)
     else
       map = media_attachments.index_by(&:id)
       ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index bdc1c45ead..8084427d06 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -532,15 +532,21 @@ RSpec.describe ActivityPub::Activity::Create do
                 mediaType: 'image/png',
                 url: 'http://example.com/attachment.png',
               },
+              {
+                type: 'Document',
+                mediaType: 'image/png',
+                url: 'http://example.com/emoji.png',
+              },
             ],
           }
         end
 
-        it 'creates status' do
+        it 'creates status with correctly-ordered media attachments' do
           status = sender.statuses.first
 
           expect(status).to_not be_nil
-          expect(status.media_attachments.map(&:remote_url)).to include('http://example.com/attachment.png')
+          expect(status.ordered_media_attachments.map(&:remote_url)).to eq ['http://example.com/attachment.png', 'http://example.com/emoji.png']
+          expect(status.ordered_media_attachment_ids).to be_present
         end
       end
 

From bb8077e784f3f351e1f7e8905ea44d851b4ed456 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Dec 2023 10:29:50 -0500
Subject: [PATCH 142/436] Fix `RSpec/LetSetup` cop in
 models/account_status_cleanup_policy (#28470)

---
 .rubocop_todo.yml                             |  4 ----
 .../account_statuses_cleanup_policy_spec.rb   | 24 +++++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6dcdb3b835..bc66bc4add 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -45,10 +45,6 @@ Metrics/PerceivedComplexity:
 RSpec/ExampleLength:
   Max: 22
 
-RSpec/LetSetup:
-  Exclude:
-    - 'spec/models/account_statuses_cleanup_policy_spec.rb'
-
 RSpec/MultipleExpectations:
   Max: 8
 
diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index 74fff30c95..da2a774b2d 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -235,13 +235,17 @@ RSpec.describe AccountStatusesCleanupPolicy do
   describe '#compute_cutoff_id' do
     subject { account_statuses_cleanup_policy.compute_cutoff_id }
 
-    let!(:unrelated_status) { Fabricate(:status, created_at: 3.years.ago) }
     let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) }
 
+    before { Fabricate(:status, created_at: 3.years.ago) }
+
     context 'when the account has posted multiple toots' do
-      let!(:very_old_status)   { Fabricate(:status, created_at: 3.years.ago, account: account) }
-      let!(:old_status)        { Fabricate(:status, created_at: 3.weeks.ago, account: account) }
-      let!(:recent_status)     { Fabricate(:status, created_at: 2.days.ago, account: account) }
+      let!(:old_status) { Fabricate(:status, created_at: 3.weeks.ago, account: account) }
+
+      before do
+        Fabricate(:status, created_at: 3.years.ago, account: account)
+        Fabricate(:status, created_at: 2.days.ago, account: account)
+      end
 
       it 'returns the most recent id that is still below policy age' do
         expect(subject).to eq old_status.id
@@ -270,16 +274,16 @@ RSpec.describe AccountStatusesCleanupPolicy do
     let!(:faved_secondary) { Fabricate(:status, created_at: 1.year.ago, account: account) }
     let!(:reblogged_primary) { Fabricate(:status, created_at: 1.year.ago, account: account) }
     let!(:reblogged_secondary) { Fabricate(:status, created_at: 1.year.ago, account: account) }
-    let!(:recent_status)     { Fabricate(:status, created_at: 2.days.ago, account: account) }
-
-    let!(:media_attachment)  { Fabricate(:media_attachment, account: account, status: status_with_media) }
-    let!(:status_pin)        { Fabricate(:status_pin, account: account, status: pinned_status) }
-    let!(:favourite)         { Fabricate(:favourite, account: account, status: self_faved) }
-    let!(:bookmark)          { Fabricate(:bookmark, account: account, status: self_bookmarked) }
+    let!(:recent_status) { Fabricate(:status, created_at: 2.days.ago, account: account) }
 
     let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) }
 
     before do
+      Fabricate(:media_attachment, account: account, status: status_with_media)
+      Fabricate(:status_pin, account: account, status: pinned_status)
+      Fabricate(:favourite, account: account, status: self_faved)
+      Fabricate(:bookmark, account: account, status: self_bookmarked)
+
       faved_primary.status_stat.update(favourites_count: 4)
       faved_secondary.status_stat.update(favourites_count: 5)
       reblogged_primary.status_stat.update(reblogs_count: 4)

From a2624ff739ea555888f27b13a44f7d6b1af35a86 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 22 Dec 2023 19:56:22 +0100
Subject: [PATCH 143/436] Convert signature verification specs to request specs
 (#28443)

---
 .../concerns/signature_verification_spec.rb   | 305 ----------------
 spec/requests/signature_verification_spec.rb  | 332 ++++++++++++++++++
 2 files changed, 332 insertions(+), 305 deletions(-)
 delete mode 100644 spec/controllers/concerns/signature_verification_spec.rb
 create mode 100644 spec/requests/signature_verification_spec.rb

diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb
deleted file mode 100644
index 650cd21eaf..0000000000
--- a/spec/controllers/concerns/signature_verification_spec.rb
+++ /dev/null
@@ -1,305 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe SignatureVerification do
-  let(:wrapped_actor_class) do
-    Class.new do
-      attr_reader :wrapped_account
-
-      def initialize(wrapped_account)
-        @wrapped_account = wrapped_account
-      end
-
-      delegate :uri, :keypair, to: :wrapped_account
-    end
-  end
-
-  controller(ApplicationController) do
-    include SignatureVerification
-
-    before_action :require_actor_signature!, only: [:signature_required]
-
-    def success
-      head 200
-    end
-
-    def alternative_success
-      head 200
-    end
-
-    def signature_required
-      head 200
-    end
-  end
-
-  before do
-    routes.draw do
-      match :via => [:get, :post], 'success' => 'anonymous#success'
-      match :via => [:get, :post], 'signature_required' => 'anonymous#signature_required'
-    end
-  end
-
-  context 'without signature header' do
-    before do
-      get :success
-    end
-
-    describe '#signed_request?' do
-      it 'returns false' do
-        expect(controller.signed_request?).to be false
-      end
-    end
-
-    describe '#signed_request_account' do
-      it 'returns nil' do
-        expect(controller.signed_request_account).to be_nil
-      end
-    end
-  end
-
-  context 'with signature header' do
-    let!(:author) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/actor') }
-
-    context 'without body' do
-      before do
-        get :success
-
-        fake_request = Request.new(:get, request.url)
-        fake_request.on_behalf_of(author)
-
-        request.headers.merge!(fake_request.headers)
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns an account' do
-          expect(controller.signed_request_account).to eq author
-        end
-
-        it 'returns nil when path does not match' do
-          request.path = '/alternative-path'
-          expect(controller.signed_request_account).to be_nil
-        end
-
-        it 'returns nil when method does not match' do
-          post :success
-          expect(controller.signed_request_account).to be_nil
-        end
-      end
-    end
-
-    context 'with a valid actor that is not an Account' do
-      let(:actor) { wrapped_actor_class.new(author) }
-
-      before do
-        get :success
-
-        fake_request = Request.new(:get, request.url)
-        fake_request.on_behalf_of(author)
-
-        request.headers.merge!(fake_request.headers)
-
-        allow(ActivityPub::TagManager.instance).to receive(:uri_to_actor).with(anything) do
-          actor
-        end
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns nil' do
-          expect(controller.signed_request_account).to be_nil
-        end
-      end
-
-      describe '#signed_request_actor' do
-        it 'returns the expected actor' do
-          expect(controller.signed_request_actor).to eq actor
-        end
-      end
-    end
-
-    context 'with request with unparsable Date header' do
-      before do
-        get :success
-
-        fake_request = Request.new(:get, request.url)
-        fake_request.add_headers({ 'Date' => 'wrong date' })
-        fake_request.on_behalf_of(author)
-
-        request.headers.merge!(fake_request.headers)
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns nil' do
-          expect(controller.signed_request_account).to be_nil
-        end
-      end
-
-      describe '#signature_verification_failure_reason' do
-        it 'contains an error description' do
-          controller.signed_request_account
-          expect(controller.signature_verification_failure_reason[:error]).to eq 'Invalid Date header: not RFC 2616 compliant date: "wrong date"'
-        end
-      end
-    end
-
-    context 'with request older than a day' do
-      before do
-        get :success
-
-        fake_request = Request.new(:get, request.url)
-        fake_request.add_headers({ 'Date' => 2.days.ago.utc.httpdate })
-        fake_request.on_behalf_of(author)
-
-        request.headers.merge!(fake_request.headers)
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns nil' do
-          expect(controller.signed_request_account).to be_nil
-        end
-      end
-
-      describe '#signature_verification_failure_reason' do
-        it 'contains an error description' do
-          controller.signed_request_account
-          expect(controller.signature_verification_failure_reason[:error]).to eq 'Signed request date outside acceptable time window'
-        end
-      end
-    end
-
-    context 'with inaccessible key' do
-      before do
-        get :success
-
-        author = Fabricate(:account, domain: 'localhost:5000', uri: 'http://localhost:5000/actor')
-        fake_request = Request.new(:get, request.url)
-        fake_request.on_behalf_of(author)
-        author.destroy
-
-        request.headers.merge!(fake_request.headers)
-
-        stub_request(:get, 'http://localhost:5000/actor#main-key').to_raise(Mastodon::HostValidationError)
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns nil' do
-          expect(controller.signed_request_account).to be_nil
-        end
-      end
-    end
-
-    context 'with body' do
-      before do
-        allow(controller).to receive(:actor_refresh_key!).and_return(author)
-        post :success, body: 'Hello world'
-
-        fake_request = Request.new(:post, request.url, body: 'Hello world')
-        fake_request.on_behalf_of(author)
-
-        request.headers.merge!(fake_request.headers)
-      end
-
-      describe '#signed_request?' do
-        it 'returns true' do
-          expect(controller.signed_request?).to be true
-        end
-      end
-
-      describe '#signed_request_account' do
-        it 'returns an account' do
-          expect(controller.signed_request_account).to eq author
-        end
-      end
-
-      context 'when path does not match' do
-        before do
-          request.path = '/alternative-path'
-        end
-
-        describe '#signed_request_account' do
-          it 'returns nil' do
-            expect(controller.signed_request_account).to be_nil
-          end
-        end
-
-        describe '#signature_verification_failure_reason' do
-          it 'contains an error description' do
-            controller.signed_request_account
-            expect(controller.signature_verification_failure_reason[:error]).to include('using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)')
-            expect(controller.signature_verification_failure_reason[:signed_string]).to include("(request-target): post /alternative-path\n")
-          end
-        end
-      end
-
-      context 'when method does not match' do
-        before do
-          get :success
-        end
-
-        describe '#signed_request_account' do
-          it 'returns nil' do
-            expect(controller.signed_request_account).to be_nil
-          end
-        end
-      end
-
-      context 'when body has been tampered' do
-        before do
-          post :success, body: 'doo doo doo'
-        end
-
-        describe '#signed_request_account' do
-          it 'returns nil when body has been tampered' do
-            expect(controller.signed_request_account).to be_nil
-          end
-        end
-      end
-    end
-  end
-
-  context 'when a signature is required' do
-    before do
-      get :signature_required
-    end
-
-    context 'without signature header' do
-      it 'returns HTTP 401' do
-        expect(response).to have_http_status(401)
-      end
-
-      it 'returns an error' do
-        expect(Oj.load(response.body)['error']).to eq 'Request not signed'
-      end
-    end
-  end
-end
diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb
new file mode 100644
index 0000000000..b753750b84
--- /dev/null
+++ b/spec/requests/signature_verification_spec.rb
@@ -0,0 +1,332 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'signature verification concern' do
+  before do
+    stub_tests_controller
+
+    # Signature checking is time-dependent, so travel to a fixed date
+    travel_to '2023-12-20T10:00:00Z'
+  end
+
+  after { Rails.application.reload_routes! }
+
+  # Include the private key so the tests can be easily adjusted and reviewed
+  let(:actor_keypair) do
+    OpenSSL::PKey.read(<<~PEM_TEXT)
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEowIBAAKCAQEAqIAYvNFGbZ5g4iiK6feSdXD4bDStFM58A7tHycYXaYtzZQpI
+      eHXAmaXuZzXIwtrP4N0gIk8JNwZvXj2UPS+S07t0V9wNK94he01LV5EMz/GN4eNn
+      FmDL64HIEuKLvV8TvgjbUPRD6Y5X0UpKi2ZIFLSb96Q5w0Z/k7ntpVKV52y8kz5F
+      jr/O/0JuHryZe0yItzJh8kzFfeMf0EXzfSnaKvT7P9jhgC6uTre+jXyvVZjiHDrn
+      qvvucdI3I7DRfXo1OqARBrLjy+TdseUAjNYJ+OuPRI1URIWQI01DCHqcohVu9+Ar
+      +BiCjFp3ua+XMuJvrvbD61d1Fvig/9nbBRR+8QIDAQABAoIBAAgySHnFWI6gItR3
+      fkfiqIm80cHCN3Xk1C6iiVu+3oBOZbHpW9R7vl9e/WOA/9O+LPjiSsQOegtWnVvd
+      RRjrl7Hj20VDlZKv5Mssm6zOGAxksrcVbqwdj+fUJaNJCL0AyyseH0x/IE9T8rDC
+      I1GH+3tB3JkhkIN/qjipdX5ab8MswEPu8IC4ViTpdBgWYY/xBcAHPw4xuL0tcwzh
+      FBlf4DqoEVQo8GdK5GAJ2Ny0S4xbXHUURzx/R4y4CCts7niAiLGqd9jmLU1kUTMk
+      QcXfQYK6l+unLc7wDYAz7sFEHh04M48VjWwiIZJnlCqmQbLda7uhhu8zkF1DqZTu
+      ulWDGQECgYEA0TIAc8BQBVab979DHEEmMdgqBwxLY3OIAk0b+r50h7VBGWCDPRsC
+      STD73fQY3lNet/7/jgSGwwAlAJ5PpMXxXiZAE3bUwPmHzgF7pvIOOLhA8O07tHSO
+      L2mvQe6NPzjZ+6iAO2U9PkClxcvGvPx2OBvisfHqZLmxC9PIVxzruQECgYEAzjM6
+      BTUXa6T/qHvLFbN699BXsUOGmHBGaLRapFDBfVvgZrwqYQcZpBBhesLdGTGSqwE7
+      gWsITPIJ+Ldo+38oGYyVys+w/V67q6ud7hgSDTW3hSvm+GboCjk6gzxlt9hQ0t9X
+      8vfDOYhEXvVUJNv3mYO60ENqQhILO4bQ0zi+VfECgYBb/nUccfG+pzunU0Cb6Dp3
+      qOuydcGhVmj1OhuXxLFSDG84Tazo7juvHA9mp7VX76mzmDuhpHPuxN2AzB2SBEoE
+      cSW0aYld413JRfWukLuYTc6hJHIhBTCRwRQFFnae2s1hUdQySm8INT2xIc+fxBXo
+      zrp+Ljg5Wz90SAnN5TX0AQKBgDaatDOq0o/r+tPYLHiLtfWoE4Dau+rkWJDjqdk3
+      lXWn/e3WyHY3Vh/vQpEqxzgju45TXjmwaVtPATr+/usSykCxzP0PMPR3wMT+Rm1F
+      rIoY/odij+CaB7qlWwxj0x/zRbwB7x1lZSp4HnrzBpxYL+JUUwVRxPLIKndSBTza
+      GvVRAoGBAIVBcNcRQYF4fvZjDKAb4fdBsEuHmycqtRCsnkGOz6ebbEQznSaZ0tZE
+      +JuouZaGjyp8uPjNGD5D7mIGbyoZ3KyG4mTXNxDAGBso1hrNDKGBOrGaPhZx8LgO
+      4VXJ+ybXrATf4jr8ccZYsZdFpOphPzz+j55Mqg5vac5P1XjmsGTb
+      -----END RSA PRIVATE KEY-----
+    PEM_TEXT
+  end
+
+  context 'without a Signature header' do
+    it 'does not treat the request as signed' do
+      get '/activitypub/success'
+
+      expect(response).to have_http_status(200)
+      expect(body_as_json).to match(
+        signed_request: false,
+        signature_actor_id: nil,
+        error: 'Request not signed'
+      )
+    end
+
+    context 'when a signature is required' do
+      it 'returns http unauthorized with appropriate error' do
+        get '/activitypub/signature_required'
+
+        expect(response).to have_http_status(401)
+        expect(body_as_json).to match(
+          error: 'Request not signed'
+        )
+      end
+    end
+  end
+
+  context 'with an HTTP Signature from a known account' do
+    let!(:actor) { Fabricate(:account, domain: 'remote.domain', uri: 'https://remote.domain/users/bob', private_key: nil, public_key: actor_keypair.public_key.to_pem) }
+
+    context 'with a valid signature on a GET request' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'successfuly verifies signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => signature_header,
+        }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: actor.id.to_s
+        )
+      end
+    end
+
+    context 'with a mismatching path' do
+      it 'fails to verify signature', :aggregate_failures do
+        get '/activitypub/alternative-path', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: anything
+        )
+      end
+    end
+
+    context 'with a mismatching method' do
+      it 'fails to verify signature', :aggregate_failures do
+        post '/activitypub/success', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: anything
+        )
+      end
+    end
+
+    context 'with an unparsable date' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="d4B7nfx8RJcfdJDu1J//5WzPzK/hgtPkdzZx49lu5QhnE7qdV3lgyVimmhCFrO16bwvzIp9iRMyRLkNFxLiEeVaa1gqeKbldGSnU0B0OMjx7rFBa65vLuzWQOATDitVGiBEYqoK4v0DMuFCz2DtFaA/DIUZ3sty8bZ/Ea3U1nByLOO6MacARA3zhMSI0GNxGqsSmZmG0hPLavB3jIXoE3IDoQabMnC39jrlcO/a8h1iaxBm2WD8TejrImJullgqlJIFpKhIHI3ipQkvTGPlm9dx0y+beM06qBvWaWQcmT09eRIUefVsOAzIhUtS/7FVb/URhZvircIJDa7vtiFcmZQ=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'fails to verify signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success', { 'Date' => 'wrong date', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'wrong date',
+          'Signature' => signature_header,
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: 'Invalid Date header: not RFC 2616 compliant date: "wrong date"'
+        )
+      end
+    end
+
+    context 'with a request older than a day' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="G1NuJv4zgoZ3B/ZIjzDWZHK4RC+5pYee74q8/LJEMCWXhcnAomcb9YHaqk1QYfQvcBUIXw3UZ3Q9xO8F9y0i8G5mzJHfQ+OgHqCoJk8EmGwsUXJMh5s1S5YFCRt8TT12TmJZz0VMqLq85ubueSYBM7QtUE/FzFIVLvz4RysgXxaXQKzdnM6+gbUEEKdCURpXdQt2NXQhp4MAmZH3+0lQoR6VxdsK0hx0Ji2PNp1nuqFTlYqNWZazVdLBN+9rETLRmvGXknvg9jOxTTppBVWnkAIl26HtLS3wwFVvz4pJzi9OQDOvLziehVyLNbU61hky+oJ215e2HuKSe2hxHNl1MA=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'fails to verify signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success', { 'Date' => 'Wed, 18 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 18 Dec 2023 10:00:00 GMT',
+          'Signature' => signature_header,
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: 'Signed request date outside acceptable time window'
+        )
+      end
+    end
+
+    context 'with a valid signature on a POST request' do
+      let(:digest_header) { 'SHA-256=ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=' }
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'successfuly verifies signature', :aggregate_failures do
+        expect(digest_header).to eq digest_value('Hello world')
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'post /activitypub/success', { 'Host' => 'www.example.com', 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Digest' => digest_header })
+
+        post '/activitypub/success', params: 'Hello world', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Digest' => digest_header,
+          'Signature' => signature_header,
+        }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: actor.id.to_s
+        )
+      end
+    end
+
+    context 'when the Digest of a POST request is not signed' do
+      let(:digest_header) { 'SHA-256=ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=' }
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="host date (request-target)",signature="CPD704CG8aCm8X8qIP8kkkiGp1qwFLk/wMVQHOGP0Txxan8c2DZtg/KK7eN8RG8tHx8br/yS2hJs51x4kXImYukGzNJd7ihE3T8lp+9RI1tCcdobTzr/VcVJHDFySdQkg266GCMijRQRZfNvqlJLiisr817PI+gNVBI5qV+vnVd1XhWCEZ+YSmMe8UqYARXAYNqMykTheojqGpTeTFGPUpTQA2Fmt2BipwIjcFDm2Hpihl2kB0MUS0x3zPmHDuadvzoBbN6m3usPDLgYrpALlh+wDs1dYMntcwdwawRKY1oE1XNtgOSum12wntDq3uYL4gya2iPdcw3c929b4koUzw=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'fails to verify signature', :aggregate_failures do
+        expect(digest_header).to eq digest_value('Hello world')
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'post /activitypub/success', { 'Host' => 'www.example.com', 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT' })
+
+        post '/activitypub/success', params: 'Hello world', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Digest' => digest_header,
+          'Signature' => signature_header,
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: 'Mastodon requires the Digest header to be signed when doing a POST request'
+        )
+      end
+    end
+
+    context 'with a tampered body on a POST request' do
+      let(:digest_header) { 'SHA-256=ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=' }
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'fails to verify signature', :aggregate_failures do
+        expect(digest_header).to_not eq digest_value('Hello world!')
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'post /activitypub/success', { 'Host' => 'www.example.com', 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Digest' => digest_header })
+
+        post '/activitypub/success', params: 'Hello world!', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Digest' => 'SHA-256=ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=',
+          'Signature' => signature_header,
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: 'Invalid Digest value. Computed SHA-256 digest: wFNeS+K3n/2TKRMFQ2v4iTFOSj+uwF7P/Lt98xrZ5Ro=; given: ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw='
+        )
+      end
+    end
+
+    context 'with a tampered path in a POST request' do
+      it 'fails to verify signature', :aggregate_failures do
+        post '/activitypub/alternative-path', params: 'Hello world', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Digest' => 'SHA-256=ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=',
+          'Signature' => 'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="host date digest (request-target)",signature="gmhMjgMROGElJU3fpehV2acD5kMHeELi8EFP2UPHOdQ54H0r55AxIpji+J3lPe+N2qSb/4H1KXIh6f0lRu8TGSsu12OQmg5hiO8VA9flcA/mh9Lpk+qwlQZIPRqKP9xUEfqD+Z7ti5wPzDKrWAUK/7FIqWgcT/mlqB1R1MGkpMFc/q4CIs2OSNiWgA4K+Kp21oQxzC2kUuYob04gAZ7cyE/FTia5t08uv6lVYFdRsn4XNPn1MsHgFBwBMRG79ng3SyhoG4PrqBEi5q2IdLq3zfre/M6He3wlCpyO2VJNdGVoTIzeZ0Zz8jUscPV3XtWUchpGclLGSaKaq/JyNZeiYQ=="', # rubocop:disable Layout/LineLength
+        }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: anything
+        )
+      end
+    end
+  end
+
+  context 'with an inaccessible key' do
+    before do
+      stub_request(:get, 'https://remote.domain/users/alice#main-key').to_return(status: 404)
+    end
+
+    it 'fails to verify signature', :aggregate_failures do
+      get '/activitypub/success', headers: {
+        'Host' => 'www.example.com',
+        'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+        'Signature' => 'keyId="https://remote.domain/users/alice#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="', # rubocop:disable Layout/LineLength
+      }
+
+      expect(body_as_json).to match(
+        signed_request: true,
+        signature_actor_id: nil,
+        error: 'Unable to fetch key JSON at https://remote.domain/users/alice#main-key'
+      )
+    end
+  end
+
+  private
+
+  def stub_tests_controller
+    stub_const('ActivityPub::TestsController', activitypub_tests_controller)
+
+    Rails.application.routes.draw do
+      # NOTE: RouteSet#draw removes all routes, so we need to re-insert one
+      resource :instance_actor, path: 'actor', only: [:show]
+
+      match :via => [:get, :post], '/activitypub/success' => 'activitypub/tests#success'
+      match :via => [:get, :post], '/activitypub/alternative-path' => 'activitypub/tests#alternative_success'
+      match :via => [:get, :post], '/activitypub/signature_required' => 'activitypub/tests#signature_required'
+    end
+  end
+
+  def activitypub_tests_controller
+    Class.new(ApplicationController) do
+      include SignatureVerification
+
+      before_action :require_actor_signature!, only: [:signature_required]
+
+      def success
+        render json: {
+          signed_request: signed_request?,
+          signature_actor_id: signed_request_actor&.id&.to_s,
+        }.merge(signature_verification_failure_reason || {})
+      end
+
+      alias_method :alternative_success, :success
+      alias_method :signature_required, :success
+    end
+  end
+
+  def digest_value(body)
+    "SHA-256=#{Digest::SHA256.base64digest(body)}"
+  end
+
+  def build_signature_string(keypair, key_id, request_target, headers)
+    algorithm = 'rsa-sha256'
+    signed_headers = headers.merge({ '(request-target)' => request_target })
+    signed_string = signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
+    signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
+
+    "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
+  end
+end

From fb5eb1f65572782c170e19b005dfd7f04543c81f Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 29 Dec 2023 10:33:06 +0100
Subject: [PATCH 144/436] Replace our custom `compression-webpack-plugin` patch
 with the fixed upstream version (#28510)

---
 ...-webpack-plugin-npm-6.1.1-3a2a65987e.patch | 22 ----------------
 package.json                                  |  2 +-
 yarn.lock                                     | 25 ++++---------------
 3 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 .yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch

diff --git a/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch b/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch
deleted file mode 100644
index 30d5db2739..0000000000
--- a/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/dist/index.js b/dist/index.js
-index 57e375592d984e9a429bcd9f800fa2d15cd662e4..0c47d96df3608e23adfd77d887a8f72abbd501c0 100644
---- a/dist/index.js
-+++ b/dist/index.js
-@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
- });
- exports.default = void 0;
- 
--var _crypto = _interopRequireDefault(require("crypto"));
-+var _createHash = _interopRequireDefault(require("webpack/lib/util/createHash"));
- 
- var _path = _interopRequireDefault(require("path"));
- 
-@@ -227,7 +227,7 @@ class CompressionPlugin {
-             originalAlgorithm: this.options.algorithm,
-             compressionOptions: this.options.compressionOptions,
-             name,
--            contentHash: _crypto.default.createHash("md4").update(input).digest("hex")
-+            contentHash: _createHash.default("md4").update(input).digest("hex")
-           };
-         } else {
-           cacheData.name = (0, _serializeJavascript.default)({
diff --git a/package.json b/package.json
index 39d387d6f4..24832bb596 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "classnames": "^2.3.2",
     "cocoon-js-vanilla": "^1.3.0",
     "color-blend": "^4.0.0",
-    "compression-webpack-plugin": "patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch",
+    "compression-webpack-plugin": "^6.1.2",
     "core-js": "^3.30.2",
     "cross-env": "^7.0.3",
     "css-loader": "^5.2.7",
diff --git a/yarn.lock b/yarn.lock
index 764faff27a..abc2817039 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2354,7 +2354,7 @@ __metadata:
     classnames: "npm:^2.3.2"
     cocoon-js-vanilla: "npm:^1.3.0"
     color-blend: "npm:^4.0.0"
-    compression-webpack-plugin: "patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch"
+    compression-webpack-plugin: "npm:^6.1.2"
     core-js: "npm:^3.30.2"
     cross-env: "npm:^7.0.3"
     css-loader: "npm:^5.2.7"
@@ -5780,9 +5780,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compression-webpack-plugin@npm:6.1.1":
-  version: 6.1.1
-  resolution: "compression-webpack-plugin@npm:6.1.1"
+"compression-webpack-plugin@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "compression-webpack-plugin@npm:6.1.2"
   dependencies:
     cacache: "npm:^15.0.5"
     find-cache-dir: "npm:^3.3.1"
@@ -5791,22 +5791,7 @@ __metadata:
     webpack-sources: "npm:^1.4.3"
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 2f2ac6ba8f3cf48b523efc5d8e50e0172f4676f47bf5d62f2365185a6d37e96c2dc090e74f5f30ddf4be092e2400c5c7e1fb34301f3f939acf4c9944e1356525
-  languageName: node
-  linkType: hard
-
-"compression-webpack-plugin@patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch":
-  version: 6.1.1
-  resolution: "compression-webpack-plugin@patch:compression-webpack-plugin@npm%3A6.1.1#~/.yarn/patches/compression-webpack-plugin-npm-6.1.1-3a2a65987e.patch::version=6.1.1&hash=129d4d"
-  dependencies:
-    cacache: "npm:^15.0.5"
-    find-cache-dir: "npm:^3.3.1"
-    schema-utils: "npm:^3.0.0"
-    serialize-javascript: "npm:^5.0.1"
-    webpack-sources: "npm:^1.4.3"
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 68d130bcf7dcc3fd13a286dc57426640732593db4a2f326a4b159c7c32e856e2752e4d43e5f44dc42d07a0e477ad08c08d9aba029a958ad57e71f06deb42784f
+  checksum: 966b1417bbeaa55af8d4b7911cf4435a187adbaaff34d3e9f2ef2b7ff747877469ff965d5b653a2211eaecfd0ce8b3c834d3a8f5519aa15dd79e68bbfea0b69e
   languageName: node
   linkType: hard
 

From 1cba91d6d116f482d5dd052bd89adb76bf3aa41e Mon Sep 17 00:00:00 2001
From: Santiago Kozak <kozaksantiago@gmail.com>
Date: Fri, 29 Dec 2023 06:48:27 -0300
Subject: [PATCH 145/436] Fix reply icon display in picture-in-picture footer
 (#28519)

---
 .../mastodon/features/picture_in_picture/components/footer.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index 9b26e2d753..ed86d19f5c 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -179,7 +179,7 @@ class Footer extends ImmutablePureComponent {
 
     if (status.get('in_reply_to_id', null) === null) {
       replyIcon = 'reply';
-      replyIconComponent = RepeatIcon;
+      replyIconComponent = ReplyIcon;
       replyTitle = intl.formatMessage(messages.reply);
     } else {
       replyIcon = 'reply-all';

From f923eeb9b816e92b0c13038a021a5a1ba4766dfa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:11:02 +0100
Subject: [PATCH 146/436] Update dependency sass to v1.69.6 (#28517)

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

diff --git a/yarn.lock b/yarn.lock
index abc2817039..ff9af41afb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14495,15 +14495,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.69.5
-  resolution: "sass@npm:1.69.5"
+  version: 1.69.6
+  resolution: "sass@npm:1.69.6"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: a9003a9482f2e467fc412cfe58ba4fa14fb78bef7e1283ce5d64a065f8a31114ec3bbf5d4e724f94eb8512c32c768a6f91f228c7f16a26a300bbf4db293b5608
+  checksum: 8153db8e51e74a9007bb54332e14d122c34288c7d21a5f2eaefef753a1b7bb13f35e042dc6247253dab5b1550b05cea27970371e7548286b4f50f23dd1147d89
   languageName: node
   linkType: hard
 

From fb58397a331365086147c858a16f4b80b0ab5281 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:11:40 +0000
Subject: [PATCH 147/436] Update dependency axios to v1.6.3 (#28509)

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

diff --git a/yarn.lock b/yarn.lock
index ff9af41afb..ff7347a2cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4631,13 +4631,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.2
-  resolution: "axios@npm:1.6.2"
+  version: 1.6.3
+  resolution: "axios@npm:1.6.3"
   dependencies:
     follow-redirects: "npm:^1.15.0"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 9b77e030e85e4f9cbcba7bb52fbff67d6ce906c92d213e0bd932346a50140faf83733bf786f55bd58301bd92f9973885c7b87d6348023e10f7eaf286d0791a1d
+  checksum: dcc6d982353db33e6893ef01cdf81d0a0548dbd8fba0cb046dc4aee1a6a16226721faa4c2a13b2673d47130509629cdb93bb991b3a2bd4ef17a5ac27a8bba0da
   languageName: node
   linkType: hard
 

From 851a9b80c8e3b54a71c1655bb63b782ab763f420 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:12:13 +0100
Subject: [PATCH 148/436] Update dependency react-redux-loading-bar to v5.0.7
 (#28511)

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

diff --git a/yarn.lock b/yarn.lock
index ff7347a2cc..c323d1f699 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13614,8 +13614,8 @@ __metadata:
   linkType: hard
 
 "react-redux-loading-bar@npm:^5.0.4":
-  version: 5.0.5
-  resolution: "react-redux-loading-bar@npm:5.0.5"
+  version: 5.0.7
+  resolution: "react-redux-loading-bar@npm:5.0.7"
   dependencies:
     prop-types: "npm:^15.7.2"
     react-lifecycles-compat: "npm:^3.0.4"
@@ -13624,7 +13624,7 @@ __metadata:
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     redux: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 0dbac046c5b8b6bd209ccfc25ccc55dc9158cd737b42b68fd1900dfe46a59c9c7e2b0082d8901b749e7cf2d7e23074590aae74f350a814f205105f47895a6214
+  checksum: 45333093e7d28df923a657ad89ffe4673d7bd135ef57c0143fb4d868f21b57aeb9044691f553f7d2afbcc9080a1f8cd3cec5b274c80cb57faf0e87a70f7a2cce
   languageName: node
   linkType: hard
 

From 3f0140bbdf72d045cbf55bcd598a0f2d4a885ce4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:13:29 +0000
Subject: [PATCH 149/436] Update dependency webauthn to v3.1.0 (#28507)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b78ca733e..d78d49165d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -510,7 +510,7 @@ GEM
       validate_email
       validate_url
       webfinger (~> 1.2)
-    openssl (3.1.0)
+    openssl (3.2.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     orm_adapter (0.5.0)
@@ -797,7 +797,7 @@ GEM
       public_suffix
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.0.0)
+    webauthn (3.1.0)
       android_key_attestation (~> 0.3.0)
       awrence (~> 1.1)
       bindata (~> 2.4)

From 01df9f1abba4aea07c3934c4c075b1e91799cc13 Mon Sep 17 00:00:00 2001
From: Christian Winther <jippignu@gmail.com>
Date: Fri, 29 Dec 2023 11:15:10 +0100
Subject: [PATCH 150/436] install "wget" in streaming Dockerfile (#28497)

---
 streaming/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 6e0a84771c..241009fe89 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -69,6 +69,7 @@ RUN \
     ca-certificates \
     curl \
     tzdata \
+    wget \
   ;
 
 # Set /opt/mastodon as working directory
@@ -101,4 +102,4 @@ USER mastodon
 # Expose default Streaming ports
 EXPOSE 4000
 # Run streaming when started
-CMD [ node ./streaming/index.js ]
\ No newline at end of file
+CMD [ node ./streaming/index.js ]

From 87e9e87a146fce5fd38cbd2e97d4d0c2038220d7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:15:43 +0100
Subject: [PATCH 151/436] Update eslint (non-major) (#28494)

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

diff --git a/yarn.lock b/yarn.lock
index c323d1f699..18eab4fd07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2585,7 +2585,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pkgr/utils@npm:^2.3.1":
+"@pkgr/utils@npm:^2.4.2":
   version: 2.4.2
   resolution: "@pkgr/utils@npm:2.4.2"
   dependencies:
@@ -3669,14 +3669,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.14.0"
+  version: 6.16.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.14.0"
-    "@typescript-eslint/type-utils": "npm:6.14.0"
-    "@typescript-eslint/utils": "npm:6.14.0"
-    "@typescript-eslint/visitor-keys": "npm:6.14.0"
+    "@typescript-eslint/scope-manager": "npm:6.16.0"
+    "@typescript-eslint/type-utils": "npm:6.16.0"
+    "@typescript-eslint/utils": "npm:6.16.0"
+    "@typescript-eslint/visitor-keys": "npm:6.16.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3689,44 +3689,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 6360efb0e142ed91de5e9bddcd041f769feeedd256332733be08f7a74c8ae637cbfb78c6b85d747c73231bbb95cef95ed2d2854ab7d43aebfbedb3a191f447f1
+  checksum: c8a68e0953d8b94f6b85d3a82090e61e670bcb0945cbee4d741321c56db727429ad47c48b8403ad1dab3b0842689bd2d4b85c99b76c51ac4f5be7f5f61c4c314
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/parser@npm:6.14.0"
+  version: 6.16.0
+  resolution: "@typescript-eslint/parser@npm:6.16.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.14.0"
-    "@typescript-eslint/types": "npm:6.14.0"
-    "@typescript-eslint/typescript-estree": "npm:6.14.0"
-    "@typescript-eslint/visitor-keys": "npm:6.14.0"
+    "@typescript-eslint/scope-manager": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/typescript-estree": "npm:6.16.0"
+    "@typescript-eslint/visitor-keys": "npm:6.16.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 0344f7f640374e7e5a5b50e9c90fbd161611b3f455132e541ef9116eef7bd3acf364db64bd38d4b6b4fe148414494620c9df660f8ddce036019c38ae8e146585
+  checksum: 9d573d14df4ec661dccaca785223a8a330d64f50a9279ff9170b1da22198ff91b9afa3ee7d3d7127c0cbc148c86831e76b33fc5b47d630799e98940ef666bfe0
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.14.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.14.0"
+"@typescript-eslint/scope-manager@npm:6.16.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.16.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.14.0"
-    "@typescript-eslint/visitor-keys": "npm:6.14.0"
-  checksum: 8c59a215af3d7d24d8d0b21c28a858263de471650829f288a941e0eb8af8a054798da5c7594b7f39370219718270c18464b5edb96f451457e5f080a33ba57c2c
+    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+  checksum: 3b275e528d19f4f36c4acd6cb872b5f004175512dce30cef0ac7a9121bb23d21e5e0f4b62658dbfea2b15851e7fa930372696f25a6c87492f863171ab56f5364
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.14.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/type-utils@npm:6.14.0"
+"@typescript-eslint/type-utils@npm:6.16.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/type-utils@npm:6.16.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.14.0"
-    "@typescript-eslint/utils": "npm:6.14.0"
+    "@typescript-eslint/typescript-estree": "npm:6.16.0"
+    "@typescript-eslint/utils": "npm:6.16.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3734,59 +3734,60 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 836a6e84be5a245b07c76968c98e2f3bae064767dde720080fe8f33e226188510778dbca4199b7e42ef675ec3fd6d0ab522ec1c77d6e2a9b50e8e275fe7c72c9
+  checksum: a5339cc1375d12411fcb242249143b28401fb18890bb2a1cff5275ba946affb4a2066cd8203e83ac383bd9d791a79ea6ee1cbf7a30deed5c832ed002897bbf82
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.14.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/types@npm:6.14.0"
-  checksum: d59306a7a441982a4dcee7d775928fd5086aba9331f7a238f915723a0dc785df0e43af562a30a7c2f1b056a1e49fd64863a8d2450d31706193add0ade87334a4
+"@typescript-eslint/types@npm:6.16.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/types@npm:6.16.0"
+  checksum: 74d9a8b7fd1b85fd1824295c92bc2f506148e450c9897f65ddaa089091017df4e25676c5b098b75c8f00529b84492f303a6b1870bb0ffee83997081325891d53
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.14.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.14.0"
+"@typescript-eslint/typescript-estree@npm:6.16.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.14.0"
-    "@typescript-eslint/visitor-keys": "npm:6.14.0"
+    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/visitor-keys": "npm:6.16.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
     semver: "npm:^7.5.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 767c3309987b8ad053a2403605a9bd7c4eb3283dece864a741a7531a1c28eea4d85acaa4613141b64e194f9f6c4cbc5bc762c9b9f3a67c6202aa8cbb18b180d2
+  checksum: c7109e90b40b3c8f1042beb7f1a7a97eeba3b6a903acd82df4947900d68bd31d04b530a190c099666c5ca4886efc162de7b42de754a44b189e41237210797d9e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.14.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/utils@npm:6.14.0"
+"@typescript-eslint/utils@npm:6.16.0, @typescript-eslint/utils@npm:^6.5.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/utils@npm:6.16.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.14.0"
-    "@typescript-eslint/types": "npm:6.14.0"
-    "@typescript-eslint/typescript-estree": "npm:6.14.0"
+    "@typescript-eslint/scope-manager": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/typescript-estree": "npm:6.16.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 72689b2897b89e1bd1c71c1c2ae436d0ccfbcfffabf3be4378de74ad8138b2ecdbeeda7c1720e2f1754569e773f2fc7216f704335e1e56c38c7601ee1d190aeb
+  checksum: 586c4c0e1ca249daf9958f0d88df3af010a7592a19db1a7dc198754542b584314896536fe56ea9c93dd0ddd531154e7697002643d46e24a8d3a459721a626e91
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.14.0":
-  version: 6.14.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.14.0"
+"@typescript-eslint/visitor-keys@npm:6.16.0":
+  version: 6.16.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.16.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.14.0"
+    "@typescript-eslint/types": "npm:6.16.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 0e2363f9f1986ebdb41507c54a666fa1c336eb6beb383dc342a10844d3c42c89067b21c3f158851fa6f0825e1e451a5470b5454fde70a6fc33b4b0259462d954
+  checksum: 13c4d90355e288eac432d2845e37bb2acc03dab6d8568564558c1914a9aa44352f2a7ff29d0f50e0b3e68d66cca5f27b2732af5ff193b82571b4366309842880
   languageName: node
   linkType: hard
 
@@ -7406,21 +7407,22 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-prettier@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "eslint-plugin-prettier@npm:5.0.1"
+  version: 5.1.2
+  resolution: "eslint-plugin-prettier@npm:5.1.2"
   dependencies:
     prettier-linter-helpers: "npm:^1.0.0"
-    synckit: "npm:^0.8.5"
+    synckit: "npm:^0.8.6"
   peerDependencies:
     "@types/eslint": ">=8.0.0"
     eslint: ">=8.0.0"
+    eslint-config-prettier: "*"
     prettier: ">=3.0.0"
   peerDependenciesMeta:
     "@types/eslint":
       optional: true
     eslint-config-prettier:
       optional: true
-  checksum: 08e2c7bed93d9f7c86e9aa0bd4f5cc51f65233a446ddfda11e821f12819e1e4be62cfbc2a4e17169c76fded1c4de7371e37e5f2525e81695decaf6c652a41fb0
+  checksum: e16c9fbb0e9f8da45bdbb1cf6e4a190266235c3686deede3815196d2604bbe2bac531d1fc9adc3c0b9a03d88b55bd3bfaa4f9d85e34e73dc040d545a1931fab9
   languageName: node
   linkType: hard
 
@@ -11423,6 +11425,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:9.0.3, minimatch@npm:^9.0.1":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -11441,15 +11452,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
-  dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
-  languageName: node
-  linkType: hard
-
 "minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
@@ -15782,13 +15784,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.8.5":
-  version: 0.8.5
-  resolution: "synckit@npm:0.8.5"
+"synckit@npm:^0.8.6":
+  version: 0.8.6
+  resolution: "synckit@npm:0.8.6"
   dependencies:
-    "@pkgr/utils": "npm:^2.3.1"
-    tslib: "npm:^2.5.0"
-  checksum: 9827f828cabc404b3a147c38f824c8d5b846eb6f65189d965aa0b71ea8ecda5048f8f50b4bdfd8813148844175233cff56c6bc8d87a7118cf10707df870519f4
+    "@pkgr/utils": "npm:^2.4.2"
+    tslib: "npm:^2.6.2"
+  checksum: 200528062e3915a0190a4c6b1e01436fcfdf812e2e8d977746746f3998bb4182d758af760e51b06a64f8323e705735aff7b4b3efc4a0ab5f75eaccc044a8cfcc
   languageName: node
   linkType: hard
 
@@ -16126,7 +16128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0":
+"tslib@npm:2.6.2, tslib@npm:^2.4.0, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb

From 07ab97d7f9d9c5c77f75fd3d1d120cf47d79eaa3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:16:00 +0000
Subject: [PATCH 152/436] Update dependency rubocop-rails to v2.23.1 (#28493)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d78d49165d..68540e049c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -682,7 +682,7 @@ GEM
     rubocop-performance (1.20.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)

From de3fa293b07fc91272ad675e5f12fe4f051bfcd9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:16:26 +0100
Subject: [PATCH 153/436] Update dependency fastimage to v2.3.0 (#28488)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 68540e049c..ac186ab542 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -301,7 +301,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fast_blank (1.0.1)
-    fastimage (2.2.7)
+    fastimage (2.3.0)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)

From 3fbfc50f178bd04e794404f4552d98021b468693 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:17:31 +0100
Subject: [PATCH 154/436] Update dependency brakeman to v6.1.1 (#28487)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index ac186ab542..722e13d27b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,7 +175,8 @@ GEM
     blurhash (0.1.7)
     bootsnap (1.17.0)
       msgpack (~> 1.2)
-    brakeman (6.1.0)
+    brakeman (6.1.1)
+      racc
     browser (5.3.1)
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)

From f6f85b9521a84e3c07a84bf8eb4351e4430c2f45 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:19:41 +0100
Subject: [PATCH 155/436] Update dependency aws-sdk-s3 to v1.142.0 (#28479)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 722e13d27b..954a4fe35a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,16 +131,16 @@ GEM
     attr_required (1.0.1)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.860.0)
-    aws-sdk-core (3.189.0)
+    aws-partitions (1.873.0)
+    aws-sdk-core (3.190.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.74.0)
+    aws-sdk-kms (1.75.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.141.0)
+    aws-sdk-s3 (1.142.0)
       aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)

From b01a027543cc80176574ffd0af0ba96f6e3eca96 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:19:56 +0100
Subject: [PATCH 156/436] Update dependency tzinfo-data to v1.2023.4 (#28478)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 954a4fe35a..81b4e14beb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -783,7 +783,7 @@ GEM
       unf (~> 0.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
+    tzinfo-data (1.2023.4)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext

From 87bf85ffdd75a59d0c4527052d160b3e858e3777 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:20:34 +0100
Subject: [PATCH 157/436] Update dependency classnames to v2.5.0 (#28498)

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

diff --git a/yarn.lock b/yarn.lock
index 18eab4fd07..c0515de13f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5531,9 +5531,9 @@ __metadata:
   linkType: hard
 
 "classnames@npm:^2.2.5, classnames@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "classnames@npm:2.3.2"
-  checksum: cd50ead57b4f97436aaa9f9885c6926323efc7c2bea8e3d4eb10e4e972aa6a1cfca1c7a0e06f8a199ca7498d4339e30bb6002e589e61c9f21248cbf3e8b0b18d
+  version: 2.5.0
+  resolution: "classnames@npm:2.5.0"
+  checksum: f10a5b07db7fda8eb77f701f795b7006f3de86a723ec62cc10f4d82b4195fc65a578bbf91c47675b8c6fcb2921b903bfea5c670bdb43513e454daa6c2e9738b3
   languageName: node
   linkType: hard
 

From f7f7236fa235fd5541df164d847e1be18e58788b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 10:21:19 +0000
Subject: [PATCH 158/436] Update dependency ws to v8.16.0 (#28504)

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

diff --git a/yarn.lock b/yarn.lock
index c0515de13f..9cdeb1d7f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17496,8 +17496,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2":
-  version: 8.15.1
-  resolution: "ws@npm:8.15.1"
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -17506,7 +17506,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 9964360dd5ab35c7376bd7c4295a3c8bd44ea0838c9413742548a6fb3ec371fc6c18552d5b8e76bdc21536db1909765612815bae072674b5ec69971605395a96
+  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
   languageName: node
   linkType: hard
 

From 63901bb34babd4923546375d1fae42daa76dfd0d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:22:43 +0100
Subject: [PATCH 159/436] Update github/codeql-action action to v3 (#28495)

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

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 3b40c3fd07..6fb93b7fef 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -31,7 +31,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -57,6 +57,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: '/language:${{matrix.language}}'

From 128c5b7db3ce6eef59fb6f575514c45086bf6c53 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 29 Dec 2023 05:23:30 -0500
Subject: [PATCH 160/436] Fix `Performance/StringIdentifierArgument` cop
 (#28508)

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

diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index 6118e204a1..8382c91599 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -46,7 +46,7 @@ module Remotable
         public_send(:"download_#{attachment_name}!", url) if download_on_assign
       end
 
-      alias_method(:"reset_#{attachment_name}!", "download_#{attachment_name}!")
+      alias_method(:"reset_#{attachment_name}!", :"download_#{attachment_name}!")
     end
   end
 end

From 54ed01538e33874468bbdc768fcc80fcee302927 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:25:31 +0100
Subject: [PATCH 161/436] Update dependency core-js to v3.35.0 (#28518)

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

diff --git a/yarn.lock b/yarn.lock
index 9cdeb1d7f4..1baa0da058 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5914,9 +5914,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.34.0
-  resolution: "core-js@npm:3.34.0"
-  checksum: 408a77898abe03bf3e5dec2a451c36f4745081cca9022f8bdf9b817d57bb6d3a534d555f47a4b95e1daa5e21dbc79122eac2402e25720d425f5925127e55dcd8
+  version: 3.35.0
+  resolution: "core-js@npm:3.35.0"
+  checksum: 1d545ff4406f2afa5e681f44b45ed5f7f119d158b380234d5aa7787ce7e47fc7a635b98b74c28c766ba8191e3db8c2316ad6ab4ff1ddecbc3fd618413a52c29c
   languageName: node
   linkType: hard
 

From 5fd16c3ffd86e0eba436714a35e60015328472e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:27:37 +0100
Subject: [PATCH 162/436] Update dependency nokogiri to v1.16.0 (#28513)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 81b4e14beb..5acee3d753 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -482,7 +482,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)

From 7df9c4f6f3ae717a5b293ce36d4443f2a4d8492e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:39:10 +0100
Subject: [PATCH 163/436] New Crowdin Translations (automated) (#28481)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/bg.json      |   2 +
 app/javascript/mastodon/locales/ca.json      |   2 +-
 app/javascript/mastodon/locales/el.json      |   8 +
 app/javascript/mastodon/locales/eo.json      |  16 ++
 app/javascript/mastodon/locales/es-AR.json   |   4 +-
 app/javascript/mastodon/locales/et.json      |   2 +
 app/javascript/mastodon/locales/fa.json      |   4 +-
 app/javascript/mastodon/locales/fi.json      |   2 +-
 app/javascript/mastodon/locales/gl.json      |   2 +
 app/javascript/mastodon/locales/he.json      |   2 +-
 app/javascript/mastodon/locales/ie.json      |   8 +
 app/javascript/mastodon/locales/is.json      |   2 +
 app/javascript/mastodon/locales/kk.json      |   1 +
 app/javascript/mastodon/locales/ko.json      |   6 +-
 app/javascript/mastodon/locales/lad.json     |   3 +
 app/javascript/mastodon/locales/nn.json      |   3 +
 app/javascript/mastodon/locales/no.json      |   7 +-
 app/javascript/mastodon/locales/ru.json      |   2 +
 app/javascript/mastodon/locales/sk.json      |   4 +-
 app/javascript/mastodon/locales/sr-Latn.json |   2 +
 app/javascript/mastodon/locales/sr.json      |   1 +
 app/javascript/mastodon/locales/th.json      |   3 +-
 app/javascript/mastodon/locales/uk.json      |   1 +
 app/javascript/mastodon/locales/vi.json      |   2 +
 config/locales/activerecord.ie.yml           |  48 +++++
 config/locales/devise.ie.yml                 |  37 ++++
 config/locales/devise.ko.yml                 |   2 +-
 config/locales/doorkeeper.ie.yml             | 146 ++++++++++++++
 config/locales/eo.yml                        |  39 ++++
 config/locales/ie.yml                        | 188 ++++++++++++++++++-
 config/locales/lad.yml                       |  92 +++++++++
 config/locales/simple_form.fa.yml            |   2 +-
 config/locales/simple_form.ie.yml            | 112 +++++++++++
 config/locales/simple_form.lad.yml           |  34 ++++
 config/locales/sk.yml                        |  27 +++
 35 files changed, 800 insertions(+), 16 deletions(-)

diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 8a6d6040d6..7ee3c868ae 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Няма публикации",
   "account.featured_tags.title": "Главни хаштагове на {name}",
   "account.follow": "Последване",
+  "account.follow_back": "Последване взаимно",
   "account.followers": "Последователи",
   "account.followers.empty": "Още никой не следва потребителя.",
   "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Заглушаване на известията",
   "account.mute_short": "Заглушаване",
   "account.muted": "Заглушено",
+  "account.mutual": "Взаимни",
   "account.no_bio": "Няма представен опис.",
   "account.open_original_page": "Отваряне на първообразната страница",
   "account.posts": "Публикации",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 86f1fb4765..290b364a52 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "No hi ha tuts",
   "account.featured_tags.title": "etiquetes destacades de {name}",
   "account.follow": "Segueix",
-  "account.follow_back": "Segueix",
+  "account.follow_back": "Segueix tu també",
   "account.followers": "Seguidors",
   "account.followers.empty": "A aquest usuari encara no el segueix ningú.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} Seguidors}}",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 83a986ba4e..17a0c9d4da 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -17,9 +17,11 @@
   "account.badges.group": "Ομάδα",
   "account.block": "Αποκλεισμός @{name}",
   "account.block_domain": "Αποκλεισμός τομέα {domain}",
+  "account.block_short": "Αποκλεισμός",
   "account.blocked": "Αποκλεισμένος/η",
   "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ",
   "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης",
+  "account.copy": "Αντιγραφή συνδέσμου προφίλ",
   "account.direct": "Ιδιωτική αναφορά @{name}",
   "account.disable_notifications": "Σταμάτα να με ειδοποιείς όταν δημοσιεύει ο @{name}",
   "account.domain_blocked": "Ο τομέας αποκλείστηκε",
@@ -30,6 +32,7 @@
   "account.featured_tags.last_status_never": "Καμία ανάρτηση",
   "account.featured_tags.title": "προβεβλημένες ετικέτες του/της {name}",
   "account.follow": "Ακολούθησε",
+  "account.follow_back": "Ακολούθησε και εσύ",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.",
   "account.followers_counter": "{count, plural, one {{counter} Ακόλουθος} other {{counter} Ακόλουθοι}}",
@@ -47,7 +50,11 @@
   "account.mention": "Ανάφερε @{name}",
   "account.moved_to": "Ο/Η {name} έχει υποδείξει ότι ο νέος λογαριασμός του/της είναι τώρα:",
   "account.mute": "Σώπασε τον @{name}",
+  "account.mute_notifications_short": "Σίγαση ειδοποιήσεων",
+  "account.mute_short": "Σίγαση",
   "account.muted": "Αποσιωπημένος/η",
+  "account.mutual": "Αμοιβαίοι",
+  "account.no_bio": "Δεν υπάρχει περιγραφή.",
   "account.open_original_page": "Ανοικτό",
   "account.posts": "Τουτ",
   "account.posts_with_replies": "Τουτ και απαντήσεις",
@@ -63,6 +70,7 @@
   "account.unendorse": "Να μην παρέχεται στο προφίλ",
   "account.unfollow": "Άρση ακολούθησης",
   "account.unmute": "Διακοπή σίγασης @{name}",
+  "account.unmute_notifications_short": "Σίγαση ειδοποιήσεων",
   "account.unmute_short": "Κατάργηση σίγασης",
   "account_note.placeholder": "Κάνε κλικ για να προσθέσεις σημείωση",
   "admin.dashboard.daily_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά ημέρα",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 4daa699dcf..643329ba99 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Neniu afiŝo",
   "account.featured_tags.title": "Rekomendataj kradvortoj de {name}",
   "account.follow": "Sekvi",
+  "account.follow_back": "Sekvu reen",
   "account.followers": "Sekvantoj",
   "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.",
   "account.followers_counter": "{count, plural, one{{counter} Sekvanto} other {{counter} Sekvantoj}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silentigu Sciigojn",
   "account.mute_short": "Silentigu",
   "account.muted": "Silentigita",
+  "account.mutual": "Reciproka",
   "account.no_bio": "Neniu priskribo estas provizita.",
   "account.open_original_page": "Malfermi la originalan paĝon",
   "account.posts": "Afiŝoj",
@@ -509,6 +511,8 @@
   "onboarding.tips.2fa": "<strong>Ĉu vi scias?</strong> Vi povas sekurigi vian konton per efektivigi dufaktora autentigo en via kontoagordoj.",
   "onboarding.tips.accounts_from_other_servers": "<strong>Ĉu vi scias?</strong> Ĉar Mastodon estas sencentra, kelkaj profiloj kiujn vi trovi estas gastigitaj ĉe aliaj serviloj kiuj ne estas via.",
   "onboarding.tips.migration": "<strong>Ĉu vi scias?</strong> Se vi sentas ke {domain} ne estas bona servilelekto por vi en la estonteco, vi povas translokiĝi al alia servilo de Mastodon sen malgajni viajn sekvantojn.",
+  "onboarding.tips.verification": "<strong>Ĉu vi sciis?</strong> Vi povas kontroli vian konton metante ligilon al via Mastodon-profilo en via propra retejo kaj aldonante la retejon al via profilo. Neniuj kotizoj aŭ dokumentoj necesaj!",
+  "password_confirmation.exceeds_maxlength": "Pasvorto-konfirmo superas la maksimuman pasvortan longon",
   "password_confirmation.mismatching": "Pasvorto konfirmo ne kongruas",
   "picture_in_picture.restore": "Remetu ĝin",
   "poll.closed": "Finita",
@@ -532,6 +536,7 @@
   "privacy.unlisted.short": "Nelistigita",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
+  "recommended": "Rekomendita",
   "refresh": "Refreŝigu",
   "regeneration_indicator.label": "Ŝargado…",
   "regeneration_indicator.sublabel": "Via abonfluo estas preparata!",
@@ -549,6 +554,7 @@
   "reply_indicator.cancel": "Nuligi",
   "report.block": "Bloki",
   "report.block_explanation": "Vi ne vidos iliajn afiŝojn. Ili ne povos vidi viajn afiŝojn, nek sekvi vin. Ili ne scios, ke vi blokas ilin.",
+  "report.categories.legal": "Laŭleĝa",
   "report.categories.other": "Aliaj",
   "report.categories.spam": "Trudmesaĝo",
   "report.categories.violation": "Enhavo malobservas unu aŭ plurajn servilajn regulojn",
@@ -587,6 +593,7 @@
   "report.unfollow": "Malsekvi @{name}",
   "report.unfollow_explanation": "Vi sekvas ĉi tiun konton. Por ne plu vidi ĝiajn afiŝojn en via hejma templinio, ĉesu sekvi ĝin.",
   "report_notification.attached_statuses": "{count, plural, one {{count} afiŝo almetita} other {{count} afiŝoj almetitaj}}",
+  "report_notification.categories.legal": "Laŭleĝa",
   "report_notification.categories.other": "Alia",
   "report_notification.categories.spam": "Trudmesaĝo",
   "report_notification.categories.violation": "Malobservo de la regulo",
@@ -599,13 +606,19 @@
   "search.quick_action.open_url": "Malfermi URL en Mastodono",
   "search.quick_action.status_search": "Afiŝoj kiuj kongruas kun {x}",
   "search.search_or_paste": "Serĉu aŭ algluu URL-on",
+  "search_popout.full_text_search_disabled_message": "Ne havebla sur {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Disponebla nur kiam ensalutinte.",
+  "search_popout.language_code": "ISO-lingva kodo",
+  "search_popout.options": "Serĉaj opcioj",
   "search_popout.quick_actions": "Rapidaj agoj",
   "search_popout.recent": "Lastaj serĉoj",
+  "search_popout.specific_date": "specifa dato",
   "search_popout.user": "uzanto",
   "search_results.accounts": "Profiloj",
   "search_results.all": "Ĉiuj",
   "search_results.hashtags": "Kradvortoj",
   "search_results.nothing_found": "Povis trovi nenion por ĉi tiuj serĉaj terminoj",
+  "search_results.see_all": "Vidu ĉiujn",
   "search_results.statuses": "Afiŝoj",
   "search_results.title": "Serĉ-rezultoj por {q}",
   "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
@@ -616,6 +629,8 @@
   "server_banner.server_stats": "Statistikoj de la servilo:",
   "sign_in_banner.create_account": "Krei konton",
   "sign_in_banner.sign_in": "Saluti",
+  "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
+  "sign_in_banner.text": "Ensalutu por sekvi profilojn aŭ haŝetikedojn, ŝatatajn, dividi kaj respondi afiŝojn. Vi ankaŭ povas interagi de via konto sur alia servilo.",
   "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
   "status.admin_domain": "Malfermu moderigan interfacon por {domain}",
   "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
@@ -632,6 +647,7 @@
   "status.edited": "Redaktita {date}",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
   "status.embed": "Enkorpigi",
+  "status.favourite": "Ŝatata",
   "status.filter": "Filtri ĉi tiun afiŝon",
   "status.filtered": "Filtrita",
   "status.hide": "Kaŝi mesaĝon",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index eb6c0f3e4f..7c2e4f0d49 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "Sin mensajes",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
-  "account.follow_back": "Seguir también",
+  "account.follow_back": "Seguir",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificaciones",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
-  "account.mutual": "Mutuo",
+  "account.mutual": "Seguimiento mutuo",
   "account.no_bio": "Sin descripción provista.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Mensajes",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index c397334109..26657d402e 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Postitusi pole",
   "account.featured_tags.title": "{name} esiletõstetud sildid",
   "account.follow": "Jälgi",
+  "account.follow_back": "Jälgi vastu",
   "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}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Vaigista teavitused",
   "account.mute_short": "Vaigista",
   "account.muted": "Vaigistatud",
+  "account.mutual": "Ühine",
   "account.no_bio": "Kirjeldust pole lisatud.",
   "account.open_original_page": "Ava algne leht",
   "account.posts": "Postitused",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index a93d0f6617..9f3201ca78 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -13,7 +13,7 @@
   "about.rules": "قوانین کارساز",
   "account.account_note_header": "یادداشت",
   "account.add_or_remove_from_list": "افزودن یا برداشتن از سیاهه‌ها",
-  "account.badges.bot": "روبات",
+  "account.badges.bot": "خودکار",
   "account.badges.group": "گروه",
   "account.block": "انسداد ‎@{name}",
   "account.block_domain": "انسداد دامنهٔ {domain}",
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "بدون فرسته",
   "account.featured_tags.title": "برچسب‌های برگزیدهٔ {name}",
   "account.follow": "پی‌گرفتن",
+  "account.follow_back": "دنبال کردن متقابل",
   "account.followers": "پی‌گیرندگان",
   "account.followers.empty": "هنوز کسی پی‌گیر این کاربر نیست.",
   "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "خموشی آگاهی‌ها",
   "account.mute_short": "خموشی",
   "account.muted": "خموش",
+  "account.mutual": "دوطرفه",
   "account.no_bio": "شرحی فراهم نشده.",
   "account.open_original_page": "گشودن صفحهٔ اصلی",
   "account.posts": "فرسته",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index dab7eac1e9..004898651b 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -607,7 +607,7 @@
   "search.quick_action.status_search": "Julkaisut haulla {x}",
   "search.search_or_paste": "Hae tai liitä URL-osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Saatavilla vain sisäänkirjautuneena.",
+  "search_popout.full_text_search_logged_out_message": "Käytettävissä vain sisäänkirjautuneena.",
   "search_popout.language_code": "ISO-kielikoodi",
   "search_popout.options": "Hakuvalinnat",
   "search_popout.quick_actions": "Pikatoiminnot",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index bfd20a4673..48bbb6b307 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Sen publicacións",
   "account.featured_tags.title": "Cancelos destacados de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir tamén",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidora} other {{counter} Seguidoras}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificacións",
   "account.mute_short": "Acalar",
   "account.muted": "Acalada",
+  "account.mutual": "Mutuo",
   "account.no_bio": "Sen descrición.",
   "account.open_original_page": "Abrir páxina orixinal",
   "account.posts": "Publicacións",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 658e16b856..6758457273 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -32,7 +32,7 @@
   "account.featured_tags.last_status_never": "אין חצרוצים",
   "account.featured_tags.title": "התגיות המועדפות של {name}",
   "account.follow": "לעקוב",
-  "account.follow_back": "החזרת עוקב",
+  "account.follow_back": "לעקוב בחזרה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index a7cf1caab4..0344470edf 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Null postas",
   "account.featured_tags.title": "Recomandat hashtags de {name}",
   "account.follow": "Sequer",
+  "account.follow_back": "Sequer reciprocmen",
   "account.followers": "Sequitores",
   "account.followers.empty": "Ancor nequi seque ti-ci usator.",
   "account.followers_counter": "{count, plural, one {{counter} Sequitor} other {{counter} Sequitor}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silentiar notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiat",
+  "account.mutual": "Reciproc",
   "account.no_bio": "Null descrition providet.",
   "account.open_original_page": "Aperter li págine original",
   "account.posts": "Postas",
@@ -191,7 +193,9 @@
   "conversation.mark_as_read": "Marcar quam leet",
   "conversation.open": "Vider conversation",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiat al Paperiere",
   "copypaste.copied": "Copiat",
+  "copypaste.copy_to_clipboard": "Copiar al Paperiere",
   "directory.federated": "Del conosset fediverse",
   "directory.local": "De solmen {domain}",
   "directory.new_arrivals": "Nov arivantes",
@@ -280,6 +284,7 @@
   "footer.directory": "Profilarium",
   "footer.get_app": "Obtener li aplication",
   "footer.invite": "Invitar gente",
+  "footer.keyboard_shortcuts": "Rapid-tastes",
   "footer.privacy_policy": "Politica pri privatie",
   "footer.source_code": "Vider li fonte-code",
   "footer.status": "Statu",
@@ -342,7 +347,9 @@
   "keyboard_shortcuts.favourite": "Favoritisar posta",
   "keyboard_shortcuts.favourites": "Aperter li liste de favorites",
   "keyboard_shortcuts.federated": "Aperter li federat témpor-linea",
+  "keyboard_shortcuts.heading": "Rapid-tastes",
   "keyboard_shortcuts.home": "Aperter li hemal témpor-linea",
+  "keyboard_shortcuts.hotkey": "Rapid clave",
   "keyboard_shortcuts.local": "Aperter li local témpor-linea",
   "keyboard_shortcuts.mention": "Mentionar li autor",
   "keyboard_shortcuts.muted": "Aperter li lista de silentiat usatores",
@@ -599,6 +606,7 @@
   "search.search_or_paste": "Serchar o glutinar URL",
   "search_popout.full_text_search_disabled_message": "Ne disponibil che {domain}.",
   "search_popout.full_text_search_logged_out_message": "Solmen disponibil con session initiat.",
+  "search_popout.language_code": "Code de lingue ISO",
   "search_popout.options": "Sercha-parametres",
   "search_popout.quick_actions": "Rapid actiones",
   "search_popout.recent": "Recent serchas",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 46e83b4dbf..fb839503e9 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Engar færslur",
   "account.featured_tags.title": "Myllumerki hjá {name} með aukið vægi",
   "account.follow": "Fylgjast með",
+  "account.follow_back": "Fylgjast með til baka",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
   "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Þagga í tilkynningum",
   "account.mute_short": "Þagga niður",
   "account.muted": "Þaggaður",
+  "account.mutual": "Sameiginlegir",
   "account.no_bio": "Engri lýsingu útvegað.",
   "account.open_original_page": "Opna upprunalega síðu",
   "account.posts": "Færslur",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index e0e047ba14..97b1991803 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -17,6 +17,7 @@
   "account.badges.group": "Топ",
   "account.block": "@{name} дегенді бұғаттау",
   "account.block_domain": "{domain} доменін бұғаттау",
+  "account.block_short": "Бұғаттау",
   "account.blocked": "Бұғатталған",
   "account.browse_more_on_origin_server": "Бастапқы профильден шолу",
   "account.cancel_follow_request": "Withdraw follow request",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5746ab67a5..264781baa3 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -240,7 +240,7 @@
   "empty_column.follow_requests": "아직 팔로우 요청이 없습니다. 요청을 받았을 때 여기에 나타납니다.",
   "empty_column.followed_tags": "아직 아무 해시태그도 팔로우하고 있지 않습니다. 해시태그를 팔로우하면, 여기에 표시됩니다.",
   "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
-  "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람을 팔로우하여 채워보세요. {suggestions}",
+  "empty_column.home": "당신의 홈 타임라인은 비어있습니다! 더 많은 사람을 팔로우하여 채워보세요.",
   "empty_column.list": "리스트에 아직 아무것도 없습니다. 리스트의 누군가가 게시물을 올리면 여기에 나타납니다.",
   "empty_column.lists": "아직 리스트가 없습니다. 리스트를 만들면 여기에 나타납니다.",
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
@@ -659,7 +659,7 @@
   "status.media_hidden": "미디어 숨겨짐",
   "status.mention": "@{name} 님에게 멘션",
   "status.more": "자세히",
-  "status.mute": "@{name} 님을 뮤트하기",
+  "status.mute": "@{name} 뮤트",
   "status.mute_conversation": "이 대화를 뮤트",
   "status.open": "상세 정보 표시",
   "status.pin": "고정",
@@ -674,7 +674,7 @@
   "status.replied_to": "{name} 님에게",
   "status.reply": "답장",
   "status.replyAll": "글타래에 답장",
-  "status.report": "{name} 님을 신고하기",
+  "status.report": "@{name} 신고하기",
   "status.sensitive_warning": "민감한 내용",
   "status.share": "공유",
   "status.show_filter_reason": "그냥 표시하기",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index c54ed2a7e9..ce6cb56473 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -482,12 +482,14 @@
   "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
+  "onboarding.profile.lead": "Siempre puedes kompletar esto mas tadre en las preferensyas, ande tambien ay mas opsyones de personalizasyon.",
   "onboarding.profile.note": "Tu deskripsyon",
   "onboarding.profile.note_hint": "Puedes @enmentar a otra djente o #etiketas…",
   "onboarding.profile.save_and_continue": "Guadra i kontinua",
   "onboarding.profile.title": "Konfigurasyon de profil",
   "onboarding.profile.upload_avatar": "Karga imaje de profil",
   "onboarding.profile.upload_header": "Karga kavesera de profil",
+  "onboarding.share.lead": "Informe a otros komo toparte en Mastodon!",
   "onboarding.share.message": "Soy {username} en #Mastodon! Segidme en {url}",
   "onboarding.share.next_steps": "Posivles sigientes pasos:",
   "onboarding.share.title": "Partaja tu profil",
@@ -497,6 +499,7 @@
   "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
   "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
+  "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
   "picture_in_picture.restore": "Restora",
   "poll.closed": "Serrado",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3ef2f80eaf..e5b1d2b378 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -482,6 +482,7 @@
   "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.discoverable": "Gjør min profil synlig",
   "onboarding.profile.display_name": "Synleg namn",
   "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
   "onboarding.profile.lead": "Du kan alltid fullføra dette seinare i innstillingane, og der er det endå fleire tilpassingsalternativ.",
@@ -534,6 +535,7 @@
   "privacy.unlisted.short": "Uoppført",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
+  "recommended": "Anbefalt",
   "refresh": "Oppdater",
   "regeneration_indicator.label": "Lastar…",
   "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
@@ -604,6 +606,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.",
   "search_popout.language_code": "ISO-språkkode",
   "search_popout.options": "Søkjealternativ",
   "search_popout.quick_actions": "Hurtighandlinger",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 29eaeddff5..c0f50283ac 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Ingen Innlegg",
   "account.featured_tags.title": "{name} sine fremhevede emneknagger",
   "account.follow": "Følg",
+  "account.follow_back": "Følg tilbake",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne brukeren ennå.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Demp varsler",
   "account.mute_short": "Demp",
   "account.muted": "Dempet",
+  "account.mutual": "Gjensidig",
   "account.no_bio": "Ingen beskrivelse oppgitt.",
   "account.open_original_page": "Gå til originalsiden",
   "account.posts": "Innlegg",
@@ -66,7 +68,7 @@
   "account.unblock_domain": "Opphev blokkering av {domain}",
   "account.unblock_short": "Opphev blokkering",
   "account.unendorse": "Ikke vis frem på profilen",
-  "account.unfollow": "Avfølg",
+  "account.unfollow": "Slutt å følge",
   "account.unmute": "Opphev demping av @{name}",
   "account.unmute_notifications_short": "Opphev demping av varsler",
   "account.unmute_short": "Opphev demping",
@@ -480,6 +482,7 @@
   "onboarding.follows.empty": "Dessverre kan ingen resultater vises akkurat nå. Du kan prøve å bruke søk eller bla gjennom utforske-siden for å finne folk å følge, eller prøve igjen senere.",
   "onboarding.follows.lead": "Hjem-skjermen din er den viktigste måten å oppleve Mastodon på. Jo flere du følger, jo mer aktiv og interessant blir det. For å komme i gang, er her noen forslag:",
   "onboarding.follows.title": "Populært på Mastodon",
+  "onboarding.profile.discoverable": "Gjør min profil synlig",
   "onboarding.profile.display_name": "Visningsnavn",
   "onboarding.profile.display_name_hint": "Ditt fulle navn eller ditt morsomme navn…",
   "onboarding.profile.lead": "Du kan alltid fullføre dette senere i innstillingene, der enda flere tilpasningsalternativer er tilgjengelige.",
@@ -532,6 +535,7 @@
   "privacy.unlisted.short": "Uoppført",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
+  "recommended": "Anbefalt",
   "refresh": "Oppfrisk",
   "regeneration_indicator.label": "Laster…",
   "regeneration_indicator.sublabel": "Dine tidslinje blir gjort klar!",
@@ -602,6 +606,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikke tilgjengelig på {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.",
   "search_popout.language_code": "ISO språkkode",
   "search_popout.options": "Alternativer for søk",
   "search_popout.quick_actions": "Hurtighandlinger",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 37a8328c98..a8ff90cc00 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Нет постов",
   "account.featured_tags.title": "Избранные хэштеги {name}",
   "account.follow": "Подписаться",
+  "account.follow_back": "Подписаться в ответ",
   "account.followers": "Подписчики",
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
   "account.followers_counter": "{count, plural, one {{counter} подписчик} many {{counter} подписчиков} other {{counter} подписчика}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Отключить уведомления",
   "account.mute_short": "Немой",
   "account.muted": "Игнорируется",
+  "account.mutual": "Взаимно",
   "account.no_bio": "Описание не предоставлено.",
   "account.open_original_page": "Открыть исходную страницу",
   "account.posts": "Посты",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 02425d73e0..3e41a2035a 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -21,7 +21,7 @@
   "account.blocked": "Blokovaný/á",
   "account.browse_more_on_origin_server": "Prehľadávaj viac na pôvodnom profile",
   "account.cancel_follow_request": "Zruš žiadosť o sledovanie",
-  "account.copy": "Skopíruj odkaz pre profil",
+  "account.copy": "Skopíruj odkaz na profil",
   "account.direct": "Spomeň @{name} súkromne",
   "account.disable_notifications": "Prestaň mi oznamovať, keď má @{name} príspevky",
   "account.domain_blocked": "Doména skrytá",
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Žiadne príspevky",
   "account.featured_tags.title": "Odporúčané hashtagy používateľa {name}",
   "account.follow": "Sleduj",
+  "account.follow_back": "Nasleduj späť",
   "account.followers": "Sledovatelia",
   "account.followers.empty": "Tohto používateľa ešte nikto nenasleduje.",
   "account.followers_counter": "{count, plural, one {{counter} Sledujúci} few {{counter} Sledujúci} many {{counter} Sledujúcich} other {{counter} Sledujúcich}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Stíš oznámenia",
   "account.mute_short": "Stíš",
   "account.muted": "Stíšený",
+  "account.mutual": "Spoločné",
   "account.no_bio": "Nie je uvedený žiadny popis.",
   "account.open_original_page": "Otvor pôvodnú stránku",
   "account.posts": "Príspevky",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 59ad0ae84e..77c262e957 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Nema objava",
   "account.featured_tags.title": "Istaknute heš oznake korisnika {name}",
   "account.follow": "Prati",
+  "account.follow_back": "Uzvrati praćenje",
   "account.followers": "Pratioci",
   "account.followers.empty": "Još uvek niko ne prati ovog korisnika.",
   "account.followers_counter": "{count, plural, one {{counter} pratilac} few {{counter} pratioca} other {{counter} pratilaca}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Isključi obaveštenja",
   "account.mute_short": "Isključi",
   "account.muted": "Ignorisan",
+  "account.mutual": "Zajednički",
   "account.no_bio": "Nema opisa.",
   "account.open_original_page": "Otvori originalnu stranicu",
   "account.posts": "Objave",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 79786b8d44..85e7567bf4 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Нема објава",
   "account.featured_tags.title": "Истакнуте хеш ознаке корисника {name}",
   "account.follow": "Прати",
+  "account.follow_back": "Узврати праћење",
   "account.followers": "Пратиоци",
   "account.followers.empty": "Још увек нико не прати овог корисника.",
   "account.followers_counter": "{count, plural, one {{counter} пратилац} few {{counter} пратиоца} other {{counter} пратилаца}}",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index d14e37517d..b108e581a4 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -53,6 +53,7 @@
   "account.mute_notifications_short": "ซ่อนการแจ้งเตือน",
   "account.mute_short": "ซ่อน",
   "account.muted": "ซ่อนอยู่",
+  "account.mutual": "คนที่มีร่วมกัน",
   "account.no_bio": "ไม่ได้ให้คำอธิบาย",
   "account.open_original_page": "เปิดหน้าดั้งเดิม",
   "account.posts": "โพสต์",
@@ -203,7 +204,7 @@
   "disabled_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบัน",
   "dismissable_banner.community_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนที่บัญชีได้รับการโฮสต์โดย {domain}",
   "dismissable_banner.dismiss": "ปิด",
-  "dismissable_banner.explore_links": "นี่คือเรื่องข่าวที่ได้รับการแบ่งปันมากที่สุดในเว็บสังคมวันนี้ เรื่องข่าวที่ใหม่กว่าที่ได้รับการโพสต์โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
+  "dismissable_banner.explore_links": "นี่เป็นเรื่องข่าวที่ได้รับการแชร์มากที่สุดในเว็บสังคมวันนี้ เรื่องข่าวที่ใหม่กว่าที่มีคนโพสต์มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.explore_statuses": "นี่คือโพสต์จากทั่วทั้งเว็บสังคมที่กำลังได้รับความสนใจวันนี้ โพสต์ที่ใหม่กว่าที่มีการดันและรายการโปรดมากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.explore_tags": "นี่คือแฮชแท็กที่กำลังได้รับความสนใจในเว็บสังคมวันนี้ แฮชแท็กที่มีการใช้โดยผู้คนต่าง ๆ มากกว่าจะได้รับการจัดอันดับที่สูงกว่า",
   "dismissable_banner.public_timeline": "นี่คือโพสต์สาธารณะล่าสุดจากผู้คนในเว็บสังคมที่ผู้คนใน {domain} ติดตาม",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 92eacaad14..5ec0da599b 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Немає дописів",
   "account.featured_tags.title": "{name} виділяє хештеґи",
   "account.follow": "Підписатися",
+  "account.follow_back": "Підписатися взаємно",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
   "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписники}}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 721c7cd4ad..03c6502651 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Chưa có tút",
   "account.featured_tags.title": "Hashtag của {name}",
   "account.follow": "Theo dõi",
+  "account.follow_back": "Theo dõi lại",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
   "account.followers_counter": "{count, plural, one {{counter} Người theo dõi} other {{counter} Người theo dõi}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Ẩn thông báo",
   "account.mute_short": "Ẩn",
   "account.muted": "Đã ẩn",
+  "account.mutual": "Đang theo dõi nhau",
   "account.no_bio": "Chưa có miêu tả.",
   "account.open_original_page": "Mở trang gốc",
   "account.posts": "Tút",
diff --git a/config/locales/activerecord.ie.yml b/config/locales/activerecord.ie.yml
index 0c63299e04..588105ae96 100644
--- a/config/locales/activerecord.ie.yml
+++ b/config/locales/activerecord.ie.yml
@@ -6,4 +6,52 @@ ie:
         expires_at: Cludent date
         options: Optiones
       user:
+        agreement: Acorde de servicie
+        email: E-posta
+        locale: Local
         password: Passa-parol
+      user/account:
+        username: Nómine del usator
+      user/invite_request:
+        text: Rason
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              reserved: es reservat
+        admin/webhook:
+          attributes:
+            url:
+              invalid: ne es un valid URL
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: ne es un valid URL
+        import:
+          attributes:
+            data:
+              malformed: es malformat
+        status:
+          attributes:
+            reblog:
+              taken: de posta ja existe
+        user:
+          attributes:
+            email:
+              unreachable: sembla ne exister
+            role_id:
+              elevated: ne posse esser plu alt quam tui actual rol
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: include permissones ne secur por li rol de base
+              elevated: ne posse includer permissiones ne possedet de tui rol actual
+              own_role: ne posse esser changeat con tui actual rol
+            position:
+              elevated: ne posse esser plu alt quam tui actual rol
+              own_role: ne posse esser changeat con tui actual rol
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: ne posse includer evenimentes por queles tu ne have li yures
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 0cf0fbe1fe..847b0f361b 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -1,6 +1,8 @@
 ---
 ie:
   devise:
+    confirmations:
+      confirmed: Tui e-mail adresse ha esset confirmat successosimen.
     failure:
       already_authenticated: Tu ha ja intrat.
       inactive: Tui conto ancor ne ha esset activat.
@@ -13,13 +15,24 @@ ie:
       unauthenticated: Tu deve intrar o registrar te ante continuar.
       unconfirmed: Tu deve confirmar tui e-posta ante continuar.
     mailer:
+      confirmation_instructions:
+        action: Verificar e-posta
+        action_with_app: Confirma e retorna a%{app}
+        title: Verificar e-posta
       email_changed:
+        explanation: 'Li e-mail adresse de tui es changeat a:'
         extra: Si tu ne changeat tui email-adresse, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto.
+        subject: 'Mastodon: E-posta changeat'
+        title: Nov adresse de e-posta
       password_change:
         explanation: Li passa-parol de tui conto ha esset changeat.
         extra: Si tu ne changeat tui passa-parol, it es probabil que alqui ha ganiat accesse a tui conto. Ples changear tui passa-parol strax o contacter li administrator del servitor si tu ne posse intrar tui conto.
         subject: 'Mastodon: Passa-parol changeat'
         title: Passa-parol changeat
+      reconfirmation_instructions:
+        explanation: Confirmar li nov adresse por changeat tui e-posta.
+        subject: 'Mastodon: E-posta de confirmation por %{instance}'
+        title: Verificar e-posta
       reset_password_instructions:
         action: Changear passa-parol
         explanation: Tu demandat un nov passa-parol por tui conto.
@@ -28,6 +41,18 @@ ie:
         title: Reiniciar passa-parol
       two_factor_disabled:
         explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+        title: 2FA desvalidat
+      two_factor_enabled:
+        title: 2FA permisset
+      unlock_instructions:
+        subject: 'Mastodon: Desserral instructiones'
+      webauthn_credential:
+        added:
+          subject: 'Mastodon: Nov clave de securitá'
+          title: Un nov clave de securitá ha esset adjuntet
+      webauthn_disabled:
+        subject: 'Mastodon: Autentication con claves de securitá desactivisat'
+        title: Claves de securitá desactivisat
     omniauth_callbacks:
       failure: Ne posset autenticar te de %{kind} pro "%{reason}".
     passwords:
@@ -38,3 +63,15 @@ ie:
       updated_not_active: Tui passa-parol ha esset changeat successosimen.
     registrations:
       signed_up: Benevenit! Tu ha successat registrar te.
+      updated: Tui conto ha esset actualisat successosimen.
+    sessions:
+      already_signed_out: Exeat successosimen.
+      signed_in: Intrat successosimen.
+      signed_out: Exeat successosimen.
+  errors:
+    messages:
+      already_confirmed: esset ja confirmat, ples prova intrar
+      confirmation_period_expired: besona esser confirmat intra %{period}, ples demanda un nov
+      expired: ha expirat, ples demandar un nov
+      not_found: ne trovat
+      not_locked: ne esset serrat
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 3ab7c11a5c..65f660f105 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -2,7 +2,7 @@
 ko:
   devise:
     confirmations:
-      confirmed: 이메일이 성공적으로 승인 되었습니다.
+      confirmed: 이메일이 성공적으로 확인 되었습니다.
       send_instructions: 몇 분 이내로 확인 이메일이 발송 됩니다. 이메일을 받지 못 한 경우, 스팸 폴더를 확인하세요.
       send_paranoid_instructions: 이메일 주소가 저희 데이터베이스에 있는 경우, 몇 분 내에 이메일 주소를 확인하는 방법에 대한 안내가 포함된 이메일을 받을 수 있습니다. 이 이메일을 받지 못했다면 스팸 폴더를 확인해 주세요.
     failure:
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index 83c9cc564f..e5e5146558 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -1,11 +1,157 @@
 ---
 ie:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nómine de aplication
+        redirect_uri: URI de redirection
+        website: Situ web de aplication
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ne posse contener un fragment.
+              invalid_uri: deve esser un URI valid.
+              relative_uri: deve esser un URI absolut.
+              secured_uri: deve esser un URI de HTTPS/SSL.
   doorkeeper:
+    applications:
+      buttons:
+        authorize: Autorisar
+        cancel: Anullar
+        destroy: Destructer
+        edit: Redacter
+        submit: Submisser
+      confirmations:
+        destroy: Es tu cert?
+      edit:
+        title: Modificar aplication
+      help:
+        redirect_uri: Usar un linea per URI
+      index:
+        application: Aplication
+        delete: Deleter
+        empty: Tu have null aplicationes.
+        name: Nómine
+        new: Nov aplication
+        show: Monstrar
+        title: Tui aplicationes
+      new:
+        title: Nov aplication
+      show:
+        actions: Actiones
+        application_id: Clave de client
+        secret: Secrete de client
+        title: 'Aplication: %{name}'
+    authorizations:
+      buttons:
+        authorize: Autorisar
+        deny: Negar
+      error:
+        title: Alquo ha errat
+      new:
+        title: Autorisation besonat
+    authorized_applications:
+      buttons:
+        revoke: Revocar
+      confirmations:
+        revoke: Es tu cert?
+      index:
+        authorized_at: Autorisat ye %{date}
+        last_used_at: Ultimmen usat ye %{date}
+        never_used: Nequande usat
+        scopes: Permissiones
+        superapp: Intern
+        title: Tui autorisat aplicationes
+    errors:
+      messages:
+        invalid_client: Fallit autentification pro ínconosset client, manca de client-autentification, o ne subtenet metode de autentification.
+        invalid_redirect_uri: Li uri de redirection includet ne es valid.
+        invalid_request:
+          unknown: Li petition manca un postulat parametre, include un ne apoyat parametre-valore, o es altrimen mal format.
+        unsupported_grant_type: Li tip de autorisation concedet ne es subtenet per li autorisant servitor.
+        unsupported_response_type: Li autorisant servitor ne subtene ti-ci tip de response.
+    flash:
+      applications:
+        create:
+          notice: Aplication creat.
+        destroy:
+          notice: Aplication deletet.
+        update:
+          notice: Aplication actualisat.
+      authorized_applications:
+        destroy:
+          notice: Aplication revocat.
     grouped_scopes:
+      access:
+        read: Accesse solmen por leer
+        read/write: Accesse por leer e scrir
+        write: Accesse solmen por scrir
       title:
+        accounts: Contos
+        admin/accounts: Administration de contos
+        admin/all: Omni functiones administrativ
+        admin/reports: Administration de raportes
+        all: Plen accesse a tui conto Mastodon
+        blocks: Bloccas
+        bookmarks: Marcatores
+        conversations: Conversationes
+        favourites: Favorites
+        filters: Filtres
         follow: Seques, silentias e bloccas
+        follows: Seque
+        lists: Listes
+        media: Medie-atachamentes
         mutes: Silentias
+        notifications: Notificationes
+        push: Notificationes push
+        reports: Raportes
+        search: Serchar
+        statuses: Postas
+    layouts:
+      admin:
+        nav:
+          applications: Aplicationes
     scopes:
+      admin:read: leer li tot data sur li servitor
+      admin:read:accounts: leer sensitiv information de omni contos
+      admin:read:domain_allows: leer sensitiv information pri omni permisses de dominia
+      admin:read:domain_blocks: leer sensitiv information pri omni bloccas de dominia
+      admin:read:email_domain_blocks: leer sensitiv information pri omni bloccas de dominia basat sur e-posta
+      admin:read:ip_blocks: leer sensitiv information pri omni bloccas de IP
+      admin:read:reports: leer sensitiv information pri omni raportes e raportat contos
+      admin:write: modificar li tot data sur li servitor
+      admin:write:accounts: far moderatori actiones sur contos
+      admin:write:canonical_email_blocks: far moderatori actiones sur canonic bloccas de e-posta
+      admin:write:domain_allows: far actiones de moderation sur permisses de dominia
+      admin:write:domain_blocks: far actiones de moderation sur bloccas de dominia
+      admin:write:email_domain_blocks: far actiones de moderation sur bloccas de dominia basat sur e-posta
+      admin:write:ip_blocks: fa moderatori actiones sur bloccas de IP
+      admin:write:reports: far moderatori actiones sur raportes
+      follow: modifica li relationes del conto
+      read: lee omni datas de tui conto
+      read:accounts: vide li informationes pri li conto
+      read:blocks: vider tui bloccas
+      read:bookmarks: vider tui marcatores
+      read:favourites: vider tui favorites
+      read:filters: vider tui filtres
+      read:follows: vider tui sequitores
+      read:lists: vider tui listes
       read:mutes: vider tui silentias
+      read:notifications: vider tui notificationes
+      read:reports: vider tui raportes
+      read:search: serchar in tui nómine
+      read:statuses: vider omni postas
+      write: modificar li tot data de tui conto
+      write:accounts: modifica tui profile
+      write:blocks: bloccar contos e dominias
       write:conversations: silentiar e deleter conversationes
+      write:favourites: favorit postas
+      write:filters: crea filtres
+      write:follows: sequer homes
+      write:lists: crear listes
       write:mutes: silentiar persones e conversationes
+      write:notifications: aclarar tui notificationes
+      write:reports: raportar altri persones
+      write:statuses: publicar postas
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 9ae5953943..8a0033ee6a 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1260,11 +1260,20 @@ eo:
       overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
     preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
     success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite
+    titles:
+      following: Importado de sekvaj kontoj
+      lists: Importi listojn
+      muting: Importado de silentigitaj kontoj
+    type: Importi tipon
+    type_groups:
+      constructive: Sekvoj & Legosignoj
+      destructive: Blokas kaj silentigas
     types:
       blocking: Listo de blokitoj
       bookmarks: Legosignoj
       domain_blocking: Listo de blokitaj domajnoj
       following: Listo de sekvatoj
+      lists: Listoj
       muting: Listo de silentigitoj
     upload: Alŝuti
   invites:
@@ -1279,6 +1288,7 @@ eo:
       '86400': 1 tago
     expires_in_prompt: Neniam
     generate: Krei
+    invalid: Ĉi tiu invito ne validas
     invited_by: 'Vi estis invitita de:'
     max_uses:
       one: 1 uzo
@@ -1305,6 +1315,18 @@ eo:
     title: Aŭtentiga historio
   mail_subscriptions:
     unsubscribe:
+      action: Jes, malabonu
+      complete: Malabonita
+      confirmation_html: Ĉu vi certas, ke vi volas malaboni por ricevi %{type} por Mastodon ĉe %{domain} al via retpoŝto ĉe %{email}? Vi ĉiam povas reaboni de viaj <a href="%{settings_path}">retpoŝtaj sciigaj agordoj</a>.
+      emails:
+        notification_emails:
+          favourite: plej ŝatataj sciigaj retpoŝtoj
+          follow: sekvu sciigajn retmesaĝojn
+          follow_request: sekvu petajn retpoŝtojn
+          mention: menciu sciigajn retmesaĝojn
+          reblog: plifortigi sciigajn retpoŝtojn
+      resubscribe_html: Se vi malabonis erare, vi povas reaboni de viaj <a href="%{settings_path}">retpoŝtaj sciigaj agordoj</a>.
+      success_html: Vi ne plu ricevos %{type} por Mastodon sur %{domain} al via retpoŝto ĉe %{email}.
       title: Malaboni
   media_attachments:
     validations:
@@ -1385,6 +1407,7 @@ eo:
     update:
       subject: "%{name} redaktis afiŝon"
   notifications:
+    administration_emails: Admin retpoŝtaj sciigoj
     email_events: Eventoj por retpoŝtaj sciigoj
     email_events_hint: 'Elekti la eventojn pri kioj vi volas ricevi sciigojn:'
     other_settings: Aliaj agordoj de sciigoj
@@ -1421,6 +1444,7 @@ eo:
       expired: La enketo jam finiĝis
       invalid_choice: La elektita voĉdono ne ekzistas
       over_character_limit: ne povas esti po pli longa ol %{max} signoj
+      self_vote: Vi ne povas voĉdoni en viaj propraj balotenketoj
       too_few_options: devas enhavi pli da unu propono
       too_many_options: ne povas enhavi pli da %{max} proponoj
   preferences:
@@ -1428,7 +1452,14 @@ eo:
     posting_defaults: Afiŝaj defaŭltoj
     public_timelines: Publikaj templinioj
   privacy:
+    hint_html: "<strong>Agordu kiel vi volas ke via profilo kaj viaj afiŝoj estu trovitaj.</strong> Diversaj funkcioj en Mastodon povas helpi vin atingi pli larĝan publikon kiam ĝi estas ebligita. Prenu momenton por revizii ĉi tiujn agordojn por certigi, ke ili taŭgas por via uzokazo."
     privacy: Privateco
+    privacy_hint_html: Kontrolu kiom vi volas malkaŝi por la avantaĝo de aliaj. Homoj malkovras interesajn profilojn kaj bonegajn apojn foliumante la sekvaĵojn de aliaj homoj kaj vidante de kiuj aplikaĵoj ili afiŝas, sed vi eble preferas konservi ĝin kaŝita.
+    reach: Atingo
+    reach_hint_html: Kontrolu ĉu vi volas esti malkovrita kaj sekvita de novaj homoj. Ĉu vi volas ke viaj afiŝoj aperu sur la ekrano Esplori? Ĉu vi volas ke aliaj homoj vidu vin en siaj sekvaj rekomendoj? Ĉu vi volas akcepti ĉiujn novajn sekvantojn aŭtomate, aŭ havi granulan kontrolon pri ĉiu?
+    search: Serĉu
+    search_hint_html: Kontrolu kiel vi volas esti trovita. Ĉu vi volas, ke homoj trovu vin laŭ tio, pri kio vi publike afiŝis? Ĉu vi volas, ke homoj ekster Mastodonto trovu vian profilon dum serĉado en la reto? Bonvolu memori, ke totala ekskludo de ĉiuj serĉiloj ne povas esti garantiita por publika informo.
+    title: Privateco kaj atingo
   privacy_policy:
     title: Privateca politiko
   reactions:
@@ -1470,6 +1501,9 @@ eo:
     over_daily_limit: Vi transpasis la limigon al %{limit} samtage planitaj mesaĝoj
     over_total_limit: Vi transpasis la limigon al %{limit} planitaj mesaĝoj
     too_soon: La planita dato devas esti en la estonteco
+  self_destruct:
+    lead_html: Bedaŭrinde, <strong>%{domain}</strong> konstante fermiĝas. Se vi havis konton tie, vi ne povos daŭrigi uzi ĝin, sed vi ankoraŭ povas peti sekurkopion de viaj datumoj.
+    title: Ĉi tiu servilo fermiĝas
   sessions:
     activity: Lasta ago
     browser: Retumilo
@@ -1638,6 +1672,10 @@ eo:
       default: "%Y.%b.%d, %H:%M"
       month: "%b %Y"
       time: "%H:%M"
+  translation:
+    errors:
+      quota_exceeded: La tutservila uzkvoto por la tradukservo estas superita.
+      too_many_requests: Lastatempe estis tro multaj petoj al la tradukservo.
   two_factor_authentication:
     add: Aldoni
     disable: Malebligi 2FA-n
@@ -1717,6 +1755,7 @@ eo:
       title: Bonvenon, %{name}!
   users:
     follow_limit_reached: Vi ne povas sekvi pli ol %{limit} homo(j)
+    go_to_sso_account_settings: Iru al la agordoj de la konto de via identeca provizanto
     invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 6013923e3f..99e628fe3b 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -72,6 +72,7 @@ ie:
       enabled_msg: Successosimen desgelat li conto de %{username}
       followers: Sequitores
       follows: Seque
+      header: Cap-image
       inbox_url: Inbuxe URL
       invite_request_text: Rason por adhesion
       invited_by: Invitat de
@@ -118,6 +119,7 @@ ie:
       remote_suspension_irreversible: Li data de ti-ci conto ha esset deletet ínreversibilmen.
       remote_suspension_reversible_hint_html: Li conto ha esset suspendet che su servitor, e li data va esser completmen removet ye %{date}. Til tande, li lontan servitor posse restaurar ti conto sin quelcunc mal efectes. Si tu vole remover omni data del conto ínmediatmen, tu posse far it in infra.
       remove_avatar: Remover li avatar
+      remove_header: Remover cap-image
       removed_avatar_msg: Successosimen removet li avatar-image de %{username}
       removed_header_msg: Successosimen removet li cap-image de %{username}
       resend_confirmation:
@@ -287,6 +289,7 @@ ie:
       deleted_account: deletet conto
       filter_by_action: Filtrar per action
       filter_by_user: Filtrar per usator
+      title: Jurnale de audit
     announcements:
       destroyed_msg: Proclamation deletet successosimen!
       edit:
@@ -330,6 +333,7 @@ ie:
       no_emoji_selected: Null emoji esset changeat pro que null esset selectet
       not_permitted: Tu ne es permisset far ti action
       overwrite: Remplazzar
+      shortcode: Curt-code
       shortcode_hint: Adminim 2 carácteres, solmen lítteres, ciffres e sublineas
       title: Customisat emoji
       uncategorized: Íncategorisat
@@ -461,6 +465,9 @@ ie:
       unsuppress: Restaurar seque-recomandation
     instances:
       availability:
+        failures_recorded:
+          one: Fallit prova por %{count} die.
+          other: Fallit provas por %{count} dies.
         no_failures_recorded: Null fallimentes registrat.
         title: Disponibilitá
         warning: Li ultim prova conexer a ti servitor ha esset ínsuccessosi
@@ -485,6 +492,8 @@ ie:
         instance_followers_measure: nor sequitores ta
         instance_follows_measure: lor sequitores ci
         instance_languages_dimension: Max grand lingues
+        instance_media_attachments_measure: salvat medie-atachamentes
+        instance_reports_measure: raportes pri les
         instance_statuses_measure: salvat postas
       delivery:
         all: Omni
@@ -565,6 +574,7 @@ ie:
         notes:
           one: "%{count} nota"
           other: "%{count} notas"
+      action_log: Jurnale de audit
       action_taken_by: Action fat de
       actions:
         delete_description_html: Li raportat postas va esser deletet e un admoniment va esser registrat por auxiliar te escalar si hay futuri infractiones del sam conto.
@@ -670,26 +680,36 @@ ie:
         manage_announcements: Tractar proclamationes
         manage_announcements_description: Permisse usatores tractar proclamationes sur li servitor
         manage_appeals: Gerer Apelles
+        manage_appeals_description: Permisse que usatores inspecte apelles contra actiones de moderatores
         manage_blocks: Gerer Bloccas
         manage_blocks_description: Permisse que usatores blocca provisores de e-posta e IP-adresses
         manage_custom_emojis: Gerer Customisat Emojis
         manage_custom_emojis_description: Permisse que usatores gere customisat emojis sur li servitor
         manage_federation: Gerer Federation
-        manage_federation_description: Permisse que usatores sive blocca sive permisse federation con altri domenes, e controla liverabilitá
+        manage_federation_description: Permisse que usatores sive blocca sive permisse federation con altri dominias, e controla liverabilitá
         manage_invites: Gerer Invitationes
+        manage_invites_description: Permisse que usatores naviga e deactiva ligamentes de invitation
         manage_reports: Gerer Raportes
+        manage_reports_description: Permisse que usatores inspecte raportes e fa actiones de moderation contra les
         manage_roles: Gerer Roles
+        manage_roles_description: Permisse que usatores gere e assigna roles sub li lores
         manage_rules: Gerer Regules
         manage_rules_description: Permisse que usatores changea regules del servitor
         manage_settings: Gerer Parametres
         manage_settings_description: Permisse que usatores changea parametres del situ
         manage_taxonomies: Gerer Taxonomies
+        manage_taxonomies_description: Permisse que usatores inspecte contenete de tendentie e actualisar parametres de hashtags
         manage_user_access: Gerer Usator-Accesse
         manage_user_access_description: Permisse usatores desactivisar li 2-factor autentication de altri usatores, changear lor email-adresses, e reiniciar lor passa-paroles
         manage_users: Gerer usatores
-        manage_webhooks: Gerer Web-crocs
+        manage_users_description: Permisse que usatores vide detallies de altri usatores e fa actiones de moderation contra les
+        manage_webhooks: Gerer Webcrocs
+        view_audit_log: Vider li Jurnale de Audit
         view_audit_log_description: Permisse que usatores vide li historie de administrativ actiones sur li servitor
+        view_dashboard: Vider Panel de Control
+        view_dashboard_description: Permisse que usatores usa li panel de control e varie metricas
         view_devops: DevOps
+        view_devops_description: Permise que usatores usa paneles de control de Sidekiq e pgHero
       title: Roles
     rules:
       add_new: Adjunter un regule
@@ -704,6 +724,8 @@ ie:
       appearance:
         preamble: Customisar li interfacie web de Mastodon.
         title: Aspecte
+      content_retention:
+        title: Retention de contenete
       discovery:
         follow_recommendations: Seque-recomandationes
         preamble: Exposir interessant contenete es importantissim por incorporar nov usatores qui fórsan conosse nequi che Mastodon. Decider qualmen diferent utensiles de decovrition functiona che vor servitor.
@@ -740,6 +762,9 @@ ie:
       documentation_link: Aprender plu
       title: Actualisationes disponibil
       type: Specie
+      types:
+        major: Majori lansament
+        minor: Minori lansament
       version: Version
     statuses:
       account: Autor
@@ -781,16 +806,39 @@ ie:
     system_checks:
       database_schema_check:
         message_html: Hay pendent migrationes de database. Ples far les por far cert que li aplication functiona quam expectat
+      elasticsearch_health_red:
+        message_html: Li cluster Elasticsearch es ínsalubri (statu rubi), functiones por serchar ne disponibil
+      elasticsearch_health_yellow:
+        message_html: Li cluster Elasticsearch es ínsalubri (statu yelb); investigar li rason vell esser un bon idé
       elasticsearch_preset:
         action: Vider li documentation
+        message_html: Tui cluster Elasticsearch have plu quam un node, ma Mastodon ne es configurat por usar les.
       elasticsearch_preset_single_node:
         action: Vider li documentation
+        message_html: Tui cluster Elasticsearch have solmen un node, ples configurar <code>ES_PRESET</code> quam <code>single_node_cluster</code>.
+      elasticsearch_running_check:
+        message_html: Ne posset conexer a Elasticsearch. Ples confirmar que it ha esset executet, o desactivar serchada de plen textu
+      elasticsearch_version_check:
+        message_html: 'Version de Elasticsearch íncompatibil: %{value}'
+        version_comparison: Elasticsearch %{running_version} executet ma %{required_version} postulat
       rules_check:
         action: Gerer regules de servitor
+        message_html: Tu ancor ne ha definit quelcunc regules de servitor.
       software_version_critical_check:
+        action: Vider actualisationes disponibil
         message_html: Un critical actualisation por Mastodon es disposibil, ples actualisar tam rapidmen possibil.
       software_version_patch_check:
         action: Vider actualisationes disponibil
+        message_html: Un actualisation por Mastodon quel fixa problemas es disponibil.
+      upload_check_privacy_error:
+        action: Vider ci por plu information
+        message_html: "<strong>Vor web-servitor es misconfigurat. Li privatie de vor usatores es in risca.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Cliccar ci por plu information
+        message_html: "<strong>Vor inmagasinage de objectes es misconfigurat. Li privatie de vor usatores es in risca.</strong>"
+    tags:
+      review: Statu de revision
+      updated_msg: Parametres pri hashtags actualisat successosimen
     title: Administration
     trends:
       allow: Permisser
@@ -805,9 +853,13 @@ ie:
         no_link_selected: Null ligamentes esset changeat pro que null esset selectet
         publishers:
           no_publisher_selected: Null editores esset changeat pro que necun esset selectet
+        shared_by_over_week:
+          one: Partit de un person durant li ultim semane
+          other: Partit de %{count} persones durant li ultim semane
         title: Ligamentes in tendentie
         usage_comparison: Partit %{today} vezes hodie, in comparation a %{yesterday} yer
       not_allowed_to_trend: Ne permisset esser in tendentie
+      only_allowed: Solmen li permissetes
       pending_review: Sub inspection
       preview_card_providers:
         allowed: Ligamentes de ti-ci editor posse esser in tendentie
@@ -859,10 +911,50 @@ ie:
       empty: Vu ancor ha definit null prefigurationes de avise.
       title: Modificar prefigurationes de avise
     webhooks:
+      add_new: Adjunter punctu terminal
+      delete: Deleter
+      disable: Desactivisar
+      disabled: Desactivisat
+      edit: Redacter punctu terminal
+      empty: Tu ancor ne have quelcunc configurat punctus terminal por webcrocs.
+      enable: Activisar
       enabled: Activ
+      enabled_events:
+        one: 1 eveniment activisat
+        other: "%{count} evenimentes activisat"
       events: Evenimentes
+      new: Nov webcroc
+      rotate_secret: Rotar secrete
+      secret: Secrete de signation
       status: Statu
+      title: Webcrocs
+      webhook: Webcroc
   admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: deleter su postas
+        disable: gelar su conto
+        mark_statuses_as_sensitive: marcar su postas quam sensitiv
+        none: un admoniment
+        sensitive: marcar su conto quam sensitiv
+        silence: limitar su conto
+        suspend: suspender su conto
+      body: "%{target} apella un moderatori decision fat de %{action_taken_by} ye %{date}, quel esset %{type}. Ilu scrit:"
+      next_steps: Tu posse aprobar li apelle por desfar li decision moderatori, o ignorar it.
+      subject: "%{username} apella un moderatori decision che %{instance}"
+    new_critical_software_updates:
+      body: Nov critic versiones de Mastodon ha esset lansat, vu fórsan vole actualisar tam tost quam es possibil!
+      subject: Critic actualisationes por Mastodon es disponibil por %{instance}!
+    new_pending_account:
+      body: Li detallies del nov conto es in-infra. Vu posse aprobar o rejecter ti aplication.
+      subject: Nov conto por tractation che %{instance} (%{username})
+    new_report:
+      body: "%{reporter} ha raportet %{target}"
+      body_remote: Alqui de %{domain} ha raportet %{target}
+      subject: Nov raporte por %{instance} (#%{id})
+    new_software_updates:
+      body: Nov versiones de Mastodon ha esset lansat, vu fórsan vole actualisar!
+      subject: Nov versiones Mastodon es disponibil por %{instance}!
     new_trends:
       new_trending_links:
         title: Populari ligamentes
@@ -1284,10 +1376,45 @@ ie:
       images_and_video: On ne posse atachar un video a un posta quel ja contene images
   migrations:
     acct: Translocat a
+    cancel: Anullar redirection
+    cancelled_msg: Anullat redirection con successe.
+    errors:
+      already_moved: es li sam conto a equel tu ha ja translocat
+      missing_also_known_as: ne es un alias de ti-ci conto
+      move_to_self: ne posse esser li conto actual
+      not_found: ne posset esser trovat
+    followers_count: Sequitores al témpor de translocation
+    incoming_migrations: Translocant de un conto diferent
+    on_cooldown: Tu ha recentmen migrat tui conto. Ti function va esser disponibil denov pos %{count} dies.
+    past_migrations: Passat migrationes
+    proceed_with_move: Translocar sequitores
+    redirected_msg: Tui conto nu have un redirection a %{acct}.
+    redirecting_to: Tui conto redirecte a %{acct}.
     set_redirect: Configurar un redirection
+    warning:
+      backreference_required: Li nov conto deve in prim esser configurat por retroreferentiar ti-ci conto
+      before: 'Ante proceder, ples leer ti notas cuidosimen:'
+      other_data: Necun altri data va esser translocat automaticmen
+  moderation:
+    title: Moderation
   move_handler:
+    carry_blocks_over_text: Ti usator translocat se de %{acct}, quel tu hat bloccat.
     carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat.
+    copy_account_note_text: 'Vi tui notas pri ti usator qui translocat se de %{acct}:'
   notification_mailer:
+    admin:
+      report:
+        subject: "%{name} inviat un raporte"
+      sign_up:
+        subject: "%{name} adheret"
+    favourite:
+      body: 'Tui posta esset favoritisat de %{name}:'
+      subject: "%{name} favoritisat tui posta"
+      title: Nov favoritisation
+    follow:
+      body: "%{name} nu seque te!"
+      subject: "%{name} nu seque te"
+      title: Nov sequitor
     follow_request:
       action: Tractar petitiones de sequer
       body: "%{name} ha petit sequer te"
@@ -1295,6 +1422,8 @@ ie:
       title: Nov petition de sequer
     mention:
       action: Responder
+      body: 'Tu esset mentionat de %{name} in:'
+      subject: Tu esset mentionat de %{name}
       title: Nov mention
     poll:
       subject: Un balotation de %{name} ha finit
@@ -1346,6 +1475,7 @@ ie:
       too_many_options: ne posse contener plu quam %{max} optiones
   preferences:
     other: Altri
+    posting_defaults: Predefinitiones por postar
     public_timelines: Public témpor-lineas
   privacy:
     hint_html: "<strong>Customisa qualmen tu vole que tui profil e tui postas posse esser trovat.</strong> Mastodon have un varietá de manieres por auxiliar te atinger un auditorie plu grand quande activisat. Prende un moment por reviser ti parametres por far cert que ili concorda tui casu de usation."
@@ -1383,6 +1513,11 @@ ie:
     remove_selected_followers: Remover selectet sequitores
     remove_selected_follows: Dessequer selectet usatores
     status: Statu del conto
+  remote_follow:
+    missing_resource: Ne posset trovar li besonat URL de redirection por tui conto
+  reports:
+    errors:
+      invalid_rules: ne refere valid regules
   rss:
     content_warning: 'Avise pri li contenete:'
     descriptions:
@@ -1476,9 +1611,16 @@ ie:
         one: "%{count} video"
         other: "%{count} videos"
     boosted_from_html: Boostat de %{acct_link}
+    content_warning: 'Avise de contenete: %{warning}'
     default_language: Sam quam li lingue del interfacie
+    disallowed_hashtags:
+      one: 'contenet un ínpermisset hashtag: %{tags}'
+      other: 'contenet li ínpermisset hashtags: %{tags}'
     edited_at_html: Modificat ye %{date}
+    errors:
+      in_reply_not_found: Li posta a quel tu prova responder ne sembla exister.
     open_in_web: Aperter in web
+    over_character_limit: límite de carácteres de %{max} transpassat
     pin_errors:
       direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores
       limit: Tu ja ha pinglat li maxim númere de postas
@@ -1495,8 +1637,11 @@ ie:
     show_more: Monstrar plu
     show_newer: Monstrar plu nov
     show_older: Monstrar plu old
+    show_thread: Monstrar fil
     title: "%{name}: «%{quote}»"
     visibilities:
+      direct: Direct
+      private: Solmen por sequitores
       private_long: Monstrar solmen a sequitores
       public: Public
       public_long: Omnes posse vider
@@ -1508,17 +1653,37 @@ ie:
     exceptions: Exceptiones
     explanation: Deletion de postas es un operation expensiv, e pro to es efectuat lentmen quande li servitor ne es ocupat. Pro to, on posse deleter tui postas un cert témpor pos atinger un cert etá.
     ignore_favs: Ignorar favorites
+    ignore_reblogs: Ignorar boosts
     interaction_exceptions: Exceptiones basat sur interactiones
+    interaction_exceptions_explanation: Nota que it ne es garantit que un posta va esser deletet si su númere de favoritisationes o boosts descresce sub li sill pos que it ha esset súper it.
     keep_direct: Retener missages direct
     keep_direct_hint: Ne delete quelcunc de tui direct missages
+    keep_media: Conservar postas con medie-atachamentes
+    keep_media_hint: Ne delete quelcunc de tui postas quel have medie-atachamentes
     keep_pinned: Conservar pinglat postas
     keep_pinned_hint: Delete null de tui pinglat postas
     keep_polls: Conservar balotationes
     keep_polls_hint: Delete null de tui balotationes
+    keep_self_bookmark: Conservar postas queles tu ha marcat
+    keep_self_bookmark_hint: Ne delete tui propri postas si tu ha marcat les
     keep_self_fav: Retener postas favorit de te
+    keep_self_fav_hint: Ne delete tui propri postas si tu ha favoritisat les
     min_age:
       '1209600': 2 semanes
+      '15778476': 6 mensus
+      '2629746': 1 mensu
       '31556952': 1 annu
+      '5259492': 2 mensus
+      '604800': 1 semane
+      '63113904': 2 annus
+      '7889238': 3 mensus
+    min_age_label: Sill de etá
+    min_favs: Conservar postas favoritisat adminim
+    min_favs_hint: Ne delete quelcunc de tui postas quel ha recivet adminim ti-ci númere de favoritisationes. Lassar vacui por deleter postas sin egard a su númere de favoritisationes
+    min_reblogs: Conservar postas boostat adminim
+    min_reblogs_hint: Ne delete quelcunc de tui postas quel ha recivet adminim ti-ci númere de boosts. Lassar vacui por deleter postas sin egard a su númere de boosts
+  stream_entries:
+    sensitive_content: Sensitiv contenete
   strikes:
     errors:
       too_late: It es tro tard por apellar ti admoniment
@@ -1595,22 +1760,37 @@ ie:
         mark_statuses_as_sensitive: Tui postas che %{acct} ha esset marcat quam sensitiv
         none: Admoniment por %{acct}
         sensitive: Tui postas che %{acct} ve esser marcat quam sensitiv pos nu
+        silence: Tui conto %{acct} ha esset limitat
+        suspend: Tui conto %{acct} ha esset suspendet
       title:
         delete_statuses: Postas efaciat
+        disable: Conto gelat
+        mark_statuses_as_sensitive: Postas marcat quam sensitiv
+        none: Admoniment
         sensitive: Conto marcat quam sensitiv
         silence: Conto limitat
         suspend: Conto suspendet
     welcome:
       edit_profile_action: Configuration de profil
+      edit_profile_step: Tu posse personalisar tui profil por cargar un profil-image, changear tui monstrat nómine e plu. Tu posse optar tractar nov sequitores ante que ili es permisset sequer te.
       explanation: Vi quelc suggestiones por que tu mey comensar
       final_action: Comensar postar
+      final_step: 'Comensa a postar! Mem sin sequitores, tui public postas posse esser videt de altres, per exemple in li local témpor-linea o in hashtags. Tu fórsan vole introducter te per li hashtag #introductions.'
+      full_handle: Tui plen usator-nómine
+      full_handle_hint: Ti-ci es ti quel tu vell dir a tui amics por que ili mey inviar missages a te o sequer te de un altri servitor.
       subject: Benevenit a Mastodon
       title: Benevenit, %{name}!
   users:
+    follow_limit_reached: Tu ne posse sequer plu quam %{limit} persones
+    go_to_sso_account_settings: Ear al parametres de conto de tui provisor de identification
+    invalid_otp_token: Ínvalid 2-factor code
+    otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email}
     seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
+    signed_in_as: 'Session apertet quam:'
   verification:
     extra_instructions_html: '<strong>Nota</strong>: Li ligament in tui websitu posse esser ínvisibil. Li important parte es <code>rel="me"</code> quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un <code>link</code> element in li cap-section del págine vice <code>a</code>, ma li HTML code deve esser accessibil sin executer JavaScript.'
     here_is_how: Vide qualmen
+    instructions_html: Copiar e collar li code ci infra in li HTML de tui web-situ. Poy adjunter li adresse de tui web-situ ad-in un del aditional campes sur tui profil ex li section "Modificar profil" e salvar li changes.
     verification: Verification
     verified_links: Tui verificat ligamentes
   webauthn_credentials:
@@ -1620,3 +1800,7 @@ ie:
       success: Tui clave de securitá esset adjuntet con successe.
     delete: Deleter
     delete_confirmation: Vole tu vermen deleter ti-ci clave de securitá?
+    invalid_credential: Ínvalid clave de securitá
+    not_enabled: Tu ancor ne ha possibilisat WebAuthn
+    not_supported: Ti-ci navigator ne subtene claves de securitá
+    registered_on: Adheret ye %{date}
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 471b830a3e..5c541d9f99 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -333,6 +333,7 @@ lad:
       not_permitted: No tienes permiso para realizar esta aksyon
       overwrite: Sobreskrive
       shortcode: Kodiche kurto
+      shortcode_hint: Al menos 2 karakteres, solo karakteres alfanumerikos i sulinyados
       title: Emojis personalizados
       uncategorized: No kategorizado
       unlist: No lista
@@ -525,6 +526,7 @@ lad:
       total_reported: Raportos sovre eyos
       total_storage: Aneksos de multimedia
       totals_time_period_hint_html: Los totales amostrados a kontinuasyon inkluyen datos para todo el tiempo.
+      unknown_instance: Por agora no ay dingun rejistro en este domeno en este sirvidor.
     invites:
       deactivate_all: Dezaktiva todos
       filter:
@@ -705,27 +707,41 @@ lad:
         manage_users: Administra utilizadores
         manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
         manage_webhooks: Administrar webhooks
+        view_audit_log: Mostra defter de revisyon
+        view_audit_log_description: Permete a los utilizadores ver una estoria de aksyones administrativas en el sirvidor
         view_dashboard: Ve pano
+        view_dashboard_description: Permete a los utilizadores akseder al panel de kontrolo i varias metrikas
         view_devops: DevOps
+        view_devops_description: Permete a los utilizadores akseder a los paneles de kontrolo Sidekiq i pgHero
       title: Rolos
     rules:
       add_new: Adjusta regla
       delete: Efasa
+      description_html: Aunke la majorita afirma aver meldado i estar de akodro kon los terminos de servisyo, la djente normalmente no los melda asta dempues de ke surja algun problema. <strong>Az ke sea mas kolay ver las normas de tu sirvidor de un vistazo estipulándolas en una lista de puntos.</strong> Aprova ke kada norma sea corta i kolay, ama sin estar divididas en munchos puntos.
       edit: Edita regla
+      empty: Dinguna regla del sirvidor tiene sido definida.
       title: Reglas del sirvidor
     settings:
       about:
         manage_rules: Administra reglas del sirvidor
+        preamble: Mete aki enformasyon detalyada sovre komo el sirvidor es operado, moderado i finansyado.
+        rules_hint: Ay una area dedikada para las reglas a las ke se aspera ke tus utilizadores sigan.
         title: Sovre esto
       appearance:
         preamble: Personaliza la enterfaz web de Mastodon.
         title: Aparensya
       branding:
+        preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza.
         title: Marka
       content_retention:
+        preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
         title: Retensyon de kontenido
+      default_noindex:
+        desc_html: Afekta a todos los utilizadores ke no trokaron esta preferensya eyos mezmos
+        title: Ekskluye utilizadores de la indeksasyon de los bushkadores komo preferensya predeterminada
       discovery:
         follow_recommendations: Rekomendasyones de kuentos
+        preamble: Ekspone kontenido enteresante a la superfisie es fundamental para inkorporar muevos utilizadores ke pueden no koneser a dinguno Mastodon. Kontrola komo fonksionan varias opsiones de diskuvrimiento en tu sirvidor.
         profile_directory: Katalogo de profiles
         public_timelines: Linyas de tiempo publikas
         publish_discovered_servers: Publika sirvidores diskuviertos
@@ -816,6 +832,7 @@ lad:
       software_version_patch_check:
         action: Amostra aktualizasyones desponivles
       upload_check_privacy_error:
+        action: Klika aki para mas enformasyon
         message_html: "<strong>Tu sirvidor de web es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
       upload_check_privacy_error_object_storage:
         action: Ve aki para mas enformasyon
@@ -837,6 +854,9 @@ lad:
         no_link_selected: No se troko dingun atadijo porke no eskojites dinguno
         publishers:
           no_publisher_selected: No se troko dingun publikador porke no eskojites dinguno
+        shared_by_over_week:
+          one: Partajado por una persona durante la ultima semana
+          other: Partajado por %{count} personas durante la ultima semana
         title: Atadijos en trend
         usage_comparison: Partajado %{today} vezes oy, komparado kon %{yesterday} ayer
       not_allowed_to_trend: Sin permiso para estar en trendes
@@ -874,6 +894,7 @@ lad:
         not_listable: No seran rekomendadas
         not_trendable: No aperesera en trendes
         not_usable: No se pueden uzar
+        peaked_on_and_decaying: Alkanso el piko en %{date}, agora dekresiendo
         title: Etiketas en trend
         trendable: Pueden apareser en trendes
         trending_rank: Trend n.º %{rank}
@@ -943,16 +964,23 @@ lad:
         title: Publikasyones en trend
       new_trending_tags:
         title: Etiketas en trend
+      subject: Muevo trend para revizion en %{instance}
   aliases:
     add_new: Kriya un alias
+    created_msg: Tienes kriyado djustamente el muevo alias. Agora puedes ampesar la movida dizde el kuento viejo.
+    deleted_msg: El alias fue supremido djustamente. La movida de akel kuento a esta ya no sera posivle.
     empty: No tienes aliases.
+    hint_html: Si keres migrar de otro kuento a este, aki puedes kriyar un alias, kale proseder antes de ampesar a mover suivantes del kuento anterior a este. Esta aksion por si mezma es <strong>inofensiva i reversivle</strong>. <strong>La migrasyon del kuento se inisya dizde el kuento viejo</strong>.
     remove: Dezata alias
   appearance:
     advanced_web_interface: Enterfaz web avanzada
+    advanced_web_interface_hint: 'Si keres utilizar todo el ancho de ekran, la enterfaz web avanzada te permete konfigurar varias kolumnas desferentes para ver tanta enformasyon al mezmo tiempo komo keras: Linya prinsipala, avizos, linya de tiempo federada, kualkier numero de listas i etiketas.'
     animations_and_accessibility: Animasyones i aksesivilita
     confirmation_dialogs: Dialogos de konfirmasyon
     discovery: Diskuvrimiento
     localization:
+      body: Mastodon es trezladado por volontarios.
+      guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Todos pueden kontribuir.
     sensitive_content: Kontenido sensivle
   application_mailer:
@@ -1067,15 +1095,27 @@ lad:
       x_months: "%{count} me"
       x_seconds: "%{count} s"
   deletes:
+    challenge_not_passed: Los datos introdusidos son yerrados
+    confirm_password: Eskrive tu kod aktual para demostrar tu identita
+    confirm_username: Eskrive tu nombre de utilizador para konfirmar
     proceed: Efasa kuento
     success_msg: Tu kuento fue efasado kon reusho
     warning:
       before: 'Antes de kontinuar, por favor melda kon atensyon las sigientes notas:'
+      caches: El kontenido ke tiene sido magazinado en kashe por otros sirvidores puede persistir
+      data_removal: Tus publikasyones i el resto de datos se supremiran definitivamente
+      email_change_html: Puedes <a href="%{path}"> trokar tu adreso de posta elektronika</a> sin supremir tu kuento
+      email_contact_html: Si ainda no te tiene parvenido, puedes eskrivir a <a href="mailto:%{email}">%{email}</a> para pider ayuda
+      email_reconfirmation_html: Si no te tiene parvenido la posta de konfirmasyon, puedes <a href="%{path}"> retornar a solisitarlo</a>
+      irreversible: No podras restaurar ni reaktivar tu kuento
+      more_details_html: Para mas detalyos, ver <a href="%{terms_path}"> la politika de privasita</a>.
+      username_available: Tu nombre de utilizador retornara a estar desponivle
       username_unavailable: Tu nombre de utilizador no estara desponivle
   disputes:
     strikes:
       action_taken: Aksyon tomada
       appeal: Apela
+      appeal_approved: Este amonestamiento fue apelado kon sukseso i ya no es valido
       appeal_rejected: La apelasyon fue refuzada
       appeal_submitted_at: Apelasyon embiada
       appealed_msg: Tu apelasyon fue embiada. Si la achetamos, se te avizara.
@@ -1143,6 +1183,7 @@ lad:
     add_new: Adjusta muevo
     errors:
       limit: Tienes alkansado el karar maksimo de etiketas
+    hint_html: "<strong>Avalia tus etiketas mas importantes en tu profil.</strong> Se amostran de forma prominente en tu profil publiko i permeten a los utilizadores navigar por tus publikasyones publikas espesifikamente basho akeyas etiketas."
   filters:
     contexts:
       account: Profiles
@@ -1154,7 +1195,11 @@ lad:
       add_keyword: Adjusta biervo yave
       keywords: Biervos yaves
       statuses: Publikasyones individualas
+      statuses_hint_html: Este filtro se aplika a las publikasyones individualas eskojidas endependientemente de si koensidan kon los biervos yave a kontinuasyon. <a href="%{path}">Revize o suprema publikasyones del filtro</a>.
       title: Edita filtro
+    errors:
+      deprecated_api_multiple_keywords: Estos parametros no se pueden trokar dizde esta aplikasyon porke se aplikan a mas de un biervo yave de filtro. Utiliza una aplikasyon mas reziente o la enterfaz web.
+      invalid_context: Se suminstro un konteksto malato o vazyo
     index:
       contexts: Filtros en %{contexts}
       delete: Efasa
@@ -1191,7 +1236,13 @@ lad:
     none: Dinguno
     order_by: Ordena por
     save_changes: Guadra trokamientos
+    select_all_matching_items:
+      one: Eskoje %{count} elemento ke koensida kon tu bushkeda.
+      other: Eskoje todos los %{count} elementos ke koensidan kon tu bushkeda.
     today: oy
+    validation_errors:
+      one: Algo no esta bien! Por favor, reviza el yerro mas abasho
+      other: Algo no esta bien! Por favor, reviza %{count} yerros mas abasho
   imports:
     errors:
       empty: Dosya CSV vaziya
@@ -1208,6 +1259,7 @@ lad:
     recent_imports: Importasyones resyentes
     states:
       finished: Finalizado
+      in_progress: En progreso
       scheduled: Programado
       unconfirmed: Sin konfirmasyon
     status: Estado
@@ -1250,6 +1302,7 @@ lad:
       one: 1 uzo
       other: "%{count} uzos"
     max_uses_prompt: Sin limito
+    prompt: Djenera i partaja atadijos kon otros para darles akseso a este sirvidor
     table:
       expires_at: Kaduka
       uses: Uzos
@@ -1314,8 +1367,16 @@ lad:
       disabled_account: Tu kuento aktual no sera kompletamente utilizable dempues. Portanto, tendras akseso a la eksportasyon de datos ansi komo a la reaktivasyon.
       followers: Esta aksion migrara a todos los suivantes del kuento aktual al muevo kuento
       only_redirect_html: Alternativamente, solo puedes <a href="%{path}">poner un readreso en tu profil</a>.
+      other_data: No se moveran otros datos otomatikamente
+      redirect: El profil de tu kuento aktual se aktualizara kon un avizo de readreso i sera eskluido de las bushkedas
   moderation:
     title: Moderasyon
+  move_handler:
+    carry_blocks_over_text: Este utilizador se movio dizde %{acct}, ke blokates.
+    carry_mutes_over_text: Este utilizador se movio dizde %{acct}, ke silensiates.
+    copy_account_note_text: 'Este utilizador se movio dizde %{acct}, aki estavan tus notas anteriores sovre el:'
+  navigation:
+    toggle_menu: Alterna menu
   notification_mailer:
     admin:
       report:
@@ -1353,6 +1414,7 @@ lad:
   notifications:
     administration_emails: Avizos de administrasyon por posta
     email_events: Evenimyentos para avizos por posta
+    email_events_hint: 'Eskoje los evenimientos para los kualos keres risivir avizos:'
     other_settings: Otras preferensyas de avizos
   number:
     human:
@@ -1365,6 +1427,8 @@ lad:
           thousand: K
           trillion: T
   otp_authentication:
+    code_hint: Introduse el kodiche jenerado por tu aplikasyon de autentifikasyon para konfirmar
+    description_html: Si kapasitas <strong>autentifikasyon en dos pasos</strong> kon una aplikasyon de autentifikasyon, la entrada rekerira ke estes en posesyon de tu telefon, ke djenerara kodiches para ke entres.
     enable: Kapasita
     instructions_html: "<strong>Eskanea este kodiche QR dizde Google Authenticator o una aplikasyon similar en tu telefon</strong>. A partir de agora, esta aplikasyon djenerara kodiches ke tendras ke ingresar kuando keras konektarte kon tu kuento."
     manual_instructions: 'Si no puedes eskanear el kodiche QR i nesesitas introdusirlo manualmente, este es el sekreto en teksto plano:'
@@ -1418,14 +1482,24 @@ lad:
     mutual: Mutual
     primary: Prinsipal
     relationship: Relasyon
+    remove_selected_domains: Kita todos los suivantes de los domenos eskojidos
     remove_selected_followers: Kita a los suivantes eskojidos
     remove_selected_follows: Desige a los utilizadores eskojidos
     status: Estado del kuento
+  remote_follow:
+    missing_resource: No se pudo topar el URL del readreso rekerido para tu kuento
+  reports:
+    errors:
+      invalid_rules: no faze referensia a reglas validas
   rss:
     content_warning: 'Avertensya de kontenido:'
     descriptions:
       account: Publikasyones publikas de @%{acct}
       tag: 'Publikasyones publikas etiketadas kon #%{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tienes superado el limito de %{limit} publikasyones programadas para akel diya
+    over_total_limit: Tienes superado el limito de %{limit} publikasyones programadas
+    too_soon: La data programada deve estar en el avenir
   self_destruct:
     title: Este sirvidor esta serrando
   sessions:
@@ -1453,6 +1527,7 @@ lad:
       weibo: Weibo
     current_session: Sesyon aktuala
     description: "%{browser} en %{platform}"
+    explanation: Estos son los navigadores internetikos konektados aktualmente kon tu kuento de Mastodon.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1543,11 +1618,16 @@ lad:
       public: Publiko
       public_long: Todos pueden ver
       unlisted: No listado
+      unlisted_long: Todos pueden ver, ama no esta listado en las linyas de tiempo publikas
   statuses_cleanup:
     enabled: Otomatikamente efasa publikasyones viejas
+    enabled_hint: Supreme otomatikamente tus publikasyones kuando alkansen un limito de tiempo espesifikado, a manko ke koensiden kon alguna de las eksepsiones detalyadas debasho
     exceptions: Eksepsiones
+    explanation: Porke la efasasion de mesajes es una operasyon kostoza, esto se faze avagar, a lo longo de un tiempo, kuando el sirvidor no esta okupado. Por esta razon, puede ser ke tus publikasyones sean efasadas un tiempo dempues de ke alkansen el limito de tiempo espesifikado.
     ignore_favs: Ignora favoritos
     ignore_reblogs: Ignora repartajasyones
+    interaction_exceptions: Eksepsiones bazadas en enteraksyones
+    interaction_exceptions_explanation: Akodrate ke no ay garantiya de ke se supremen las publikasyones ke estan por debasho de los limitos de favoritos o de repartajasiones si los tienen superado en algun momento.
     keep_direct: Manten enmentaduras privadas
     keep_direct_hint: No efasa dingunos mesajes privados
     keep_media: Manten publikasyones kon atamientos
@@ -1569,8 +1649,11 @@ lad:
       '604800': 1 semana
       '63113904': 2 anyos
       '7889238': 3 mezes
+    min_age_label: Limito de tiempo
     min_favs: Manten publikasyones favoritadas a lo manko
+    min_favs_hint: No efasa dinguna de las publikasyones ke plazgan a mas de esta kantita de personas. Desha en blanko para supremir publikasyones sin importar el numero de personas a las ke plazen las publikasyones
     min_reblogs: Manten publikasyones repartajadas a lo manko
+    min_reblogs_hint: No efasa dinguna de las publikasyones ke ayan sido repartajadas mas de este numero de vezes. Desha en blanko para supremir publikasyones sin importar el numero de repartajasiones
   stream_entries:
     sensitive_content: Kontenido sensivle
   strikes:
@@ -1635,6 +1718,8 @@ lad:
         disable: Ya no puedes uzar tu kuento, ama tu profil i el resto de datos permanesen intactos. Puedes solisitar una kopia de sigurita de tus datos, trokar la konfigurasyon de tu kuento o supremirlo.
         mark_statuses_as_sensitive: Algunas de tus publikasyones an sido markados komo sensivles por los moderadores de %{instance}. Esto sinyifika ke la djente tendra ke pulsar los dosyas multimedia en las publikasyones antes de ke se amostre una vista previa. Puedes markar los dosyas multimedia komo sensivles tu mezmo kuando publikes en el avenir.
         sensitive: A partir de agora todas los dosyas multimedia ke subas seran markados komo sensivles i eskondidos tras una avertensya.
+        silence: Ainda puedes uzar tu kuento, ama solo las personas ke te estan sigiendo veran tus publikasyones en este sirvidor, i puedes ser eskluido de varias fonksionalitas de diskuvrimiento. Portanto, otros kuentos podran ampesar a segirte manualmente.
+        suspend: Ya no puedes utilizar tu kuento, i tu profil i el resto de datos ya no son aksesivles. Ainda puedes inisyar sesion para solisitar una kopia de sigurita de tus datos, asta ke estos sean supremidos por kompleto en unos 30 diyas, aunke konservaremos algunos datos bazikos para impedir ke evitas la suspensyon.
       reason: 'Razon:'
       statuses: 'Publikasyones relevantes:'
       subject:
@@ -1655,7 +1740,12 @@ lad:
         suspend: Kuento suspendido
     welcome:
       edit_profile_action: Konfigurasyon de profil
+      edit_profile_step: Puedes personalizar tu profil kargando una foto de profil, trokando tu nombre de utilizador i muncho mas. Puedes optar por revizar a los muevos suivantes antes de ke puedan segirte.
+      explanation: Aki ay algunos konsejos para ampesar
       final_action: Ampesa a publikar
+      final_step: 'Ampesa a publikar! Inkluzo sin suivantes, tus publikasyones publikas pueden ser vistas por otros, por enshemplo en la linya de tiempo lokal o en etiketas. Tal vez keras aprezentarte kon la etiketa de #introduksiones.'
+      full_handle: Tu sovrenombre kompleto
+      full_handle_hint: Esto es lo ke le dirias a tus haverim para ke eyos puedan embiarte mesajes o segirte dizde otra instansya.
       subject: Bienvenido a Mastodon
       title: Bienvenido, %{name}!
   users:
@@ -1668,10 +1758,12 @@ lad:
   webauthn_credentials:
     add: Adjusta mueva yave de sigurita
     create:
+      error: Uvo un problem al adjustar tu yave de sigurita. Por favor aprova de muevo.
       success: Tu yave de sigurita fue adjustada kon sukseso.
     delete: Efasa
     delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita?
     destroy:
+      error: Uvo un problem al efasar tu yave de sigurita. Por favor aprova de muevo.
       success: Tu yave de sigurita fue efasada kon sukseso.
     invalid_credential: Yave de sigurita no valida
     nickname_hint: Introduska el sovrenombre de tu mueva yave de sigurita
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 5ff495a540..23fbc43b07 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -162,7 +162,7 @@ fa:
       defaults:
         autofollow: دعوت از دیگران برای عضو شدن و پیگیری حساب شما
         avatar: تصویر نمایه
-        bot: این حساب یک ربات است
+        bot: این یک حساب خودکار شده است
         chosen_languages: جدا کردن زبان‌ها
         confirm_new_password: تأیید گذرواژه تازه
         confirm_password: تأیید گذرواژه
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 672ff9d003..3bcce47d36 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -3,11 +3,20 @@ ie:
   simple_form:
     hints:
       account:
+        discoverable: Tui public postas e profil posse esser recomandat in multiplic areas de Mastodon e tui profil posse esser suggestat a altri usatores.
+        display_name: Tui complet nómine o tui amusant nómine.
+        fields: Tui websitu, pronómines, etá, quocunc quel tu vole.
+        note: 'Tu posse @mentionar altri persones o #hashtags.'
         unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
+      account_alias:
+        acct: Specificar li usatornomine@dominia del conto ex quel tu vole translocar
+      account_migration:
+        acct: Specificar li usatornomine@dominia del conto a quel tu vole translocar
       account_warning_preset:
         text: Tu posse usar posta-sintaxe, quam URLs, hashtags e mentiones
         title: Ínobligatori. Ne visibil al recipiente
       admin_account_action:
+        include_statuses: Li usator va posser vider quel postas ha causat li moderatori action o admonition
         send_email_notification: Li usator va reciver un explication de ti quel evenit con su conto
         text_html: Ínobligatori. Tu posse usar posta-sintaxe. Tu posse <a href="%{path}">adjunter preconfigurationes de avises</a> por sparar témpor
         type_html: Selecte quo far con <strong>%{acct}</strong>
@@ -48,24 +57,49 @@ ie:
         setting_display_media_default: Celar medie marcat quam sensitiv
         setting_display_media_hide_all: Sempre celar medie
         setting_display_media_show_all: Sempre monstrar medie
+      featured_tag:
+        name: 'Vi quelc hashtags usat max recentmen de te:'
+      filters:
+        action: Selecter quel action a far quande un posta egala un filtre
+        actions:
+          hide: Celar completmen li contenete filtrat, quam si it ne existe
+          warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+        peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
+        profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
+        site_contact_email: Qualmen on posse contacter te por inquestes legal o de apoy.
         site_contact_username: Qualmen li gente posse atinger te sur Mastodon.
+        site_title: Quant persones posse aluder a tui servitor ultra su nómine de dominia.
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
         timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
       form_challenge:
         current_password: Tu nu intra un area secur
       ip_block:
+        comment: Facultativ. Ne obliviar pro quo tu adjuntet ti-ci regul.
         severities:
           sign_up_block: Nov registrationes ne va esser possibil
           sign_up_requires_approval: Nov registrationes va besonar tui aprobation
+        severity: Selecter quo va evenir con demandes ex ti-ci IP
+      rule:
+        text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
+      user:
+        role: Permissiones de usator decidet per su rol
+      user_role:
+        color: Color a usar por li rol tra li UI, quam RGB (rubi-verdi-blu) in formate hex
+        highlighted: Va far li rol publicmen visibil
+        name: Public nómine del rol, si li rol va esser monstrat quam signe
+        permissions_as_keys: Usatores con ti-ci rol va haver accesse a...
       webhook:
         events: Selecter evenimentes a misser
+        template: Composir tui propri carga JSON usant interpolation de variabiles. Lassa blanc por JSON predefinit.
         url: Ad u misser evenimentes
     labels:
       account:
+        discoverable: Monstrar profil e postas in algoritmes de decovrition
         fields:
+          name: Etiquette
           value: Contenete
         indexable: Includer public postas in resultates de sercha
       account_warning_preset:
@@ -73,7 +107,14 @@ ie:
         title: Titul
       admin_account_action:
         send_email_notification: Notificar li usator per e-posta
+        text: Admonition customisat
         type: Action
+        types:
+          disable: Gelar
+          none: Misser un admonition
+          sensitive: Sensitiv
+          silence: Limitar
+          suspend: Suspender
         warning_preset_id: Usar un prefiguration de avise
       announcement:
         all_day: Eveniment del tot die
@@ -81,7 +122,12 @@ ie:
         scheduled_at: Planar publication
         starts_at: Comense del eveniment
         text: Proclamation
+      appeal:
+        text: Explicar pro que ti-ci decision mey esser renversat
       defaults:
+        autofollow: Invitar a sequer tui conto
+        avatar: Foto de profil
+        bot: Ti-ci conto es automatisat
         chosen_languages: Filtrar lingues
         confirm_new_password: Confirmar nov passa-parol
         confirm_password: Confirmar passa-parol
@@ -91,28 +137,94 @@ ie:
         display_name: Nómine a monstrar
         email: E-posta
         expires_in: Expirar pos
+        fields: Campes aditional
+        header: Cap-image
         honeypot: "%{label} (ne plenar)"
+        irreversible: Lassar cader vice celar
         locale: Lingue del interfacie
         new_password: Nov passa-parol
         note: Biografie
         password: Passa-parol
+        phrase: Clave-parol o frase
+        setting_advanced_layout: Possibilisar web-interfacie avansat
         setting_default_language: Lingue in quel postar
         setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
         setting_display_media_default: Predefinitiones
         setting_display_media_hide_all: Celar omno
         setting_display_media_show_all: Monstrar omno
+        setting_expand_spoilers: Sempre expander postas marcat con admonitiones de contenete
+        setting_system_font_ui: Usar predefinit fonte de sistema
         setting_theme: Tema de situ
         setting_trends: Monstrar li hodial tendenties
         setting_unfollow_modal: Monstrar dialog de confirmation ante dessequer alquem
         setting_use_pending_items: Mode lent
+        severity: Severitá
+        sign_in_token_attempt: Code de securitá
+        title: Titul
+        username: Nómine de usator
+        whole_word: Plen parol
+      filters:
+        actions:
+          warn: Celar con un admonition
       form_admin_settings:
+        custom_css: Custom CSS
+        profile_directory: Possibilisar profilarium
         registrations_mode: Qui posse registrar se
+        show_domain_blocks: Vider bloccas de dominia
+        show_domain_blocks_rationale: Monstrar pro quo cert dominias esset bloccat
+        site_contact_email: Contact e-mail adresse
+        site_title: Nómine de servitor
         theme: Predefenit tema
+        trendable_by_default: Possibilisar tendenties sin priori inspection
         trends: Possibilisar tendenties
         trends_as_landing_page: Usar tendenties quam frontispicie
+      invite:
+        comment: Comentar
+      invite_request:
+        text: Pro quo tu vole adherer?
+      ip_block:
+        comment: Comentar
+        ip: IP
+        severities:
+          no_access: Bloccar accesse
+          sign_up_block: Bloccar usator-registrationes
+          sign_up_requires_approval: Limitar usator-registrationes
+        severity: Regul
       notification_emails:
+        favourite: Alqui favoritisat tui posta
+        follow: Alqui sequet te
         follow_request: Alqui petit sequer te
+        mention: Alqui mentionat te
+        pending_account: Nov conto besonant inspection
+        report: Nov raporte es submisset
+        software_updates:
+          all: Notificar pri omni nov actualisationes
+          critical: Notificar solmen pri critical actualisationes
+          label: Un nov version de Mastodon es disponibil
         trending_tag: Nov tendentie besonant inspection
+      rule:
+        text: Regul
       tag:
+        name: Hashtag
         trendable: Permisse que ti-ci hashtag apari sub tendenties
+      user:
+        role: Rol
+        time_zone: Zone temporal
+      user_role:
+        color: Color del insignie
+        name: Nómine
+        permissions_as_keys: Permissiones
+        position: Prioritá
+      webhook:
+        events: Evenimentes activisat
+        url: URL de punctu terminal
+    'no': 'No'
+    recommended: Recomandat
+    required:
+      mark: "*"
+      text: besonat
+    title:
+      sessions:
+        webauthn: Usar un de tui claves de securitá por intrar
+    'yes': 'Yes'
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index aeac5f1c58..c23960e07d 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -3,10 +3,13 @@ lad:
   simple_form:
     hints:
       account:
+        discoverable: Tus publikasyones publikas i profil pueden ser avaliadas o rekomendadas en varias partes de Mastodon i tu profil puede ser sujerido a otros utilizadores.
         display_name: Tu nombre para amostrar.
         fields: Tu deskripsyon, pronombres, edad, todo lo ke keras.
+        indexable: Tus publikasyones publikas pueden apareser en rezultados de bushkeda en Mastodon. Personas ke enteraktuaron kon tus publikasyones syempre pueden bushkarlas inkluzo si trokes esta preferensya.
         note: 'Puedes @enmentar a otra djente o #etiketas.'
         show_collections: Otra djente podra ver tus segidos i suivantes. Personas a las kualas siges siempre podran ver que las estas sigiendo.
+        unlocked: Djente va poder segirte sin solisitar tu achetasyon. Deseleksyona si keres revizar solisitasyones de segimyento i dechidir si keres achetar o refuzar a muevos suivantes.
       account_alias:
         acct: Espesifika tu nombre de utilizador@domeno del kuento de ande keres migrar
       account_migration:
@@ -118,6 +121,7 @@ lad:
         otp: 'Introduse el kodiche de autentifikasyon de dos pasos djenerado por tu aplikasyon de telefon o uza uno de tus kodiches de recuperasyon:'
         webauthn: Si es una yave USB, asigurete de insertarla y, si es necesario, pulsala.
       settings:
+        indexable: Tu pajina de profil puede apareser en rezultados de bushkeda en Google, Bing i otros.
         show_application: Tu siempre podras ver dizde kuala aplikasyon publikates tu publikasyon.
       tag:
         name: Solo se puede trokar la kapitalizasyon de las letras, por enshemplo, para ke sea mas meldable
@@ -132,9 +136,11 @@ lad:
         position: Un rolo mas alto deside la rezolusyon de konfliktos en algunas situasyones. Algunas aksyones solo pueden levarse por rolos kon menor priorita
       webhook:
         events: Eskoje evenimientos para embiar
+        template: Kriya tu propio JSON uzando interpolasyon de las variavlas. Deshalo en blanko para el JSON predeterminado.
         url: Ande los evenimientos seran embiados
     labels:
       account:
+        discoverable: Avalia profil i publikasyones en algoritmos de deskuvrimyento
         fields:
           name: Etiketa
           value: Kontenido
@@ -183,6 +189,9 @@ lad:
         expires_in: Kaduka dempues de
         fields: Datos adisyonales
         header: Imaje de kavesera
+        honeypot: "%{label} (no inche)"
+        inbox_url: URL del kuti de relevo
+        irreversible: Refuza en lugar de eskonder
         locale: Lingua de enterfaz
         max_uses: Maksimo numero de uzos
         new_password: Muevo kod
@@ -190,17 +199,27 @@ lad:
         otp_attempt: Kodiche de dos pasos
         password: Kod
         phrase: Biervo yave o fraza
+        setting_advanced_layout: Kapasita la enterfaz web avanzada
         setting_aggregate_reblogs: Agrupa repartajasyones en linyas
         setting_always_send_emails: Siempre embia avizos por posta
         setting_auto_play_gif: Siempre reproduse los GIFs animados
+        setting_boost_modal: Amostra ventana de konfirmasyon antes de repartajar
         setting_default_language: Lingua de publikasyones
         setting_default_privacy: Privasita de publikasyones
+        setting_default_sensitive: Syempre marka multimedia komo sensivles
+        setting_delete_modal: Mostra dialogo de konfirmasyon antes de efasar una publikasyon
+        setting_disable_swiping: Inkapasita movimyentos de arresvalamiento
+        setting_display_media: Vizualizasyon de multimedia
         setting_display_media_default: Predeterminado
         setting_display_media_hide_all: Eskonde todo
         setting_display_media_show_all: Amostra todo
+        setting_expand_spoilers: Siempre espande las publikasyones markadas kon avertensyas de kontenido
+        setting_hide_network: Eskonde tu red sosyala
         setting_reduce_motion: Reduse el movimyento en animasyones
         setting_system_font_ui: Uza el font predeterminado del sistem
+        setting_theme: Tema del sitio
         setting_trends: Amostra los trendes de oy
+        setting_unfollow_modal: Mostra dialogo de konfirmasyon antes de desegir a alguno
         setting_use_blurhash: Amostra gradientes koloridos para kontenido multimedia eskondido
         setting_use_pending_items: Modo lento
         severity: Severita
@@ -263,6 +282,8 @@ lad:
           sign_up_requires_approval: Limita enrejistrasyones
         severity: Regla
       notification_emails:
+        appeal: Alguno tiene apelado una dechizyon de moderasyon
+        digest: Embia rezumen de posta elektronika
         favourite: A alguno le plaze tu publikasyon
         follow: Alguno te ampeso a segir
         follow_request: Alguno tiene solisitado segirte
@@ -276,25 +297,38 @@ lad:
           label: Mueva version de Mastodon esta desponivle
           none: Nunkua avizame de aktualizasyones (no rekomendado)
           patch: Avizame de aktualizasyones de yerros
+        trending_tag: Un muevo trend nesesita revizyon
       rule:
         text: Regla
       settings:
         indexable: Inkluye la pajina de profil en los bushkadores
+        show_application: Amostra aplikasyon uzada para adjustar publikasyones
       tag:
+        listable: Permite ke esta etiketa apareska en bushkedas i sujestyones
         name: Etiketa
+        trendable: Permite ke esta etiketa apareska en trendes
+        usable: Permite ke publikasyones uzen esta etiketa
       user:
         role: Rolo
+        time_zone: Zona de tiempo
       user_role:
+        color: Kolor de insinya
+        highlighted: Mostra rolo komo insinya en profiles de utilizadores
         name: Nombre
         permissions_as_keys: Permisos
         position: Priorita
       webhook:
         events: Evenimientos kapasitados
+        template: Modelo de kontenido
         url: URL de Endpoint
     'no': 'No'
     not_recommended: No rekomendado
+    overridden: Sovreskrive
     recommended: Rekomendado
     required:
       mark: "*"
       text: rekerido
+    title:
+      sessions:
+        webauthn: Uza una de tus yaves de sigurita para konektarte
     'yes': Si
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ab2bc51553..4fe190cfec 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -435,6 +435,7 @@ sk:
       delivery:
         all: Všetko
         failing: Zlyhávajúce
+        stop: Zastav doručenie
         unavailable: Nedostupné
       delivery_available: Je v dosahu doručovania
       empty: Nenájdené žiadne domény.
@@ -579,6 +580,7 @@ sk:
         manage_roles: Spravuj postavenia
         manage_rules: Spravuj pravidlá
         manage_settings: Spravuj nastavenia
+        manage_user_access: Spravuj užívateľský prístup
         manage_users: Spravuj užívateľov
       title: Postavenia
     rules:
@@ -621,9 +623,11 @@ sk:
     software_updates:
       critical_update: Kritické — prosím aktualizuj rýchlo
       documentation_link: Zisti viac
+      release_notes: Poznámky k vydaniu
       title: Dostupné aktualizácie
       types:
         major: Hlavné vydanie
+        patch: Opravné vydanie - opravy a jednoducho uplatniteľné zmeny
       version: Verzia
     statuses:
       account: Autor
@@ -692,7 +696,9 @@ sk:
         title: Populárne príspevky
       tags:
         dashboard:
+          tag_servers_measure: iné servery
           tag_uses_measure: užívateľov celkovo
+        not_usable: Nemôže byť použitý
         title: Populárne štítky
         trending_rank: 'Populárne #%{rank}'
         usable: Môže byť použitý
@@ -708,7 +714,11 @@ sk:
       disable: Vypni
       disabled: Vypnuté
       enable: Povoľ
+      status: Stav
   admin_mailer:
+    new_appeal:
+      actions:
+        none: varovanie
     new_pending_account:
       body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť.
       subject: Nový účet očakáva preverenie na %{instance} (%{username})
@@ -757,6 +767,9 @@ sk:
     apply_for_account: Vyžiadaj si účet
     captcha_confirmation:
       title: Bezpečnostná kontrola
+    confirmations:
+      login_link: prihlás sa
+      welcome_title: Vitaj, %{name}!
     delete_account: Vymaž účet
     delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak <a href="%{path}">urobiť tu</a>. Budeš požiadaný/á o potvrdenie tohto kroku.
     description:
@@ -786,6 +799,9 @@ sk:
     setup:
       link_not_received: Nedostal/a si odkaz?
       title: Skontroluj svoju schránku
+    sign_in:
+      preamble_html: Prihlás sa so svojimi údajmi pre <strong>%{domain}</strong>. Pokiaľ je tvoj účet hostovaný na inom serveri, nebudeš sa môcť prihlásiť tu.
+      title: Prihlás sa na %{domain}
     status:
       account_status: Stav účtu
       confirming: Čaká sa na dokončenie potvrdenia emailom.
@@ -841,6 +857,9 @@ sk:
         silence: Obmedzenie účtu
   domain_validator:
     invalid_domain: nieje správny tvar domény
+  edit_profile:
+    basic_information: Základné informácie
+    other: Ostatné
   errors:
     '400': Požiadavka, ktorú si odoslal/a, bola buď nesprávna, alebo znehodnotená.
     '403': Nemáš povolenie pre zobrazenie tejto stránky.
@@ -885,22 +904,28 @@ sk:
       public: Verejné osi
       thread: Konverzácie
     edit:
+      add_keyword: Pridaj kľúčové slovo
+      keywords: Kľúčové slová
       title: Uprav triedenie
     errors:
       invalid_context: Nebola poskytnutá žiadna, alebo ide o neplatnú súvislosť
     index:
       delete: Vymaž
       empty: Nemáš žiadné filtrovanie.
+      expires_on: Expiruje dňa %{date}
       title: Triedenia
     new:
       title: Pridaj nové triedenie
   generic:
     all: Všetko
+    cancel: Zruš
     changes_saved_msg: Zmeny boli úspešne uložené!
+    confirm: Potvrď
     copy: Kopíruj
     delete: Vymaž
     order_by: Zoraď podľa
     save_changes: Ulož zmeny
+    today: dnes
     validation_errors:
       few: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie
       many: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie
@@ -923,6 +948,7 @@ sk:
       bookmarks: Záložky
       domain_blocking: Zoznam blokovaných domén
       following: Zoznam sledovaných
+      lists: Zoznamy
       muting: Zoznam ignorovaných
     upload: Nahraj
   invites:
@@ -1182,6 +1208,7 @@ sk:
     keep_pinned: Ponechaj pripnuté príspevky
     keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov
     keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami
+    keep_self_fav: Ponechať príspevky, ktoré si si obľúbil/a
   stream_entries:
     sensitive_content: Senzitívny obsah
   tags:

From fd57e40681f1f9c15f83a440858bcd117af9ba1f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:55:05 +0100
Subject: [PATCH 164/436] Update dependency rubocop-performance to v1.20.1
 (#28492)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 5acee3d753..8e25f302bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -680,7 +680,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.20.0)
+    rubocop-performance (1.20.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rails (2.23.1)

From ba5f659bb3066dc8a70eaab469bba1b1398919a9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 29 Dec 2023 05:55:50 -0500
Subject: [PATCH 165/436] Use shorter attribute query methods in `Announcement`
 (#28474)

---
 app/models/announcement.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 2cd7c1d5ed..83a8d3682c 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -28,8 +28,8 @@ class Announcement < ApplicationRecord
   has_many :announcement_reactions, dependent: :destroy
 
   validates :text, presence: true
-  validates :starts_at, presence: true, if: -> { ends_at.present? }
-  validates :ends_at, presence: true, if: -> { starts_at.present? }
+  validates :starts_at, presence: true, if: :ends_at?
+  validates :ends_at, presence: true, if: :starts_at?
 
   before_validation :set_published, on: :create
 
@@ -46,7 +46,7 @@ class Announcement < ApplicationRecord
   end
 
   def time_range?
-    starts_at.present? && ends_at.present?
+    starts_at? && ends_at?
   end
 
   def mentions

From 3599622b5bcdfd44f7df664428a749896fde319e Mon Sep 17 00:00:00 2001
From: Cal Moody <calvinmcm@gmail.com>
Date: Fri, 29 Dec 2023 06:32:40 -0500
Subject: [PATCH 166/436] Fix destructive actions in dropdowns not using error
 color in light theme (#28484)

---
 app/javascript/styles/mastodon-light/diff.scss | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3777fccbfb..3a27c974ad 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -300,10 +300,15 @@ html {
   }
 
   &__item {
+    color: $darker-text-color;
+
+    &--dangerous {
+      color: $error-value-color;
+    }
+
     a,
     button {
       background: $white;
-      color: $darker-text-color;
     }
   }
 }
@@ -315,9 +320,9 @@ html {
 .privacy-dropdown__option.active .privacy-dropdown__option__content strong,
 .privacy-dropdown__option:hover .privacy-dropdown__option__content,
 .privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item a:active,
-.dropdown-menu__item a:focus,
-.dropdown-menu__item a:hover,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
+.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
 .actions-modal ul li:not(:empty) a.active,
 .actions-modal ul li:not(:empty) a.active button,
 .actions-modal ul li:not(:empty) a:active,

From fcfdeadc04983ab6937df6ce6a04dbe38e33b1a5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 29 Dec 2023 17:23:07 +0100
Subject: [PATCH 167/436] Fix random `NoMethodError` errors on cached
 `CustomFilter` objects (#28521)

---
 app/models/custom_filter.rb         | 19 +++++++++++++++++--
 app/models/custom_filter_keyword.rb | 10 +++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 5a53e73ba8..9c936fed39 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -17,8 +17,23 @@
 class CustomFilter < ApplicationRecord
   self.ignored_columns += %w(whole_word irreversible)
 
-  alias_attribute :title, :phrase
-  alias_attribute :filter_action, :action
+  # NOTE: We previously used `alias_attribute` but this does not play nicely
+  # with cache
+  def title
+    phrase
+  end
+
+  def title=(value)
+    self.phrase = value
+  end
+
+  def filter_action
+    action
+  end
+
+  def filter_action=(value)
+    self.action = value
+  end
 
   VALID_CONTEXTS = %w(
     home
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 3158b3b79a..1812a43081 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -17,7 +17,15 @@ class CustomFilterKeyword < ApplicationRecord
 
   validates :keyword, presence: true
 
-  alias_attribute :phrase, :keyword
+  # NOTE: We previously used `alias_attribute` but this does not play nicely
+  # with cache
+  def phrase
+    keyword
+  end
+
+  def phrase=(value)
+    self.keyword = value
+  end
 
   before_save :prepare_cache_invalidation!
   before_destroy :prepare_cache_invalidation!

From 6374358357ee81b5f137f471f028a56974109155 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 29 Dec 2023 17:34:13 +0100
Subject: [PATCH 168/436] Change media to be hidden/blurred by default in
 report modal (#28522)

---
 app/javascript/mastodon/components/media_attachments.jsx     | 5 ++++-
 .../mastodon/features/report/components/status_check_box.jsx | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/media_attachments.jsx b/app/javascript/mastodon/components/media_attachments.jsx
index 7b945a0ea2..63fe3e67f9 100644
--- a/app/javascript/mastodon/components/media_attachments.jsx
+++ b/app/javascript/mastodon/components/media_attachments.jsx
@@ -15,6 +15,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
     lang: PropTypes.string,
     height: PropTypes.number,
     width: PropTypes.number,
+    visible: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -51,7 +52,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
   };
 
   render () {
-    const { status, width, height } = this.props;
+    const { status, width, height, visible } = this.props;
     const mediaAttachments = status.get('media_attachments');
     const language = status.getIn(['language', 'translation']) || status.get('language') || this.props.lang;
 
@@ -99,6 +100,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
               height={height}
               inline
               sensitive={status.get('sensitive')}
+              visible={visible}
               onOpenVideo={noop}
             />
           )}
@@ -113,6 +115,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
               lang={language}
               sensitive={status.get('sensitive')}
               defaultWidth={width}
+              visible={visible}
               height={height}
               onOpenMedia={noop}
             />
diff --git a/app/javascript/mastodon/features/report/components/status_check_box.jsx b/app/javascript/mastodon/features/report/components/status_check_box.jsx
index 8bee76e591..481ee3e5ed 100644
--- a/app/javascript/mastodon/features/report/components/status_check_box.jsx
+++ b/app/javascript/mastodon/features/report/components/status_check_box.jsx
@@ -47,7 +47,7 @@ class StatusCheckBox extends PureComponent {
         </div>
 
         <StatusContent status={status} />
-        <MediaAttachments status={status} />
+        <MediaAttachments status={status} visible={false} />
       </div>
     );
 

From ac588daf37784d5f7260577d404605e85f2df56f Mon Sep 17 00:00:00 2001
From: Dennis Kamau <97116157+devcamke@users.noreply.github.com>
Date: Mon, 1 Jan 2024 22:08:01 +0300
Subject: [PATCH 169/436] Update copyright year to 2024 (#28550)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b22d61b5e..267f0ed295 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ You can open issues for bugs you've found or features you think are missing. You
 
 ## License
 
-Copyright (C) 2016-2023 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
+Copyright (C) 2016-2024 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

From c652b0e46b6655366d976e8e18b92c63b734b91b Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 2 Jan 2024 02:47:38 -0600
Subject: [PATCH 170/436] Add wget to base Dockerfile (#28548)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 4d5bd57f11..96f8b5cd27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -103,6 +103,7 @@ RUN \
     procps \
     tini \
     tzdata \
+    wget \
   ; \
 # Patch Ruby to use jemalloc
   patchelf --add-needed libjemalloc.so.2 /usr/local/bin/ruby; \

From e082a98b4d2b3adc8cd4172a51ee53000af4eaab Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 09:50:08 +0100
Subject: [PATCH 171/436] Update dependency mime-types to v3.5.2 (#28556)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 8e25f302bc..08b9fc0de4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -457,9 +457,9 @@ GEM
       azure-storage-blob (~> 2.0.1)
       hashie (~> 5.0)
     memory_profiler (1.0.1)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.20.0)

From 663a7b6ba91b5d10944f8555aca3fb99e009e0ef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 08:50:29 +0000
Subject: [PATCH 172/436] Update devDependencies (non-major) (#28543)

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

diff --git a/yarn.lock b/yarn.lock
index 1baa0da058..298ffd4eea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,10 +12,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/css-tools@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "@adobe/css-tools@npm:4.3.1"
-  checksum: 05672719b544cc0c21ae3ed0eb6349bf458e9d09457578eeeb07cf0f696469ac6417e9c9be1b129e5d6a18098a061c1db55b2275591760ef30a79822436fcbfa
+"@adobe/css-tools@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "@adobe/css-tools@npm:4.3.2"
+  checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39
   languageName: node
   linkType: hard
 
@@ -1539,38 +1539,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "@csstools/css-parser-algorithms@npm:2.3.2"
+"@csstools/css-parser-algorithms@npm:^2.4.0":
+  version: 2.5.0
+  resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.2.1
-  checksum: ccae373a3ab5c10716418b69ce1f6db10a26d3a2d60b65df5fe69099afe4fb1d3192925f3c0f93c3b17c3ab1964b0f39ad2b0e97312ec4a51caa55d6b6a31672
+    "@csstools/css-tokenizer": ^2.2.3
+  checksum: 31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "@csstools/css-tokenizer@npm:2.2.1"
-  checksum: 0c6901d291e99c567893846a47068057c2a28b3edc4219b6da589a530f55f51ddd4675f906f707b393bfe7a508ab2604bf3f75708f064db857bb277636bd5a44
+"@csstools/css-tokenizer@npm:^2.2.2":
+  version: 2.2.3
+  resolution: "@csstools/css-tokenizer@npm:2.2.3"
+  checksum: 557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.5":
-  version: 2.1.5
-  resolution: "@csstools/media-query-list-parser@npm:2.1.5"
+"@csstools/media-query-list-parser@npm:^2.1.6":
+  version: 2.1.7
+  resolution: "@csstools/media-query-list-parser@npm:2.1.7"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.3.2
-    "@csstools/css-tokenizer": ^2.2.1
-  checksum: ae0692c6f92cdc82053291c7a50028b692094dfed795f0259571c5eb40f4b3fa580182ac3701e56c2834e40a62a122ea6639299e43ae88b3a835ae4c869a1a12
+    "@csstools/css-parser-algorithms": ^2.5.0
+    "@csstools/css-tokenizer": ^2.2.3
+  checksum: 433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@csstools/selector-specificity@npm:3.0.0"
+"@csstools/selector-specificity@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/selector-specificity@npm:3.0.1"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
-  checksum: 6f0e2fa9a3c5dcbc7a446fd827d3eb85ca775cc884f73f0bbb119ab49b4f5f0af8763dd23a37d423f4e7989069c09bb977e7e5f017db296e1417abb1fba75c30
+  checksum: 4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f
   languageName: node
   linkType: hard
 
@@ -2894,10 +2894,10 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.1.5
-  resolution: "@testing-library/jest-dom@npm:6.1.5"
+  version: 6.1.6
+  resolution: "@testing-library/jest-dom@npm:6.1.6"
   dependencies:
-    "@adobe/css-tools": "npm:^4.3.1"
+    "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
@@ -2919,7 +2919,7 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: f3643a56fcd970b5c7e8fd10faf3c4817d8ab0e74fb1198d726643bdc5ac675ceaac3b0068c5b4fbad254470e8f98ed50028741de875a29ceaa2f854570979c9
+  checksum: f98f79f3e470517469c86947d0ff1bb83ac2e59fd2a29728ab306eca5fba63c948084ec06b7b531642e6002d1f0211d918c298c628f0d386c0ef63ba881c47ba
   languageName: node
   linkType: hard
 
@@ -7940,12 +7940,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "file-entry-cache@npm:7.0.2"
+"file-entry-cache@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "file-entry-cache@npm:8.0.0"
   dependencies:
-    flat-cache: "npm:^3.2.0"
-  checksum: 822664e35c3e295e6a8ca7ec490d8d8077017607f41f94b29922f1f49c6dd07025048e3ed528e2909a1439eba66d60f802c0774aa612cf6ee053ee4ecc16c8c5
+    flat-cache: "npm:^4.0.0"
+  checksum: 9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638
   languageName: node
   linkType: hard
 
@@ -8079,7 +8079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^3.0.4, flat-cache@npm:^3.2.0":
+"flat-cache@npm:^3.0.4":
   version: 3.2.0
   resolution: "flat-cache@npm:3.2.0"
   dependencies:
@@ -8090,6 +8090,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flat-cache@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "flat-cache@npm:4.0.0"
+  dependencies:
+    flatted: "npm:^3.2.9"
+    keyv: "npm:^4.5.4"
+    rimraf: "npm:^5.0.5"
+  checksum: 8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547
+  languageName: node
+  linkType: hard
+
 "flat@npm:^5.0.2":
   version: 5.0.2
   resolution: "flat@npm:5.0.2"
@@ -10737,7 +10748,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:^4.5.3":
+"keyv@npm:^4.5.3, keyv@npm:^4.5.4":
   version: 4.5.4
   resolution: "keyv@npm:4.5.4"
   dependencies:
@@ -11265,10 +11276,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^12.1.1":
-  version: 12.1.1
-  resolution: "meow@npm:12.1.1"
-  checksum: a125ca99a32e2306e2f4cbe651a0d27f6eb67918d43a075f6e80b35e9bf372ebf0fc3a9fbc201cbbc9516444b6265fb3c9f80c5b7ebd32f548aa93eb7c28e088
+"meow@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "meow@npm:13.0.0"
+  checksum: fab0f91578154c048e792a81704f3f28099ffff900f364df8a85f6e770a57e1c124859a25e186186e149dad30692c7893af0dfd71517bea343bfe5d749b1fa04
   languageName: node
   linkType: hard
 
@@ -14344,7 +14355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.1":
+"rimraf@npm:^5.0.1, rimraf@npm:^5.0.5":
   version: 5.0.5
   resolution: "rimraf@npm:5.0.5"
   dependencies:
@@ -15609,13 +15620,13 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.0.2
-  resolution: "stylelint@npm:16.0.2"
+  version: 16.1.0
+  resolution: "stylelint@npm:16.1.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.3.2"
-    "@csstools/css-tokenizer": "npm:^2.2.1"
-    "@csstools/media-query-list-parser": "npm:^2.1.5"
-    "@csstools/selector-specificity": "npm:^3.0.0"
+    "@csstools/css-parser-algorithms": "npm:^2.4.0"
+    "@csstools/css-tokenizer": "npm:^2.2.2"
+    "@csstools/media-query-list-parser": "npm:^2.1.6"
+    "@csstools/selector-specificity": "npm:^3.0.1"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
     cosmiconfig: "npm:^9.0.0"
@@ -15624,7 +15635,7 @@ __metadata:
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^7.0.2"
+    file-entry-cache: "npm:^8.0.0"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
@@ -15634,7 +15645,7 @@ __metadata:
     is-plain-object: "npm:^5.0.0"
     known-css-properties: "npm:^0.29.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^12.1.1"
+    meow: "npm:^13.0.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.0"
@@ -15652,7 +15663,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 5ec755e209beb1877ff40d50f18c1ebb05bf251925da1f98f28fb3911e4031195eb86adaf641ac5cdb01ba973f4c999bc0c6b0270d08c1d5c070adbdd9e734cf
+  checksum: 765eea0b07319d1e7989502c07b8b5794938e5a8542bec00990b09ec10c3f7006891689930099e948d06c9ef9982066edb98b1ea64a435138a6b0f0905eb2b87
   languageName: node
   linkType: hard
 

From 629152a80d170cd08fa81b850488f2e6295f6fa0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 09:50:45 +0100
Subject: [PATCH 173/436] Update DefinitelyTyped types (non-major) (#28542)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 24832bb596..7b09178adb 100644
--- a/package.json
+++ b/package.json
@@ -166,7 +166,7 @@
     "@types/react-dom": "^18.2.4",
     "@types/react-helmet": "^6.1.6",
     "@types/react-immutable-proptypes": "^2.1.0",
-    "@types/react-motion": "^0.0.39",
+    "@types/react-motion": "^0.0.40",
     "@types/react-overlays": "^3.1.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
diff --git a/yarn.lock b/yarn.lock
index 298ffd4eea..2e246ae5e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2323,7 +2323,7 @@ __metadata:
     "@types/react-dom": "npm:^18.2.4"
     "@types/react-helmet": "npm:^6.1.6"
     "@types/react-immutable-proptypes": "npm:^2.1.0"
-    "@types/react-motion": "npm:^0.0.39"
+    "@types/react-motion": "npm:^0.0.40"
     "@types/react-overlays": "npm:^3.1.0"
     "@types/react-router": "npm:^5.1.20"
     "@types/react-router-dom": "npm:^5.3.3"
@@ -3379,12 +3379,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-motion@npm:^0.0.39":
-  version: 0.0.39
-  resolution: "@types/react-motion@npm:0.0.39"
+"@types/react-motion@npm:^0.0.40":
+  version: 0.0.40
+  resolution: "@types/react-motion@npm:0.0.40"
   dependencies:
     "@types/react": "npm:*"
-  checksum: 0dfcde777576b3c3289b4dbf2a5085decf71aba6d543697f4c1069d02ed3b543792a253692bd98870af04112c92469328a4fdb93988f93af2e099de8f2c9bc2e
+  checksum: 8a560051be917833fdbe051185b53aeafbe8657968ac8e073ac874b9a55c6f16e3793748b13cfb9bd6d9a3d27aba116d6f8f296ec1950f4175dc94d17c5e8470
   languageName: node
   linkType: hard
 
@@ -3482,13 +3482,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.45
-  resolution: "@types/react@npm:18.2.45"
+  version: 18.2.46
+  resolution: "@types/react@npm:18.2.46"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 4cc650c47ffb88baac29fb7a74e842e4af4a55f437086ef70250fdc75f0a5f2fcf8adc272d05ab2e00b1de6e14613296881271caee037dadf9130fdeb498c59e
+  checksum: 814cc67107e5e69501d65bfc371cc2c716665d2a3608d395a2f81e24c3a2875db28e2cad717dfb17017eabcffd1d68ee2c9e09ecaba3f7108d5b7fbb9888ebab
   languageName: node
   linkType: hard
 

From c2340682aa3db3d0c4b181f369074aeac9a2a139 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 09:51:58 +0100
Subject: [PATCH 174/436] Update babel monorepo to v7.23.7 (#28528)

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

diff --git a/yarn.lock b/yarn.lock
index 2e246ae5e9..1f21b80657 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -60,25 +60,25 @@ __metadata:
   linkType: hard
 
 "@babel/core@npm:^7.10.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.22.1":
-  version: 7.23.6
-  resolution: "@babel/core@npm:7.23.6"
+  version: 7.23.7
+  resolution: "@babel/core@npm:7.23.7"
   dependencies:
     "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-module-transforms": "npm:^7.23.3"
-    "@babel/helpers": "npm:^7.23.6"
+    "@babel/helpers": "npm:^7.23.7"
     "@babel/parser": "npm:^7.23.6"
     "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.6"
+    "@babel/traverse": "npm:^7.23.7"
     "@babel/types": "npm:^7.23.6"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: a02bae7d916029b70706dc301535e1b31e5d216f55d4ee6f64a15825c6b69ee2c14c52a213d1497ec414e925ed4e9d897d41fb0d75df9fea28ed2c0008790e31
+  checksum: 38c9934973d384ed83369712978453eac91dc3f22167404dbdb272b64f602e74728a6f37012c53ee57e521b8ae2da60097f050497d9b6a212d28b59cdfb2cd1d
   languageName: node
   linkType: hard
 
@@ -167,9 +167,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
+"@babel/helper-define-polyfill-provider@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.22.6"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -178,7 +178,7 @@ __metadata:
     resolve: "npm:^1.14.2"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 0007035157e0d32ee9cb4ca319b89d6f3705523383efe52a59eb3d4dfa2ed08c5147e49c10a6e6d69c15221d89c76c8e5875475d6710fb44a5c37b8e69388e40
+  checksum: 60126f5f719b9e2114df62e3bf3ac0797b71d8dc733db60192eb169b004fde72ee309fa5848c5fdfe98b8e8863c46f55e16da5aa8a4e420b4d2670cd0c5dd708
   languageName: node
   linkType: hard
 
@@ -342,14 +342,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/helpers@npm:7.23.6"
+"@babel/helpers@npm:^7.23.7":
+  version: 7.23.7
+  resolution: "@babel/helpers@npm:7.23.7"
   dependencies:
     "@babel/template": "npm:^7.22.15"
-    "@babel/traverse": "npm:^7.23.6"
+    "@babel/traverse": "npm:^7.23.7"
     "@babel/types": "npm:^7.23.6"
-  checksum: df1cf6607676ad36f52f652ec03536f2732d70aef5e76dba5c964e34d49f3c2d3dcf9fb3740db359f53071d74b64606a833d5ba156f79f437f71bfe06e2e7e19
+  checksum: f74a61ad28a1bc1fdd9133ad571c07787b66d6db017c707b87c203b0cd06879cea8b33e9c6a8585765a4949efa5df3cc9e19b710fe867f11be38ee29fd4a0488
   languageName: node
   linkType: hard
 
@@ -397,15 +397,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.3"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
+  version: 7.23.7
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 0f43b74741d50e637ba4dcef2786621126fe4da6ccf4ee2e94423ee23f6a04ecd91d458e59764c43e4968be139e5197ee43be8a2fea2c09f0b202a3391e548cc
+  checksum: 355746e21ad7f43e4f4daef54cfe2ef461ecd19446b2afedd53c39df1bf9aa2eeeeaabee2279b1321de89a97c9360e4f76e9ba950fee50ff1676c25f6929d625
   languageName: node
   linkType: hard
 
@@ -661,9 +661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.7":
+  version: 7.23.7
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7"
   dependencies:
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
@@ -671,7 +671,7 @@ __metadata:
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f2eef4de609975a3f7da7832576b5ffc93e43c80f87e1a99e886b0f8591096cfc4c37e2d5f52fdeaa2a9c09a25a59f3e621159abaca75d3193922a5c0e4cbe0c
+  checksum: 63d314edc9fbeaf2700745ca0e19bf9840e87f2d7d1f6c5638e06d2aec3e7418d0d7493ed09087e2fe369cc15e9d96c113fb2cd367cb5e3ff922e3712c27b7d4
   languageName: node
   linkType: hard
 
@@ -1201,18 +1201,18 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-transform-runtime@npm:^7.22.4":
-  version: 7.23.6
-  resolution: "@babel/plugin-transform-runtime@npm:7.23.6"
+  version: 7.23.7
+  resolution: "@babel/plugin-transform-runtime@npm:7.23.7"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.22.15"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.6"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.5"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.3"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
+    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 94a7ee92f073df53fd8bebf9ed391a95553716077da1c6c3a57f10f042358c938495d55e6b09b4b50544c01f03560c4770c17698e1c24817a15d3668e8231249
+  checksum: 0d5038462a5762c3a88d820785f685ce1b659075527a3ad538647fd9ce486052777d5aea3d62e626639d60441a04dd0ded2ed32c86b92cf8afbdbd3d54460c13
   languageName: node
   linkType: hard
 
@@ -1334,8 +1334,8 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.6
-  resolution: "@babel/preset-env@npm:7.23.6"
+  version: 7.23.7
+  resolution: "@babel/preset-env@npm:7.23.7"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
@@ -1343,7 +1343,7 @@ __metadata:
     "@babel/helper-validator-option": "npm:^7.23.5"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.7"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
     "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
@@ -1364,7 +1364,7 @@ __metadata:
     "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.23.3"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.4"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.23.7"
     "@babel/plugin-transform-async-to-generator": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3"
     "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
@@ -1412,14 +1412,14 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": "npm:^7.23.3"
     "@babel/plugin-transform-unicode-sets-regex": "npm:^7.23.3"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.6"
-    babel-plugin-polyfill-corejs3: "npm:^0.8.5"
-    babel-plugin-polyfill-regenerator: "npm:^0.5.3"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.7"
+    babel-plugin-polyfill-corejs3: "npm:^0.8.7"
+    babel-plugin-polyfill-regenerator: "npm:^0.5.4"
     core-js-compat: "npm:^3.31.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5b24d179af52f082d04b9b98cc4777e37bf31a97cef5a91d8917e996dbd75f2f743c88c40f80744cb8529355bb674619d150c0260c32d834aa4067e21d0c8962
+  checksum: ac9def873cec52ee02a550bde6e22eced16d1ae331bb8ebc82c03e4c91c12ac17e3e4027647e61612937bcc25ac46e71370aaf99dc2e85dbd11f7777ffeed54e
   languageName: node
   linkType: hard
 
@@ -1484,11 +1484,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.6
-  resolution: "@babel/runtime@npm:7.23.6"
+  version: 7.23.7
+  resolution: "@babel/runtime@npm:7.23.7"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: d886954e985ef8e421222f7a2848884d96a752e0020d3078b920dd104e672fdf23bcc6f51a44313a048796319f1ac9d09c2c88ec8cbb4e1f09174bcd3335b9ff
+  checksum: 3e304133ee55b0750e03e53cb4efb47fb2bdcdb5795f85bbffa10595196c34b9be60eb65bd6d833c87f49fc827f0365f86f95f51d85b188004d3128bb5129c93
   languageName: node
   linkType: hard
 
@@ -1503,9 +1503,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/traverse@npm:7.23.6"
+"@babel/traverse@npm:7, @babel/traverse@npm:^7.23.7":
+  version: 7.23.7
+  resolution: "@babel/traverse@npm:7.23.7"
   dependencies:
     "@babel/code-frame": "npm:^7.23.5"
     "@babel/generator": "npm:^7.23.6"
@@ -1517,7 +1517,7 @@ __metadata:
     "@babel/types": "npm:^7.23.6"
     debug: "npm:^4.3.1"
     globals: "npm:^11.1.0"
-  checksum: 5b4ebb94a00a7e1daf111e4b0b45a7998d5b7598637a14e75e855e88cc1b702789e09a958726b5d599a003be1e9032dbdfde4b88ea6061332228738950d5582d
+  checksum: e32fceb4249beec2bde83968ddffe17444221c1ee5cd18c543a2feaf94e3ca83f2a4dfbc2dcca87cf226e0105973e0fe3717063a21e982a9de9945615ab3f3f5
   languageName: node
   linkType: hard
 
@@ -4764,39 +4764,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.6":
-  version: 0.4.6
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
+"babel-plugin-polyfill-corejs2@npm:^0.4.7":
+  version: 0.4.7
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
   dependencies:
     "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.3"
+    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 64a98811f343492aa6970ab253760194e389c0417e5b830522f944009c1f0c78e1251975fd1b9869cd48cc4623111b20a3389cf6732a1d10ba0d19de6fa5114f
+  checksum: f80f7284ec72c63e7dd751e0bdf25e9978df195a79e0887470603bfdea13ee518d62573cf360bb1bc01b80819e54915dd5edce9cff14c52d0af5f984aa3d36a3
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.8.5":
-  version: 0.8.5
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.5"
+"babel-plugin-polyfill-corejs3@npm:^0.8.7":
+  version: 0.8.7
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.3"
-    core-js-compat: "npm:^3.32.2"
+    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
+    core-js-compat: "npm:^3.33.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 577a072971bda2929a87655c816ad14b6a8f7276e6914851b98a6465bdb56f7f2e3db6136c8b8607bd6ba4cde3cd9cbde21f0078250cd93aee3df977c0a731d0
+  checksum: 094e40f4ab9f131408202063964d63740609fd4fdb70a5b6332b371761921b540ffbcee7a434c0199b8317dfb2ba4675eef674867215fd3b85e24054607c1501
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.3":
-  version: 0.5.3
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
+"babel-plugin-polyfill-regenerator@npm:^0.5.4":
+  version: 0.5.4
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.4.3"
+    "@babel/helper-define-polyfill-provider": "npm:^0.4.4"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: cc32313b9ebbf1d7bedc33524a861136b9e5d3b6e9be317ac360a1c2a59ae5ed1b465a6c68b2715cdefb089780ddfb0c11f4a148e49827a947beee76e43da598
+  checksum: 0b903f5fe2f8c487b4260935dfe60bd9a95bcaee7ae63958f063045093b16d4e8288c232199d411261300aa21f6b106a3cb83c42cc996de013b337f5825a79fe
   languageName: node
   linkType: hard
 
@@ -5151,7 +5151,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.1, browserslist@npm:^4.22.2":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2":
   version: 4.22.2
   resolution: "browserslist@npm:4.22.2"
   dependencies:
@@ -5897,12 +5897,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.32.2":
-  version: 3.33.1
-  resolution: "core-js-compat@npm:3.33.1"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
+  version: 3.35.0
+  resolution: "core-js-compat@npm:3.35.0"
   dependencies:
-    browserslist: "npm:^4.22.1"
-  checksum: 9c7361b370eac30756e6ec52469988d62c6110759efa1c85edd15e6b30f05ace8319a9cc0671bf596a98e7e81c67ad693ceaab2691b85cb62c636da1afe8feb9
+    browserslist: "npm:^4.22.2"
+  checksum: 8c4379240b8decb94b21e81d5ba6f768418721061923b28c9dfc97574680c35d778d39c010207402fc7c8308a68a4cf6d5e02bcbcb96e931c52e6e0dce29a68c
   languageName: node
   linkType: hard
 

From 1982137590a888fb3a29e6b23cada06c799f25a7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 09:52:09 +0100
Subject: [PATCH 175/436] Update dependency classnames to v2.5.1 (#28524)

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

diff --git a/yarn.lock b/yarn.lock
index 1f21b80657..a0a74ec3c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5531,9 +5531,9 @@ __metadata:
   linkType: hard
 
 "classnames@npm:^2.2.5, classnames@npm:^2.3.2":
-  version: 2.5.0
-  resolution: "classnames@npm:2.5.0"
-  checksum: f10a5b07db7fda8eb77f701f795b7006f3de86a723ec62cc10f4d82b4195fc65a578bbf91c47675b8c6fcb2921b903bfea5c670bdb43513e454daa6c2e9738b3
+  version: 2.5.1
+  resolution: "classnames@npm:2.5.1"
+  checksum: afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
   languageName: node
   linkType: hard
 

From fdec8d7ffbdaf480d8fb144c27983f7e0de0373e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 2 Jan 2024 03:09:54 -0600
Subject: [PATCH 176/436] Fix OCR when using S3/CDN for assets (#28551)

---
 .../mastodon/features/ui/components/focal_point_modal.jsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 5353ebdb8a..91dca26718 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -222,7 +222,7 @@ class FocalPointModal extends ImmutablePureComponent {
       const worker = createWorker({
         workerPath: tesseractWorkerPath,
         corePath: tesseractCorePath,
-        langPath: `${assetHost}/ocr/lang-data/`,
+        langPath: `${assetHost}/ocr/lang-data`,
         logger: ({ status, progress }) => {
           if (status === 'recognizing text') {
             this.setState({ ocrStatus: 'detecting', progress });

From 0374e110919fe99b4e4da86363febf433d47a5d9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 09:11:53 +0000
Subject: [PATCH 177/436] New Crowdin Translations (automated) (#28529)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json | 11 ++++++++--
 app/javascript/mastodon/locales/hr.json | 28 +++++++++++++++++++++++++
 app/javascript/mastodon/locales/ie.json |  2 ++
 app/javascript/mastodon/locales/ta.json | 28 +++++++++++++++++++++++++
 config/locales/cy.yml                   |  1 +
 config/locales/devise.ie.yml            |  2 ++
 config/locales/doorkeeper.ie.yml        |  1 +
 config/locales/fi.yml                   |  2 +-
 config/locales/ie.yml                   | 17 +++++++++++++++
 config/locales/simple_form.ie.yml       | 20 ++++++++++++++++++
 config/locales/sk.yml                   |  2 ++
 11 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 17133631a5..04b39904e4 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -21,6 +21,7 @@
   "account.blocked": "Blociwyd",
   "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
   "account.cancel_follow_request": "Tynnu cais i ddilyn",
+  "account.copy": "Copïo dolen i'r proffil",
   "account.direct": "Crybwyll yn breifat @{name}",
   "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
   "account.domain_blocked": "Parth wedi ei flocio",
@@ -31,6 +32,7 @@
   "account.featured_tags.last_status_never": "Dim postiadau",
   "account.featured_tags.title": "Prif hashnodau {name}",
   "account.follow": "Dilyn",
+  "account.follow_back": "Dilyn yn ôl",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {Dilynwr: {counter}} other {Dilynwyr: {counter}}}",
@@ -51,6 +53,7 @@
   "account.mute_notifications_short": "Distewi hysbysiadau",
   "account.mute_short": "Tewi",
   "account.muted": "Wedi anwybyddu",
+  "account.mutual": "Cydgydnabod",
   "account.no_bio": "Dim disgrifiad wedi'i gynnig.",
   "account.open_original_page": "Agor y dudalen wreiddiol",
   "account.posts": "Postiadau",
@@ -168,9 +171,9 @@
   "confirmations.delete.confirm": "Dileu",
   "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
   "confirmations.delete_list.confirm": "Dileu",
-  "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu y rhestr hwn am byth?",
+  "confirmations.delete_list.message": "Ydych chi'n siŵr eich bod eisiau dileu'r rhestr hwn am byth?",
   "confirmations.discard_edit_media.confirm": "Dileu",
-  "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg, eu taflu beth bynnag?",
+  "confirmations.discard_edit_media.message": "Mae gennych newidiadau heb eu cadw i'r disgrifiad cyfryngau neu'r rhagolwg - eu dileu beth bynnag?",
   "confirmations.domain_block.confirm": "Blocio parth cyfan",
   "confirmations.domain_block.message": "Ydych chi wir, wir eisiau blocio'r holl {domain}? Fel arfer, mae blocio neu dewi pobl penodol yn broses mwy effeithiol. Fyddwch chi ddim yn gweld cynnwys o'r parth hwnnw mewn ffrydiau cyhoeddus neu yn eich hysbysiadau. Bydd eich dilynwyr o'r parth hwnnw yn cael eu ddileu.",
   "confirmations.edit.confirm": "Golygu",
@@ -481,12 +484,15 @@
   "onboarding.follows.title": "Yn boblogaidd ar Mastodon",
   "onboarding.profile.discoverable": "Gwnewch fy mhroffil yn un y gellir ei ddarganfod",
   "onboarding.profile.discoverable_hint": "Pan fyddwch yn optio i mewn i ddarganfodadwyedd ar Mastodon, gall eich postiadau ymddangos mewn canlyniadau chwilio a thueddiadau, ac efallai y bydd eich proffil yn cael ei awgrymu i bobl sydd â diddordebau tebyg i chi.",
+  "onboarding.profile.display_name": "Enw dangos",
   "onboarding.profile.display_name_hint": "Eich enw llawn neu'ch enw hwyl…",
+  "onboarding.profile.lead": "Gallwch chi bob amser gwblhau hyn yn ddiweddarach yn y gosodiadau, lle mae hyd yn oed mwy o ddewisiadau cyfaddasu ar gael.",
   "onboarding.profile.note": "Bywgraffiad",
   "onboarding.profile.note_hint": "Gallwch @grybwyll pobl eraill neu #hashnodau…",
   "onboarding.profile.save_and_continue": "Cadw a pharhau",
   "onboarding.profile.title": "Gosodiad proffil",
   "onboarding.profile.upload_avatar": "Llwytho llun proffil",
+  "onboarding.profile.upload_header": "Llwytho pennyn proffil",
   "onboarding.share.lead": "Cofiwch ddweud wrth bobl sut y gallan nhw ddod o hyd i chi ar Mastodon!",
   "onboarding.share.message": "Fi yw {username} ar #Mastodon! Dewch i'm dilyn i yn {url}",
   "onboarding.share.next_steps": "Camau nesaf posib:",
@@ -601,6 +607,7 @@
   "search.quick_action.status_search": "Postiadau sy'n cyfateb i {x}",
   "search.search_or_paste": "Chwilio neu gludo URL",
   "search_popout.full_text_search_disabled_message": "Ddim ar gael ar {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Dim ond ar gael pan wedi mewngofnodi.",
   "search_popout.language_code": "Cod iaith ISO",
   "search_popout.options": "Dewisiadau chwilio",
   "search_popout.quick_actions": "Gweithredoedd cyflym",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 654991a0f9..c535f1affc 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,8 +1,15 @@
 {
   "about.blocks": "Moderirani poslužitelji",
   "about.contact": "Kontakt:",
+  "about.disclaimer": "Mastodon je besplatan softver otvorenog koda i zaštitni znak tvrtke Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razlog nije dostupan",
+  "about.domain_blocks.preamble": "Mastodon vam općenito omogućuje pregled sadržaja i interakciju s korisnicima s bilo kojeg drugog poslužitelja u fediverse. Ovo su iznimke napravljene na ovom poslužitelju.",
+  "about.domain_blocks.silenced.explanation": "Obično nećete vidjeti profile i sadržaj s ovog poslužitelja, osim ako ga izričito ne potražite ili uključite u njega slijedeći ga.",
+  "about.domain_blocks.silenced.title": "Ograničen",
+  "about.domain_blocks.suspended.explanation": "Podatci s ovog poslužitelja neće se obrađivati, pohranjivati ili razmjenjivati, što onemogućuje bilo kakvu interakciju ili komunikaciju s korisnicima s ovog poslužitelja.",
   "about.domain_blocks.suspended.title": "Suspendiran",
+  "about.not_available": "Te informacije nisu dostupne na ovom poslužitelju.",
+  "about.powered_by": "Decentralizirani društveni mediji koje pokreće {mastodon}",
   "about.rules": "Pravila servera",
   "account.account_note_header": "Bilješka",
   "account.add_or_remove_from_list": "Dodaj ili ukloni s liste",
@@ -14,6 +21,8 @@
   "account.blocked": "Blokirano",
   "account.browse_more_on_origin_server": "Pogledajte više na izvornom profilu",
   "account.cancel_follow_request": "Withdraw follow request",
+  "account.copy": "Kopiraj vezu u profil",
+  "account.direct": "Privatno spomeni @{name}",
   "account.disable_notifications": "Nemoj me obavjestiti kada @{name} napravi objavu",
   "account.domain_blocked": "Domena je blokirana",
   "account.edit_profile": "Uredi profil",
@@ -21,7 +30,9 @@
   "account.endorse": "Istakni na profilu",
   "account.featured_tags.last_status_at": "Zadnji post {date}",
   "account.featured_tags.last_status_never": "Nema postova",
+  "account.featured_tags.title": "Istaknuti hashtagovi {name}",
   "account.follow": "Prati",
+  "account.follow_back": "Slijedi natrag",
   "account.followers": "Pratitelji",
   "account.followers.empty": "Nitko još ne prati korisnika/cu.",
   "account.followers_counter": "{count, plural, one {{counter} pratitelj} other {{counter} pratitelja}}",
@@ -32,6 +43,7 @@
   "account.hide_reblogs": "Sakrij boostove od @{name}",
   "account.in_memoriam": "U sjećanje.",
   "account.joined_short": "Pridružen",
+  "account.languages": "Promjeni pretplaćene jezike",
   "account.link_verified_on": "Vlasništvo ove poveznice provjereno je {date}",
   "account.locked_info": "Status privatnosti ovog računa postavljen je na zaključano. Vlasnik ručno pregledava tko ih može pratiti.",
   "account.media": "Medijski sadržaj",
@@ -40,11 +52,14 @@
   "account.mute_notifications_short": "Utišaj obavijesti",
   "account.mute_short": "Utišaj",
   "account.muted": "Utišano",
+  "account.mutual": "Uzajamno",
+  "account.no_bio": "Nije dan opis.",
   "account.open_original_page": "Otvori originalnu stranicu",
   "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}",
   "account.statuses_counter": "{count, plural, one {{counter} toot} other {{counter} toota}}",
@@ -54,11 +69,18 @@
   "account.unendorse": "Ne ističi na profilu",
   "account.unfollow": "Prestani pratiti",
   "account.unmute": "Poništi utišavanje @{name}",
+  "account.unmute_notifications_short": "Uključi utišane obavijesti",
   "account.unmute_short": "Poništi utišavanje",
   "account_note.placeholder": "Kliknite za dodavanje bilješke",
+  "admin.dashboard.daily_retention": "Stopa zadržavanja korisnika po danu nakon prijave",
+  "admin.dashboard.monthly_retention": "Stopa zadržavanja korisnika po mjesecu nakon prijave",
   "admin.dashboard.retention.average": "Prosječno",
   "admin.dashboard.retention.cohort": "Mjesec prijave",
   "admin.dashboard.retention.cohort_size": "Novi korisnici",
+  "admin.impact_report.instance_accounts": "Profili računa koji bi ovo izbrisali",
+  "admin.impact_report.instance_followers": "Sljedbenici koje bi izgubili naši korisnici",
+  "admin.impact_report.instance_follows": "Sljedbenici koje bi izgubili njihovi korisnici",
+  "admin.impact_report.title": "Sažetak učinka",
   "alert.rate_limited.message": "Molimo pokušajte nakon {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ograničenje učestalosti",
   "alert.unexpected.message": "Dogodila se neočekivana greška.",
@@ -68,10 +90,14 @@
   "audio.hide": "Sakrij audio",
   "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
+  "bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
+  "bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
   "bundle_column_error.error.title": "Oh, ne!",
+  "bundle_column_error.network.body": "Došlo je do pogreške prilikom pokušaja učitavanja ove stranice. Razlog može biti privremeni problem s internetskom vezom ili ovim poslužiteljem.",
   "bundle_column_error.network.title": "Greška mreže",
   "bundle_column_error.retry": "Pokušajte ponovno",
   "bundle_column_error.return": "Na glavnu",
+  "bundle_column_error.routing.body": "Traženu stranicu nije moguće pronaći. Jeste li sigurni da je URL u adresnoj traci točan?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto je pošlo po zlu tijekom učitavanja ove komponente.",
@@ -171,6 +197,7 @@
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Evo kako će izgledati:",
   "emoji_button.activity": "Aktivnost",
+  "emoji_button.clear": "Obriši",
   "emoji_button.custom": "Prilagođeno",
   "emoji_button.flags": "Zastave",
   "emoji_button.food": "Hrana i piće",
@@ -211,6 +238,7 @@
   "explore.trending_links": "Novosti",
   "explore.trending_statuses": "Objave",
   "explore.trending_tags": "Hashtagovi",
+  "filter_modal.added.context_mismatch_title": "Nepodudaranje konteksta!",
   "filter_modal.added.review_and_configure_title": "Postavke filtara",
   "filter_modal.added.title": "Filtar dodan!",
   "filter_modal.select_filter.prompt_new": "Nova kategorija: {name}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 0344470edf..8579fc89c6 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -250,6 +250,7 @@
   "error.unexpected_crash.explanation_addons": "Ti-ci págine ne posset esser monstrat correctmen. Li error es probabilmen causat de un extension al navigator o instrumentes por automatic traduction.",
   "error.unexpected_crash.next_steps": "Prova recargar li págine. Si to ne auxilia, tu fórsan posse usar Mastodon per un diferent navigator o aplication.",
   "error.unexpected_crash.next_steps_addons": "Prova desactivisar les e recargar li págine. Si to ne auxilia, tu fórsan posse usar Mastodon per un diferent navigator o aplication.",
+  "errors.unexpected_crash.copy_stacktrace": "Copiar cumul-tracie a paperiere",
   "errors.unexpected_crash.report_issue": "Raportar un problema",
   "explore.search_results": "Resultates de sercha",
   "explore.suggested_follows": "Gente",
@@ -350,6 +351,7 @@
   "keyboard_shortcuts.heading": "Rapid-tastes",
   "keyboard_shortcuts.home": "Aperter li hemal témpor-linea",
   "keyboard_shortcuts.hotkey": "Rapid clave",
+  "keyboard_shortcuts.legend": "Monstrar ti-ci legende",
   "keyboard_shortcuts.local": "Aperter li local témpor-linea",
   "keyboard_shortcuts.mention": "Mentionar li autor",
   "keyboard_shortcuts.muted": "Aperter li lista de silentiat usatores",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 6b2332d5b8..955955b8c2 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -10,6 +10,7 @@
   "account.badges.group": "குழு",
   "account.block": "@{name} -ஐத் தடு",
   "account.block_domain": "{domain} யில் இருந்து வரும் எல்லாவற்றையும் மறை",
+  "account.block_short": "தடு",
   "account.blocked": "முடக்கப்பட்டது",
   "account.browse_more_on_origin_server": "மேலும் உலாவ சுயவிவரத்திற்குச் செல்க",
   "account.cancel_follow_request": "Withdraw follow request",
@@ -18,20 +19,26 @@
   "account.edit_profile": "சுயவிவரத்தை மாற்று",
   "account.enable_notifications": "@{name} பதிவிட்டல் எனக்குத் தெரியப்படுத்தவும்",
   "account.endorse": "சுயவிவரத்தில் வெளிப்படுத்து",
+  "account.featured_tags.last_status_never": "இடுகைகள் இல்லை",
   "account.follow": "பின்தொடர்",
+  "account.follow_back": "பின்தொடரு",
   "account.followers": "பின்தொடர்பவர்கள்",
   "account.followers.empty": "இதுவரை யாரும் இந்த பயனரைப் பின்தொடரவில்லை.",
   "account.followers_counter": "{count, plural, one {{counter} வாசகர்} other {{counter} வாசகர்கள்}}",
   "account.following": "பின்தொடரும்",
   "account.following_counter": "{count, plural,one {{counter} சந்தா} other {{counter} சந்தாக்கள்}}",
   "account.follows.empty": "இந்த பயனர் இதுவரை யாரையும் பின்தொடரவில்லை.",
+  "account.go_to_profile": "சுயவிவரத்திற்குச் செல்லவும்",
   "account.hide_reblogs": "இருந்து ஊக்கியாக மறை @{name}",
   "account.link_verified_on": "இந்த இணைப்பை உரிமையாளர் சரிபார்க்கப்பட்டது {date}",
   "account.locked_info": "இந்தக் கணக்கு தனியுரிமை நிலை பூட்டப்பட்டுள்ளது. அவர்களைப் பின்தொடர்பவர் யார் என்பதை உரிமையாளர் கைமுறையாக மதிப்பாய்வு செய்கிறார்.",
   "account.media": "ஊடகங்கள்",
   "account.mention": "குறிப்பிடு @{name}",
   "account.mute": "ஊமையான @{name}",
+  "account.mute_notifications_short": "அறிவிப்புகளை ஒலியடக்கு",
+  "account.mute_short": "அமைதியாக்கு",
   "account.muted": "முடக்கியது",
+  "account.no_bio": "விளக்கம் எதுவும் வழங்கப்படவில்லை.",
   "account.posts": "டூட்டுகள்",
   "account.posts_with_replies": "Toots மற்றும் பதில்கள்",
   "account.report": "@{name} -ஐப் புகாரளி",
@@ -61,15 +68,29 @@
   "audio.hide": "ஆடியோவை மறை",
   "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
+  "bundle_column_error.error.title": "அடடே!",
+  "bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
+  "bundle_column_error.network.title": "பிணையப் பிழை",
   "bundle_column_error.retry": "மீண்டும் முயற்சிக்கவும்",
+  "bundle_column_error.return": "முகப்பிற்கு செல்லவும்",
+  "bundle_column_error.routing.body": "கேட்கப்பட்ட பக்கத்தைக் காணவில்லை. நீங்கள் உள்ளிட்ட முகவரி சரியனதா?",
+  "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "மூடுக",
   "bundle_modal_error.message": "இக்கூற்றை ஏற்றம் செய்யும்பொழுது ஏதோ தவறு ஏற்பட்டுள்ளது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
+  "closed_registrations.other_server_instructions": "மசுடோடன் இரு பரவலாக்கப்பட்ட மென்பொருள் என்பதால், நீங்கள் வேரு ஒரு வழங்கியில் கணக்கை உருவாக்கியிருந்தாலும் இந்த வழங்கியில் பயன்படுத்தலாம்.",
+  "closed_registrations_modal.description": "{domain} இல் இப்பொழுது கணக்குகள் உருவாக்க முடியாது. நீங்கள் மசுடோடன் பயன்படுத்த, குறிப்பாக {domain} முகவரியில் கணக்கைத் துவங்க வேண்டும் என்ற அவசியமில்லை என்பதை மனதில் வைத்துக் கொள்ளவும்.",
+  "closed_registrations_modal.find_another_server": "வேறொரு வழங்கியைக் கண்டுபிடி",
+  "closed_registrations_modal.preamble": "மசுடோடன் ஒரு பரவலாக்கப்பட்ட மென்பொருள். ஆதனால் நீங்கள் எங்குக் கணக்கை உருவாக்கினாலும் இந்த வழங்கியில் உள்ள யாருடன் வேண்டும் என்றாலும் உரவாடலாம். நீங்களே கூட ஒரு வழங்கியை நிறுவலாம்!",
+  "closed_registrations_modal.title": "மசுடோடன் கணக்கு துவங்கப்படுகிறது",
+  "column.about": "பற்றி",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "அடையாளக்குறிகள்",
   "column.community": "சுய நிகழ்வு காலவரிசை",
+  "column.direct": "தனிப்பட்ட குறிப்புகள்",
   "column.directory": "சுயவிவரங்களை உலாவு",
   "column.domain_blocks": "மறைந்திருக்கும் திரளங்கள்",
+  "column.favourites": "பிடித்தவை",
   "column.follow_requests": "பின்தொடர அனுமதிகள்",
   "column.home": "முகப்பு",
   "column.lists": "பட்டியல்கள்",
@@ -90,6 +111,9 @@
   "community.column_settings.remote_only": "தொலைவிலிருந்து மட்டுமே",
   "compose.language.change": "மொழியை மாற்று",
   "compose.language.search": "தேடல் மொழிகள்...",
+  "compose.published.body": "பதிவிடப்பட்டது.",
+  "compose.published.open": "திற",
+  "compose.saved.body": "பதிவி சேமிக்கப்பட்டது.",
   "compose_form.direct_message_warning_learn_more": "மேலும் அறிய",
   "compose_form.encryption_warning": "Mastodonல் உள்ள பதிவுகள் முறையாக என்க்ரிப்ட்(encrypt) செய்யபடவில்லை. அதனால் முக்கிய தகவல்களை இங்கே பகிர வேண்டாம்.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
@@ -180,6 +204,10 @@
   "error.unexpected_crash.next_steps": "பக்கத்தைப் புதுப்பித்துப் பார்க்கவும். அப்படியும் வேலை செய்யவில்லை எனில், மாஸ்டடானை வேறு ஒரு உலாவியின் மூலமோ, அல்லது பொருத்தமான செயலியின் மூலமோ பயன்படுத்திப் பார்க்கவும்.",
   "errors.unexpected_crash.copy_stacktrace": "Stacktrace-ஐ clipboard-ல் நகலெடு",
   "errors.unexpected_crash.report_issue": "புகாரளி",
+  "explore.title": "உலாவு",
+  "explore.trending_links": "செய்திகள்",
+  "explore.trending_statuses": "பதிவுகள்",
+  "explore.trending_tags": "ஹேஷ்டேக்குகள்",
   "follow_request.authorize": "அனுமதியளி",
   "follow_request.reject": "நிராகரி",
   "follow_requests.unlocked_explanation": "உங்கள் கணக்கு பூட்டப்படவில்லை என்றாலும், இந்தக் கணக்குகளிலிருந்து உங்களைப் பின்தொடர விரும்பும் கோரிக்கைகளை நீங்கள் பரீசீலிப்பது நலம் என்று {domain} ஊழியர் எண்ணுகிறார்.",
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 7f60e93422..9dd533b2ad 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -659,6 +659,7 @@ cy:
       created_at: Adroddwyd
       delete_and_resolve: Dileu postiadau
       forwarded: Wedi'i anfon ymlaen
+      forwarded_replies_explanation: Mae'r adroddiad hwn gan ddefnyddiwr o weinydd arall ac am gynnwys pell. Mae wedi ei anfon ymlaen atoch chi oherwydd bod y cynnwys sy'n cael ei adrodd yn ateb i un o'ch defnyddwyr.
       forwarded_to: Wedi'i anfon ymlaen i %{domain}
       mark_as_resolved: Nodi fel wedi'i ddatrys
       mark_as_sensitive: Marcio fel sensitif
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 847b0f361b..e4f2e6fb19 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -18,6 +18,8 @@ ie:
       confirmation_instructions:
         action: Verificar e-posta
         action_with_app: Confirma e retorna a%{app}
+        explanation: Tu ha creat un conto sur %{host} con ti-ci e-posta, quel tu posse activar per un sol clicc. Si it ne esset tu qui creat li conto, ples ignorar ti-ci missage.
+        explanation_when_pending: Tu ha demandat un invitation a %{host} con ti-ci e-posta. Pos confirmation de tui adresse, noi va inspecter tui aplication. Tu posse inloggar por changear detallies o deleter li conto, ma li pluparte del functiones va restar ínusabil til quande tui conto es aprobat. Tui data va esser deletet si tui conto es rejectet, e in ti casu tu ne besona far quelcunc cose. Si it ne esset tu qui creat li conto, ples ignorar ti-ci missage.
         title: Verificar e-posta
       email_changed:
         explanation: 'Li e-mail adresse de tui es changeat a:'
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index e5e5146558..1b4b5994bd 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -151,6 +151,7 @@ ie:
       write:filters: crea filtres
       write:follows: sequer homes
       write:lists: crear listes
+      write:media: adcargar files de medie
       write:mutes: silentiar persones e conversationes
       write:notifications: aclarar tui notificationes
       write:reports: raportar altri persones
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index d48653edcc..93545b6a1b 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1559,7 +1559,7 @@ fi:
     last_active: Viimeksi aktiivinen
     most_recent: Viimeisimmät
     moved: Muuttaneet
-    mutual: Molemmat
+    mutual: Seuraatte toisianne
     primary: Ensisijaiset
     relationship: Suhde
     remove_selected_domains: Poista kaikki seuraajat valituista verkkotunnuksista
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 99e628fe3b..87aa1c41cc 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -112,6 +112,7 @@ ie:
       promote: Promoer
       protocol: Protocol
       public: Public
+      push_subscription_expires: Subscrition a PuSH expira
       redownload: Recargar li profil
       redownloaded_msg: Successosimen recargat li profil de %{username} del original fonte
       reject: Rejecter
@@ -465,6 +466,7 @@ ie:
       unsuppress: Restaurar seque-recomandation
     instances:
       availability:
+        failure_threshold_reached: Límite de falliment atinget ye %{date}.
         failures_recorded:
           one: Fallit prova por %{count} die.
           other: Fallit provas por %{count} dies.
@@ -478,6 +480,8 @@ ie:
       confirm_purge: Vole tu vermen permanentmen deleter data de ti dominia?
       content_policies:
         comment: Internal nota
+        description_html: Tu posse definar planes de contenete a aplicar sur omni contos de ti-ci dominia e omni su subdominias.
+        limited_federation_mode_description_html: Tu posse selecter ca permisser federation a ti-ci dominia.
         policies:
           reject_media: Rejecter medie
           reject_reports: Rejecter raportes
@@ -704,6 +708,7 @@ ie:
         manage_users: Gerer usatores
         manage_users_description: Permisse que usatores vide detallies de altri usatores e fa actiones de moderation contra les
         manage_webhooks: Gerer Webcrocs
+        manage_webhooks_description: Permisse que usatores configura webcrocs por evenimentes administrativ
         view_audit_log: Vider li Jurnale de Audit
         view_audit_log_description: Permisse que usatores vide li historie de administrativ actiones sur li servitor
         view_dashboard: Vider Panel de Control
@@ -714,6 +719,7 @@ ie:
     rules:
       add_new: Adjunter un regule
       delete: Deleter
+      description_html: Benque li pluparte di que ili ha leet e acorda con li termines de servicie, presc nequi perlee les til quande un problema eveni. <strong>Tu posse facilitar li perletura del regules de tui servitor per dar les sur un liste de plat balle-punctus.</strong> Li índividual regules posse esser curt e simplic, ma mem un liste de micri punctus posse esser tro exigent por li letor si it es tro grand.
       edit: Redacter regul
       empty: Ancor null regules de servitor ha esset definit.
       title: Regules del servitor
@@ -724,6 +730,11 @@ ie:
       appearance:
         preamble: Customisar li interfacie web de Mastodon.
         title: Aspecte
+      branding:
+        title: Marca
+      captcha_enabled:
+        desc_html: To ci usa extern scrites de hCaptcha, quel posse esser ínquietant pro rasones de securitá e privatie. In plu, <strong>it posse far li processu de registration mult plu desfacil (particularimen por tis con deshabilitás)</strong>. Pro ti rasones, ples considerar alternativ mesuras, tales quam registration per aprobation o invitation.
+        title: Exige que nov usatores solue un CAPTCHA por confirmar lor conto
       content_retention:
         title: Retention de contenete
       discovery:
@@ -1374,6 +1385,7 @@ ie:
   media_attachments:
     validations:
       images_and_video: On ne posse atachar un video a un posta quel ja contene images
+      too_many: Ne posse atachar plu quam 4 files
   migrations:
     acct: Translocat a
     cancel: Anullar redirection
@@ -1401,6 +1413,8 @@ ie:
     carry_blocks_over_text: Ti usator translocat se de %{acct}, quel tu hat bloccat.
     carry_mutes_over_text: Ti-ci usator movet se de %{acct}, quel tu hat silentiat.
     copy_account_note_text: 'Vi tui notas pri ti usator qui translocat se de %{acct}:'
+  navigation:
+    toggle_menu: Changear menú
   notification_mailer:
     admin:
       report:
@@ -1443,6 +1457,7 @@ ie:
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: B
           million: M
@@ -1800,6 +1815,8 @@ ie:
       success: Tui clave de securitá esset adjuntet con successe.
     delete: Deleter
     delete_confirmation: Vole tu vermen deleter ti-ci clave de securitá?
+    destroy:
+      success: Tui clave de securitá esset successosimen deletet.
     invalid_credential: Ínvalid clave de securitá
     not_enabled: Tu ancor ne ha possibilisat WebAuthn
     not_supported: Ti-ci navigator ne subtene claves de securitá
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 3bcce47d36..f945e2342e 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -6,6 +6,7 @@ ie:
         discoverable: Tui public postas e profil posse esser recomandat in multiplic areas de Mastodon e tui profil posse esser suggestat a altri usatores.
         display_name: Tui complet nómine o tui amusant nómine.
         fields: Tui websitu, pronómines, etá, quocunc quel tu vole.
+        indexable: Tui public postas posse aparir in sercha-resultates sur Mastodon. E in omni casu, tis qui ha interactet con tui postas va posser serchar e trovar les.
         note: 'Tu posse @mentionar altri persones o #hashtags.'
         unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
       account_alias:
@@ -65,20 +66,27 @@ ie:
           hide: Celar completmen li contenete filtrat, quam si it ne existe
           warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
+        backups_retention_period: Mantener usator-generat archives por li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
         site_contact_email: Qualmen on posse contacter te por inquestes legal o de apoy.
         site_contact_username: Qualmen li gente posse atinger te sur Mastodon.
+        site_short_description: Un curt descrition por auxiliar identificar tui servitor. Qui gere it, por qual persones it es?
         site_title: Quant persones posse aluder a tui servitor ultra su nómine de dominia.
+        status_page_url: URL de un págine monstrant li statu de ti-ci servitor durant un ruptura de servicie
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
+        thumbnail: Un image de dimensiones circa 2:1 monstrat along tui servitor-information.
         timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
+        trends: Tendenties monstra quel postas, hashtags e novas es ganiant atention sur tui servitor.
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
       form_challenge:
         current_password: Tu nu intra un area secur
       ip_block:
         comment: Facultativ. Ne obliviar pro quo tu adjuntet ti-ci regul.
+        expires_in: IP-adresses es un ressurse finit, quelcvez partit e transferet de manu a manu. Pro to, un índefinit bloccada de IP ne es recomandat.
         severities:
+          no_access: Bloccar accesse a omni ressurses
           sign_up_block: Nov registrationes ne va esser possibil
           sign_up_requires_approval: Nov registrationes va besonar tui aprobation
         severity: Selecter quo va evenir con demandes ex ti-ci IP
@@ -142,11 +150,13 @@ ie:
         honeypot: "%{label} (ne plenar)"
         irreversible: Lassar cader vice celar
         locale: Lingue del interfacie
+        max_uses: Max grand númere de usas
         new_password: Nov passa-parol
         note: Biografie
         password: Passa-parol
         phrase: Clave-parol o frase
         setting_advanced_layout: Possibilisar web-interfacie avansat
+        setting_always_send_emails: Sempre misser notificationes de e-posta
         setting_default_language: Lingue in quel postar
         setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
@@ -162,18 +172,27 @@ ie:
         severity: Severitá
         sign_in_token_attempt: Code de securitá
         title: Titul
+        type: Specie de importation
         username: Nómine de usator
         whole_word: Plen parol
+      featured_tag:
+        name: Hashtag
       filters:
         actions:
+          hide: Celar completmen
           warn: Celar con un admonition
       form_admin_settings:
+        backups_retention_period: Periode de retener archives de usator
+        bootstrap_timeline_accounts: Sempre recomandar ti-ci contos a nov usatores
+        closed_registrations_message: Customisat missage quande registration ne disponibil
         custom_css: Custom CSS
         profile_directory: Possibilisar profilarium
         registrations_mode: Qui posse registrar se
         show_domain_blocks: Vider bloccas de dominia
         show_domain_blocks_rationale: Monstrar pro quo cert dominias esset bloccat
         site_contact_email: Contact e-mail adresse
+        site_contact_username: Usator-nómine de contact
+        site_extended_description: Extendet descrition
         site_title: Nómine de servitor
         theme: Predefenit tema
         trendable_by_default: Possibilisar tendenties sin priori inspection
@@ -220,6 +239,7 @@ ie:
         events: Evenimentes activisat
         url: URL de punctu terminal
     'no': 'No'
+    not_recommended: Ne recomandat
     recommended: Recomandat
     required:
       mark: "*"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 4fe190cfec..feb84ea984 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -574,6 +574,7 @@ sk:
         manage_announcements: Spravuj oboznámenia
         manage_appeals: Spravuj námietky
         manage_blocks: Spravuj blokovania
+        manage_custom_emojis: Spravuj vlastné emotikony
         manage_federation: Spravuj federáciu
         manage_invites: Spravuj pozvánky
         manage_reports: Spravuj hlásenia
@@ -696,6 +697,7 @@ sk:
         title: Populárne príspevky
       tags:
         dashboard:
+          tag_accounts_measure: unikátnych použití
           tag_servers_measure: iné servery
           tag_uses_measure: užívateľov celkovo
         not_usable: Nemôže byť použitý

From cd09be054fcf12ba2bd0b85c20cfa0432b8d5532 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 11:13:22 +0100
Subject: [PATCH 178/436] Update dependency eslint-plugin-jsdoc to v47 (#28541)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 7b09178adb..479852cd51 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
-    "eslint-plugin-jsdoc": "^46.1.0",
+    "eslint-plugin-jsdoc": "^47.0.0",
     "eslint-plugin-jsx-a11y": "~6.8.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
diff --git a/yarn.lock b/yarn.lock
index a0a74ec3c2..b44c218016 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2368,7 +2368,7 @@ __metadata:
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
-    eslint-plugin-jsdoc: "npm:^46.1.0"
+    eslint-plugin-jsdoc: "npm:^47.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
     eslint-plugin-prettier: "npm:^5.0.0"
     eslint-plugin-promise: "npm:~6.1.1"
@@ -7361,9 +7361,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^46.1.0":
-  version: 46.9.1
-  resolution: "eslint-plugin-jsdoc@npm:46.9.1"
+"eslint-plugin-jsdoc@npm:^47.0.0":
+  version: 47.0.1
+  resolution: "eslint-plugin-jsdoc@npm:47.0.1"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7375,8 +7375,8 @@ __metadata:
     semver: "npm:^7.5.4"
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: d15d68797e85bb7b6fdcfc1170653683c16ab1d62c2e9c537101e774cb3231913e2bc4781f2bb808d074adce5699e5b545e450c6801b637c6434587d226ad6ac
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+  checksum: f2657cfc1394af0fca2c9c079065ffbc4e5fd41678299afb9ae261aff246cbd861d0ff38b57258caf6c9e9c57eb9975c75cd47c9f8c92bfefdaa4924eef62c24
   languageName: node
   linkType: hard
 

From 1184887b012e863fbf44f65ef5c65e0049123c27 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Jan 2024 13:27:51 +0100
Subject: [PATCH 179/436] Fix streaming API redirection ignoring the port of
 `streaming_api_base_url` (#28558)

---
 app/controllers/api/v1/streaming_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb
index 0cdd00d62f..0cb6e856f2 100644
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@@ -13,7 +13,9 @@ class Api::V1::StreamingController < Api::BaseController
 
   def streaming_api_url
     Addressable::URI.parse(request.url).tap do |uri|
-      uri.host = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url).host
+      base_url = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url)
+      uri.host = base_url.host
+      uri.port = base_url.port
     end.to_s
   end
 end

From 65ea097f1df5f14a4b389aa6ec0b955f2066b41c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 2 Jan 2024 16:02:25 +0100
Subject: [PATCH 180/436] Fix loading local accounts with extraneous domain
 part in WebUI (#28559)

---
 app/javascript/mastodon/reducers/accounts_map.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/reducers/accounts_map.js b/app/javascript/mastodon/reducers/accounts_map.js
index d5ecad7dbf..9053dcc9c0 100644
--- a/app/javascript/mastodon/reducers/accounts_map.js
+++ b/app/javascript/mastodon/reducers/accounts_map.js
@@ -2,8 +2,13 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { ACCOUNT_LOOKUP_FAIL } from '../actions/accounts';
 import { importAccounts } from '../actions/accounts_typed';
+import { domain } from '../initial_state';
 
-export const normalizeForLookup = str => str.toLowerCase();
+export const normalizeForLookup = str => {
+  str = str.toLowerCase();
+  const trailingIndex = str.indexOf(`@${domain.toLowerCase()}`);
+  return (trailingIndex > 0) ? str.slice(0, trailingIndex) : str;
+};
 
 const initialState = ImmutableMap();
 

From 3944b12b5eec8c6ae4666ec922411b32b3442dd6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 2 Jan 2024 10:19:54 -0500
Subject: [PATCH 181/436] Update `@typescript-eslint/parser` to version 6.17.0
 (#28218)

---
 package.json |  2 +-
 yarn.lock    | 64 ++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 479852cd51..54dac54cd5 100644
--- a/package.json
+++ b/package.json
@@ -181,7 +181,7 @@
     "@types/webpack": "^4.41.33",
     "@types/yargs": "^17.0.24",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/parser": "^6.17.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
     "eslint-config-prettier": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index b44c218016..571e29e7d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2338,7 +2338,7 @@ __metadata:
     "@types/webpack": "npm:^4.41.33"
     "@types/yargs": "npm:^17.0.24"
     "@typescript-eslint/eslint-plugin": "npm:^6.0.0"
-    "@typescript-eslint/parser": "npm:^6.0.0"
+    "@typescript-eslint/parser": "npm:^6.17.0"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.4.0"
     autoprefixer: "npm:^10.4.14"
@@ -3693,21 +3693,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.0.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/parser@npm:6.16.0"
+"@typescript-eslint/parser@npm:^6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/parser@npm:6.17.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.16.0"
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/typescript-estree": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+    "@typescript-eslint/scope-manager": "npm:6.17.0"
+    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/typescript-estree": "npm:6.17.0"
+    "@typescript-eslint/visitor-keys": "npm:6.17.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9d573d14df4ec661dccaca785223a8a330d64f50a9279ff9170b1da22198ff91b9afa3ee7d3d7127c0cbc148c86831e76b33fc5b47d630799e98940ef666bfe0
+  checksum: 66b53159688083eb48259de5b4daf076f3de284ac3b4d2618bda3f7ab2d8ee27b01ae851b08e8487047e33ff3668424f17d677d66413164cb231f1519dcff82f
   languageName: node
   linkType: hard
 
@@ -3721,6 +3721,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.17.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+  checksum: b7ac7d9c39515c2a1b3844577fab967bf126ec25ccf28076240748b3f42d60ab3e64131bfffee61f66251bdf2d59e50e39f5cb0bee7987c85c49140c75d26b5f
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:6.16.0":
   version: 6.16.0
   resolution: "@typescript-eslint/type-utils@npm:6.16.0"
@@ -3745,6 +3755,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/types@npm:6.17.0"
+  checksum: c458d985b9ab4f369018536bcb88f0aedafb0c8c4b22ffd376e0c0c768a44e3956475c85ebeef40ae44238841c8df268893477b85873aa2621995c37e738e37e
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:6.16.0":
   version: 6.16.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
@@ -3764,6 +3781,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 5a858288bb05f45a2a45b04394115826ff19f85555144bfb67dc281d4e75fc3a1e1aceb3dee68022e86b91f199d1310c15bda3100a4890004b8e474d86afad51
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:6.16.0, @typescript-eslint/utils@npm:^6.5.0":
   version: 6.16.0
   resolution: "@typescript-eslint/utils@npm:6.16.0"
@@ -3791,6 +3827,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:6.17.0":
+  version: 6.17.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.17.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.17.0"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 75a48f5810c6a69bc1c082b07d2b840c40895807b1b4ecf9d3ab9eb783176eeb3e7b11eb89d652e8331da79d604f82300f315ffc21cd937819197a8601b48d1d
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"

From c2b4588f1cd65f2b36fc45f998681492ef2f0f79 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 10:04:59 +0100
Subject: [PATCH 182/436] Update dependency sass to v1.69.7 (#28570)

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

diff --git a/yarn.lock b/yarn.lock
index 571e29e7d3..2bab9a2d0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14554,15 +14554,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.69.6
-  resolution: "sass@npm:1.69.6"
+  version: 1.69.7
+  resolution: "sass@npm:1.69.7"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 8153db8e51e74a9007bb54332e14d122c34288c7d21a5f2eaefef753a1b7bb13f35e042dc6247253dab5b1550b05cea27970371e7548286b4f50f23dd1147d89
+  checksum: 773d0938e7d4ff3972d3fda3132f34fe98a2f712e028a58e28fecd615434795eff3266eddc38d5e13f03b90c0d6360d0e737b30bff2949a47280c64a18e0fb18
   languageName: node
   linkType: hard
 

From 8c5d3e527892dee08f5f6ae7517f9af8f3b4963e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 09:05:52 +0000
Subject: [PATCH 183/436] Update dependency puma to v6.4.1 (#28569)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 08b9fc0de4..295461bd35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -544,7 +544,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
-    puma (6.4.0)
+    puma (6.4.1)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)

From 2b330ede224d4fcc79b48f0de36da1ca9909d83d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 10:10:19 +0100
Subject: [PATCH 184/436] Update dependency eslint-plugin-jsdoc to v48 (#28564)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 54dac54cd5..82cfd689a5 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.29.0",
-    "eslint-plugin-jsdoc": "^47.0.0",
+    "eslint-plugin-jsdoc": "^48.0.0",
     "eslint-plugin-jsx-a11y": "~6.8.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "~6.1.1",
diff --git a/yarn.lock b/yarn.lock
index 2bab9a2d0d..3cd45a11d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2368,7 +2368,7 @@ __metadata:
     eslint-import-resolver-typescript: "npm:^3.5.5"
     eslint-plugin-formatjs: "npm:^4.10.1"
     eslint-plugin-import: "npm:~2.29.0"
-    eslint-plugin-jsdoc: "npm:^47.0.0"
+    eslint-plugin-jsdoc: "npm:^48.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.8.0"
     eslint-plugin-prettier: "npm:^5.0.0"
     eslint-plugin-promise: "npm:~6.1.1"
@@ -7407,9 +7407,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^47.0.0":
-  version: 47.0.1
-  resolution: "eslint-plugin-jsdoc@npm:47.0.1"
+"eslint-plugin-jsdoc@npm:^48.0.0":
+  version: 48.0.1
+  resolution: "eslint-plugin-jsdoc@npm:48.0.1"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7422,7 +7422,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: f2657cfc1394af0fca2c9c079065ffbc4e5fd41678299afb9ae261aff246cbd861d0ff38b57258caf6c9e9c57eb9975c75cd47c9f8c92bfefdaa4924eef62c24
+  checksum: 9b211cfb2e07e076dad12681cd2045c65766dd24fe9399fd0adeaf6f8785f9a4dd58608f1183195f63d3c6c91013aa1cf9edc9101580cff9cb60e1e688f456f9
   languageName: node
   linkType: hard
 

From 7cce2a41f279ff157cb04d826bd5c46a129689aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 10:19:46 +0100
Subject: [PATCH 185/436] New Crowdin Translations (automated) (#28573)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json | 63 ++++++++++++++++++++++++-
 app/javascript/mastodon/locales/lt.json |  4 +-
 app/javascript/mastodon/locales/ta.json | 10 ++--
 config/locales/doorkeeper.ie.yml        |  4 ++
 config/locales/simple_form.ie.yml       |  6 +++
 5 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 917a034667..35397b8e12 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -1,23 +1,84 @@
 {
   "account.add_or_remove_from_list": "Adder o remover ab listas",
+  "account.badges.group": "Gruppo",
+  "account.block": "Blocar @{name}",
+  "account.block_short": "Blocar",
+  "account.blocked": "Blocate",
   "account.copy": "Copiar ligamine a profilo",
+  "account.edit_profile": "Modificar profilo",
+  "account.go_to_profile": "Vader al profilo",
+  "account.moved_to": "{name} indicava que lor nove conto ora es:",
+  "account.share": "Compartir profilo de @{name}",
+  "account.unblock": "Disblocar @{name}",
+  "account.unblock_short": "Disblocar",
+  "account.unendorse": "Non evidentiar sur le profilo",
+  "account_note.placeholder": "Clicca pro adder un nota",
+  "admin.dashboard.retention.cohort_size": "Nove usatores",
+  "audio.hide": "Celar audio",
+  "autosuggest_hashtag.per_week": "{count} per septimana",
   "bundle_column_error.network.title": "Error de rete",
+  "bundle_column_error.retry": "Tentar novemente",
+  "bundle_column_error.return": "Retornar al initio",
   "bundle_modal_error.close": "Clauder",
+  "bundle_modal_error.retry": "Tentar novemente",
+  "column.blocks": "Usatores blocate",
+  "column.directory": "Navigar profilos",
+  "column.favourites": "Favoritos",
   "column.home": "Initio",
+  "column.lists": "Listas",
+  "column.notifications": "Notificationes",
+  "column_header.hide_settings": "Celar le parametros",
+  "column_header.show_settings": "Monstrar le parametros",
   "column_subheading.settings": "Parametros",
+  "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.open": "Aperir",
+  "compose_form.poll.add_option": "Adder un option",
+  "compose_form.poll.remove_option": "Remover iste option",
   "confirmation_modal.cancel": "Cancellar",
+  "confirmations.delete.confirm": "Deler",
+  "confirmations.delete_list.confirm": "Deler",
   "confirmations.logout.confirm": "Clauder le session",
+  "copy_icon_button.copied": "Copiate al area de transferentia",
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
+  "disabled_account_banner.account_settings": "Parametros de conto",
   "dismissable_banner.dismiss": "Dimitter",
+  "emoji_button.activity": "Activitate",
+  "emoji_button.custom": "Personalisate",
+  "emoji_button.search_results": "Resultatos de recerca",
+  "empty_column.account_unavailable": "Profilo non disponibile",
+  "errors.unexpected_crash.report_issue": "Signalar un defecto",
+  "explore.search_results": "Resultatos de recerca",
+  "explore.trending_links": "Novas",
+  "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
+  "firehose.remote": "Altere servitores",
   "footer.about": "A proposito de",
+  "footer.directory": "Directorio de profilos",
+  "footer.privacy_policy": "Politica de confidentialitate",
+  "footer.source_code": "Vider le codice fonte",
+  "footer.status": "Stato",
   "home.pending_critical_update.link": "Vider actualisationes",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
-  "navigation_bar.about": "A proposito de"
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
+  "navigation_bar.about": "A proposito de",
+  "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
+  "navigation_bar.blocks": "Usatores blocate",
+  "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.lists": "Listas",
+  "navigation_bar.logout": "Clauder le session",
+  "navigation_bar.preferences": "Preferentias",
+  "navigation_bar.security": "Securitate",
+  "notifications.column_settings.alert": "Notificationes de scriptorio",
+  "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
+  "notifications.column_settings.sound": "Reproducer sono",
+  "notifications.filter.all": "Toto",
+  "onboarding.compose.template": "Salute #Mastodon!",
+  "onboarding.profile.save_and_continue": "Salvar e continuar",
+  "onboarding.share.title": "Compartir tu profilo"
 }
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 82f1669b1a..ec0d30363c 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -2,7 +2,7 @@
   "about.blocks": "Prižiūrimi serveriai",
   "about.contact": "Kontaktuoti:",
   "about.disclaimer": "Mastodon – nemokama atvirojo kodo programa ir Mastodon gGmbH prekės ženklas.",
-  "about.domain_blocks.no_reason_available": "Priežastis nežinoma",
+  "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "Mastodon paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
   "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
   "about.domain_blocks.silenced.title": "Ribota",
@@ -35,7 +35,7 @@
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
-  "account.followers_counter": "{count, plural, one {{counter} sekėjas (-a)} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
+  "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
   "account.following": "Seka",
   "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
   "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 955955b8c2..5290e13ff4 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -78,11 +78,11 @@
   "bundle_modal_error.close": "மூடுக",
   "bundle_modal_error.message": "இக்கூற்றை ஏற்றம் செய்யும்பொழுது ஏதோ தவறு ஏற்பட்டுள்ளது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
-  "closed_registrations.other_server_instructions": "மசுடோடன் இரு பரவலாக்கப்பட்ட மென்பொருள் என்பதால், நீங்கள் வேரு ஒரு வழங்கியில் கணக்கை உருவாக்கியிருந்தாலும் இந்த வழங்கியில் பயன்படுத்தலாம்.",
-  "closed_registrations_modal.description": "{domain} இல் இப்பொழுது கணக்குகள் உருவாக்க முடியாது. நீங்கள் மசுடோடன் பயன்படுத்த, குறிப்பாக {domain} முகவரியில் கணக்கைத் துவங்க வேண்டும் என்ற அவசியமில்லை என்பதை மனதில் வைத்துக் கொள்ளவும்.",
+  "closed_registrations.other_server_instructions": "மேச்டடான் இரு பரவலாக்கப்பட்ட மென்பொருள் என்பதால், நீங்கள் வேரு ஒரு வழங்கியில் கணக்கை உருவாக்கியிருந்தாலும் இந்த வழங்கியில் பயன்படுத்தலாம்.",
+  "closed_registrations_modal.description": "{domain} இல் இப்பொழுது கணக்குகள் உருவாக்க முடியாது. நீங்கள் மேச்டடான் பயன்படுத்த, குறிப்பாக {domain} முகவரியில் கணக்கைத் துவங்க வேண்டும் என்ற அவசியமில்லை என்பதை மனதில் வைத்துக் கொள்ளவும்.",
   "closed_registrations_modal.find_another_server": "வேறொரு வழங்கியைக் கண்டுபிடி",
-  "closed_registrations_modal.preamble": "மசுடோடன் ஒரு பரவலாக்கப்பட்ட மென்பொருள். ஆதனால் நீங்கள் எங்குக் கணக்கை உருவாக்கினாலும் இந்த வழங்கியில் உள்ள யாருடன் வேண்டும் என்றாலும் உரவாடலாம். நீங்களே கூட ஒரு வழங்கியை நிறுவலாம்!",
-  "closed_registrations_modal.title": "மசுடோடன் கணக்கு துவங்கப்படுகிறது",
+  "closed_registrations_modal.preamble": "மேச்டடான் ஒரு பரவலாக்கப்பட்ட மென்பொருள். ஆதனால் நீங்கள் எங்குக் கணக்கை உருவாக்கினாலும் இந்த வழங்கியில் உள்ள யாருடன் வேண்டும் என்றாலும் உரவாடலாம். நீங்களே கூட ஒரு வழங்கியை நிறுவலாம்!",
+  "closed_registrations_modal.title": "மேச்டடான் கணக்கு துவங்கப்படுகிறது",
   "column.about": "பற்றி",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "அடையாளக்குறிகள்",
@@ -113,7 +113,7 @@
   "compose.language.search": "தேடல் மொழிகள்...",
   "compose.published.body": "பதிவிடப்பட்டது.",
   "compose.published.open": "திற",
-  "compose.saved.body": "பதிவி சேமிக்கப்பட்டது.",
+  "compose.saved.body": "பதிவு சேமிக்கப்பட்டது.",
   "compose_form.direct_message_warning_learn_more": "மேலும் அறிய",
   "compose_form.encryption_warning": "Mastodonல் உள்ள பதிவுகள் முறையாக என்க்ரிப்ட்(encrypt) செய்யபடவில்லை. அதனால் முக்கிய தகவல்களை இங்கே பகிர வேண்டாம்.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index 1b4b5994bd..86a5de7b37 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -70,6 +70,10 @@ ie:
         invalid_redirect_uri: Li uri de redirection includet ne es valid.
         invalid_request:
           unknown: Li petition manca un postulat parametre, include un ne apoyat parametre-valore, o es altrimen mal format.
+        invalid_token:
+          expired: Li access-clave expirat
+          revoked: Li access-clave esset revocat
+          unknown: Li accesse-clave es ínvalid
         unsupported_grant_type: Li tip de autorisation concedet ne es subtenet per li autorisant servitor.
         unsupported_response_type: Li autorisant servitor ne subtene ti-ci tip de response.
     flash:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index f945e2342e..bde52e2a78 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -68,6 +68,7 @@ ie:
       form_admin_settings:
         backups_retention_period: Mantener usator-generat archives por li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+        mascot: Substitue li ilustration in li avansat interfacie web.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
         site_contact_email: Qualmen on posse contacter te por inquestes legal o de apoy.
@@ -110,6 +111,10 @@ ie:
           name: Etiquette
           value: Contenete
         indexable: Includer public postas in resultates de sercha
+      account_alias:
+        acct: Usator-nómine del anteyan conto
+      account_migration:
+        acct: Usator-nómine del nov conto
       account_warning_preset:
         text: Textu prefigurat
         title: Titul
@@ -240,6 +245,7 @@ ie:
         url: URL de punctu terminal
     'no': 'No'
     not_recommended: Ne recomandat
+    overridden: Substituet
     recommended: Recomandat
     required:
       mark: "*"

From bd415af9a11fe7057c9f428b7bdaeb8d4fb3a77b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 3 Jan 2024 11:23:58 +0100
Subject: [PATCH 186/436] Change streaming API host to not be overridden to
 localhost in development mode (#28557)

---
 config/initializers/1_hosts.rb                | 2 +-
 spec/requests/content_security_policy_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/1_hosts.rb b/config/initializers/1_hosts.rb
index 6ff0845c46..5c59e28bd1 100644
--- a/config/initializers/1_hosts.rb
+++ b/config/initializers/1_hosts.rb
@@ -23,7 +23,7 @@ Rails.application.configure do
     if Rails.env.production?
       "ws#{https ? 's' : ''}://#{web_host}"
     else
-      "ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000"
+      "ws://#{host.split(':').first}:4000"
     end
   end
 
diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index 7610e698cd..d4cc40bce5 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -20,7 +20,7 @@ describe 'Content-Security-Policy' do
       "form-action 'self'",
       "child-src 'self' blob: https://cb6e6126.ngrok.io",
       "worker-src 'self' blob: https://cb6e6126.ngrok.io",
-      "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://localhost:4000",
+      "connect-src 'self' data: blob: https://cb6e6126.ngrok.io ws://cb6e6126.ngrok.io:4000",
       "script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'"
     )
   end

From 092bb8a27af9ee87ff9ebabaf354477470ea3a94 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 3 Jan 2024 12:29:26 +0100
Subject: [PATCH 187/436] Fix Mastodon not correctly processing HTTP Signatures
 with query strings (#28476)

---
 .../concerns/signature_verification.rb        | 22 ++++++-
 app/lib/request.rb                            | 11 +++-
 spec/requests/signature_verification_spec.rb  | 66 +++++++++++++++++++
 3 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index f0a344f1c9..35391e64c4 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -91,14 +91,23 @@ module SignatureVerification
     raise SignatureVerificationError, "Public key not found for key #{signature_params['keyId']}" if actor.nil?
 
     signature             = Base64.decode64(signature_params['signature'])
-    compare_signed_string = build_signed_string
+    compare_signed_string = build_signed_string(include_query_string: true)
 
     return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
+    # Compatibility quirk with older Mastodon versions
+    compare_signed_string = build_signed_string(include_query_string: false)
+    return actor unless verify_signature(actor, signature, compare_signed_string).nil?
+
     actor = stoplight_wrap_request { actor_refresh_key!(actor) }
 
     raise SignatureVerificationError, "Could not refresh public key #{signature_params['keyId']}" if actor.nil?
 
+    compare_signed_string = build_signed_string(include_query_string: true)
+    return actor unless verify_signature(actor, signature, compare_signed_string).nil?
+
+    # Compatibility quirk with older Mastodon versions
+    compare_signed_string = build_signed_string(include_query_string: false)
     return actor unless verify_signature(actor, signature, compare_signed_string).nil?
 
     fail_with! "Verification failed for #{actor.to_log_human_identifier} #{actor.uri} using rsa-sha256 (RSASSA-PKCS1-v1_5 with SHA-256)", signed_string: compare_signed_string, signature: signature_params['signature']
@@ -180,11 +189,18 @@ module SignatureVerification
     nil
   end
 
-  def build_signed_string
+  def build_signed_string(include_query_string: true)
     signed_headers.map do |signed_header|
       case signed_header
       when Request::REQUEST_TARGET
-        "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+        if include_query_string
+          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}"
+        else
+          # Current versions of Mastodon incorrectly omit the query string from the (request-target) pseudo-header.
+          # Therefore, temporarily support such incorrect signatures for compatibility.
+          # TODO: remove eventually some time after release of the fixed version
+          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+        end
       when '(created)'
         raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'
         raise SignatureVerificationError, 'Pseudo-header (created) used but corresponding argument missing' if signature_params['created'].blank?
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 5f128af734..8d4120868d 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -77,6 +77,7 @@ class Request
     @url         = Addressable::URI.parse(url).normalize
     @http_client = options.delete(:http_client)
     @allow_local = options.delete(:allow_local)
+    @full_path   = options.delete(:with_query_string)
     @options     = options.merge(socket_class: use_proxy? || @allow_local ? ProxySocket : Socket)
     @options     = @options.merge(timeout_class: PerOperationWithDeadline, timeout_options: TIMEOUT)
     @options     = @options.merge(proxy_url) if use_proxy?
@@ -146,7 +147,7 @@ class Request
   private
 
   def set_common_headers!
-    @headers[REQUEST_TARGET]    = "#{@verb} #{@url.path}"
+    @headers[REQUEST_TARGET]    = request_target
     @headers['User-Agent']      = Mastodon::Version.user_agent
     @headers['Host']            = @url.host
     @headers['Date']            = Time.now.utc.httpdate
@@ -157,6 +158,14 @@ class Request
     @headers['Digest'] = "SHA-256=#{Digest::SHA256.base64digest(@options[:body])}"
   end
 
+  def request_target
+    if @url.query.nil? || !@full_path
+      "#{@verb} #{@url.path}"
+    else
+      "#{@verb} #{@url.path}?#{@url.query}"
+    end
+  end
+
   def signature
     algorithm = 'rsa-sha256'
     signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest.new('SHA256'), signed_string))
diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb
index b753750b84..401828c4a3 100644
--- a/spec/requests/signature_verification_spec.rb
+++ b/spec/requests/signature_verification_spec.rb
@@ -94,6 +94,72 @@ describe 'signature verification concern' do
       end
     end
 
+    context 'with a valid signature on a GET request that has a query string' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="SDMa4r/DQYMXYxVgYO2yEqGWWUXugKjVuz0I8dniQAk+aunzBaF2aPu+4grBfawAshlx1Xytl8lhb0H2MllEz16/tKY7rUrb70MK0w8ohXgpb0qs3YvQgdj4X24L1x2MnkFfKHR/J+7TBlnivq0HZqXm8EIkPWLv+eQxu8fbowLwHIVvRd/3t6FzvcfsE0UZKkoMEX02542MhwSif6cu7Ec/clsY9qgKahb9JVGOGS1op9Lvg/9y1mc8KCgD83U5IxVygYeYXaVQ6gixA9NgZiTCwEWzHM5ELm7w5hpdLFYxYOHg/3G3fiqJzpzNQAcCD4S4JxfE7hMI0IzVlNLT6A=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'successfuly verifies signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success?foo=42', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success?foo=42', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => signature_header,
+        }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: actor.id.to_s
+        )
+      end
+    end
+
+    context 'when the query string is missing from the signature verification (compatibility quirk)' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="Z8ilar3J7bOwqZkMp7sL8sRs4B1FT+UorbmvWoE+A5UeoOJ3KBcUmbsh+k3wQwbP5gMNUrra9rEWabpasZGphLsbDxfbsWL3Cf0PllAc7c1c7AFEwnewtExI83/qqgEkfWc2z7UDutXc2NfgAx89Ox8DXU/fA2GG0jILjB6UpFyNugkY9rg6oI31UnvfVi3R7sr3/x8Ea3I9thPvqI2byF6cojknSpDAwYzeKdngX3TAQEGzFHz3SDWwyp3jeMWfwvVVbM38FxhvAnSumw7YwWW4L7M7h4M68isLimoT3yfCn2ucBVL5Dz8koBpYf/40w7QidClAwCafZQFC29yDOg=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'successfuly verifies signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success?foo=42', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => signature_header,
+        }
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: actor.id.to_s
+        )
+      end
+    end
+
+    context 'with mismatching query string' do
+      let(:signature_header) do
+        'keyId="https://remote.domain/users/bob#main-key",algorithm="rsa-sha256",headers="date host (request-target)",signature="SDMa4r/DQYMXYxVgYO2yEqGWWUXugKjVuz0I8dniQAk+aunzBaF2aPu+4grBfawAshlx1Xytl8lhb0H2MllEz16/tKY7rUrb70MK0w8ohXgpb0qs3YvQgdj4X24L1x2MnkFfKHR/J+7TBlnivq0HZqXm8EIkPWLv+eQxu8fbowLwHIVvRd/3t6FzvcfsE0UZKkoMEX02542MhwSif6cu7Ec/clsY9qgKahb9JVGOGS1op9Lvg/9y1mc8KCgD83U5IxVygYeYXaVQ6gixA9NgZiTCwEWzHM5ELm7w5hpdLFYxYOHg/3G3fiqJzpzNQAcCD4S4JxfE7hMI0IzVlNLT6A=="' # rubocop:disable Layout/LineLength
+      end
+
+      it 'fails to verify signature', :aggregate_failures do
+        expect(signature_header).to eq build_signature_string(actor_keypair, 'https://remote.domain/users/bob#main-key', 'get /activitypub/success?foo=42', { 'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT', 'Host' => 'www.example.com' })
+
+        get '/activitypub/success?foo=43', headers: {
+          'Host' => 'www.example.com',
+          'Date' => 'Wed, 20 Dec 2023 10:00:00 GMT',
+          'Signature' => signature_header,
+        }
+
+        expect(body_as_json).to match(
+          signed_request: true,
+          signature_actor_id: nil,
+          error: anything
+        )
+      end
+    end
+
     context 'with a mismatching path' do
       it 'fails to verify signature', :aggregate_failures do
         get '/activitypub/alternative-path', headers: {

From e12d8893f42e5d2b2c71b43e0dff09438fbe81a2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jan 2024 08:06:15 -0500
Subject: [PATCH 188/436] Fix intermittent failure from unspecified order in
 `export_domain_blocks` controller spec (#28562)

---
 app/controllers/admin/export_domain_blocks_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
index 433b8a1587..ffc4478172 100644
--- a/app/controllers/admin/export_domain_blocks_controller.rb
+++ b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -68,7 +68,7 @@ module Admin
 
     def export_data
       CSV.generate(headers: export_headers, write_headers: true) do |content|
-        DomainBlock.with_limitations.each do |instance|
+        DomainBlock.with_limitations.order(id: :asc).each do |instance|
           content << [instance.domain, instance.severity, instance.reject_media, instance.reject_reports, instance.public_comment, instance.obfuscate]
         end
       end

From 74a0d81e90607c275ab9c411a8b9c29512afa961 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jan 2024 08:06:38 -0500
Subject: [PATCH 189/436] Add coverage for CLI `self-destruct` command (#28565)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 spec/lib/mastodon/cli/main_spec.rb | 109 +++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 59f1fc4784..931ca57c30 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -20,4 +20,113 @@ describe Mastodon::CLI::Main do
         .to output_results(Mastodon::Version.to_s)
     end
   end
+
+  describe '#self_destruct' do
+    let(:action) { :self_destruct }
+
+    context 'with self destruct mode enabled' do
+      before do
+        allow(SelfDestructHelper).to receive(:self_destruct?).and_return(true)
+      end
+
+      context 'with pending accounts' do
+        before { Fabricate(:account) }
+
+        it 'reports about pending accounts' do
+          expect { subject }
+            .to output_results(
+              'already enabled',
+              'still pending deletion'
+            )
+            .and raise_error(SystemExit)
+        end
+      end
+
+      context 'with sidekiq notices being processed' do
+        before do
+          Account.delete_all
+          stats_double = instance_double(Sidekiq::Stats, enqueued: 5)
+          allow(Sidekiq::Stats).to receive(:new).and_return(stats_double)
+        end
+
+        it 'reports about notices' do
+          expect { subject }
+            .to output_results(
+              'already enabled',
+              'notices are still being'
+            )
+            .and raise_error(SystemExit)
+        end
+      end
+
+      context 'with sidekiq failed deliveries' do
+        before do
+          Account.delete_all
+          stats_double = instance_double(Sidekiq::Stats, enqueued: 0, retry_size: 10)
+          allow(Sidekiq::Stats).to receive(:new).and_return(stats_double)
+        end
+
+        it 'reports about notices' do
+          expect { subject }
+            .to output_results(
+              'already enabled',
+              'some have failed and are scheduled'
+            )
+            .and raise_error(SystemExit)
+        end
+      end
+
+      context 'with self descruct mode ready' do
+        before do
+          Account.delete_all
+          stats_double = instance_double(Sidekiq::Stats, enqueued: 0, retry_size: 0)
+          allow(Sidekiq::Stats).to receive(:new).and_return(stats_double)
+        end
+
+        it 'reports about notices' do
+          expect { subject }
+            .to output_results(
+              'already enabled',
+              'can safely delete all data'
+            )
+            .and raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'with self destruct mode disabled' do
+      before do
+        allow(SelfDestructHelper).to receive(:self_destruct?).and_return(false)
+      end
+
+      context 'with an incorrect response to hostname' do
+        let(:prompt_double) { instance_double(TTY::Prompt, ask: 'wrong') }
+
+        before do
+          allow(TTY::Prompt).to receive(:new).and_return(prompt_double)
+        end
+
+        it 'reports failed answer' do
+          expect { subject }
+            .to raise_error(SystemExit)
+        end
+      end
+
+      context 'with a correct response to hostname' do
+        # TODO: Update after tty-prompt replace with Thor methods
+        let(:prompt_double) { instance_double(TTY::Prompt, ask: Rails.configuration.x.local_domain, warn: nil, no?: false, ok: nil) }
+
+        before do
+          allow(TTY::Prompt).to receive(:new).and_return(prompt_double)
+        end
+
+        it 'instructs to set the appropriate environment variable' do
+          expect { subject }
+            .to_not raise_error
+          # TODO: Update after tty-prompt replace with Thor methods
+          expect(prompt_double).to have_received(:ok).with(/add the following variable/)
+        end
+      end
+    end
+  end
 end

From 51d2b80ff7407a6c49a44eee80c67f81dc09d7dc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jan 2024 08:22:03 -0500
Subject: [PATCH 190/436] Solve `Abc/*` metrics for `db/*migrate*` files
 (#28568)

---
 .rubocop.yml                                  |   2 -
 ...221101190723_backfill_admin_action_logs.rb | 209 +++++++++++-------
 ...114142_backfill_admin_action_logs_again.rb | 209 +++++++++++-------
 3 files changed, 254 insertions(+), 166 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 61cb1164b4..8832e28f6e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -74,14 +74,12 @@ Metrics/ModuleLength:
 Metrics/AbcSize:
   Exclude:
     - 'lib/mastodon/cli/*.rb'
-    - db/*migrate/**/*
 
 # Reason: Currently disabled in .rubocop_todo.yml
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
 Metrics/CyclomaticComplexity:
   Exclude:
     - lib/mastodon/cli/*.rb
-    - db/*migrate/**/*
 
 # Reason:
 # https://docs.rubocop.org/rubocop/cops_metrics.html#metricsparameterlists
diff --git a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
index 6476f4b13a..1d8d983b3a 100644
--- a/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
+++ b/db/post_migrate/20221101190723_backfill_admin_action_logs.rb
@@ -77,90 +77,135 @@ class BackfillAdminActionLogs < ActiveRecord::Migration[6.1]
 
   def up
     safety_assured do
-      AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
-        next if log.account.nil?
-
-        log.update_attribute('human_identifier', log.account.acct)
-      end
-
-      AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
-        next if log.user.nil?
-
-        log.update_attribute('human_identifier', log.user.account.acct)
-        log.update_attribute('route_param', log.user.account_id)
-      end
-
-      AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
-
-      AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
-        next if log.domain_block.nil?
-
-        log.update_attribute('human_identifier', log.domain_block.domain)
-      end
-
-      AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
-        next if log.domain_allow.nil?
-
-        log.update_attribute('human_identifier', log.domain_allow.domain)
-      end
-
-      AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
-        next if log.email_domain_block.nil?
-
-        log.update_attribute('human_identifier', log.email_domain_block.domain)
-      end
-
-      AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
-        next if log.unavailable_domain.nil?
-
-        log.update_attribute('human_identifier', log.unavailable_domain.domain)
-      end
-
-      AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
-        next if log.status.nil?
-
-        log.update_attribute('human_identifier', log.status.account.acct)
-        log.update_attribute('permalink', log.status.uri)
-      end
-
-      AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
-        next if log.account_warning.nil?
-
-        log.update_attribute('human_identifier', log.account_warning.account.acct)
-      end
-
-      AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
-        next if log.announcement.nil?
-
-        log.update_attribute('human_identifier', log.announcement.text)
-      end
-
-      AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
-        next if log.ip_block.nil?
-
-        log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
-      end
-
-      AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
-        next if log.custom_emoji.nil?
-
-        log.update_attribute('human_identifier', log.custom_emoji.shortcode)
-      end
-
-      AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
-        next if log.canonical_email_block.nil?
-
-        log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
-      end
-
-      AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
-        next if log.appeal.nil?
-
-        log.update_attribute('human_identifier', log.appeal.account.acct)
-        log.update_attribute('route_param', log.appeal.account_warning_id)
-      end
+      process_logs_for_account
+      process_logs_for_user
+      process_logs_for_report
+      process_logs_for_domain_block
+      process_logs_for_domain_allow
+      process_logs_for_email_domain_block
+      process_logs_for_unavailable_domain
+      process_logs_for_status
+      process_logs_for_account_warning
+      process_logs_for_announcement
+      process_logs_for_ip_block
+      process_logs_for_custom_emoji
+      process_logs_for_canonical_email_block
+      process_logs_for_appeal
     end
   end
 
   def down; end
+
+  private
+
+  def process_logs_for_account
+    AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+      next if log.account.nil?
+
+      log.update_attribute('human_identifier', log.account.acct)
+    end
+  end
+
+  def process_logs_for_user
+    AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
+      next if log.user.nil?
+
+      log.update_attribute('human_identifier', log.user.account.acct)
+      log.update_attribute('route_param', log.user.account_id)
+    end
+  end
+
+  def process_logs_for_report
+    AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+  end
+
+  def process_logs_for_domain_block
+    AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+      next if log.domain_block.nil?
+
+      log.update_attribute('human_identifier', log.domain_block.domain)
+    end
+  end
+
+  def process_logs_for_domain_allow
+    AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+      next if log.domain_allow.nil?
+
+      log.update_attribute('human_identifier', log.domain_allow.domain)
+    end
+  end
+
+  def process_logs_for_email_domain_block
+    AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
+      next if log.email_domain_block.nil?
+
+      log.update_attribute('human_identifier', log.email_domain_block.domain)
+    end
+  end
+
+  def process_logs_for_unavailable_domain
+    AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+      next if log.unavailable_domain.nil?
+
+      log.update_attribute('human_identifier', log.unavailable_domain.domain)
+    end
+  end
+
+  def process_logs_for_status
+    AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
+      next if log.status.nil?
+
+      log.update_attribute('human_identifier', log.status.account.acct)
+      log.update_attribute('permalink', log.status.uri)
+    end
+  end
+
+  def process_logs_for_account_warning
+    AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
+      next if log.account_warning.nil?
+
+      log.update_attribute('human_identifier', log.account_warning.account.acct)
+    end
+  end
+
+  def process_logs_for_announcement
+    AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
+      next if log.announcement.nil?
+
+      log.update_attribute('human_identifier', log.announcement.text)
+    end
+  end
+
+  def process_logs_for_ip_block
+    AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
+      next if log.ip_block.nil?
+
+      log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+    end
+  end
+
+  def process_logs_for_custom_emoji
+    AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
+      next if log.custom_emoji.nil?
+
+      log.update_attribute('human_identifier', log.custom_emoji.shortcode)
+    end
+  end
+
+  def process_logs_for_canonical_email_block
+    AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
+      next if log.canonical_email_block.nil?
+
+      log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
+    end
+  end
+
+  def process_logs_for_appeal
+    AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
+      next if log.appeal.nil?
+
+      log.update_attribute('human_identifier', log.appeal.account.acct)
+      log.update_attribute('route_param', log.appeal.account_warning_id)
+    end
+  end
 end
diff --git a/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
index 3c68470a7f..c080e77ecf 100644
--- a/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
+++ b/db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb
@@ -77,90 +77,135 @@ class BackfillAdminActionLogsAgain < ActiveRecord::Migration[6.1]
 
   def up
     safety_assured do
-      AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
-        next if log.account.nil?
-
-        log.update_attribute('human_identifier', log.account.acct)
-      end
-
-      AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
-        next if log.user.nil?
-
-        log.update_attribute('human_identifier', log.user.account.acct)
-        log.update_attribute('route_param', log.user.account_id)
-      end
-
-      AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
-
-      AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
-        next if log.domain_block.nil?
-
-        log.update_attribute('human_identifier', log.domain_block.domain)
-      end
-
-      AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
-        next if log.domain_allow.nil?
-
-        log.update_attribute('human_identifier', log.domain_allow.domain)
-      end
-
-      AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
-        next if log.email_domain_block.nil?
-
-        log.update_attribute('human_identifier', log.email_domain_block.domain)
-      end
-
-      AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
-        next if log.unavailable_domain.nil?
-
-        log.update_attribute('human_identifier', log.unavailable_domain.domain)
-      end
-
-      AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
-        next if log.status.nil?
-
-        log.update_attribute('human_identifier', log.status.account.acct)
-        log.update_attribute('permalink', log.status.uri)
-      end
-
-      AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
-        next if log.account_warning.nil?
-
-        log.update_attribute('human_identifier', log.account_warning.account.acct)
-      end
-
-      AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
-        next if log.announcement.nil?
-
-        log.update_attribute('human_identifier', log.announcement.text)
-      end
-
-      AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
-        next if log.ip_block.nil?
-
-        log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
-      end
-
-      AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
-        next if log.custom_emoji.nil?
-
-        log.update_attribute('human_identifier', log.custom_emoji.shortcode)
-      end
-
-      AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
-        next if log.canonical_email_block.nil?
-
-        log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
-      end
-
-      AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
-        next if log.appeal.nil?
-
-        log.update_attribute('human_identifier', log.appeal.account.acct)
-        log.update_attribute('route_param', log.appeal.account_warning_id)
-      end
+      process_logs_for_account
+      process_logs_for_user
+      process_logs_for_report
+      process_logs_for_domain_block
+      process_logs_for_domain_allow
+      process_logs_for_email_domain_block
+      process_logs_for_unavailable_domain
+      process_logs_for_status
+      process_logs_for_account_warning
+      process_logs_for_announcement
+      process_logs_for_ip_block
+      process_logs_for_custom_emoji
+      process_logs_for_canonical_email_block
+      process_logs_for_appeal
     end
   end
 
   def down; end
+
+  private
+
+  def process_logs_for_account
+    AdminActionLog.includes(:account).where(target_type: 'Account', human_identifier: nil).find_each do |log|
+      next if log.account.nil?
+
+      log.update_attribute('human_identifier', log.account.acct)
+    end
+  end
+
+  def process_logs_for_user
+    AdminActionLog.includes(user: :account).where(target_type: 'User', human_identifier: nil).find_each do |log|
+      next if log.user.nil?
+
+      log.update_attribute('human_identifier', log.user.account.acct)
+      log.update_attribute('route_param', log.user.account_id)
+    end
+  end
+
+  def process_logs_for_report
+    AdminActionLog.where(target_type: 'Report', human_identifier: nil).in_batches.update_all('human_identifier = target_id::text')
+  end
+
+  def process_logs_for_domain_block
+    AdminActionLog.includes(:domain_block).where(target_type: 'DomainBlock').find_each do |log|
+      next if log.domain_block.nil?
+
+      log.update_attribute('human_identifier', log.domain_block.domain)
+    end
+  end
+
+  def process_logs_for_domain_allow
+    AdminActionLog.includes(:domain_allow).where(target_type: 'DomainAllow').find_each do |log|
+      next if log.domain_allow.nil?
+
+      log.update_attribute('human_identifier', log.domain_allow.domain)
+    end
+  end
+
+  def process_logs_for_email_domain_block
+    AdminActionLog.includes(:email_domain_block).where(target_type: 'EmailDomainBlock').find_each do |log|
+      next if log.email_domain_block.nil?
+
+      log.update_attribute('human_identifier', log.email_domain_block.domain)
+    end
+  end
+
+  def process_logs_for_unavailable_domain
+    AdminActionLog.includes(:unavailable_domain).where(target_type: 'UnavailableDomain').find_each do |log|
+      next if log.unavailable_domain.nil?
+
+      log.update_attribute('human_identifier', log.unavailable_domain.domain)
+    end
+  end
+
+  def process_logs_for_status
+    AdminActionLog.includes(status: :account).where(target_type: 'Status', human_identifier: nil).find_each do |log|
+      next if log.status.nil?
+
+      log.update_attribute('human_identifier', log.status.account.acct)
+      log.update_attribute('permalink', log.status.uri)
+    end
+  end
+
+  def process_logs_for_account_warning
+    AdminActionLog.includes(account_warning: :account).where(target_type: 'AccountWarning', human_identifier: nil).find_each do |log|
+      next if log.account_warning.nil?
+
+      log.update_attribute('human_identifier', log.account_warning.account.acct)
+    end
+  end
+
+  def process_logs_for_announcement
+    AdminActionLog.includes(:announcement).where(target_type: 'Announcement', human_identifier: nil).find_each do |log|
+      next if log.announcement.nil?
+
+      log.update_attribute('human_identifier', log.announcement.text)
+    end
+  end
+
+  def process_logs_for_ip_block
+    AdminActionLog.includes(:ip_block).where(target_type: 'IpBlock', human_identifier: nil).find_each do |log|
+      next if log.ip_block.nil?
+
+      log.update_attribute('human_identifier', "#{log.ip_block.ip}/#{log.ip_block.ip.prefix}")
+    end
+  end
+
+  def process_logs_for_custom_emoji
+    AdminActionLog.includes(:custom_emoji).where(target_type: 'CustomEmoji', human_identifier: nil).find_each do |log|
+      next if log.custom_emoji.nil?
+
+      log.update_attribute('human_identifier', log.custom_emoji.shortcode)
+    end
+  end
+
+  def process_logs_for_canonical_email_block
+    AdminActionLog.includes(:canonical_email_block).where(target_type: 'CanonicalEmailBlock', human_identifier: nil).find_each do |log|
+      next if log.canonical_email_block.nil?
+
+      log.update_attribute('human_identifier', log.canonical_email_block.canonical_email_hash)
+    end
+  end
+
+  def process_logs_for_appeal
+    AdminActionLog.includes(appeal: :account).where(target_type: 'Appeal', human_identifier: nil).find_each do |log|
+      next if log.appeal.nil?
+
+      log.update_attribute('human_identifier', log.appeal.account.acct)
+      log.update_attribute('route_param', log.appeal.account_warning_id)
+    end
+  end
 end

From 5c769de096ce7205308deaf5d62ad516b1e39259 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jan 2024 09:12:56 -0500
Subject: [PATCH 191/436] Add spec coverage for `CLI::Media#remove_orphans`
 command (#28267)

---
 lib/mastodon/cli/base.rb            |  1 +
 spec/lib/mastodon/cli/media_spec.rb | 54 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index 32aff2fcc5..8c222bbb2b 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -4,6 +4,7 @@ require_relative '../../../config/boot'
 require_relative '../../../config/environment'
 
 require 'thor'
+require 'pastel'
 require_relative 'progress_helper'
 
 module Mastodon
diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 24e1467a3c..071bcd9e34 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -184,4 +184,58 @@ describe Mastodon::CLI::Media do
       end
     end
   end
+
+  describe '#remove_orphans' do
+    let(:action) { :remove_orphans }
+
+    before do
+      FileUtils.mkdir_p Rails.public_path.join('system')
+    end
+
+    context 'without any options' do
+      it 'runs without error' do
+        expect { subject }
+          .to output_results('Removed', 'orphans (approx')
+      end
+    end
+
+    context 'when in azure mode' do
+      before do
+        allow(Paperclip::Attachment).to receive(:default_options).and_return(storage: :azure)
+      end
+
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to output_results('azure storage driver is not supported')
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when in fog mode' do
+      before do
+        allow(Paperclip::Attachment).to receive(:default_options).and_return(storage: :fog)
+      end
+
+      it 'warns about usage and exits' do
+        expect { subject }
+          .to output_results('fog storage driver is not supported')
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when in filesystem mode' do
+      before do
+        allow(File).to receive(:delete).and_return(true)
+        media_attachment.delete
+      end
+
+      let(:media_attachment) { Fabricate(:media_attachment) }
+
+      it 'removes the unlinked files' do
+        expect { subject }
+          .to output_results('Removed', 'orphans (approx')
+        expect(File).to have_received(:delete).with(media_attachment.file.path)
+      end
+    end
+  end
 end

From 905794fd57386a33f8773cbeaec7b1cbb37c3e68 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 3 Jan 2024 16:04:10 +0100
Subject: [PATCH 192/436] Remove v3.5 branch from supported Mastodon versions
 (#28574)

---
 SECURITY.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 954ff73a24..81472b01b4 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,10 +13,8 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 ## Supported Versions
 
-| Version | Supported        |
-| ------- | ---------------- |
-| 4.2.x   | Yes              |
-| 4.1.x   | Yes              |
-| 4.0.x   | No               |
-| 3.5.x   | Until 2023-12-31 |
-| < 3.5   | No               |
+| Version | Supported |
+| ------- | --------- |
+| 4.2.x   | Yes       |
+| 4.1.x   | Yes       |
+| < 4.1   | No        |

From f92d8c654df654538096efff05e9b1a989d01490 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 3 Jan 2024 10:08:08 -0500
Subject: [PATCH 193/436] Standardize on Thor methods in CLI classes (#28566)

---
 lib/mastodon/cli/federation.rb     | 36 ++++++----------
 lib/mastodon/cli/preview_cards.rb  |  1 -
 spec/lib/mastodon/cli/main_spec.rb | 68 ++++++++++++++++++++++++------
 3 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/lib/mastodon/cli/federation.rb b/lib/mastodon/cli/federation.rb
index 1b4cb467a5..4a4dde3686 100644
--- a/lib/mastodon/cli/federation.rb
+++ b/lib/mastodon/cli/federation.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'tty-prompt'
-
 module Mastodon::CLI
   module Federation
     extend ActiveSupport::Concern
@@ -30,45 +28,39 @@ module Mastodon::CLI
       LONG_DESC
       def self_destruct
         if SelfDestructHelper.self_destruct?
-          prompt.ok('Self-destruct mode is already enabled for this Mastodon server')
+          say('Self-destruct mode is already enabled for this Mastodon server', :green)
 
           pending_accounts = Account.local.without_suspended.count + Account.local.suspended.joins(:deletion_request).count
           sidekiq_stats = Sidekiq::Stats.new
 
           if pending_accounts.positive?
-            prompt.warn("#{pending_accounts} accounts are still pending deletion.")
+            say("#{pending_accounts} accounts are still pending deletion.", :yellow)
           elsif sidekiq_stats.enqueued.positive?
-            prompt.warn('Deletion notices are still being processed')
+            say('Deletion notices are still being processed', :yellow)
           elsif sidekiq_stats.retry_size.positive?
-            prompt.warn('At least one delivery attempt for each deletion notice has been made, but some have failed and are scheduled for retry')
+            say('At least one delivery attempt for each deletion notice has been made, but some have failed and are scheduled for retry', :yellow)
           else
-            prompt.ok('Every deletion notice has been sent! You can safely delete all data and decomission your servers!')
+            say('Every deletion notice has been sent! You can safely delete all data and decomission your servers!', :green)
           end
 
           exit(0)
         end
 
-        exit(1) unless prompt.ask('Type in the domain of the server to confirm:', required: true) == Rails.configuration.x.local_domain
+        exit(1) unless ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
 
-        prompt.warn('This operation WILL NOT be reversible.')
-        prompt.warn('While the data won\'t be erased locally, the server will be in a BROKEN STATE afterwards.')
-        prompt.warn('The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).')
+        say('This operation WILL NOT be reversible.', :yellow)
+        say('While the data won\'t be erased locally, the server will be in a BROKEN STATE afterwards.', :yellow)
+        say('The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).', :yellow)
 
-        exit(1) if prompt.no?('Are you sure you want to proceed?')
+        exit(1) if no?('Are you sure you want to proceed?')
 
         self_destruct_value = Rails.application.message_verifier('self-destruct').generate(Rails.configuration.x.local_domain)
-        prompt.ok('To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:')
-        prompt.ok("  SELF_DESTRUCT=#{self_destruct_value}")
-        prompt.ok("\nYou can re-run this command to see the state of the self-destruct process.")
-      rescue TTY::Reader::InputInterrupt
+        say('To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:', :green)
+        say("  SELF_DESTRUCT=#{self_destruct_value}", :green)
+        say("\nYou can re-run this command to see the state of the self-destruct process.", :green)
+      rescue Interrupt
         exit(1)
       end
-
-      private
-
-      def prompt
-        @prompt ||= TTY::Prompt.new
-      end
     end
   end
 end
diff --git a/lib/mastodon/cli/preview_cards.rb b/lib/mastodon/cli/preview_cards.rb
index 2df3d095da..9b20a0cbb8 100644
--- a/lib/mastodon/cli/preview_cards.rb
+++ b/lib/mastodon/cli/preview_cards.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'tty-prompt'
 require_relative 'base'
 
 module Mastodon::CLI
diff --git a/spec/lib/mastodon/cli/main_spec.rb b/spec/lib/mastodon/cli/main_spec.rb
index 931ca57c30..081cd2dd47 100644
--- a/spec/lib/mastodon/cli/main_spec.rb
+++ b/spec/lib/mastodon/cli/main_spec.rb
@@ -100,33 +100,77 @@ describe Mastodon::CLI::Main do
       end
 
       context 'with an incorrect response to hostname' do
-        let(:prompt_double) { instance_double(TTY::Prompt, ask: 'wrong') }
-
         before do
-          allow(TTY::Prompt).to receive(:new).and_return(prompt_double)
+          answer_hostname_incorrectly
         end
 
-        it 'reports failed answer' do
+        it 'exits silently' do
           expect { subject }
             .to raise_error(SystemExit)
         end
       end
 
-      context 'with a correct response to hostname' do
-        # TODO: Update after tty-prompt replace with Thor methods
-        let(:prompt_double) { instance_double(TTY::Prompt, ask: Rails.configuration.x.local_domain, warn: nil, no?: false, ok: nil) }
-
+      context 'with a correct response to hostname but no to proceed' do
         before do
-          allow(TTY::Prompt).to receive(:new).and_return(prompt_double)
+          answer_hostname_correctly
+          decline_proceed
+        end
+
+        it 'passes first step but stops before instructions' do
+          expect { subject }
+            .to output_results('operation WILL NOT')
+            .and raise_error(SystemExit)
+        end
+      end
+
+      context 'with a correct response to hostname and yes to proceed' do
+        before do
+          answer_hostname_correctly
+          accept_proceed
         end
 
         it 'instructs to set the appropriate environment variable' do
           expect { subject }
-            .to_not raise_error
-          # TODO: Update after tty-prompt replace with Thor methods
-          expect(prompt_double).to have_received(:ok).with(/add the following variable/)
+            .to output_results(
+              'operation WILL NOT',
+              'the following variable'
+            )
         end
       end
+
+      private
+
+      def answer_hostname_incorrectly
+        allow(cli.shell)
+          .to receive(:ask)
+          .with('Type in the domain of the server to confirm:')
+          .and_return('wrong.host')
+          .once
+      end
+
+      def answer_hostname_correctly
+        allow(cli.shell)
+          .to receive(:ask)
+          .with('Type in the domain of the server to confirm:')
+          .and_return(Rails.configuration.x.local_domain)
+          .once
+      end
+
+      def decline_proceed
+        allow(cli.shell)
+          .to receive(:no?)
+          .with('Are you sure you want to proceed?')
+          .and_return(true)
+          .once
+      end
+
+      def accept_proceed
+        allow(cli.shell)
+          .to receive(:no?)
+          .with('Are you sure you want to proceed?')
+          .and_return(false)
+          .once
+      end
     end
   end
 end

From 195b89d33619e0ce4271cef33fc29379254206f1 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Wed, 3 Jan 2024 13:02:53 -0600
Subject: [PATCH 194/436] Fix .opus file uploads being misidentified by
 Paperclip (#28580)

---
 app/models/concerns/attachmentable.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 4cdbdeb473..3b7db1fcef 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -11,11 +11,12 @@ module Attachmentable
   # For some file extensions, there exist different content
   # type variants, and browsers often send the wrong one,
   # for example, sending an audio .ogg file as video/ogg,
-  # likewise, MimeMagic also misreports them as such. For
+  # likewise, kt-paperclip also misreports them as such. For
   # those files, it is necessary to use the output of the
   # `file` utility instead
   INCORRECT_CONTENT_TYPES = %w(
     audio/vorbis
+    audio/opus
     video/ogg
     video/webm
   ).freeze

From dfdadb92e834cc099d16d7539a661105e1d12390 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jan 2024 10:07:05 +0100
Subject: [PATCH 195/436] Add ability to require approval when users sign up
 using specific email domains (#28468)

---
 .../admin/email_domain_blocks_controller.rb   |  4 ++--
 .../admin/email_domain_blocks_controller.rb   |  2 +-
 app/models/email_domain_block.rb              | 23 +++++++++++--------
 app/models/user.rb                            |  8 ++++++-
 .../admin/email_domain_block_serializer.rb    |  2 +-
 .../_email_domain_block.html.haml             |  4 ++++
 .../admin/email_domain_blocks/new.html.haml   |  3 +++
 config/locales/en.yml                         |  1 +
 ...ow_with_approval_to_email_domain_blocks.rb |  7 ++++++
 db/schema.rb                                  |  3 ++-
 .../email_domain_blocks_controller_spec.rb    |  3 ++-
 .../auth/registrations_controller_spec.rb     | 19 +++++++++++++++
 spec/services/app_sign_up_service_spec.rb     | 21 +++++++++++++++++
 13 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20231222100226_add_allow_with_approval_to_email_domain_blocks.rb

diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index 4a3228ec30..ff754bc0b4 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -40,7 +40,7 @@ module Admin
           (@email_domain_block.other_domains || []).uniq.each do |domain|
             next if EmailDomainBlock.where(domain: domain).exists?
 
-            other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
+            other_email_domain_block = EmailDomainBlock.create!(domain: domain, allow_with_approval: @email_domain_block.allow_with_approval, parent: @email_domain_block)
             log_action :create, other_email_domain_block
           end
         end
@@ -65,7 +65,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:email_domain_block).permit(:domain, other_domains: [])
+      params.require(:email_domain_block).permit(:domain, :allow_with_approval, other_domains: [])
     end
 
     def form_email_domain_block_batch_params
diff --git a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
index 850eda6224..df54b9f0a4 100644
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@@ -55,7 +55,7 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:domain)
+    params.permit(:domain, :allow_with_approval)
   end
 
   def insert_pagination_headers
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 60e90208db..f1b14c8b08 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -4,11 +4,12 @@
 #
 # Table name: email_domain_blocks
 #
-#  id         :bigint(8)        not null, primary key
-#  domain     :string           default(""), not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  parent_id  :bigint(8)
+#  id                  :bigint(8)        not null, primary key
+#  domain              :string           default(""), not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  parent_id           :bigint(8)
+#  allow_with_approval :boolean          default(FALSE), not null
 #
 
 class EmailDomainBlock < ApplicationRecord
@@ -42,8 +43,8 @@ class EmailDomainBlock < ApplicationRecord
       @attempt_ip = attempt_ip
     end
 
-    def match?
-      blocking? || invalid_uri?
+    def match?(...)
+      blocking?(...) || invalid_uri?
     end
 
     private
@@ -52,8 +53,8 @@ class EmailDomainBlock < ApplicationRecord
       @uris.any?(&:nil?)
     end
 
-    def blocking?
-      blocks = EmailDomainBlock.where(domain: domains_with_variants).order(Arel.sql('char_length(domain) desc'))
+    def blocking?(allow_with_approval: false)
+      blocks = EmailDomainBlock.where(domain: domains_with_variants, allow_with_approval: allow_with_approval).order(Arel.sql('char_length(domain) desc'))
       blocks.each { |block| block.history.add(@attempt_ip) } if @attempt_ip.present?
       blocks.any?
     end
@@ -86,4 +87,8 @@ class EmailDomainBlock < ApplicationRecord
   def self.block?(domain_or_domains, attempt_ip: nil)
     Matcher.new(domain_or_domains, attempt_ip: attempt_ip).match?
   end
+
+  def self.requires_approval?(domain_or_domains, attempt_ip: nil)
+    Matcher.new(domain_or_domains, attempt_ip: attempt_ip).match?(allow_with_approval: true)
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index a1574c02ad..be1e84b49c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -418,7 +418,7 @@ class User < ApplicationRecord
 
   def set_approved
     self.approved = begin
-      if sign_up_from_ip_requires_approval?
+      if sign_up_from_ip_requires_approval? || sign_up_email_requires_approval?
         false
       else
         open_registrations? || valid_invitation? || external?
@@ -430,6 +430,12 @@ class User < ApplicationRecord
     !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
   end
 
+  def sign_up_email_requires_approval?
+    return false unless email.present? || unconfirmed_email.present?
+
+    EmailDomainBlock.requires_approval?(email.presence || unconfirmed_email, attempt_ip: sign_up_ip)
+  end
+
   def open_registrations?
     Setting.registrations_mode == 'open'
   end
diff --git a/app/serializers/rest/admin/email_domain_block_serializer.rb b/app/serializers/rest/admin/email_domain_block_serializer.rb
index a026ff680e..afe7722cb5 100644
--- a/app/serializers/rest/admin/email_domain_block_serializer.rb
+++ b/app/serializers/rest/admin/email_domain_block_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::Admin::EmailDomainBlockSerializer < ActiveModel::Serializer
-  attributes :id, :domain, :created_at, :history
+  attributes :id, :domain, :created_at, :history, :allow_with_approval
 
   def id
     object.id.to_s
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
index 7cb973c4b4..f6a6e82667 100644
--- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
+++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
@@ -12,3 +12,7 @@
         ·
 
       = t('admin.email_domain_blocks.attempts_over_week', count: email_domain_block.history.reduce(0) { |sum, day| sum + day.accounts })
+
+      - if email_domain_block.allow_with_approval?
+        ·
+        = t('admin.email_domain_blocks.allow_registrations_with_approval')
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index fa1d950ad2..3d31487733 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -7,6 +7,9 @@
   .fields-group
     = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain'), input_html: { readonly: defined?(@resolved_records) }
 
+  .fields-group
+    = f.input :allow_with_approval, wrapper: :with_label, hint: false, label: I18n.t('admin.email_domain_blocks.allow_registrations_with_approval')
+
   - if defined?(@resolved_records)
     %p.hint= t('admin.email_domain_blocks.resolved_dns_records_hint_html')
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15d682d173..50f814a81d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -425,6 +425,7 @@ en:
       view: View domain block
     email_domain_blocks:
       add_new: Add new
+      allow_registrations_with_approval: Allow registrations with approval
       attempts_over_week:
         one: "%{count} attempt over the last week"
         other: "%{count} sign-up attempts over the last week"
diff --git a/db/migrate/20231222100226_add_allow_with_approval_to_email_domain_blocks.rb b/db/migrate/20231222100226_add_allow_with_approval_to_email_domain_blocks.rb
new file mode 100644
index 0000000000..01e8edfed4
--- /dev/null
+++ b/db/migrate/20231222100226_add_allow_with_approval_to_email_domain_blocks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAllowWithApprovalToEmailDomainBlocks < ActiveRecord::Migration[7.1]
+  def change
+    add_column :email_domain_blocks, :allow_with_approval, :boolean, default: false, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 126ed8785a..4ea9744f40 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[7.1].define(version: 2023_12_12_073317) do
+ActiveRecord::Schema[7.1].define(version: 2023_12_22_100226) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -435,6 +435,7 @@ ActiveRecord::Schema[7.1].define(version: 2023_12_12_073317) do
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "parent_id"
+    t.boolean "allow_with_approval", default: false, null: false
     t.index ["domain"], name: "index_email_domain_blocks_on_domain", unique: true
   end
 
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
index 4286600144..9379fe374a 100644
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
@@ -12,13 +12,14 @@ RSpec.describe Admin::EmailDomainBlocksController do
   describe 'GET #index' do
     around do |example|
       default_per_page = EmailDomainBlock.default_per_page
-      EmailDomainBlock.paginates_per 1
+      EmailDomainBlock.paginates_per 2
       example.run
       EmailDomainBlock.paginates_per default_per_page
     end
 
     it 'returns http success' do
       2.times { Fabricate(:email_domain_block) }
+      Fabricate(:email_domain_block, allow_with_approval: true)
       get :index, params: { page: 2 }
       expect(response).to have_http_status(200)
     end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index 37172f8d24..bd1c616595 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -135,6 +135,25 @@ RSpec.describe Auth::RegistrationsController do
       end
     end
 
+    context 'when user has an email address requiring approval' do
+      subject do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'example.com')
+        request.headers['Accept-Language'] = accept_language
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      it 'creates unapproved user and redirects to setup' do
+        subject
+        expect(response).to redirect_to auth_setup_path
+
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+        expect(user.approved).to be(false)
+      end
+    end
+
     context 'with Approval-based registrations without invite' do
       subject do
         Setting.registrations_mode = 'approved'
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index 0adb473f17..86e64dab21 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -27,6 +27,27 @@ RSpec.describe AppSignUpService, type: :service do
       end
     end
 
+    context 'when the email address requires approval' do
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'email.com')
+      end
+
+      it 'creates an unapproved user', :aggregate_failures do
+        access_token = subject.call(app, remote_ip, params)
+        expect(access_token).to_not be_nil
+        expect(access_token.scopes.to_s).to eq 'read write'
+
+        user = User.find_by(id: access_token.resource_owner_id)
+        expect(user).to_not be_nil
+        expect(user.confirmed?).to be false
+        expect(user.approved?).to be false
+
+        expect(user.account).to_not be_nil
+        expect(user.invite_request).to be_nil
+      end
+    end
+
     context 'when registrations are closed' do
       before do
         Setting.registrations_mode = 'none'

From 38e5d1b53f042f17d18092471302445a902fae07 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:15:56 +0100
Subject: [PATCH 196/436] Update dependency net-ldap to v0.19.0 (#28588)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 295461bd35..8d01167537 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -474,7 +474,7 @@ GEM
     net-imap (0.4.4)
       date
       net-protocol
-    net-ldap (0.18.0)
+    net-ldap (0.19.0)
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)

From 0f3f98c01f33b0fd5968c8247f15dd0961afc9bc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:16:12 +0100
Subject: [PATCH 197/436] Update dependency react-redux-loading-bar to v5.0.8
 (#28587)

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

diff --git a/yarn.lock b/yarn.lock
index 3cd45a11d6..fd18bd9635 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13673,8 +13673,8 @@ __metadata:
   linkType: hard
 
 "react-redux-loading-bar@npm:^5.0.4":
-  version: 5.0.7
-  resolution: "react-redux-loading-bar@npm:5.0.7"
+  version: 5.0.8
+  resolution: "react-redux-loading-bar@npm:5.0.8"
   dependencies:
     prop-types: "npm:^15.7.2"
     react-lifecycles-compat: "npm:^3.0.4"
@@ -13683,7 +13683,7 @@ __metadata:
     react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
     react-redux: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     redux: ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 45333093e7d28df923a657ad89ffe4673d7bd135ef57c0143fb4d868f21b57aeb9044691f553f7d2afbcc9080a1f8cd3cec5b274c80cb57faf0e87a70f7a2cce
+  checksum: 797c1abf8bcc947feb127380e6d363db264c12bc94e578d635f86f1d806b0ec714dc3723e54c884937448b17f9042cfc995fe7a1deaf558efc01681e43e4669c
   languageName: node
   linkType: hard
 

From 9c268c9413a5bb6f1bad5c531dfdd0391326873f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 09:16:29 +0000
Subject: [PATCH 198/436] Update dependency axios to v1.6.4 (#28586)

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

diff --git a/yarn.lock b/yarn.lock
index fd18bd9635..b2ffa3b9ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4678,13 +4678,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.3
-  resolution: "axios@npm:1.6.3"
+  version: 1.6.4
+  resolution: "axios@npm:1.6.4"
   dependencies:
-    follow-redirects: "npm:^1.15.0"
+    follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: dcc6d982353db33e6893ef01cdf81d0a0548dbd8fba0cb046dc4aee1a6a16226721faa4c2a13b2673d47130509629cdb93bb991b3a2bd4ef17a5ac27a8bba0da
+  checksum: daac697fa1ea9865cb48e9edb7eacd99e8a9214997f2d8e886cb61c380a613e5c270078bfc153ac96206680106c223f005f0e4bf2f3b2ddd88e559ecf970521f
   languageName: node
   linkType: hard
 
@@ -8163,13 +8163,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0":
-  version: 1.15.3
-  resolution: "follow-redirects@npm:1.15.3"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4":
+  version: 1.15.4
+  resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 915a2cf22e667bdf47b1a43cc6b7dce14d95039e9bbf9a24d0e739abfbdfa00077dd43c86d4a7a19efefcc7a99af144920a175eedc3888d268af5df67c272ee5
+  checksum: 5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a
   languageName: node
   linkType: hard
 

From 9826b7780ab4f0a6cbb633bf159fcea4db1b7ed9 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:18:03 +0100
Subject: [PATCH 199/436] Streaming: use standard cors package instead of
 custom implementation (#28523)

---
 streaming/index.js     | 16 ++--------------
 streaming/package.json |  2 ++
 yarn.lock              | 25 +++++++++++++++++++++++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index fb3e3fb2be..42d0afc7c5 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -5,6 +5,7 @@ const http = require('http');
 const path = require('path');
 const url = require('url');
 
+const cors = require('cors');
 const dotenv = require('dotenv');
 const express = require('express');
 const Redis = require('ioredis');
@@ -187,6 +188,7 @@ const startServer = async () => {
 
   const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
   const server = http.createServer(app);
+  app.use(cors());
 
   /**
    * @type {Object.<string, Array.<function(Object<string, any>): void>>}
@@ -327,19 +329,6 @@ const startServer = async () => {
     }
   };
 
-  /**
-   * @param {any} req
-   * @param {any} res
-   * @param {function(Error=): void} next
-   */
-  const allowCrossDomain = (req, res, next) => {
-    res.header('Access-Control-Allow-Origin', '*');
-    res.header('Access-Control-Allow-Headers', 'Authorization, Accept, Cache-Control');
-    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');
-
-    next();
-  };
-
   /**
    * @param {any} req
    * @param {any} res
@@ -987,7 +976,6 @@ const startServer = async () => {
 
   api.use(setRequestId);
   api.use(setRemoteAddress);
-  api.use(allowCrossDomain);
 
   api.use(authenticationMiddleware);
   api.use(errorMiddleware);
diff --git a/streaming/package.json b/streaming/package.json
index 0cfc5b3276..2d70acb829 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -16,6 +16,7 @@
     "check:types": "tsc --noEmit"
   },
   "dependencies": {
+    "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
@@ -28,6 +29,7 @@
     "ws": "^8.12.1"
   },
   "devDependencies": {
+    "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
     "@types/npmlog": "^7.0.0",
     "@types/pg": "^8.6.6",
diff --git a/yarn.lock b/yarn.lock
index b2ffa3b9ea..7b7f0e3153 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2468,12 +2468,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@mastodon/streaming@workspace:streaming"
   dependencies:
+    "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
     "@types/npmlog": "npm:^7.0.0"
     "@types/pg": "npm:^8.6.6"
     "@types/uuid": "npm:^9.0.0"
     "@types/ws": "npm:^8.5.9"
     bufferutil: "npm:^4.0.7"
+    cors: "npm:^2.8.5"
     dotenv: "npm:^16.0.3"
     eslint-define-config: "npm:^2.0.0"
     express: "npm:^4.18.2"
@@ -3027,6 +3029,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/cors@npm:^2.8.16":
+  version: 2.8.16
+  resolution: "@types/cors@npm:2.8.16"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: ebcfb325b102739249bbaa4845cf1cf4830baf5490a32bcd1a85cd9b8c4d4b9eaaaea94423e454b5b7c9da77e46a64db80d2381d3bc3f940d15d13814e87b70a
+  languageName: node
+  linkType: hard
+
 "@types/emoji-mart@npm:^3.0.9":
   version: 3.0.14
   resolution: "@types/emoji-mart@npm:3.0.14"
@@ -5973,6 +5984,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cors@npm:^2.8.5":
+  version: 2.8.5
+  resolution: "cors@npm:2.8.5"
+  dependencies:
+    object-assign: "npm:^4"
+    vary: "npm:^1"
+  checksum: 373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
+  languageName: node
+  linkType: hard
+
 "cosmiconfig@npm:^7.0.0":
   version: 7.1.0
   resolution: "cosmiconfig@npm:7.1.0"
@@ -11953,7 +11974,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
+"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
@@ -16728,7 +16749,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vary@npm:~1.1.2":
+"vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
   checksum: f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f

From 06374d07c3ce5eab2560ae85b56939cef575aee8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:19:38 +0100
Subject: [PATCH 200/436] Update dependency cssnano to v6.0.3 (#28581)

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

diff --git a/yarn.lock b/yarn.lock
index 7b7f0e3153..99c3eedb26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5208,7 +5208,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
   version: 4.22.2
   resolution: "browserslist@npm:4.22.2"
   dependencies:
@@ -6140,7 +6140,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-declaration-sorter@npm:^7.0.0":
+"css-declaration-sorter@npm:^7.1.1":
   version: 7.1.1
   resolution: "css-declaration-sorter@npm:7.1.1"
   peerDependencies:
@@ -6228,7 +6228,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^2.2.1, css-tree@npm:^2.3.1":
+"css-tree@npm:^2.3.1":
   version: 2.3.1
   resolution: "css-tree@npm:2.3.1"
   dependencies:
@@ -6278,42 +6278,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "cssnano-preset-default@npm:6.0.2"
+"cssnano-preset-default@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "cssnano-preset-default@npm:6.0.3"
   dependencies:
-    css-declaration-sorter: "npm:^7.0.0"
+    css-declaration-sorter: "npm:^7.1.1"
     cssnano-utils: "npm:^4.0.1"
     postcss-calc: "npm:^9.0.1"
-    postcss-colormin: "npm:^6.0.1"
-    postcss-convert-values: "npm:^6.0.1"
+    postcss-colormin: "npm:^6.0.2"
+    postcss-convert-values: "npm:^6.0.2"
     postcss-discard-comments: "npm:^6.0.1"
     postcss-discard-duplicates: "npm:^6.0.1"
     postcss-discard-empty: "npm:^6.0.1"
     postcss-discard-overridden: "npm:^6.0.1"
-    postcss-merge-longhand: "npm:^6.0.1"
-    postcss-merge-rules: "npm:^6.0.2"
+    postcss-merge-longhand: "npm:^6.0.2"
+    postcss-merge-rules: "npm:^6.0.3"
     postcss-minify-font-values: "npm:^6.0.1"
     postcss-minify-gradients: "npm:^6.0.1"
-    postcss-minify-params: "npm:^6.0.1"
-    postcss-minify-selectors: "npm:^6.0.1"
+    postcss-minify-params: "npm:^6.0.2"
+    postcss-minify-selectors: "npm:^6.0.2"
     postcss-normalize-charset: "npm:^6.0.1"
     postcss-normalize-display-values: "npm:^6.0.1"
     postcss-normalize-positions: "npm:^6.0.1"
     postcss-normalize-repeat-style: "npm:^6.0.1"
     postcss-normalize-string: "npm:^6.0.1"
     postcss-normalize-timing-functions: "npm:^6.0.1"
-    postcss-normalize-unicode: "npm:^6.0.1"
+    postcss-normalize-unicode: "npm:^6.0.2"
     postcss-normalize-url: "npm:^6.0.1"
     postcss-normalize-whitespace: "npm:^6.0.1"
     postcss-ordered-values: "npm:^6.0.1"
-    postcss-reduce-initial: "npm:^6.0.1"
+    postcss-reduce-initial: "npm:^6.0.2"
     postcss-reduce-transforms: "npm:^6.0.1"
-    postcss-svgo: "npm:^6.0.1"
-    postcss-unique-selectors: "npm:^6.0.1"
+    postcss-svgo: "npm:^6.0.2"
+    postcss-unique-selectors: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: c6f97674704c3a2a2473440549eac38ac722feebabbd39f2d4d1b8fae7f137f8fd0dfb88929e1ff737d54008de583c39e96f9dc450f2d71f8be6fc3bac2840a3
+  checksum: d100a1f8ab71adbb6df85e00f4a9e5d04ac06fc50343157eef853aded3f75dd0489dd845a5b2fb43ca701bd88c39c5aa88673f842bc1f94f4318c7b38ced1963
   languageName: node
   linkType: hard
 
@@ -6327,23 +6327,14 @@ __metadata:
   linkType: hard
 
 "cssnano@npm:^6.0.1":
-  version: 6.0.2
-  resolution: "cssnano@npm:6.0.2"
+  version: 6.0.3
+  resolution: "cssnano@npm:6.0.3"
   dependencies:
-    cssnano-preset-default: "npm:^6.0.2"
+    cssnano-preset-default: "npm:^6.0.3"
     lilconfig: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 5f4146a6c8937d24b0d1d33e3acd85db7913c7558cc80b23169f86c9a552d091a26e0af6adcc535f8355561872f797a917b9353e38fe935bbaf08ec2b66f5ff8
-  languageName: node
-  linkType: hard
-
-"csso@npm:5.0.5":
-  version: 5.0.5
-  resolution: "csso@npm:5.0.5"
-  dependencies:
-    css-tree: "npm:~2.2.0"
-  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
+  checksum: d1669eb987fd96159bae262ef2f76c1a64fffefe8fa593918a6bda377977798b60fb4a6a871a9b9a9deb11258130ee254fdb8c3144769b3060ad9f2a95a4ed0a
   languageName: node
   linkType: hard
 
@@ -6356,6 +6347,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"csso@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "csso@npm:5.0.5"
+  dependencies:
+    css-tree: "npm:~2.2.0"
+  checksum: ab4beb1e97dd7e207c10e9925405b45f15a6cd1b4880a8686ad573aa6d476aed28b4121a666cffd26c37a26179f7b54741f7c257543003bfb244d06a62ad569b
+  languageName: node
+  linkType: hard
+
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
@@ -12743,29 +12743,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-colormin@npm:6.0.1"
+"postcss-colormin@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-colormin@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     caniuse-api: "npm:^3.0.0"
     colord: "npm:^2.9.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: b0056812b3436b05b6b84284a1ebe68a72299f23e7eeb0b7b40a775978d06a1cbe235f3665e3f694f5de76fe7d9b93db607536d07697b31a59fd4e8705e5b64d
+  checksum: 229681f9b89ba0909b4c69563837b0c32cc3d1c17ed1b00c33d4abfb0a0ef455124968e4885b5f92c64482e92074cd1958018ec111ed5d118f1e24baeda19c14
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-convert-values@npm:6.0.1"
+"postcss-convert-values@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-convert-values@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 53b951d7475206969c63b8427a2dea0ccba0a7cb08122e5f05aee8d12b09c870c070b101c9f8eceda76ff4d0fd9e5fa9385e83f143d658bb729dbb6a3583b872
+  checksum: 882d0b7839ef07ac8ffbf9cb48db0f610939a3496bd0321c7f23096ead676f13e09ab3d9c20ff3dbe2c887e855826051ca7dffeaffce5068cfdc9aaa573a3842
   languageName: node
   linkType: hard
 
@@ -12828,29 +12828,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-merge-longhand@npm:6.0.1"
+"postcss-merge-longhand@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-merge-longhand@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    stylehacks: "npm:^6.0.1"
+    stylehacks: "npm:^6.0.2"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 2c0eb81b6c6d3d2af3b129c46d10317b7923f218db1cadcb4723091fb951fe4624638002b65f235151129d4ce9b4775a6ed0d5fa13419c0df580f72e15fa4ad3
+  checksum: 2b3fae51bffc5962258d638bc7f415237593b515f369233e023f0eae5b13116297463c04b8c47a7b7af51cba5faaa7f517b653f6123e51935d670d4d4de5a26d
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-merge-rules@npm:6.0.2"
+"postcss-merge-rules@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "postcss-merge-rules@npm:6.0.3"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     caniuse-api: "npm:^3.0.0"
     cssnano-utils: "npm:^4.0.1"
-    postcss-selector-parser: "npm:^6.0.5"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 138a9921423420116b20e5761a1139392f0bcfcf34264fe11e254917d9c3170e3c0478a1b409e227d22bb0d9820b0168a871a240215d114e9c1e218ee6c132e6
+  checksum: c8355db11aa60bedcb1e6535fcd70f6ecec2dadd5c2975d3accf0eedbc92af782ac1f5e91a53866816ce332e4cbf1b94749a9425067935be066bc0c974e30fee
   languageName: node
   linkType: hard
 
@@ -12878,27 +12878,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-params@npm:6.0.1"
+"postcss-minify-params@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-params@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     cssnano-utils: "npm:^4.0.1"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 0b34817f032ec9793fad4d33f3ba5551531073a36c9120d77194a3edeee860132951ed6954913494e5a6752ae8da1bc5cdb2a44fa5f428621afae8edddb0ca80
+  checksum: 6638460d2be4a2eca8adee8409b70d6c6a19aff8cf93fda1b45c9da627b258b6baaa6acb48f51d26cd287704a235f9c9ae2e4744335b1fd47e163177c33896df
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-minify-selectors@npm:6.0.1"
+"postcss-minify-selectors@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-minify-selectors@npm:6.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.5"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: ffc7ebb286beda2b2aa0ed13abafc89b5ffe232a48d57d3f2b9f69e167e354482a6f5279e9118bed753bf6e82d3cfb21228a6b07acd93d0dc9e01bbf0e7ebc75
+  checksum: 5437b586c1237fc442e7e6078d4f23c987efc456366368b07a0da67332b04bd55821cedf0441e73e1209689f63139e272d930508e2963ba6e27c46561a661128
   languageName: node
   linkType: hard
 
@@ -13010,15 +13010,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-normalize-unicode@npm:6.0.1"
+"postcss-normalize-unicode@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-normalize-unicode@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 8057748dade94dc2dd63a3b75a85e394c2e9a7076053886ff08aa9b7729d383f204eda52d882e5361ae1ec493036e90b2e18dcc5f8c9b3a8f1cbfada12bcc05b
+  checksum: ea696194f65ad31de2a9c022f1946a07c298f04070706d88a20061845e1e052e645c74b5bc785595814db87d14e435f85e968a44855dedc207d8c0b5d43b1aee
   languageName: node
   linkType: hard
 
@@ -13056,15 +13056,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-reduce-initial@npm:6.0.1"
+"postcss-reduce-initial@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-reduce-initial@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
+    browserslist: "npm:^4.22.2"
     caniuse-api: "npm:^3.0.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 3f8f6c26ceeb79ddc285b0e01183fe30e911dd26b3abcdca56568e2bef3747f2b7f22ee3f9117e9752e1e93c10bcd88bd6a2842ca525b54336726292ebd3c3ad
+  checksum: d35ad6f9725cdceb390a97a461e8594df7fbed4c55497c90d07c42f8343bf80139e720eaebc580bf480bf10e92959490aa308af66d8802ba71c327bdf08c93a1
   languageName: node
   linkType: hard
 
@@ -13104,36 +13104,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5":
-  version: 6.0.13
-  resolution: "postcss-selector-parser@npm:6.0.13"
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+  version: 6.0.15
+  resolution: "postcss-selector-parser@npm:6.0.15"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 51f099b27f7c7198ea1826470ef0adfa58b3bd3f59b390fda123baa0134880a5fa9720137b6009c4c1373357b144f700b0edac73335d0067422063129371444e
+  checksum: 48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-svgo@npm:6.0.1"
+"postcss-svgo@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-svgo@npm:6.0.2"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
-    svgo: "npm:^3.0.5"
+    svgo: "npm:^3.2.0"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 021da9b0d0696fce970f407891a0d6c05e51d1908af435026e0cd5936a75cd8502a7d504cd0e6a33b6f3369fee41f01b848e5bd919aecc3e804ce6308e91a6cc
+  checksum: db607404d09af256c7957a0ace822d651a00a52a1796da603f93ba3f0a095ac7595e1f624b9dc53f362ab10e382845d7873f485980f9c92fcb86256833f5e835
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "postcss-unique-selectors@npm:6.0.1"
+"postcss-unique-selectors@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-unique-selectors@npm:6.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.5"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 637e35775d0ee8fbcf4a81b28d3832c5076de7c0232eb7769d4fbbf783f26793e2ec95e18461ae3b9f5f5cd63c3de9db102464487ba2488d4947aad24dc8841f
+  checksum: a0fe112d1094f90e1bfcfd2174a74b2fd0630a24449e9942923d02956c7d64ea4add5adede53d9efb3f6d40cd388ac150d032a115f6a46b73d5f3d3d26fa1bb7
   languageName: node
   linkType: hard
 
@@ -15606,15 +15606,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "stylehacks@npm:6.0.1"
+"stylehacks@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "stylehacks@npm:6.0.2"
   dependencies:
-    browserslist: "npm:^4.21.4"
-    postcss-selector-parser: "npm:^6.0.4"
+    browserslist: "npm:^4.22.2"
+    postcss-selector-parser: "npm:^6.0.15"
   peerDependencies:
     postcss: ^8.4.31
-  checksum: 0877016f5b2a06b8ceaf39382b0c33da11ea93268209444f67f29b1ce465994058f305fc3bc90dda21e8664c959561fbb06ba12b82289c3b26ba832c6979d513
+  checksum: 658cac8b28edcb94d1db67808ab3aaa511cb1b9293594fc95607ee42ac4f57e742d9a1fa3ff5d5849db692971dc2a310e9ac1ed0bd4ea4bc48c80f5a6ef823fc
   languageName: node
   linkType: hard
 
@@ -15838,20 +15838,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svgo@npm:^3.0.5":
-  version: 3.1.0
-  resolution: "svgo@npm:3.1.0"
+"svgo@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "svgo@npm:3.2.0"
   dependencies:
     "@trysound/sax": "npm:0.2.0"
     commander: "npm:^7.2.0"
     css-select: "npm:^5.1.0"
-    css-tree: "npm:^2.2.1"
+    css-tree: "npm:^2.3.1"
     css-what: "npm:^6.1.0"
-    csso: "npm:5.0.5"
+    csso: "npm:^5.0.5"
     picocolors: "npm:^1.0.0"
   bin:
     svgo: ./bin/svgo
-  checksum: b3f00b3319dee6ddc53f8b8ac5acef581860e1708c98b492169e096621edc1bdf46e3778099e3dffb5116bf0d4c074a686099843dbc020c73b3ccfae7b6a88f0
+  checksum: 28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c
   languageName: node
   linkType: hard
 

From f06c1f1552f289bd357e4f05cd6486832cf5028f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Jan 2024 04:20:32 -0500
Subject: [PATCH 201/436] Fix `Capybara/ClickLinkOrButtonStyle` cop in
 spec/features (#28576)

---
 Gemfile.lock                                  |  2 +-
 spec/features/admin/accounts_spec.rb          |  8 ++---
 spec/features/admin/custom_emojis_spec.rb     |  2 +-
 spec/features/admin/domain_blocks_spec.rb     | 18 +++++-----
 .../admin/email_domain_blocks_spec.rb         |  2 +-
 spec/features/admin/ip_blocks_spec.rb         |  2 +-
 spec/features/admin/software_updates_spec.rb  |  4 +--
 spec/features/admin/statuses_spec.rb          |  2 +-
 .../links/preview_card_providers_spec.rb      |  2 +-
 spec/features/admin/trends/links_spec.rb      |  2 +-
 spec/features/admin/trends/statuses_spec.rb   |  2 +-
 spec/features/admin/trends/tags_spec.rb       |  2 +-
 spec/features/captcha_spec.rb                 |  2 +-
 spec/features/log_in_spec.rb                  |  6 ++--
 spec/features/oauth_spec.rb                   | 36 +++++++++----------
 spec/support/stories/profile_stories.rb       |  2 +-
 spec/system/new_statuses_spec.rb              |  4 +--
 17 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8d01167537..c3f27966d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -676,7 +676,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
diff --git a/spec/features/admin/accounts_spec.rb b/spec/features/admin/accounts_spec.rb
index ad9c51485a..6d7bab1844 100644
--- a/spec/features/admin/accounts_spec.rb
+++ b/spec/features/admin/accounts_spec.rb
@@ -22,7 +22,7 @@ describe 'Admin::Accounts' do
 
     context 'without selecting any accounts' do
       it 'displays a notice about account selection' do
-        click_button button_for_suspend
+        click_on button_for_suspend
 
         expect(page).to have_content(selection_error_text)
       end
@@ -32,7 +32,7 @@ describe 'Admin::Accounts' do
       it 'suspends the account' do
         batch_checkbox_for(approved_user_account).check
 
-        click_button button_for_suspend
+        click_on button_for_suspend
 
         expect(approved_user_account.reload).to be_suspended
       end
@@ -42,7 +42,7 @@ describe 'Admin::Accounts' do
       it 'approves the account user' do
         batch_checkbox_for(unapproved_user_account).check
 
-        click_button button_for_approve
+        click_on button_for_approve
 
         expect(unapproved_user_account.reload.user).to be_approved
       end
@@ -52,7 +52,7 @@ describe 'Admin::Accounts' do
       it 'rejects and removes the account' do
         batch_checkbox_for(unapproved_user_account).check
 
-        click_button button_for_reject
+        click_on button_for_reject
 
         expect { unapproved_user_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
diff --git a/spec/features/admin/custom_emojis_spec.rb b/spec/features/admin/custom_emojis_spec.rb
index 3fea8f06fe..8a8b6efcd1 100644
--- a/spec/features/admin/custom_emojis_spec.rb
+++ b/spec/features/admin/custom_emojis_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::CustomEmojis' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_enable
+        click_on button_for_enable
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/features/admin/domain_blocks_spec.rb
index 4379ac91db..6a1405cdf6 100644
--- a/spec/features/admin/domain_blocks_spec.rb
+++ b/spec/features/admin/domain_blocks_spec.rb
@@ -14,7 +14,7 @@ describe 'blocking domains through the moderation interface' do
 
       fill_in 'domain_block_domain', with: 'example.com'
       select I18n.t('admin.domain_blocks.new.severity.silence'), from: 'domain_block_severity'
-      click_button I18n.t('admin.domain_blocks.new.create')
+      click_on I18n.t('admin.domain_blocks.new.create')
 
       expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -27,14 +27,14 @@ describe 'blocking domains through the moderation interface' do
 
       fill_in 'domain_block_domain', with: 'example.com'
       select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_button I18n.t('admin.domain_blocks.new.create')
+      click_on I18n.t('admin.domain_blocks.new.create')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
       expect(DomainBlockWorker).to_not have_received(:perform_async)
 
       # Confirming creates a block
-      click_button I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
 
       expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -49,14 +49,14 @@ describe 'blocking domains through the moderation interface' do
 
       fill_in 'domain_block_domain', with: 'example.com'
       select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_button I18n.t('admin.domain_blocks.new.create')
+      click_on I18n.t('admin.domain_blocks.new.create')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
       expect(DomainBlockWorker).to_not have_received(:perform_async)
 
       # Confirming updates the block
-      click_button I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
 
       expect(domain_block.reload.severity).to eq 'suspend'
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -71,14 +71,14 @@ describe 'blocking domains through the moderation interface' do
 
       fill_in 'domain_block_domain', with: 'subdomain.example.com'
       select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_button I18n.t('admin.domain_blocks.new.create')
+      click_on I18n.t('admin.domain_blocks.new.create')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'subdomain.example.com'))
       expect(DomainBlockWorker).to_not have_received(:perform_async)
 
       # Confirming creates the block
-      click_button I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
 
       expect(DomainBlock.where(domain: 'subdomain.example.com', severity: 'suspend')).to exist
       expect(DomainBlockWorker).to have_received(:perform_async)
@@ -96,14 +96,14 @@ describe 'blocking domains through the moderation interface' do
       visit edit_admin_domain_block_path(domain_block)
 
       select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
-      click_button I18n.t('generic.save_changes')
+      click_on I18n.t('generic.save_changes')
 
       # It doesn't immediately block but presents a confirmation screen
       expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
       expect(DomainBlockWorker).to_not have_received(:perform_async)
 
       # Confirming updates the block
-      click_button I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
       expect(DomainBlockWorker).to have_received(:perform_async)
 
       expect(domain_block.reload.severity).to eq 'suspend'
diff --git a/spec/features/admin/email_domain_blocks_spec.rb b/spec/features/admin/email_domain_blocks_spec.rb
index 80efe72e95..14959cbe74 100644
--- a/spec/features/admin/email_domain_blocks_spec.rb
+++ b/spec/features/admin/email_domain_blocks_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::EmailDomainBlocks' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_delete
+        click_on button_for_delete
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/ip_blocks_spec.rb b/spec/features/admin/ip_blocks_spec.rb
index 465c889190..c9b16f6f78 100644
--- a/spec/features/admin/ip_blocks_spec.rb
+++ b/spec/features/admin/ip_blocks_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::IpBlocks' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_delete
+        click_on button_for_delete
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/software_updates_spec.rb b/spec/features/admin/software_updates_spec.rb
index a2373d35a6..4a635d1a79 100644
--- a/spec/features/admin/software_updates_spec.rb
+++ b/spec/features/admin/software_updates_spec.rb
@@ -11,13 +11,13 @@ describe 'finding software updates through the admin interface' do
 
   it 'shows a link to the software updates page, which links to release notes' do
     visit settings_profile_path
-    click_link I18n.t('admin.critical_update_pending')
+    click_on I18n.t('admin.critical_update_pending')
 
     expect(page).to have_title(I18n.t('admin.software_updates.title'))
 
     expect(page).to have_content('99.99.99')
 
-    click_link I18n.t('admin.software_updates.release_notes')
+    click_on I18n.t('admin.software_updates.release_notes')
     expect(page).to have_current_path('https://github.com/mastodon/mastodon/releases/v99', url: true)
   end
 end
diff --git a/spec/features/admin/statuses_spec.rb b/spec/features/admin/statuses_spec.rb
index a21c901a92..531d0de953 100644
--- a/spec/features/admin/statuses_spec.rb
+++ b/spec/features/admin/statuses_spec.rb
@@ -17,7 +17,7 @@ describe 'Admin::Statuses' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_report
+        click_on button_for_report
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/trends/links/preview_card_providers_spec.rb b/spec/features/admin/trends/links/preview_card_providers_spec.rb
index cf9796abf3..dca89117b1 100644
--- a/spec/features/admin/trends/links/preview_card_providers_spec.rb
+++ b/spec/features/admin/trends/links/preview_card_providers_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::Trends::Links::PreviewCardProviders' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_allow
+        click_on button_for_allow
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/trends/links_spec.rb b/spec/features/admin/trends/links_spec.rb
index 8b1b991a5a..99638bc069 100644
--- a/spec/features/admin/trends/links_spec.rb
+++ b/spec/features/admin/trends/links_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::Trends::Links' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_allow
+        click_on button_for_allow
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/trends/statuses_spec.rb b/spec/features/admin/trends/statuses_spec.rb
index a578ab0559..779a15d38f 100644
--- a/spec/features/admin/trends/statuses_spec.rb
+++ b/spec/features/admin/trends/statuses_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::Trends::Statuses' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_allow
+        click_on button_for_allow
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/admin/trends/tags_spec.rb b/spec/features/admin/trends/tags_spec.rb
index 7502bc8c6f..52e49c3a5d 100644
--- a/spec/features/admin/trends/tags_spec.rb
+++ b/spec/features/admin/trends/tags_spec.rb
@@ -16,7 +16,7 @@ describe 'Admin::Trends::Tags' do
 
     context 'without selecting any records' do
       it 'displays a notice about selection' do
-        click_button button_for_allow
+        click_on button_for_allow
 
         expect(page).to have_content(selection_error_text)
       end
diff --git a/spec/features/captcha_spec.rb b/spec/features/captcha_spec.rb
index 906aec4af9..15c37eb463 100644
--- a/spec/features/captcha_spec.rb
+++ b/spec/features/captcha_spec.rb
@@ -23,7 +23,7 @@ describe 'email confirmation flow when captcha is enabled' do
       expect(user.reload.confirmed?).to be false
 
       # It redirects to app and confirms user
-      click_button I18n.t('challenge.confirm')
+      click_on I18n.t('challenge.confirm')
       expect(user.reload.confirmed?).to be true
       expect(page).to have_current_path(/\A#{client_app.confirmation_redirect_uri}/, url: true)
 
diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb
index 7e5196aba9..c64e19d2b7 100644
--- a/spec/features/log_in_spec.rb
+++ b/spec/features/log_in_spec.rb
@@ -19,7 +19,7 @@ describe 'Log in' do
   it 'A valid email and password user is able to log in' do
     fill_in 'user_email', with: email
     fill_in 'user_password', with: password
-    click_button I18n.t('auth.login')
+    click_on I18n.t('auth.login')
 
     expect(subject).to have_css('div.app-holder')
   end
@@ -27,7 +27,7 @@ describe 'Log in' do
   it 'A invalid email and password user is not able to log in' do
     fill_in 'user_email', with: 'invalid_email'
     fill_in 'user_password', with: 'invalid_password'
-    click_button I18n.t('auth.login')
+    click_on I18n.t('auth.login')
 
     expect(subject).to have_css('.flash-message', text: failure_message('invalid'))
   end
@@ -38,7 +38,7 @@ describe 'Log in' do
     it 'A unconfirmed user is able to log in' do
       fill_in 'user_email', with: email
       fill_in 'user_password', with: password
-      click_button I18n.t('auth.login')
+      click_on I18n.t('auth.login')
 
       expect(subject).to have_css('div.admin-wrapper')
     end
diff --git a/spec/features/oauth_spec.rb b/spec/features/oauth_spec.rb
index 0e612b56a5..967956cc8e 100644
--- a/spec/features/oauth_spec.rb
+++ b/spec/features/oauth_spec.rb
@@ -20,7 +20,7 @@ describe 'Using OAuth from an external app' do
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon authorizing, it redirects to the apps' callback URL
-      click_button I18n.t('doorkeeper.authorizations.buttons.authorize')
+      click_on I18n.t('doorkeeper.authorizations.buttons.authorize')
       expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
       # It grants the app access to the account
@@ -35,7 +35,7 @@ describe 'Using OAuth from an external app' do
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.deny'))
 
       # Upon denying, it redirects to the apps' callback URL
-      click_button I18n.t('doorkeeper.authorizations.buttons.deny')
+      click_on I18n.t('doorkeeper.authorizations.buttons.deny')
       expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
       # It does not grant the app access to the account
@@ -63,17 +63,17 @@ describe 'Using OAuth from an external app' do
       # Failing to log-in presents the form again
       fill_in 'user_email', with: email
       fill_in 'user_password', with: 'wrong password'
-      click_button I18n.t('auth.login')
+      click_on I18n.t('auth.login')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
       fill_in 'user_email', with: email
       fill_in 'user_password', with: password
-      click_button I18n.t('auth.login')
+      click_on I18n.t('auth.login')
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon authorizing, it redirects to the apps' callback URL
-      click_button I18n.t('doorkeeper.authorizations.buttons.authorize')
+      click_on I18n.t('doorkeeper.authorizations.buttons.authorize')
       expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
       # It grants the app access to the account
@@ -90,17 +90,17 @@ describe 'Using OAuth from an external app' do
       # Failing to log-in presents the form again
       fill_in 'user_email', with: email
       fill_in 'user_password', with: 'wrong password'
-      click_button I18n.t('auth.login')
+      click_on I18n.t('auth.login')
       expect(page).to have_content(I18n.t('auth.login'))
 
       # Logging in redirects to an authorization page
       fill_in 'user_email', with: email
       fill_in 'user_password', with: password
-      click_button I18n.t('auth.login')
+      click_on I18n.t('auth.login')
       expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
       # Upon denying, it redirects to the apps' callback URL
-      click_button I18n.t('doorkeeper.authorizations.buttons.deny')
+      click_on I18n.t('doorkeeper.authorizations.buttons.deny')
       expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
       # It does not grant the app access to the account
@@ -120,27 +120,27 @@ describe 'Using OAuth from an external app' do
         # Failing to log-in presents the form again
         fill_in 'user_email', with: email
         fill_in 'user_password', with: 'wrong password'
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
         fill_in 'user_email', with: email
         fill_in 'user_password', with: password
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
         fill_in 'user_otp_attempt', with: 'wrong'
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
         fill_in 'user_otp_attempt', with: user.current_otp
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon authorizing, it redirects to the apps' callback URL
-        click_button I18n.t('doorkeeper.authorizations.buttons.authorize')
+        click_on I18n.t('doorkeeper.authorizations.buttons.authorize')
         expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
         # It grants the app access to the account
@@ -157,27 +157,27 @@ describe 'Using OAuth from an external app' do
         # Failing to log-in presents the form again
         fill_in 'user_email', with: email
         fill_in 'user_password', with: 'wrong password'
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('auth.login'))
 
         # Logging in redirects to a two-factor authentication page
         fill_in 'user_email', with: email
         fill_in 'user_password', with: password
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in an incorrect two-factor authentication code presents the form again
         fill_in 'user_otp_attempt', with: 'wrong'
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('simple_form.hints.sessions.otp'))
 
         # Filling in the correct TOTP code redirects to an app authorization page
         fill_in 'user_otp_attempt', with: user.current_otp
-        click_button I18n.t('auth.login')
+        click_on I18n.t('auth.login')
         expect(page).to have_content(I18n.t('doorkeeper.authorizations.buttons.authorize'))
 
         # Upon denying, it redirects to the apps' callback URL
-        click_button I18n.t('doorkeeper.authorizations.buttons.deny')
+        click_on I18n.t('doorkeeper.authorizations.buttons.deny')
         expect(page).to have_current_path(/\A#{client_app.redirect_uri}/, url: true)
 
         # It does not grant the app access to the account
diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb
index 82667ca080..2b345ddef1 100644
--- a/spec/support/stories/profile_stories.rb
+++ b/spec/support/stories/profile_stories.rb
@@ -18,7 +18,7 @@ module ProfileStories
     visit new_user_session_path
     fill_in 'user_email', with: email
     fill_in 'user_password', with: password
-    click_button I18n.t('auth.login')
+    click_on I18n.t('auth.login')
   end
 
   def with_alice_as_local_user
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 244101f4d4..02f2e28393 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -24,7 +24,7 @@ describe 'NewStatuses' do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_button 'Publish!'
+      click_on 'Publish!'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
@@ -37,7 +37,7 @@ describe 'NewStatuses' do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_button 'Publish!'
+      click_on 'Publish!'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)

From 1af5c3770153e7c3569d13c431e988049956ae8b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Jan 2024 04:21:27 -0500
Subject: [PATCH 202/436] Use heredoc on federation CLI warning strings
 (#28578)

---
 lib/mastodon/cli/federation.rb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/mastodon/cli/federation.rb b/lib/mastodon/cli/federation.rb
index 4a4dde3686..8bb46ecb1a 100644
--- a/lib/mastodon/cli/federation.rb
+++ b/lib/mastodon/cli/federation.rb
@@ -48,19 +48,31 @@ module Mastodon::CLI
 
         exit(1) unless ask('Type in the domain of the server to confirm:') == Rails.configuration.x.local_domain
 
-        say('This operation WILL NOT be reversible.', :yellow)
-        say('While the data won\'t be erased locally, the server will be in a BROKEN STATE afterwards.', :yellow)
-        say('The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).', :yellow)
+        say(<<~WARNING, :yellow)
+          This operation WILL NOT be reversible.
+          While the data won't be erased locally, the server will be in a BROKEN STATE afterwards.
+          The deletion process itself may take a long time, and will be handled by Sidekiq, so do not shut it down until it has finished (you will be able to re-run this command to see the state of the self-destruct process).
+        WARNING
 
         exit(1) if no?('Are you sure you want to proceed?')
 
-        self_destruct_value = Rails.application.message_verifier('self-destruct').generate(Rails.configuration.x.local_domain)
-        say('To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:', :green)
-        say("  SELF_DESTRUCT=#{self_destruct_value}", :green)
-        say("\nYou can re-run this command to see the state of the self-destruct process.", :green)
+        say(<<~INSTRUCTIONS, :green)
+          To switch Mastodon to self-destruct mode, add the following variable to your evironment (e.g. by adding a line to your `.env.production`) and restart all Mastodon processes:
+            SELF_DESTRUCT=#{self_destruct_value}
+          You can re-run this command to see the state of the self-destruct process.
+        INSTRUCTIONS
       rescue Interrupt
         exit(1)
       end
+
+      private
+
+      def self_destruct_value
+        Rails
+          .application
+          .message_verifier('self-destruct')
+          .generate(Rails.configuration.x.local_domain)
+      end
     end
   end
 end

From bdf4750633703d97269522759ea6f2f8ecbd4976 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 09:24:13 +0000
Subject: [PATCH 203/436] New Crowdin Translations (automated) (#28590)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ia.json  | 25 +++++++++++++++++++++++-
 app/javascript/mastodon/locales/lad.json |  1 +
 app/javascript/mastodon/locales/nn.json  |  2 +-
 app/javascript/mastodon/locales/no.json  |  2 +-
 config/locales/devise.ie.yml             |  7 +++++++
 config/locales/doorkeeper.ie.yml         |  3 +++
 config/locales/lad.yml                   | 21 ++++++++++++++++++++
 config/locales/simple_form.ie.yml        | 12 ++++++++++++
 8 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 35397b8e12..9781d6aa77 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -38,12 +38,14 @@
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.delete.confirm": "Deler",
   "confirmations.delete_list.confirm": "Deler",
+  "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Clauder le session",
   "copy_icon_button.copied": "Copiate al area de transferentia",
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
   "disabled_account_banner.account_settings": "Parametros de conto",
   "dismissable_banner.dismiss": "Dimitter",
   "emoji_button.activity": "Activitate",
+  "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
   "emoji_button.search_results": "Resultatos de recerca",
   "empty_column.account_unavailable": "Profilo non disponibile",
@@ -69,16 +71,37 @@
   "navigation_bar.about": "A proposito de",
   "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
+  "navigation_bar.discover": "Discoperir",
+  "navigation_bar.edit_profile": "Modificar profilo",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder le session",
   "navigation_bar.preferences": "Preferentias",
+  "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.filter.all": "Toto",
+  "notifications.grant_permission": "Conceder permission.",
+  "notifications.group": "{count} notificationes",
   "onboarding.compose.template": "Salute #Mastodon!",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
-  "onboarding.share.title": "Compartir tu profilo"
+  "onboarding.share.title": "Compartir tu profilo",
+  "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
+  "relative_time.just_now": "ora",
+  "relative_time.today": "hodie",
+  "reply_indicator.cancel": "Cancellar",
+  "report.next": "Sequente",
+  "report.placeholder": "Commentos additional",
+  "report.reasons.dislike": "Non me place",
+  "search.quick_action.go_to_account": "Vader al profilo {x}",
+  "search_results.accounts": "Profilos",
+  "search_results.see_all": "Vider toto",
+  "status.delete": "Deler",
+  "status.share": "Compartir",
+  "status.translate": "Traducer",
+  "status.translated_from_with": "Traducite ab {lang} usante {provider}",
+  "tabs_bar.home": "Initio",
+  "tabs_bar.notifications": "Notificationes"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index ce6cb56473..2067edcc70 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -501,6 +501,7 @@
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
   "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
+  "password_confirmation.mismatching": "Los dos kodes son desferentes",
   "picture_in_picture.restore": "Restora",
   "poll.closed": "Serrado",
   "poll.refresh": "Arefreska",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index e5b1d2b378..ec2ff82144 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -606,7 +606,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikkje tilgjengeleg på {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.",
+  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig når man er logget inn.",
   "search_popout.language_code": "ISO-språkkode",
   "search_popout.options": "Søkjealternativ",
   "search_popout.quick_actions": "Hurtighandlinger",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index c0f50283ac..50da3bb2be 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -606,7 +606,7 @@
   "search.quick_action.status_search": "Innlegg som samsvarer med {x}",
   "search.search_or_paste": "Søk eller lim inn URL",
   "search_popout.full_text_search_disabled_message": "Ikke tilgjengelig på {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig ved innlogging.",
+  "search_popout.full_text_search_logged_out_message": "Bare tilgjengelig når man er logget inn.",
   "search_popout.language_code": "ISO språkkode",
   "search_popout.options": "Alternativer for søk",
   "search_popout.quick_actions": "Hurtighandlinger",
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index e4f2e6fb19..687e7115a6 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -46,6 +46,10 @@ ie:
         title: 2FA desvalidat
       two_factor_enabled:
         title: 2FA permisset
+      two_factor_recovery_codes_changed:
+        explanation: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
+        subject: 'Mastodon: 2-factor codes de recuperation regenerat'
+        title: 2FA codes de recuperation changeat
       unlock_instructions:
         subject: 'Mastodon: Desserral instructiones'
       webauthn_credential:
@@ -55,8 +59,11 @@ ie:
       webauthn_disabled:
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
+      webauthn_enabled:
+        title: Claves de securitá activisat
     omniauth_callbacks:
       failure: Ne posset autenticar te de %{kind} pro "%{reason}".
+      success: Successosimen autenticat de conto %{kind}.
     passwords:
       no_token: Tu ne posse accessar ti-ci págine sin venir de un email pri reiniciar li passa-parol. Si tu ha venit de un email pri reiniciar li passa-parol, ples far cert que tu usat li complet URL providet.
       send_instructions: Si tui email-adresse existe in nor database, tu va reciver un ligament por recuperar li passa-parol a tui email-adresse in quelc minutes. Ples vider tui spam-emails si tu ne recivet ti email.
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index 86a5de7b37..b778871e3a 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -31,6 +31,7 @@ ie:
         redirect_uri: Usar un linea per URI
       index:
         application: Aplication
+        callback_url: URL de retrovocada
         delete: Deleter
         empty: Tu have null aplicationes.
         name: Nómine
@@ -42,6 +43,7 @@ ie:
       show:
         actions: Actiones
         application_id: Clave de client
+        callback_urls: URLs de retrovocada
         secret: Secrete de client
         title: 'Aplication: %{name}'
     authorizations:
@@ -51,6 +53,7 @@ ie:
       error:
         title: Alquo ha errat
       new:
+        review_permissions: Inspecter permissiones
         title: Autorisation besonat
     authorized_applications:
       buttons:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 5c541d9f99..323ade8ddb 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -383,7 +383,11 @@ lad:
       confirm_suspension:
         cancel: Anula
         confirm: Suspende
+        permanent_action: Si kites la suspensyon no restoraras dingunos datos ni relasyones.
+        remove_all_data: Esto efasara todo el kontenido, multimedia i datos de profiles de los kuentos en este domeno de tu sirvidor.
+        stop_communication: Tu sirvidor deshara de komunikarse kon estos sirvidores.
         title: Konfirma bloko de domeno para %{domain}
+        undo_relationships: Esto kitara todas las relasyones de segimyento entre tu kuentos en estos sirvidores i el tu sirvidor.
       created_msg: El bloko de domeno esta siendo prosesado
       destroyed_msg: El bloko de domeno se dezizo
       domain: Domeno
@@ -772,6 +776,8 @@ lad:
       type: Tipo
       types:
         major: Versyon prinsipala
+        minor: Versyon minora
+        patch: Versyon de remendo – koreksyones de yerros i trokamientos simples
       version: Versyon
     statuses:
       account: Autor
@@ -829,8 +835,10 @@ lad:
         message_html: No ay dingun prosedura Sidekiq en egzekusion para la(s) kola(s) %{value}. Por favor, reviza tu konfigurasyon de Sidekiq
       software_version_critical_check:
         action: Amostra aktualizasyones desponivles
+        message_html: Una aktualizasyon kritika de Mastodon esta desponivle. Por favor aktualiza pishin.
       software_version_patch_check:
         action: Amostra aktualizasyones desponivles
+        message_html: Una aktualizasyon de Mastodon kon koreksyon de yerros esta desponivle.
       upload_check_privacy_error:
         action: Klika aki para mas enformasyon
         message_html: "<strong>Tu sirvidor de web es mal konfigurado. La privasita de tus utilizadores esta en riziko.</strong>"
@@ -945,6 +953,7 @@ lad:
       next_steps: Puedes achetar la apelasyon para dezazer la dechizyon de moderasyon, o ignorarla.
       subject: "%{username} esta apelando a una dechizyon de moderasyon en %{instance}"
     new_critical_software_updates:
+      body: Ay mueva versyon kritika de Mastodon. Es posivle ke keras aktualizar pishin!
       subject: Ay aktualizasyones kritikas de Mastodon desponivles para %{instance}!
     new_pending_account:
       body: Los peratim del muevo kuento estan abashos. Puedes achetar o refuzar esta aplikasyon.
@@ -1045,13 +1054,17 @@ lad:
       accept: Acheta
       back: Atras
       preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
+      preamble_invited: Antes de kontinuar, por favor reviza las reglas del sirvidor establesidas por los moderatores de %{domain}.
       title: Algunas reglas bazikas.
       title_invited: Fuites envitado.
     security: Sigurita
     set_new_password: Establese muevo kod
     setup:
       email_below_hint_html: Mira en tu kuti de spam o solisita de muevo. Si el adreso de posta elektronika ke aparese aki es yerrado, puedes trokarlo aki.
+      email_settings_hint_html: Klika el atadjiko ke te embimos para verifikar %{email}. Asperaremos aki.
       link_not_received: No risivites un atadijo?
+      new_confirmation_instructions_sent: Resiviras un muevo mesaj de posta elektronika kon el atadjio de konfirmasyon en unos minutos!
+      title: Reviza tu kuti de arivo
     sign_in:
       preamble_html: Konektate kon tus kredensiales de <strong>%{domain}</strong>. Si tu kuento esta balabayado en otruno servidor, no puedras konektarte aki.
       title: Konektate kon %{domain}
@@ -1246,9 +1259,11 @@ lad:
   imports:
     errors:
       empty: Dosya CSV vaziya
+      incompatible_type: Inkompativle kon el tipo de importo eskojido
       invalid_csv_file: 'Dosya CSV no valida. Yerro: %{error}'
       over_rows_processing_limit: kontiene mas de %{count} filas
       too_large: Dosya es mas grande
+    failures: Yerros
     imported: Importado
     modes:
       merge: Une
@@ -1671,6 +1686,9 @@ lad:
       month: "%b %Y"
       time: "%H:%M"
       with_time_zone: "%d de %b del %Y, %H:%M %Z"
+  translation:
+    errors:
+      too_many_requests: Ay demaziadas solisitudes de servisyo de traduksyon.
   two_factor_authentication:
     add: Adjusta
     disable: Inkapasita autentifikasyon en dos pasos
@@ -1750,9 +1768,12 @@ lad:
       title: Bienvenido, %{name}!
   users:
     follow_limit_reached: No puedes segir a mas de %{limit} personas
+    go_to_sso_account_settings: Va a la konfigurasyon de kuento de tu prokurador de identita
     invalid_otp_token: Kodiche de dos pasos no valido
+    otp_lost_help_html: Si pedriste akseso a los dos, puedes kontaktarte kon %{email}
     signed_in_as: 'Konektado komo:'
   verification:
+    here_is_how: Ansina es komo
     verification: Verifikasyon
     verified_links: Tus atadijos verifikados
   webauthn_credentials:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index bde52e2a78..bd055b1c9e 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -86,6 +86,7 @@ ie:
       ip_block:
         comment: Facultativ. Ne obliviar pro quo tu adjuntet ti-ci regul.
         expires_in: IP-adresses es un ressurse finit, quelcvez partit e transferet de manu a manu. Pro to, un índefinit bloccada de IP ne es recomandat.
+        ip: Intrar un adresse IPv4 o IPv6. Tu posse bloccar un tot intervalle de ili con li sintaxe CIDR. Atention a ne bloccar te self!
         severities:
           no_access: Bloccar accesse a omni ressurses
           sign_up_block: Nov registrationes ne va esser possibil
@@ -93,6 +94,10 @@ ie:
         severity: Selecter quo va evenir con demandes ex ti-ci IP
       rule:
         text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
+      sessions:
+        otp: 'Intrar li 2-factor code generat del app sur tui portabile o usar un de tui codes de recuperation:'
+      settings:
+        show_application: Totvez, tu va sempre posser vider quel app ha publicat tui posta.
       user:
         role: Permissiones de usator decidet per su rol
       user_role:
@@ -111,6 +116,7 @@ ie:
           name: Etiquette
           value: Contenete
         indexable: Includer public postas in resultates de sercha
+        unlocked: Automaticmen acceptar nov sequitores
       account_alias:
         acct: Usator-nómine del anteyan conto
       account_migration:
@@ -158,6 +164,7 @@ ie:
         max_uses: Max grand númere de usas
         new_password: Nov passa-parol
         note: Biografie
+        otp_attempt: 2-factor code
         password: Passa-parol
         phrase: Clave-parol o frase
         setting_advanced_layout: Possibilisar web-interfacie avansat
@@ -165,10 +172,12 @@ ie:
         setting_default_language: Lingue in quel postar
         setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
+        setting_display_media: Exposition de medie
         setting_display_media_default: Predefinitiones
         setting_display_media_hide_all: Celar omno
         setting_display_media_show_all: Monstrar omno
         setting_expand_spoilers: Sempre expander postas marcat con admonitiones de contenete
+        setting_hide_network: Celar tui grafica social
         setting_system_font_ui: Usar predefinit fonte de sistema
         setting_theme: Tema de situ
         setting_trends: Monstrar li hodial tendenties
@@ -179,6 +188,7 @@ ie:
         title: Titul
         type: Specie de importation
         username: Nómine de usator
+        username_or_email: Usator-nómine o E-posta
         whole_word: Plen parol
       featured_tag:
         name: Hashtag
@@ -193,11 +203,13 @@ ie:
         custom_css: Custom CSS
         profile_directory: Possibilisar profilarium
         registrations_mode: Qui posse registrar se
+        require_invite_text: Exiger un rason por adherer se
         show_domain_blocks: Vider bloccas de dominia
         show_domain_blocks_rationale: Monstrar pro quo cert dominias esset bloccat
         site_contact_email: Contact e-mail adresse
         site_contact_username: Usator-nómine de contact
         site_extended_description: Extendet descrition
+        site_short_description: Descrition del servitor
         site_title: Nómine de servitor
         theme: Predefenit tema
         trendable_by_default: Possibilisar tendenties sin priori inspection

From da7290839aa140e5aa082dc1d57bfa59933178c3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:24:43 +0100
Subject: [PATCH 204/436] Update dependency stylelint-config-standard-scss to
 v13 (#28589)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 82cfd689a5..a5b6a228ca 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "prettier": "^3.0.0",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^16.0.2",
-    "stylelint-config-standard-scss": "^12.0.0",
+    "stylelint-config-standard-scss": "^13.0.0",
     "typescript": "^5.0.4",
     "webpack-dev-server": "^3.11.3",
     "yargs": "^17.7.2"
diff --git a/yarn.lock b/yarn.lock
index 99c3eedb26..e1c8ab3fb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2433,7 +2433,7 @@ __metadata:
     stacktrace-js: "npm:^2.0.2"
     stringz: "npm:^2.1.0"
     stylelint: "npm:^16.0.2"
-    stylelint-config-standard-scss: "npm:^12.0.0"
+    stylelint-config-standard-scss: "npm:^13.0.0"
     substring-trie: "npm:^1.0.2"
     terser-webpack-plugin: "npm:^4.2.3"
     tesseract.js: "npm:^2.1.5"
@@ -15644,30 +15644,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint-config-standard-scss@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "stylelint-config-standard-scss@npm:12.0.0"
+"stylelint-config-standard-scss@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "stylelint-config-standard-scss@npm:13.0.0"
   dependencies:
     stylelint-config-recommended-scss: "npm:^14.0.0"
-    stylelint-config-standard: "npm:^35.0.0"
+    stylelint-config-standard: "npm:^36.0.0"
   peerDependencies:
     postcss: ^8.3.3
-    stylelint: ^16.0.2
+    stylelint: ^16.1.0
   peerDependenciesMeta:
     postcss:
       optional: true
-  checksum: 7f3ccfb4175f9c50b69d30ca35a97887008c5ba493dbe7d5bce0b57b1eafd21b268177b82404368e7780600077cba784f98e1046671724be3b29a00c6a7913a4
+  checksum: 4abf317676184f4aaace6ce72b9fc9e2dffe051d43dd5637afc5803b062ea381e2807ae983c045dff22e96af58388a8b1fe9a8bdda9f97bc3660280cf24fb4d3
   languageName: node
   linkType: hard
 
-"stylelint-config-standard@npm:^35.0.0":
-  version: 35.0.0
-  resolution: "stylelint-config-standard@npm:35.0.0"
+"stylelint-config-standard@npm:^36.0.0":
+  version: 36.0.0
+  resolution: "stylelint-config-standard@npm:36.0.0"
   dependencies:
     stylelint-config-recommended: "npm:^14.0.0"
   peerDependencies:
-    stylelint: ^16.0.0
-  checksum: 791fbc26cc3029ce3c2423a643e903545b5e4cd605251b18f0ce790bac6fbaaf380469845c1ff45f4e320126af9f8a9dc1ca85d0df9274277ae60da91e81895b
+    stylelint: ^16.1.0
+  checksum: 1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b
   languageName: node
   linkType: hard
 

From 419c659bc445fa258550b7e1bf00251663ca6a21 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jan 2024 15:14:46 +0100
Subject: [PATCH 205/436] Add fallback redirection when getting a webfinger
 query `WEB_DOMAIN@WEB_DOMAIN` (#28592)

---
 app/controllers/well_known/webfinger_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
index 364fbf8a18..72f0ea890f 100644
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -21,7 +21,7 @@ module WellKnown
       username = username_from_resource
 
       @account = begin
-        if username == Rails.configuration.x.local_domain
+        if username == Rails.configuration.x.local_domain || username == Rails.configuration.x.web_domain
           Account.representative
         else
           Account.find_local!(username)

From d0fd14f851871659834ae600f043d81e352cdc1f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 4 Jan 2024 15:17:38 +0100
Subject: [PATCH 206/436] Fix scrolling to detailed status not always working
 (#28577)

---
 .../mastodon/features/status/index.jsx        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 67a9697311..c581255c99 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -582,16 +582,20 @@ class Status extends ImmutablePureComponent {
     ));
   }
 
-  setRef = c => {
+  setContainerRef = c => {
     this.node = c;
   };
 
+  setStatusRef = c => {
+    this.statusNode = c;
+  };
+
   _scrollStatusIntoView () {
     const { status, multiColumn } = this.props;
 
     if (status) {
-      window.requestAnimationFrame(() => {
-        this.node?.querySelector('.detailed-status__wrapper')?.scrollIntoView(true);
+      requestIdleCallback(() => {
+        this.statusNode?.scrollIntoView(true);
 
         // In the single-column interface, `scrollIntoView` will put the post behind the header,
         // so compensate for that.
@@ -629,9 +633,8 @@ class Status extends ImmutablePureComponent {
     }
 
     // Scroll to focused post if it is loaded
-    const child = this.node?.querySelector('.detailed-status__wrapper');
-    if (child) {
-      return [0, child.offsetTop];
+    if (this.statusNode) {
+      return [0, this.statusNode.offsetTop];
     }
 
     // Do not scroll otherwise, `componentDidUpdate` will take care of that
@@ -692,11 +695,11 @@ class Status extends ImmutablePureComponent {
         />
 
         <ScrollContainer scrollKey='thread' shouldUpdateScroll={this.shouldUpdateScroll}>
-          <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
+          <div className={classNames('scrollable', { fullscreen })} ref={this.setContainerRef}>
             {ancestors}
 
             <HotKeys handlers={handlers}>
-              <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader(intl, status, false)}>
+              <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader(intl, status, false)} ref={this.setStatusRef}>
                 <DetailedStatus
                   key={`details-${status.get('id')}`}
                   status={status}

From ae39bed95b973c822e732b31b5e821dbd2447cd6 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Jan 2024 11:40:28 -0500
Subject: [PATCH 207/436] Solve remaining `db/*migrate*` cops (#28579)

---
 .rubocop_todo.yml                             |  4 -
 .../20170901141119_truncate_preview_cards.rb  | 10 +--
 ...024224956_migrate_account_conversations.rb |  2 +-
 ..._preserve_old_layout_for_existing_users.rb |  2 +-
 ...04024901_migrate_settings_to_user_roles.rb | 77 ++++++++++++-------
 5 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bc66bc4add..d68832e85e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -165,7 +165,6 @@ Rails/WhereExists:
     - 'app/validators/reaction_validator.rb'
     - 'app/validators/vote_validator.rb'
     - 'app/workers/move_worker.rb'
-    - 'db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb'
     - 'lib/tasks/tests.rake'
     - 'spec/models/account_spec.rb'
     - 'spec/services/activitypub/process_collection_service_spec.rb'
@@ -253,8 +252,6 @@ Style/GuardClause:
     - 'app/workers/redownload_media_worker.rb'
     - 'app/workers/remote_account_refresh_worker.rb'
     - 'config/initializers/devise.rb'
-    - 'db/migrate/20170901141119_truncate_preview_cards.rb'
-    - 'db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb'
     - 'lib/devise/strategies/two_factor_ldap_authenticatable.rb'
     - 'lib/devise/strategies/two_factor_pam_authenticatable.rb'
     - 'lib/mastodon/cli/accounts.rb'
@@ -275,7 +272,6 @@ Style/HashAsLastArrayItem:
     - 'app/models/status.rb'
     - 'app/services/batched_remove_status_service.rb'
     - 'app/services/notify_service.rb'
-    - 'db/migrate/20181024224956_migrate_account_conversations.rb'
 
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
diff --git a/db/migrate/20170901141119_truncate_preview_cards.rb b/db/migrate/20170901141119_truncate_preview_cards.rb
index 22a7731099..b4ba8c45ea 100644
--- a/db/migrate/20170901141119_truncate_preview_cards.rb
+++ b/db/migrate/20170901141119_truncate_preview_cards.rb
@@ -22,11 +22,9 @@ class TruncatePreviewCards < ActiveRecord::Migration[5.1]
   end
 
   def down
-    if ActiveRecord::Base.connection.table_exists? 'deprecated_preview_cards'
-      drop_table :preview_cards
-      rename_table :deprecated_preview_cards, :preview_cards
-    else
-      raise ActiveRecord::IrreversibleMigration, 'Previous preview cards table has already been removed'
-    end
+    raise ActiveRecord::IrreversibleMigration, 'Previous preview cards table has already been removed' unless ActiveRecord::Base.connection.table_exists? 'deprecated_preview_cards'
+
+    drop_table :preview_cards
+    rename_table :deprecated_preview_cards, :preview_cards
   end
 end
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
index 93ef5da615..d879fd88a2 100644
--- a/db/migrate/20181024224956_migrate_account_conversations.rb
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -105,7 +105,7 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2]
       end
     end
 
-    notifications_about_direct_statuses.includes(:account, mention: { status: [:account, mentions: :account] }).find_each do |notification|
+    notifications_about_direct_statuses.includes(:account, mention: { status: [:account, { mentions: :account }] }).find_each do |notification|
       MigrationAccountConversation.add_status(notification.account, notification.target_status)
       migrated += 1
 
diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
index 88dcea4360..4597ec5ef4 100644
--- a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
+++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb
@@ -9,7 +9,7 @@ class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2]
     # on the to-be-changed default
 
     User.where(User.arel_table[:current_sign_in_at].gteq(1.month.ago)).find_each do |user|
-      next if Setting.unscoped.where(thing_type: 'User', thing_id: user.id, var: 'advanced_layout').exists?
+      next if Setting.unscoped.exists?(thing_type: 'User', thing_id: user.id, var: 'advanced_layout')
 
       user.settings.advanced_layout = true
     end
diff --git a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
index 254690cc3a..00afee26d0 100644
--- a/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
+++ b/db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb
@@ -6,36 +6,55 @@ class MigrateSettingsToUserRoles < ActiveRecord::Migration[6.1]
   class UserRole < ApplicationRecord; end
 
   def up
-    owner_role     = UserRole.find_by(name: 'Owner')
-    admin_role     = UserRole.find_by(name: 'Admin')
-    moderator_role = UserRole.find_by(name: 'Moderator')
-    everyone_role  = UserRole.find_by(id: -99)
-
-    min_invite_role  = Setting.min_invite_role
-    show_staff_badge = Setting.show_staff_badge
-
-    if everyone_role
-      everyone_role.permissions &= ~::UserRole::FLAGS[:invite_users] unless min_invite_role == 'user'
-      everyone_role.save
-    end
-
-    if owner_role
-      owner_role.highlighted = show_staff_badge
-      owner_role.save
-    end
-
-    if admin_role
-      admin_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(admin moderator).include?(min_invite_role)
-      admin_role.highlighted  = show_staff_badge
-      admin_role.save
-    end
-
-    if moderator_role
-      moderator_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(moderator).include?(min_invite_role)
-      moderator_role.highlighted  = show_staff_badge
-      moderator_role.save
-    end
+    process_role_everyone
+    process_role_owner
+    process_role_admin
+    process_role_moderator
   end
 
   def down; end
+
+  private
+
+  def process_role_everyone
+    everyone_role = UserRole.find_by(id: -99)
+    return unless everyone_role
+
+    everyone_role.permissions &= ~::UserRole::FLAGS[:invite_users] unless min_invite_role == 'user'
+    everyone_role.save
+  end
+
+  def process_role_owner
+    owner_role = UserRole.find_by(name: 'Owner')
+    return unless owner_role
+
+    owner_role.highlighted = show_staff_badge
+    owner_role.save
+  end
+
+  def process_role_admin
+    admin_role = UserRole.find_by(name: 'Admin')
+    return unless admin_role
+
+    admin_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(admin moderator).include?(min_invite_role)
+    admin_role.highlighted  = show_staff_badge
+    admin_role.save
+  end
+
+  def process_role_moderator
+    moderator_role = UserRole.find_by(name: 'Moderator')
+    return unless moderator_role
+
+    moderator_role.permissions |= ::UserRole::FLAGS[:invite_users] if %w(moderator).include?(min_invite_role)
+    moderator_role.highlighted  = show_staff_badge
+    moderator_role.save
+  end
+
+  def min_invite_role
+    Setting.min_invite_role
+  end
+
+  def show_staff_badge
+    Setting.show_staff_badge
+  end
 end

From 964a0ecf37c46bafba3e33aceacc9f80c78d9779 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 4 Jan 2024 11:55:00 -0500
Subject: [PATCH 208/436] Add sleep statement to nudge thread scheduler in
 request pool spec (#28596)

---
 spec/lib/request_pool_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/lib/request_pool_spec.rb b/spec/lib/request_pool_spec.rb
index f179e6ca94..bdb0859d76 100644
--- a/spec/lib/request_pool_spec.rb
+++ b/spec/lib/request_pool_spec.rb
@@ -33,11 +33,13 @@ describe RequestPool do
 
       subject
 
-      threads = Array.new(20) do |_i|
+      threads = Array.new(3) do
         Thread.new do
-          20.times do
+          2.times do
             subject.with('http://example.com') do |http_client|
               http_client.get('/').flush
+              # Nudge scheduler to yield and exercise the full pool
+              sleep(0)
             end
           end
         end

From 5f4643b895191ecc8ad8136008e0a0b33f88851c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Jan 2024 11:45:36 +0100
Subject: [PATCH 209/436] Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy
 when used (#28561)

---
 app/lib/content_security_policy.rb       | 11 ++++++++++-
 spec/lib/content_security_policy_spec.rb | 12 ++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/lib/content_security_policy.rb b/app/lib/content_security_policy.rb
index 966e41f03b..210f37cea0 100644
--- a/app/lib/content_security_policy.rb
+++ b/app/lib/content_security_policy.rb
@@ -10,7 +10,7 @@ class ContentSecurityPolicy
   end
 
   def media_hosts
-    [assets_host, cdn_host_value].compact
+    [assets_host, cdn_host_value, paperclip_root_url].compact
   end
 
   private
@@ -23,6 +23,15 @@ class ContentSecurityPolicy
     s3_alias_host || s3_cloudfront_host || azure_alias_host || s3_hostname_host
   end
 
+  def paperclip_root_url
+    root_url = ENV.fetch('PAPERCLIP_ROOT_URL', nil)
+    return if root_url.blank?
+
+    (Addressable::URI.parse(assets_host) + root_url).tap do |uri|
+      uri.path += '/' unless uri.path.blank? || uri.path.end_with?('/')
+    end.to_s
+  end
+
   def url_from_base_host
     host_to_url(base_host)
   end
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 4286f14980..27a3e80257 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -125,5 +125,17 @@ describe ContentSecurityPolicy do
         expect(subject.media_hosts).to contain_exactly(subject.assets_host, 'https://asset-host.s3.example')
       end
     end
+
+    context 'when PAPERCLIP_ROOT_URL is configured' do
+      around do |example|
+        ClimateControl.modify PAPERCLIP_ROOT_URL: 'https://paperclip-host.example' do
+          example.run
+        end
+      end
+
+      it 'uses the provided URL in the content security policy' do
+        expect(subject.media_hosts).to contain_exactly(subject.assets_host, 'https://paperclip-host.example')
+      end
+    end
   end
 end

From 9ecf99df149eb75f27562ab8ee8f4022b57604dc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:45:55 +0100
Subject: [PATCH 210/436] Update dependency net-http to v0.4.1 (#28606)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c3f27966d6..d1dfd6e86a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -467,7 +467,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.3.0)
     mutex_m (0.2.0)
-    net-http (0.4.0)
+    net-http (0.4.1)
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)

From 6b63652656f9b1af5b8d1838591c071c5e19880f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:46:32 +0100
Subject: [PATCH 211/436] Update dependency rubocop-rspec to v2.26.0 (#28595)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d1dfd6e86a..009293167f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -678,7 +678,7 @@ GEM
       parser (>= 3.2.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
+    rubocop-factory_bot (2.25.0)
       rubocop (~> 1.33)
     rubocop-performance (1.20.1)
       rubocop (>= 1.48.1, < 2.0)
@@ -688,7 +688,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.25.0)
+    rubocop-rspec (2.26.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From d537b3926fda5693d4f08a6ea30684479f5e7668 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:46:38 +0100
Subject: [PATCH 212/436] Update dependency sass-loader to v10.5.2 (#28594)

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

diff --git a/yarn.lock b/yarn.lock
index e1c8ab3fb8..8849124e18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14550,8 +14550,8 @@ __metadata:
   linkType: hard
 
 "sass-loader@npm:^10.2.0":
-  version: 10.5.1
-  resolution: "sass-loader@npm:10.5.1"
+  version: 10.5.2
+  resolution: "sass-loader@npm:10.5.2"
   dependencies:
     klona: "npm:^2.0.4"
     loader-utils: "npm:^2.0.0"
@@ -14570,7 +14570,7 @@ __metadata:
       optional: true
     sass:
       optional: true
-  checksum: 841448d02045b0c65595eab4cb701384b01a2adcb3594beacbb767b0cee5bd9d444027f4fc3a10acef3fe1c7eb6510fccffdee72a20e9877777789a5e349cb49
+  checksum: 5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
   languageName: node
   linkType: hard
 

From 9699ea22d6be08d5809c0a05500e6778f96a09a2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 11:47:22 +0100
Subject: [PATCH 213/436] Update dependency postcss to v8.4.33 (#28602)

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

diff --git a/yarn.lock b/yarn.lock
index 8849124e18..70d98332ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13145,13 +13145,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.32":
-  version: 8.4.32
-  resolution: "postcss@npm:8.4.32"
+  version: 8.4.33
+  resolution: "postcss@npm:8.4.33"
   dependencies:
     nanoid: "npm:^3.3.7"
     picocolors: "npm:^1.0.0"
     source-map-js: "npm:^1.0.2"
-  checksum: 39308a9195fa34d4dbdd7b58a896cff0c7809f84f7a4ac1b95b68ca86c9138a395addff33075668ed3983d41b90aac05754c445237a9365eb1c3a5602ebd03ad
+  checksum: 16eda83458fcd8a91bece287b5920c7f57164c3ea293e6c80d0ea71ce7843007bcd8592260a5160b9a7f02693e6ac93e2495b02d8c7596d3f3f72c1447e3ba79
   languageName: node
   linkType: hard
 

From 6ad0fb5a77dcdb12d3bf61617978dcd6e6f6fb20 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 5 Jan 2024 12:07:57 +0100
Subject: [PATCH 214/436] Fix NULL MX handling and tighten DNS resolving specs
 (#28607)

---
 app/validators/email_mx_validator.rb                   |  1 +
 .../admin/email_domain_blocks_controller_spec.rb       | 10 ++++++++++
 spec/rails_helper.rb                                   |  4 ++++
 spec/validators/email_mx_validator_spec.rb             |  2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index a30a0c820d..7943778943 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -47,6 +47,7 @@ class EmailMxValidator < ActiveModel::Validator
       dns.timeouts = 5
 
       records = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+      next if records == [''] # This domain explicitly rejects emails
 
       ([domain] + records).uniq.each do |hostname|
         ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
index 9379fe374a..4de3ef0f62 100644
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
@@ -35,6 +35,16 @@ RSpec.describe Admin::EmailDomainBlocksController do
   describe 'POST #create' do
     context 'when resolve button is pressed' do
       before do
+        resolver = instance_double(Resolv::DNS)
+
+        allow(resolver).to receive(:getresources)
+          .with('example.com', Resolv::DNS::Resource::IN::MX)
+          .and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:timeouts=).and_return(nil)
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+
         post :create, params: { email_domain_block: { domain: 'example.com' } }
       end
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c9352a4d5d..e5d432b45f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -128,6 +128,10 @@ RSpec.configure do |config|
     self.use_transactional_tests = true
   end
 
+  config.before do |example|
+    allow(Resolv::DNS).to receive(:open).and_raise('Real DNS queries are disabled, stub Resolv::DNS as needed') unless example.metadata[:type] == :system
+  end
+
   config.before do |example|
     unless example.metadata[:paperclip_processing]
       allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
index 876d73c184..21b1ad0a11 100644
--- a/spec/validators/email_mx_validator_spec.rb
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -111,7 +111,7 @@ describe EmailMxValidator do
       allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
       allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
       allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
-      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: 'fd00::2')])
+      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
       allow(resolver).to receive(:timeouts=).and_return(nil)
       allow(Resolv::DNS).to receive(:open).and_yield(resolver)
 

From 43d800ada64478e3a9119ca9313b47018b811243 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 12:29:19 +0100
Subject: [PATCH 215/436] New Crowdin Translations (automated) (#28604)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/el.json    | 11 +++++
 app/javascript/mastodon/locales/ia.json    | 16 +++++++
 app/javascript/mastodon/locales/sq.json    |  2 +
 app/javascript/mastodon/locales/zh-CN.json |  6 +--
 config/locales/activerecord.ia.yml         |  1 +
 config/locales/activerecord.ie.yml         |  2 +
 config/locales/be.yml                      |  1 +
 config/locales/ca.yml                      |  1 +
 config/locales/cy.yml                      |  1 +
 config/locales/da.yml                      |  1 +
 config/locales/devise.el.yml               |  2 +-
 config/locales/devise.ia.yml               | 24 ++++++++++
 config/locales/devise.ie.yml               |  5 ++
 config/locales/doorkeeper.el.yml           | 10 ++--
 config/locales/doorkeeper.ia.yml           | 54 ++++++++++++++++++++++
 config/locales/doorkeeper.ie.yml           |  9 ++++
 config/locales/el.yml                      |  9 +++-
 config/locales/es-AR.yml                   |  1 +
 config/locales/es-MX.yml                   |  1 +
 config/locales/es.yml                      |  1 +
 config/locales/eu.yml                      |  1 +
 config/locales/fo.yml                      |  1 +
 config/locales/fy.yml                      |  1 +
 config/locales/gl.yml                      |  1 +
 config/locales/he.yml                      |  1 +
 config/locales/hu.yml                      |  1 +
 config/locales/ia.yml                      | 23 +++++++++
 config/locales/ie.yml                      | 26 +++++++++++
 config/locales/it.yml                      |  1 +
 config/locales/ko.yml                      |  1 +
 config/locales/lt.yml                      |  1 +
 config/locales/nl.yml                      |  1 +
 config/locales/nn.yml                      |  1 +
 config/locales/no.yml                      |  1 +
 config/locales/pl.yml                      |  1 +
 config/locales/pt-BR.yml                   |  1 +
 config/locales/pt-PT.yml                   |  1 +
 config/locales/simple_form.ia.yml          | 45 ++++++++++++++++++
 config/locales/simple_form.ie.yml          | 39 ++++++++++++++++
 config/locales/simple_form.sk.yml          |  2 +
 config/locales/sk.yml                      |  1 +
 config/locales/sl.yml                      |  1 +
 config/locales/sq.yml                      |  1 +
 config/locales/sr-Latn.yml                 |  1 +
 config/locales/sr.yml                      |  1 +
 config/locales/th.yml                      |  1 +
 config/locales/tr.yml                      |  1 +
 config/locales/uk.yml                      |  1 +
 config/locales/vi.yml                      |  1 +
 config/locales/zh-CN.yml                   |  1 +
 config/locales/zh-HK.yml                   |  1 +
 51 files changed, 309 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 17a0c9d4da..53e55fa950 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -260,6 +260,9 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
+  "firehose.all": "Όλα",
+  "firehose.local": "Αυτός ο διακομιστής",
+  "firehose.remote": "Άλλοι διακομιστές",
   "follow_request.authorize": "Εξουσιοδότησε",
   "follow_request.reject": "Απέρριψε",
   "follow_requests.unlocked_explanation": "Παρόλο που ο λογαριασμός σου δεν είναι κλειδωμένος, το προσωπικό του {domain} θεώρησαν πως ίσως να θέλεις να ελέγξεις χειροκίνητα αυτά τα αιτήματα ακολούθησης.",
@@ -285,11 +288,15 @@
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
+  "home.actions.go_to_suggestions": "Βρείτε άτομα για να ακολουθήσετε",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.explore_prompt.body": "Your home feed will have a mix of posts from the hashtags you've chosen to follow, the people you've chosen to follow, and the posts they boost. If that feels too quiet, you may want to:\nΗ τροφοδοσία της αρχικής σελίδας σας είναι ένα μίγμα από αναρτήσεις με τις ετικέτες και τα άτομα που επιλέξατε να ακολουθείτε, και τις αναρτήσεις που προωθούν. Εάν αυτό σας φαίνεται πολύ ήσυχο, μπορεί να θέλετε:",
+  "home.explore_prompt.title": "Αυτό είναι το σπίτι σας στο Mastodon.",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
+  "home.pending_critical_update.link": "Δείτε ενημερώσεις",
+  "home.pending_critical_update.title": "Κρίσιμη ενημέρωση ασφαλείας διαθέσιμη!",
   "home.show_announcements": "Εμφάνιση ανακοινώσεων",
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
@@ -314,6 +321,7 @@
   "keyboard_shortcuts.direct": "για το άνοιγμα της στήλης ιδιωτικών επισημάνσεων",
   "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "Εμφάνιση ανάρτησης",
+  "keyboard_shortcuts.favourite": "Αγαπημένη δημοσίευση",
   "keyboard_shortcuts.federated": "Άνοιγμα ροής συναλλαγών",
   "keyboard_shortcuts.heading": "Συντομεύσεις πληκτρολογίου",
   "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας",
@@ -358,6 +366,7 @@
   "lists.search": "Αναζήτησε μεταξύ των ανθρώπων που ακουλουθείς",
   "lists.subheading": "Οι λίστες σου",
   "load_pending": "{count, plural, one {# νέο στοιχείο} other {# νέα στοιχεία}}",
+  "loading_indicator.label": "Φόρτωση…",
   "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
   "mute_modal.duration": "Διάρκεια",
@@ -380,6 +389,7 @@
   "navigation_bar.lists": "Λίστες",
   "navigation_bar.logout": "Αποσύνδεση",
   "navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
+  "navigation_bar.opened_in_classic_interface": "Δημοσιεύσεις, λογαριασμοί και άλλες συγκεκριμένες σελίδες ανοίγονται από προεπιλογή στην κλασική διεπαφή ιστού.",
   "navigation_bar.personal": "Προσωπικά",
   "navigation_bar.pins": "Καρφιτσωμένες αναρτήσεις",
   "navigation_bar.preferences": "Προτιμήσεις",
@@ -403,6 +413,7 @@
   "notifications.column_settings.admin.report": "Νέες αναφορές:",
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
+  "notifications.column_settings.favourite": "Αγαπημένα:",
   "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
   "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
   "notifications.column_settings.filter_bar.show_bar": "Εμφάνιση μπάρας φίλτρου",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9781d6aa77..00cafe260b 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -1,4 +1,8 @@
 {
+  "about.blocks": "Servitores moderate",
+  "about.contact": "Contacto:",
+  "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+  "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adder o remover ab listas",
   "account.badges.group": "Gruppo",
   "account.block": "Blocar @{name}",
@@ -21,9 +25,12 @@
   "bundle_column_error.return": "Retornar al initio",
   "bundle_modal_error.close": "Clauder",
   "bundle_modal_error.retry": "Tentar novemente",
+  "column.about": "A proposito de",
   "column.blocks": "Usatores blocate",
+  "column.bookmarks": "Marcapaginas",
   "column.directory": "Navigar profilos",
   "column.favourites": "Favoritos",
+  "column.firehose": "Fluxos in directe",
   "column.home": "Initio",
   "column.lists": "Listas",
   "column.notifications": "Notificationes",
@@ -33,6 +40,7 @@
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
   "compose.published.open": "Aperir",
+  "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.poll.add_option": "Adder un option",
   "compose_form.poll.remove_option": "Remover iste option",
   "confirmation_modal.cancel": "Cancellar",
@@ -41,6 +49,7 @@
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Clauder le session",
   "copy_icon_button.copied": "Copiate al area de transferentia",
+  "copypaste.copied": "Copiate",
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
   "disabled_account_banner.account_settings": "Parametros de conto",
   "dismissable_banner.dismiss": "Dimitter",
@@ -52,6 +61,7 @@
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
   "explore.trending_links": "Novas",
+  "filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
@@ -64,8 +74,13 @@
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
+  "lightbox.previous": "Precedente",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
+  "lists.delete": "Deler lista",
+  "lists.edit": "Modificar lista",
+  "lists.new.create": "Adder lista",
+  "lists.subheading": "Tu listas",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
   "navigation_bar.about": "A proposito de",
@@ -83,6 +98,7 @@
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.sound": "Reproducer sono",
   "notifications.filter.all": "Toto",
+  "notifications.filter.favourites": "Favoritos",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
   "onboarding.compose.template": "Salute #Mastodon!",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 48eac1487e..f45266c845 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Pa postime",
   "account.featured_tags.title": "Hashtagë të zgjedhur të {name}",
   "account.follow": "Ndiqeni",
+  "account.follow_back": "Ndiqe gjithashtu",
   "account.followers": "Ndjekës",
   "account.followers.empty": "Këtë përdorues ende s’e ndjek kush.",
   "account.followers_counter": "{count, plural, one {{counter} Ndjekës} other {{counter} Ndjekës}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Mos shfaq njoftime",
   "account.mute_short": "Mos i shfaq",
   "account.muted": "Heshtuar",
+  "account.mutual": "Reciproke",
   "account.no_bio": "S’u dha përshkrim.",
   "account.open_original_page": "Hap faqen origjinale",
   "account.posts": "Mesazhe",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 575e0c7aeb..720e4331b3 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "关闭通知",
   "account.mute_short": "隐藏",
   "account.muted": "已隐藏",
-  "account.mutual": "互相关注",
+  "account.mutual": "互粉好友",
   "account.no_bio": "未提供描述。",
   "account.open_original_page": "打开原始页面",
   "account.posts": "嘟文",
@@ -446,7 +446,7 @@
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
   "notifications.column_settings.filter_bar.category": "快速过滤栏",
   "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
-  "notifications.column_settings.follow": "新关注者：",
+  "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票结果：",
@@ -700,7 +700,7 @@
   "time_remaining.moments": "即将结束",
   "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
   "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的{resource}",
-  "timeline_hint.resources.followers": "关注者",
+  "timeline_hint.resources.followers": "粉丝",
   "timeline_hint.resources.follows": "关注",
   "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.counter_by_accounts": "过去 {days, plural, other {{days} 天}}有{count, plural, other { {counter} 人}}讨论",
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index 480fd56f63..7d1e7d7190 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -3,6 +3,7 @@ ia:
   activerecord:
     attributes:
       user:
+        email: Adresse de e-mail
         password: Contrasigno
       user/account:
         username: Nomine de usator
diff --git a/config/locales/activerecord.ie.yml b/config/locales/activerecord.ie.yml
index 588105ae96..0b22dd886c 100644
--- a/config/locales/activerecord.ie.yml
+++ b/config/locales/activerecord.ie.yml
@@ -19,6 +19,7 @@ ie:
         account:
           attributes:
             username:
+              invalid: deve contener solmen lítteres, númeres e sublineas
               reserved: es reservat
         admin/webhook:
           attributes:
@@ -39,6 +40,7 @@ ie:
         user:
           attributes:
             email:
+              blocked: usa un ne-permisset provisor de e-posta
               unreachable: sembla ne exister
             role_id:
               elevated: ne posse esser plu alt quam tui actual rol
diff --git a/config/locales/be.yml b/config/locales/be.yml
index d8703b7992..ca9b0d2b88 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -439,6 +439,7 @@ be:
       view: Праглядзець новы блок дамену
     email_domain_blocks:
       add_new: Дадаць
+      allow_registrations_with_approval: Дазволіць рэгістрацыю з дазволам
       attempts_over_week:
         few: "%{count} спробы рэгіістрацыі за апошні тыдзень"
         many: "%{count} спроб рэгіістрацыі за апошні тыдзень"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0d7605f023..25f19ef25f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -425,6 +425,7 @@ ca:
       view: Veure el bloqueig del domini
     email_domain_blocks:
       add_new: Afegir nou
+      allow_registrations_with_approval: Registre permès amb validació
       attempts_over_week:
         one: "%{count} intent en la darrera setmana"
         other: "%{count} intents de registre en la darrera setmana"
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 9dd533b2ad..70b994903e 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -453,6 +453,7 @@ cy:
       view: Gweld bloc parth
     email_domain_blocks:
       add_new: Ychwanegu
+      allow_registrations_with_approval: Caniatáu cofrestriadau wedi'u cymeradwyo
       attempts_over_week:
         few: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
         many: "%{count} ymgais i gofrestru dros yr wythnos ddiwethaf"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6403ac1ccb..3d6850ca5e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -425,6 +425,7 @@ da:
       view: Vis domæneblokering
     email_domain_blocks:
       add_new: Tilføj ny
+      allow_registrations_with_approval: Tillad registreringer med godkendelse
       attempts_over_week:
         one: "%{count} tilmeldingsforsøg over den seneste uge"
         other: "%{count} tilmeldingsforsøg over den seneste uge"
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index ba3ee59fab..13daa4b97a 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -34,7 +34,7 @@ el:
         explanation: Το συνθηματικό του λογαριασμού σου άλλαξε.
         extra: Αν δεν άλλαξες εσύ το συνθηματικό σου, ίσως κάποιος να έχει αποκτήσει πρόσβαση στο λογαριασμό σου. Παρακαλούμε άλλαξε το συνθηματικό σου άμεσα ή επικοινώνησε με τον διαχειριστή του κόμβου σου αν έχεις κλειδωθεί απ' έξω.
         subject: 'Mastodon: Αλλαγή συνθηματικού'
-        title: Αλλαγή συνθηματικού
+        title: Ο κωδικός άλλαξε
       reconfirmation_instructions:
         explanation: Επιβεβαίωσε τη νέα διεύθυνση για να αλλάξεις το email σου.
         extra: Αν δεν ζήτησες εσύ αυτή την αλλαγή, παρακαλούμε αγνόησε αυτό το email. Η διεύθυνση email για τον λογαριασμό σου στο Mastodon δεν θα αλλάξει μέχρι να επισκεφτείς τον παραπάνω σύνδεσμο.
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 6ab26788bd..7b0ec29579 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -1 +1,25 @@
+---
 ia:
+  devise:
+    mailer:
+      confirmation_instructions:
+        action: Verificar adresse de e-mail
+        action_with_app: Confirmar e retornar a %{app}
+        title: Verificar adresse de e-mail
+      email_changed:
+        title: Nove adresse de e-mail
+      reconfirmation_instructions:
+        title: Verificar adresse de e-mail
+      reset_password_instructions:
+        action: Cambiar contrasigno
+        title: Reinitialisar contrasigno
+      two_factor_disabled:
+        title: 2FA disactivate
+    registrations:
+      updated: Tu conto ha essite actualisate con successo.
+    unlocks:
+      unlocked: Tu conto ha essite disblocate con successo. Initia session a continuar.
+  errors:
+    messages:
+      already_confirmed: jam esseva confirmate, tenta initiar session
+      not_found: non trovate
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 687e7115a6..c6468d34c2 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -56,6 +56,8 @@ ie:
         added:
           subject: 'Mastodon: Nov clave de securitá'
           title: Un nov clave de securitá ha esset adjuntet
+        deleted:
+          subject: 'Mastodon: Clave de securitá deletet'
       webauthn_disabled:
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
@@ -84,3 +86,6 @@ ie:
       expired: ha expirat, ples demandar un nov
       not_found: ne trovat
       not_locked: ne esset serrat
+      not_saved:
+        one: '1 error prohibit ti %{resource} de esser conservat:'
+        other: "%{count} errores prohibit ti %{resource} de esser conservat:"
diff --git a/config/locales/doorkeeper.el.yml b/config/locales/doorkeeper.el.yml
index b275af3365..1cb9b3513b 100644
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@@ -127,6 +127,7 @@ el:
         bookmarks: Σελιδοδείκτες
         conversations: Συνομιλίες
         crypto: Κρυπτογράφηση από άκρο σε άκρο
+        favourites: Αγαπημένα
         filters: Φίλτρα
         follow: Ακολουθείτε, σε Σίγαση και Αποκλεισμοί
         follows: Ακολουθείτε
@@ -169,9 +170,10 @@ el:
       read:accounts: να βλέπει τα στοιχεία λογαριασμών
       read:blocks: να βλέπει τους αποκλεισμένους σου
       read:bookmarks: εμφάνιση των σελιδοδεικτών σας
+      read:favourites: δείτε τα αγαπημένα σας
       read:filters: να βλέπει τα φίλτρα σου
-      read:follows: να βλέπει ποιους ακολουθείς
-      read:lists: να βλέπει τις λίστες σου
+      read:follows: δές ποιους ακολουθείς
+      read:lists: δές τις λίστες σου
       read:mutes: να βλέπει ποιους αποσιωπείς
       read:notifications: να βλέπει τις ειδοποιήσεις σου
       read:reports: να βλέπει τις καταγγελίες σου
@@ -183,8 +185,8 @@ el:
       write:bookmarks: προσθήκη σελιδοδεικτών
       write:conversations: σίγαση και διαγραφή συνομιλιών
       write:filters: να δημιουργεί φίλτρα
-      write:follows: να ακολουθεί ανθρώπους
-      write:lists: να δημιουργεί λίστες
+      write:follows: ακολουθήστε ανθρώπους
+      write:lists: δημιουργία λιστών
       write:media: να ανεβάζει πολυμέσα
       write:mutes: να αποσιωπεί ανθρώπους και συζητήσεις
       write:notifications: να καθαρίζει τις ειδοποιήσεις σου
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 6ab26788bd..55f28634a5 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -1 +1,55 @@
+---
 ia:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nomine de application
+        website: Sito web de application
+  doorkeeper:
+    applications:
+      buttons:
+        cancel: Cancellar
+        edit: Modificar
+      edit:
+        title: Modificar application
+      index:
+        application: Application
+        delete: Deler
+        name: Nomine
+        new: Nove application
+        show: Monstrar
+        title: Tu applicationes
+      new:
+        title: Nove application
+      show:
+        actions: Actiones
+        title: 'Application: %{name}'
+    authorizations:
+      error:
+        title: Ocurreva un error
+    authorized_applications:
+      confirmations:
+        revoke: Es tu secur?
+      index:
+        scopes: Permissiones
+        title: Tu applicationes autorisate
+    flash:
+      applications:
+        create:
+          notice: Application create.
+        destroy:
+          notice: Application delite.
+        update:
+          notice: Application actualisate.
+    grouped_scopes:
+      title:
+        accounts: Contos
+        admin/accounts: Gestion de contos
+        favourites: Favoritos
+        lists: Listas
+        notifications: Notificationes
+        push: Notificationes push
+    layouts:
+      admin:
+        nav:
+          applications: Applicationes
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index b778871e3a..f49eb1d968 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -5,6 +5,7 @@ ie:
       doorkeeper/application:
         name: Nómine de aplication
         redirect_uri: URI de redirection
+        scopes: Scopes
         website: Situ web de aplication
     errors:
       models:
@@ -29,6 +30,7 @@ ie:
         title: Modificar aplication
       help:
         redirect_uri: Usar un linea per URI
+        scopes: Separar scopes con intersticies. Lassar blanc por usar li scopes predefinit.
       index:
         application: Aplication
         callback_url: URL de retrovocada
@@ -36,6 +38,7 @@ ie:
         empty: Tu have null aplicationes.
         name: Nómine
         new: Nov aplication
+        scopes: Scopes
         show: Monstrar
         title: Tui aplicationes
       new:
@@ -44,6 +47,7 @@ ie:
         actions: Actiones
         application_id: Clave de client
         callback_urls: URLs de retrovocada
+        scopes: Scopes
         secret: Secrete de client
         title: 'Aplication: %{name}'
     authorizations:
@@ -120,9 +124,13 @@ ie:
       admin:
         nav:
           applications: Aplicationes
+          oauth2_provider: Provisor OAuth2
+      application:
+        title: Autorisation OAuth besonat
     scopes:
       admin:read: leer li tot data sur li servitor
       admin:read:accounts: leer sensitiv information de omni contos
+      admin:read:canonical_email_blocks: leer sensitiv information pri omni canonic bloccas de e-posta
       admin:read:domain_allows: leer sensitiv information pri omni permisses de dominia
       admin:read:domain_blocks: leer sensitiv information pri omni bloccas de dominia
       admin:read:email_domain_blocks: leer sensitiv information pri omni bloccas de dominia basat sur e-posta
@@ -137,6 +145,7 @@ ie:
       admin:write:ip_blocks: fa moderatori actiones sur bloccas de IP
       admin:write:reports: far moderatori actiones sur raportes
       follow: modifica li relationes del conto
+      push: reciver tui pussa-notificationes
       read: lee omni datas de tui conto
       read:accounts: vide li informationes pri li conto
       read:blocks: vider tui bloccas
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4c58bfda0a..4c31bfdde0 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -962,6 +962,7 @@ el:
     notification_preferences: Αλλαγή προτιμήσεων email
     salutation: "%{name},"
     settings: 'Άλλαξε τις προτιμήσεις email: %{link}'
+    unsubscribe: Κατάργηση εγγραφής
     view: 'Προβολή:'
     view_profile: Προβολή προφίλ
     view_status: Προβολή ανάρτησης
@@ -975,6 +976,8 @@ el:
     your_token: Το διακριτικό πρόσβασής σου
   auth:
     apply_for_account: Ζήτα έναν λογαριασμό
+    captcha_confirmation:
+      title: Ελεγχος ασφαλείας
     confirmations:
       wrong_email_hint: Εάν αυτή η διεύθυνση email δεν είναι σωστή, μπορείς να την αλλάξεις στις ρυθμίσεις λογαριασμού.
     delete_account: Διαγραφή λογαριασμού
@@ -1238,6 +1241,8 @@ el:
     status: Κατάσταση
     success: Τα δεδομένα σου μεταφορτώθηκαν επιτυχώς και θα επεξεργαστούν σύντομα
     time_started: Ξεκίνησε στις
+    titles:
+      following: Εισαγωγή λογαριασμών που ακολουθείτε
     type: Τύπος εισαγωγής
     type_groups:
       destructive: Μπλοκ & σίγαση
@@ -1245,7 +1250,7 @@ el:
       blocking: Λίστα αποκλεισμού
       bookmarks: Σελιδοδείκτες
       domain_blocking: Λίστα αποκλεισμένων τομέων
-      following: Λίστα ακολούθων
+      following: Λίστα ατόμων που ακολουθείτε
       muting: Λίστα αποσιωπήσεων
     upload: Μεταμόρφωση
   invites:
@@ -1420,7 +1425,7 @@ el:
     follow_failure: Δεν ήταν δυνατή η παρακολούθηση ορισμένων από τους επιλεγμένους λογαριασμούς.
     follow_selected_followers: Ακολούθησε τους επιλεγμένους ακόλουθους
     followers: Ακόλουθοι
-    following: Ακολουθείς
+    following: Ακολουθείτε
     invited: Προσκεκλημένοι
     last_active: Τελευταία ενεργός
     most_recent: Πιο πρόσφατος
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 0000c297ad..f214c92d2a 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -425,6 +425,7 @@ es-AR:
       view: Ver bloqueo de dominio
     email_domain_blocks:
       add_new: Agregar nuevo
+      allow_registrations_with_approval: Permitir crear cuentas con aprobación
       attempts_over_week:
         one: "%{count} intento durante la última semana"
         other: "%{count} intentos durante la última semana"
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 424262ca19..7f5b282873 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -425,6 +425,7 @@ es-MX:
       view: Ver dominio bloqueado
     email_domain_blocks:
       add_new: Añadir nuevo
+      allow_registrations_with_approval: Permitir registros con aprobación
       attempts_over_week:
         one: "%{count} intentos durante la última semana"
         other: "%{count} intentos de registro en la última semana"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f4a70e5e57..a1e9401f5a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -425,6 +425,7 @@ es:
       view: Ver dominio bloqueado
     email_domain_blocks:
       add_new: Añadir nuevo
+      allow_registrations_with_approval: Permitir registros con aprobación
       attempts_over_week:
         one: "%{count} intento durante la última semana"
         other: "%{count} intentos de registro durante la última semana"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index bcf8540e74..0d253e9b3b 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -427,6 +427,7 @@ eu:
       view: Ikusi domeinuaren blokeoa
     email_domain_blocks:
       add_new: Gehitu berria
+      allow_registrations_with_approval: Baimendu izen-emateak onarpen bidez
       attempts_over_week:
         one: Izen-emateko saiakera %{count} azken astean
         other: Izen-emateko %{count} saiakera azken astean
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 726c9607e2..00fb9c5560 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -425,6 +425,7 @@ fo:
       view: Vís navnaøkisblokering
     email_domain_blocks:
       add_new: Stovna
+      allow_registrations_with_approval: Loyv skrásetingum við góðkenning
       attempts_over_week:
         one: "%{count} roynd seinastu vikuna"
         other: "%{count} tilmeldingarroyndir seinastu vikuna"
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index a08b3a401e..9471c03b92 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -425,6 +425,7 @@ fy:
       view: Domeinblokkade besjen
     email_domain_blocks:
       add_new: Nije tafoegje
+      allow_registrations_with_approval: Ynskriuwingen mei tastimming tastean
       attempts_over_week:
         one: "%{count} registraasjebesykjen yn de ôfrûne wike"
         other: "%{count} registraasjebesykjen yn de ôfrûne wike"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c0e76842f7..cff9427c66 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -425,6 +425,7 @@ gl:
       view: Ollar dominios bloqueados
     email_domain_blocks:
       add_new: Engadir novo
+      allow_registrations_with_approval: Permitir crear contas con aprobación
       attempts_over_week:
         one: "%{count} intento na última semana"
         other: "%{count} intentos de conexión na última semana"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index f2cc882141..23a4e0c3a6 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -439,6 +439,7 @@ he:
       view: צפייה בחסימת דומיינים
     email_domain_blocks:
       add_new: הוספת חדש
+      allow_registrations_with_approval: הרשאת הרשמה לאחר אישור
       attempts_over_week:
         many: "%{count} נסיונות הרשמה במשך השבוע שעבר"
         one: "%{count} נסיון במשך השבוע שעבר"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5da1a4e066..5c8d1cf9a4 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -425,6 +425,7 @@ hu:
       view: Domain tiltásának megtekintése
     email_domain_blocks:
       add_new: Új hozzáadása
+      allow_registrations_with_approval: Regisztráció engedélyezése jóváhagyással
       attempts_over_week:
         one: "%{count} próbálkozás a múlt héten"
         other: "%{count} próbálkozás feliratkozásra a múlt héten"
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 64315d177f..795ed8cc94 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -50,3 +50,26 @@ ia:
         '15778476': 6 menses
         '2629746': 1 mense
         '86400': 1 die
+  statuses_cleanup:
+    min_age:
+      '1209600': 2 septimanas
+      '15778476': 6 menses
+      '2629746': 1 mense
+      '31556952': 1 anno
+      '5259492': 2 menses
+      '604800': 1 septimana
+      '63113904': 2 annos
+      '7889238': 3 menses
+  themes:
+    default: Mastodon (Obscur)
+    mastodon-light: Mastodon (Clar)
+  two_factor_authentication:
+    add: Adder
+    disable: Disactivar 2FA
+  user_mailer:
+    appeal_approved:
+      action: Vader a tu conto
+    welcome:
+      subject: Benvenite in Mastodon
+  webauthn_credentials:
+    delete: Deler
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 87aa1c41cc..638205a7f4 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -424,6 +424,7 @@ ie:
       view: Vider dominia-blocca
     email_domain_blocks:
       add_new: Adjunter un nov
+      allow_registrations_with_approval: Permisser registrationes con aprobation
       attempts_over_week:
         one: "%{count} registration-prova durant li ultim semane"
         other: "%{count} registration-prova durant li ultim semane"
@@ -439,6 +440,7 @@ ie:
         title: Bloccar nov email-dominia
       no_email_domain_block_selected: Null email-dominia-bloccas esset changeat pro que null esset selectet
       not_permitted: Ne permisset
+      resolved_dns_records_hint_html: Li dominia-nómine resolue se al seque dominias MX, queles es in fine responsabil por acceptar e-posta. Bloccar un dominia MX va bloccar inscriptiones de quelcunc e-posta quel usa li sam dominia MX, mem si li visibil dominia-nómine es diferent. <strong>Esse caut e ne blocca majori provisores de e-posta.</strong>
       resolved_through_html: Resoluet per %{domain}
       title: Bloccat email-dominias
     export_domain_allows:
@@ -672,11 +674,13 @@ ie:
       description_html: Con <strong>roles por usatores</strong>, tu posse customisar li functiones e locs de Mastodon in queles tui usatores posse accesser.
       edit: Modificar rol '%{name}'
       everyone: Permissiones predefinit
+      everyone_full_description_html: Ti es li <strong>fundamental rol</strong> quel afecta <strong>omni usatores</strong>, mem tis sin un assignat rol. Omni altri roles hereda permissiones de it.
       permissions_count:
         one: "%{count} permission"
         other: "%{count} permissiones"
       privileges:
         administrator: Administrator
+        administrator_description: Usatores con ti permission va trapassar omni permission
         delete_user_data: Deleter Data de Usator
         delete_user_data_description: Possibilisa que usatores mey deleter li data de altri usatores strax
         invite_users: Invitar Usatores
@@ -726,6 +730,8 @@ ie:
     settings:
       about:
         manage_rules: Gerer regules de servitor
+        preamble: Provider detalliat information pri qualmen li servitor es operat, moderat, payat.
+        rules_hint: Hay un dedicat area por regules queles vor usatores es expectat obedir.
         title: Pri
       appearance:
         preamble: Customisar li interfacie web de Mastodon.
@@ -736,7 +742,10 @@ ie:
         desc_html: To ci usa extern scrites de hCaptcha, quel posse esser ínquietant pro rasones de securitá e privatie. In plu, <strong>it posse far li processu de registration mult plu desfacil (particularimen por tis con deshabilitás)</strong>. Pro ti rasones, ples considerar alternativ mesuras, tales quam registration per aprobation o invitation.
         title: Exige que nov usatores solue un CAPTCHA por confirmar lor conto
       content_retention:
+        preamble: Decider qualmen usator-generat contenete es inmagasinat in Mastodon.
         title: Retention de contenete
+      default_noindex:
+        desc_html: Afecta omni usatores qui ne ha changeat ti parametre personalmen
       discovery:
         follow_recommendations: Seque-recomandationes
         preamble: Exposir interessant contenete es importantissim por incorporar nov usatores qui fórsan conosse nequi che Mastodon. Decider qualmen diferent utensiles de decovrition functiona che vor servitor.
@@ -771,11 +780,13 @@ ie:
       critical_update: Critic — ples actualisar rapidmen
       description: On recomanda que vu actualisa vor Mastodon-servitor regularimen por profiter del max recent fixes e facultates. In plu, quelcvez it es critic actualisar Mastodon promptmen por evitar problemas de securitá. Pro ti rasones, Mastodon questiona chascun 30 minutes ca hay actualisationes, e va notificar vos secun vor parametres pri email-notificationes.
       documentation_link: Aprender plu
+      release_notes: Version-notas
       title: Actualisationes disponibil
       type: Specie
       types:
         major: Majori lansament
         minor: Minori lansament
+        patch: Lapp-version — bug-corectiones e changes facil a aplicar
       version: Version
     statuses:
       account: Autor
@@ -967,6 +978,7 @@ ie:
       body: Nov versiones de Mastodon ha esset lansat, vu fórsan vole actualisar!
       subject: Nov versiones Mastodon es disponibil por %{instance}!
     new_trends:
+      body: 'Li sequent elementes besona un revision ante que on posse monstrar les publicmen:'
       new_trending_links:
         title: Populari ligamentes
       new_trending_statuses:
@@ -1385,10 +1397,12 @@ ie:
   media_attachments:
     validations:
       images_and_video: On ne posse atachar un video a un posta quel ja contene images
+      not_ready: Ne posse atachar files ancor sub tractament. Prova denov pos ne long!
       too_many: Ne posse atachar plu quam 4 files
   migrations:
     acct: Translocat a
     cancel: Anullar redirection
+    cancel_explanation: Anullar li redirection va reactivisar tui actual conto, ma ne va restaurar sequitores queles ha esset movet a ti-ta conto.
     cancelled_msg: Anullat redirection con successe.
     errors:
       already_moved: es li sam conto a equel tu ha ja translocat
@@ -1397,6 +1411,9 @@ ie:
       not_found: ne posset esser trovat
     followers_count: Sequitores al témpor de translocation
     incoming_migrations: Translocant de un conto diferent
+    incoming_migrations_html: Por mover de un altri conto a ti-ci, erstmen tu deve <a href="%{path}">crear un alias de conto</a>.
+    moved_msg: Tui conto nu redirecte a %{acct} e tui sequitores es in li processu de esser movet.
+    not_redirecting: Tui conto redirecte a null altri conto actualmen.
     on_cooldown: Tu ha recentmen migrat tui conto. Ti function va esser disponibil denov pos %{count} dies.
     past_migrations: Passat migrationes
     proceed_with_move: Translocar sequitores
@@ -1406,7 +1423,12 @@ ie:
     warning:
       backreference_required: Li nov conto deve in prim esser configurat por retroreferentiar ti-ci conto
       before: 'Ante proceder, ples leer ti notas cuidosimen:'
+      cooldown: Pos mover se, hay un periode de atendida durant quel tu ne va posser mover te denov
+      disabled_account: Tui actual conto ne va esser completmen usabil pos to. Támen, tu va posser accesser li exportation de data, e anc reactivisation.
+      followers: Ti-ci action va mover omni sequitores del actual conto al nov conto
+      only_redirect_html: Alternativmen, tu posse <a href="%{path}">solmen meter un redirection sur tui profil</a>.
       other_data: Necun altri data va esser translocat automaticmen
+      redirect: Li profil de tui actual conto va esser actualisat con un anuncie de redirection e va esser excludet de serchas
   moderation:
     title: Moderation
   move_handler:
@@ -1805,6 +1827,7 @@ ie:
   verification:
     extra_instructions_html: '<strong>Nota</strong>: Li ligament in tui websitu posse esser ínvisibil. Li important parte es <code>rel="me"</code> quel prevente fals self-identification in websitus con contenete generat de usatores. Tu posse mem usar un <code>link</code> element in li cap-section del págine vice <code>a</code>, ma li HTML code deve esser accessibil sin executer JavaScript.'
     here_is_how: Vide qualmen
+    hint_html: "<strong>Verificar tui identitá che Mastodon es por omnes.</strong> Basat sur apert web-criteries, líber nu e sempre. Omno quel tu besona es un websitu personal per quel gente reconosse te. Quande tu fa un ligament a tui websitu de tui profil, on va controlar que li websitu have un ligament reciproc a tui profil e monstrar un visual indicator sur it."
     instructions_html: Copiar e collar li code ci infra in li HTML de tui web-situ. Poy adjunter li adresse de tui web-situ ad-in un del aditional campes sur tui profil ex li section "Modificar profil" e salvar li changes.
     verification: Verification
     verified_links: Tui verificat ligamentes
@@ -1815,9 +1838,12 @@ ie:
       success: Tui clave de securitá esset adjuntet con successe.
     delete: Deleter
     delete_confirmation: Vole tu vermen deleter ti-ci clave de securitá?
+    description_html: Si tu activisa <strong>autentication per clave de securitá</strong>, aperter session va postular que tu usa un de tui claves de securitá.
     destroy:
+      error: Un problema evenit durant li deletion de tui clave de securitá. Ples provar denov.
       success: Tui clave de securitá esset successosimen deletet.
     invalid_credential: Ínvalid clave de securitá
     not_enabled: Tu ancor ne ha possibilisat WebAuthn
     not_supported: Ti-ci navigator ne subtene claves de securitá
+    otp_required: Por usar claves de securitá, ples activisar 2-factor autentication.
     registered_on: Adheret ye %{date}
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 3637313c0d..16b327f3e1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -425,6 +425,7 @@ it:
       view: Visualizza blocco di dominio
     email_domain_blocks:
       add_new: Aggiungi nuovo
+      allow_registrations_with_approval: Consenti registrazioni con approvazione
       attempts_over_week:
         one: "%{count} tentativo nell'ultima settimana"
         other: "%{count} tentativi di registrazione nell'ultima settimana"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e6187f4d83..76bb3bd9f1 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -420,6 +420,7 @@ ko:
       view: 도메인 차단 보기
     email_domain_blocks:
       add_new: 새로 추가하기
+      allow_registrations_with_approval: 승인을 통한 가입 허용
       attempts_over_week:
         other: 지난 주 동안 %{count}건의 가입 시도가 있었습니다
       created_msg: 이메일 도메인 차단 규칙을 생성했습니다
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b1d8772b6b..b194011a42 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -169,6 +169,7 @@ lt:
       undo: Atkurti domeno bloką
     email_domain_blocks:
       add_new: Pridėti naują
+      allow_registrations_with_approval: Leisti registracijas su patvirtinimu
       created_msg: El pašto domenas sėkmingai pridėtas į juodąjį sąrašą
       delete: Ištrinti
       domain: Domenas
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 44843b2198..b2894e4abb 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -425,6 +425,7 @@ nl:
       view: Domeinblokkade bekijken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
+      allow_registrations_with_approval: Inschrijvingen met toestemming toestaan
       attempts_over_week:
         one: "%{count} registratiepoging tijdens de afgelopen week"
         other: "%{count} registratiepogingen tijdens de afgelopen week"
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 3ee02863db..70cbc27d6d 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -425,6 +425,7 @@ nn:
       view: Vis domeneblokkering
     email_domain_blocks:
       add_new: Lag ny
+      allow_registrations_with_approval: Tillat registreringer med godkjenning
       attempts_over_week:
         one: "%{count} forsøk i løpet av den siste uken"
         other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f791c7151e..54f82550b7 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -425,6 +425,7 @@
       view: Vis domeneblokkering
     email_domain_blocks:
       add_new: Lag ny
+      allow_registrations_with_approval: Tillat registreringer med godkjenning
       attempts_over_week:
         one: "%{count} forsøk i løpet av den siste uken"
         other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 79de3b5196..15aefe5f74 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -439,6 +439,7 @@ pl:
       view: Zobacz blokadę domeny
     email_domain_blocks:
       add_new: Dodaj nową
+      allow_registrations_with_approval: Zezwól na rejestracje po zatwierdzeniu
       attempts_over_week:
         few: "%{count} próby w ciągu ostatniego tygodnia"
         many: "%{count} prób w ciągu ostatniego tygodnia"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c8060ad803..2c485283b1 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -425,6 +425,7 @@ pt-BR:
       view: Ver domínios bloqueados
     email_domain_blocks:
       add_new: Adicionar novo
+      allow_registrations_with_approval: Permitir inscrições com aprovação
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 89da6b480e..111f0fa8ee 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -425,6 +425,7 @@ pt-PT:
       view: Ver domínios bloqueados
     email_domain_blocks:
       add_new: Adicionar novo
+      allow_registrations_with_approval: Permitir inscrições com aprovação
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 6ab26788bd..552abb2550 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -1 +1,46 @@
+---
 ia:
+  simple_form:
+    labels:
+      account:
+        fields:
+          name: Etiquetta
+          value: Contento
+      admin_account_action:
+        type: Action
+      defaults:
+        avatar: Pictura de profilo
+        confirm_new_password: Confirmar nove contrasigno
+        confirm_password: Confirmar contrasigno
+        current_password: Contrasigno actual
+        new_password: Nove contrasigno
+        password: Contrasigno
+        setting_display_media_default: Predefinite
+        setting_display_media_hide_all: Celar toto
+        setting_display_media_show_all: Monstrar toto
+        setting_system_font_ui: Usar typo de litteras predefinite del systema
+        setting_theme: Thema de sito
+        setting_trends: Monstrar le tendentias de hodie
+        sign_in_token_attempt: Codice de securitate
+        title: Titulo
+        username: Nomine de usator
+        username_or_email: Nomine de usator o e-mail
+      form_admin_settings:
+        custom_css: CSS personalisate
+        profile_directory: Activar directorio de profilos
+        site_contact_email: Adresse de e-mail de contacto
+        site_contact_username: Nomine de usator de contacto
+        site_terms: Politica de confidentialitate
+        site_title: Nomine de servitor
+        theme: Thema predefinite
+        trends: Activar tendentias
+      notification_emails:
+        software_updates:
+          label: Un nove version de Mastodon es disponibile
+      user:
+        time_zone: Fuso horari
+      user_role:
+        name: Nomine
+        permissions_as_keys: Permissiones
+        position: Prioritate
+    'yes': Si
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index bd055b1c9e..72797bde5e 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -8,6 +8,7 @@ ie:
         fields: Tui websitu, pronómines, etá, quocunc quel tu vole.
         indexable: Tui public postas posse aparir in sercha-resultates sur Mastodon. E in omni casu, tis qui ha interactet con tui postas va posser serchar e trovar les.
         note: 'Tu posse @mentionar altri persones o #hashtags.'
+        show_collections: Gente va posser navigar tra tui sequentes e sequitores. Gente quem tu seque va vider que tu seque les sin egarda.
         unlocked: Persones va posser sequer te sin petir aprobation. Desselecte si tu vole manualmen tractar petitiones de sequer e decider ca acceptar o rejecter nov sequitores.
       account_alias:
         acct: Specificar li usatornomine@dominia del conto ex quel tu vole translocar
@@ -58,6 +59,14 @@ ie:
         setting_display_media_default: Celar medie marcat quam sensitiv
         setting_display_media_hide_all: Sempre celar medie
         setting_display_media_show_all: Sempre monstrar medie
+        setting_use_blurhash: Gradientes es basat sur li colores del celat visuales ma obscura omni detallies
+        setting_use_pending_items: Celar nov postas detra un clicc vice rular li témpor-linea automaticmen
+        username: Tu posse usar lítteres, númeres e sublineas
+      domain_allow:
+        domain: Ti dominia va posser obtener data de ti-ci servitor, e data venient de it va esser tractat e inmagasinat
+      email_domain_block:
+        domain: Ti posse esser li dominia-nómine quel apari in li email-adresse o li MX-registre quel it usa. Ili va esser controlat durant adhesion.
+        with_dns_records: On va far un prova resoluer li DNS-registres del specificat dominia, e li resultates anc va esser bloccat
       featured_tag:
         name: 'Vi quelc hashtags usat max recentmen de te:'
       filters:
@@ -66,8 +75,12 @@ ie:
           hide: Celar completmen li contenete filtrat, quam si it ne existe
           warn: Celar li contenete filtrat detra un avise mentionant li titul del filtre
       form_admin_settings:
+        activity_api_enabled: Númeres de postas publicat localmen, activ usatores, e nov adhesiones in periodes semanal
         backups_retention_period: Mantener usator-generat archives por li specificat quantitá de dies.
         bootstrap_timeline_accounts: Ti-ci contos va esser pinglat al parte superiori del recomandationes por nov usatores.
+        closed_registrations_message: Monstrat quande adhesiones es cludet
+        content_cache_retention_period: Omni postas e boosts de altri servitores va esser deletet pos li specificat quantitá de dies. Quelc postas fórsan va esser ínrestaurabil. Omni pertinent marcatores, favorites e boosts anc va esser perdit e ínpossibil a restaurar.
+        custom_css: On posse aplicar customisat stiles al web-version de Mastodon.
         mascot: Substitue li ilustration in li avansat interfacie web.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
@@ -178,6 +191,7 @@ ie:
         setting_display_media_show_all: Monstrar omno
         setting_expand_spoilers: Sempre expander postas marcat con admonitiones de contenete
         setting_hide_network: Celar tui grafica social
+        setting_reduce_motion: Reducter motion in animationes
         setting_system_font_ui: Usar predefinit fonte de sistema
         setting_theme: Tema de situ
         setting_trends: Monstrar li hodial tendenties
@@ -190,6 +204,8 @@ ie:
         username: Nómine de usator
         username_or_email: Usator-nómine o E-posta
         whole_word: Plen parol
+      email_domain_block:
+        with_dns_records: Includer archives MX e IPs del dominia
       featured_tag:
         name: Hashtag
       filters:
@@ -197,10 +213,14 @@ ie:
           hide: Celar completmen
           warn: Celar con un admonition
       form_admin_settings:
+        activity_api_enabled: Publicar agregat statisticas pri usator-activitá in li API
         backups_retention_period: Periode de retener archives de usator
         bootstrap_timeline_accounts: Sempre recomandar ti-ci contos a nov usatores
         closed_registrations_message: Customisat missage quande registration ne disponibil
+        content_cache_retention_period: Periode de retention por cachat contenete
         custom_css: Custom CSS
+        media_cache_retention_period: Periode de retention por cachat medie
+        peers_api_enabled: Publicar liste de conosset servitores per li API
         profile_directory: Possibilisar profilarium
         registrations_mode: Qui posse registrar se
         require_invite_text: Exiger un rason por adherer se
@@ -210,11 +230,19 @@ ie:
         site_contact_username: Usator-nómine de contact
         site_extended_description: Extendet descrition
         site_short_description: Descrition del servitor
+        site_terms: Politica pri Privatie
         site_title: Nómine de servitor
+        status_page_url: URL de statu-págine
         theme: Predefenit tema
+        thumbnail: Miniatura del servitor
+        timeline_preview: Permisser accesse ínautenticat al public témpor-lineas
         trendable_by_default: Possibilisar tendenties sin priori inspection
         trends: Possibilisar tendenties
         trends_as_landing_page: Usar tendenties quam frontispicie
+      interactions:
+        must_be_follower: Bloccar notificationes de tis qui ne seque te
+        must_be_following: Bloccar notificationes de tis quem tu ne seque
+        must_be_following_dm: Bloccar direct missages de tis quem tu ne seque
       invite:
         comment: Comentar
       invite_request:
@@ -228,27 +256,38 @@ ie:
           sign_up_requires_approval: Limitar usator-registrationes
         severity: Regul
       notification_emails:
+        appeal: Alqui apella un decision moderatori
+        digest: Inviar compendies per email
         favourite: Alqui favoritisat tui posta
         follow: Alqui sequet te
         follow_request: Alqui petit sequer te
         mention: Alqui mentionat te
         pending_account: Nov conto besonant inspection
+        reblog: Alqui boostat tui posta
         report: Nov raporte es submisset
         software_updates:
           all: Notificar pri omni nov actualisationes
           critical: Notificar solmen pri critical actualisationes
           label: Un nov version de Mastodon es disponibil
+          none: Nequande notificar pri actualisationes (ne recomandat)
+          patch: Notificar pri problema-fixant actualisationes
         trending_tag: Nov tendentie besonant inspection
       rule:
         text: Regul
+      settings:
+        indexable: Includer profil-pagine in serchatores
+        show_application: Monstrar de quel aplication tu fat un posta
       tag:
+        listable: Permisser que ti hashtag apari in serchas e suggestiones
         name: Hashtag
         trendable: Permisse que ti-ci hashtag apari sub tendenties
+        usable: Permisser que postas usa ti hashtag
       user:
         role: Rol
         time_zone: Zone temporal
       user_role:
         color: Color del insignie
+        highlighted: Monstrar rol quam insigne sur usator-profiles
         name: Nómine
         permissions_as_keys: Permissiones
         position: Prioritá
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index a89e1a4290..e13a05835f 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -149,6 +149,8 @@ sk:
         text: Prečo sa k nám chceš pridať?
       ip_block:
         comment: Komentár
+        severities:
+          sign_up_requires_approval: Obmedz registrácie
         severity: Pravidlo
       notification_emails:
         digest: Zasielať súhrnné emaily
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index feb84ea984..cfc5ee7087 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -374,6 +374,7 @@ sk:
       view: Ukáž blokovanie domén
     email_domain_blocks:
       add_new: Pridaj nový
+      allow_registrations_with_approval: Povoľ registrovanie so schválením
       created_msg: Emailová doména bola úspešne pridaná do zoznamu zakázaných
       delete: Vymaž
       dns:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index ecff5a6672..83d52ae0e7 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -439,6 +439,7 @@ sl:
       view: Pokaži domenski blok
     email_domain_blocks:
       add_new: Dodaj novo
+      allow_registrations_with_approval: Dovoli registracije z odobritvijo
       attempts_over_week:
         few: "%{count} poskusi prijave zadnji teden"
         one: "%{count} poskus prijave zadnji teden"
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index af1bb4644d..9ab6e85361 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -425,6 +425,7 @@ sq:
       view: Shihni bllokim përkatësie
     email_domain_blocks:
       add_new: Shtoni të ri
+      allow_registrations_with_approval: Lejo regjistrim me miratim
       attempts_over_week:
         one: "%{count} përpjekje gjatë javës së shkuar"
         other: "%{count} përpjekje regjistrimi gjatë javës së kaluar"
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index e8760697e2..02f63ede71 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -432,6 +432,7 @@ sr-Latn:
       view: Pročitaj blok domena
     email_domain_blocks:
       add_new: Dodaj novi
+      allow_registrations_with_approval: Dozvoli registraciju uz odobrenje
       attempts_over_week:
         few: "%{count} pokušaja tokom prethodne nedelje"
         one: "%{count} pokušaj tokom prethodne nedelje"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b32d86f652..51613940bc 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -432,6 +432,7 @@ sr:
       view: Прочитај блок домена
     email_domain_blocks:
       add_new: Додај нови
+      allow_registrations_with_approval: Дозволи регистрацију уз одобрење
       attempts_over_week:
         few: "%{count} покушаја током претходне недеље"
         one: "%{count} покушај током претходне недеље"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 59a6b2c4fb..f553f6a41c 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -418,6 +418,7 @@ th:
       view: ดูการปิดกั้นโดเมน
     email_domain_blocks:
       add_new: เพิ่มใหม่
+      allow_registrations_with_approval: อนุญาตการลงทะเบียนด้วยการอนุมัติ
       attempts_over_week:
         other: "%{count} ความพยายามในการลงทะเบียนในช่วงสัปดาห์ที่ผ่านมา"
       created_msg: ปิดกั้นโดเมนอีเมลสำเร็จ
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 568607e70d..da8935f6ca 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -425,6 +425,7 @@ tr:
       view: Alan adı bloğunu görüntüle
     email_domain_blocks:
       add_new: Yeni ekle
+      allow_registrations_with_approval: Onaylı kayıtlara izin ver
       attempts_over_week:
         one: Son haftada %{count} deneme
         other: Son haftada %{count} kayıt denemesi
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 139b8be30d..7a1957eba7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -439,6 +439,7 @@ uk:
       view: Переглянути заблоковані домени
     email_domain_blocks:
       add_new: Додати
+      allow_registrations_with_approval: Дозволити реєстрації із затвердженням
       attempts_over_week:
         few: "%{count} спроби входу за останній тиждень"
         many: "%{count} спроб входу за останній тиждень"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c06a84b973..85aabe7176 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -418,6 +418,7 @@ vi:
       view: Xem máy chủ chặn
     email_domain_blocks:
       add_new: Thêm mới
+      allow_registrations_with_approval: Cho đăng ký nhưng duyệt thủ công
       attempts_over_week:
         other: "%{count} lần thử đăng ký vào tuần trước"
       created_msg: Đã chặn tên miền email này
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ec4d714233..a573c8f99b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -418,6 +418,7 @@ zh-CN:
       view: 查看域名屏蔽
     email_domain_blocks:
       add_new: 添加新条目
+      allow_registrations_with_approval: 注册时需要批准
       attempts_over_week:
         other: 上周有 %{count} 次注册尝试
       created_msg: 成功屏蔽电子邮件域名
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 01a0a026a7..61355a4c53 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -418,6 +418,7 @@ zh-HK:
       view: 顯示正被阻隔的網域
     email_domain_blocks:
       add_new: 新增
+      allow_registrations_with_approval: 允許經批准的註冊
       attempts_over_week:
         other: 上週嘗試了註冊 %{count} 次
       created_msg: 已新增電郵網域阻隔

From e1b49d3454a0c2d492d65e076700882272e982fc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Jan 2024 07:26:31 -0500
Subject: [PATCH 216/436] Regenerate rubocop todo with version 1.59.0 (#28597)

---
 .rubocop_todo.yml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d68832e85e..6ab8957055 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.57.2.
+# using RuboCop version 1.59.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,7 +26,7 @@ Lint/NonLocalExitFromIterator:
 
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 100
+  Max: 82
 
 # Configuration parameters: CountBlocks, Max.
 Metrics/BlockNesting:
@@ -50,7 +50,7 @@ RSpec/MultipleExpectations:
 
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 21
+  Max: 17
 
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
@@ -66,7 +66,6 @@ Rails/ApplicationController:
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/concerns/account/associations.rb'
-    - 'app/models/preview_card.rb'
     - 'app/models/status.rb'
     - 'app/models/tag.rb'
 
@@ -144,7 +143,6 @@ Rails/WhereExists:
   Exclude:
     - 'app/controllers/activitypub/inboxes_controller.rb'
     - 'app/controllers/admin/email_domain_blocks_controller.rb'
-    - 'app/controllers/auth/registrations_controller.rb'
     - 'app/lib/activitypub/activity/create.rb'
     - 'app/lib/delivery_failure_tracker.rb'
     - 'app/lib/feed_manager.rb'
@@ -160,7 +158,6 @@ Rails/WhereExists:
     - 'app/serializers/rest/announcement_serializer.rb'
     - 'app/serializers/rest/tag_serializer.rb'
     - 'app/services/activitypub/fetch_remote_status_service.rb'
-    - 'app/services/app_sign_up_service.rb'
     - 'app/services/vote_service.rb'
     - 'app/validators/reaction_validator.rb'
     - 'app/validators/vote_validator.rb'
@@ -171,12 +168,6 @@ Rails/WhereExists:
     - 'spec/services/purge_domain_service_spec.rb'
     - 'spec/services/unallow_domain_service_spec.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowOnConstant, AllowOnSelfClass.
-Style/CaseEquality:
-  Exclude:
-    - 'config/initializers/trusted_proxies.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: ==, equal?, eql?
@@ -204,8 +195,8 @@ Style/FetchEnvVar:
     - 'config/initializers/devise.rb'
     - 'config/initializers/paperclip.rb'
     - 'config/initializers/vapid.rb'
-    - 'lib/premailer_webpack_strategy.rb'
     - 'lib/mastodon/redis_config.rb'
+    - 'lib/premailer_webpack_strategy.rb'
     - 'lib/tasks/repo.rake'
     - 'spec/features/profile_spec.rb'
 
@@ -222,7 +213,6 @@ Style/FormatStringToken:
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
-    - 'config/boot.rb'
     - 'config/environments/development.rb'
     - 'config/environments/production.rb'
 
@@ -411,8 +401,8 @@ Style/TrailingCommaInHashLiteral:
     - 'config/environments/test.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
+# Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
-  Exclude:
-    - 'app/helpers/languages_helper.rb'
+  EnforcedStyle: percent
+  MinSize: 3

From b3dab17b586ef34bc8cd64f6b25e3ec661f7defd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Jan 2024 07:31:18 -0500
Subject: [PATCH 217/436] Remove deprecated `RSpec/FilePath` cop (#28601)

---
 .rubocop.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8832e28f6e..bedd8f7850 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -118,15 +118,10 @@ Rails/UnusedIgnoredColumns:
 Rails/NegateInclude:
   Enabled: false
 
-# Reason: Some single letter camel case files shouldn't be split
+# Reason: Deprecated cop, will be removed in 3.0, replaced by SpecFilePathFormat
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
 RSpec/FilePath:
-  CustomTransform:
-    ActivityPub: activitypub
-    DeepL: deepl
-    FetchOEmbedService: fetch_oembed_service
-    OEmbedController: oembed_controller
-    OStatus: ostatus
+  Enabled: false
 
 # Reason:
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject

From 12bed81187dd5b041a735af8e9cb5a5f96b4b75a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 5 Jan 2024 10:13:59 -0500
Subject: [PATCH 218/436] Add validation specs to `CustomFilter` model (#28600)

---
 app/models/custom_filter.rb       |  6 +++++-
 spec/models/custom_filter_spec.rb | 35 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 spec/models/custom_filter_spec.rb

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 9c936fed39..0ee9e35328 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -143,6 +143,10 @@ class CustomFilter < ApplicationRecord
   end
 
   def context_must_be_valid
-    errors.add(:context, I18n.t('filters.errors.invalid_context')) if context.empty? || context.any? { |c| !VALID_CONTEXTS.include?(c) }
+    errors.add(:context, I18n.t('filters.errors.invalid_context')) if invalid_context_value?
+  end
+
+  def invalid_context_value?
+    context.blank? || context.difference(VALID_CONTEXTS).any?
   end
 end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
new file mode 100644
index 0000000000..9404936337
--- /dev/null
+++ b/spec/models/custom_filter_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomFilter do
+  describe 'Validations' do
+    it 'requires presence of title' do
+      record = described_class.new(title: '')
+      record.valid?
+
+      expect(record).to model_have_error_on_field(:title)
+    end
+
+    it 'requires presence of context' do
+      record = described_class.new(context: nil)
+      record.valid?
+
+      expect(record).to model_have_error_on_field(:context)
+    end
+
+    it 'requires non-empty of context' do
+      record = described_class.new(context: [])
+      record.valid?
+
+      expect(record).to model_have_error_on_field(:context)
+    end
+
+    it 'requires valid context value' do
+      record = described_class.new(context: ['invalid'])
+      record.valid?
+
+      expect(record).to model_have_error_on_field(:context)
+    end
+  end
+end

From 5a6d533c5390832f86c3352af0f6023f9ad07156 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Fri, 5 Jan 2024 22:57:47 +0100
Subject: [PATCH 219/436] Enable Rails 7.1 Marshalling format (#28609)

---
 app/controllers/concerns/cache_concern.rb | 155 +---------------------
 app/models/custom_filter.rb               |  19 +--
 app/models/custom_filter_keyword.rb       |  10 +-
 config/application.rb                     |   2 +
 lib/mastodon/redis_config.rb              |   2 +-
 5 files changed, 8 insertions(+), 180 deletions(-)

diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb
index 2dfe5e263a..62f763fe2f 100644
--- a/app/controllers/concerns/cache_concern.rb
+++ b/app/controllers/concerns/cache_concern.rb
@@ -3,150 +3,6 @@
 module CacheConcern
   extend ActiveSupport::Concern
 
-  module ActiveRecordCoder
-    EMPTY_HASH = {}.freeze
-
-    class << self
-      def dump(record)
-        instances = InstanceTracker.new
-        serialized_associations = serialize_associations(record, instances)
-        serialized_records = instances.map { |r| serialize_record(r) }
-        [serialized_associations, *serialized_records]
-      end
-
-      def load(payload)
-        instances = InstanceTracker.new
-        serialized_associations, *serialized_records = payload
-        serialized_records.each { |attrs| instances.push(deserialize_record(*attrs)) }
-        deserialize_associations(serialized_associations, instances)
-      end
-
-      private
-
-      # Records without associations, or which have already been visited before,
-      # are serialized by their id alone.
-      #
-      # Records with associations are serialized as a two-element array including
-      # their id and the record's association cache.
-      #
-      def serialize_associations(record, instances)
-        return unless record
-
-        if (id = instances.lookup(record))
-          payload = id
-        else
-          payload = instances.push(record)
-
-          cached_associations = record.class.reflect_on_all_associations.select do |reflection|
-            record.association_cached?(reflection.name)
-          end
-
-          unless cached_associations.empty?
-            serialized_associations = cached_associations.map do |reflection|
-              association = record.association(reflection.name)
-
-              serialized_target = if reflection.collection?
-                                    association.target.map { |target_record| serialize_associations(target_record, instances) }
-                                  else
-                                    serialize_associations(association.target, instances)
-                                  end
-
-              [reflection.name, serialized_target]
-            end
-
-            payload = [payload, serialized_associations]
-          end
-        end
-
-        payload
-      end
-
-      def deserialize_associations(payload, instances)
-        return unless payload
-
-        id, associations = payload
-        record = instances.fetch(id)
-
-        associations&.each do |name, serialized_target|
-          begin
-            association = record.association(name)
-          rescue ActiveRecord::AssociationNotFoundError
-            raise AssociationMissingError, "undefined association: #{name}"
-          end
-
-          target = if association.reflection.collection?
-                     serialized_target.map! { |serialized_record| deserialize_associations(serialized_record, instances) }
-                   else
-                     deserialize_associations(serialized_target, instances)
-                   end
-
-          association.target = target
-        end
-
-        record
-      end
-
-      def serialize_record(record)
-        arguments = [record.class.name, attributes_for_database(record)]
-        arguments << true if record.new_record?
-        arguments
-      end
-
-      def attributes_for_database(record)
-        attributes = record.attributes_for_database
-        attributes.transform_values! { |attr| attr.is_a?(::ActiveModel::Type::Binary::Data) ? attr.to_s : attr }
-        attributes
-      end
-
-      def deserialize_record(class_name, attributes_from_database, new_record = false) # rubocop:disable Style/OptionalBooleanParameter
-        begin
-          klass = Object.const_get(class_name)
-        rescue NameError
-          raise ClassMissingError, "undefined class: #{class_name}"
-        end
-
-        # Ideally we'd like to call `klass.instantiate`, however it doesn't allow to pass
-        # wether the record was persisted or not.
-        attributes = klass.attributes_builder.build_from_database(attributes_from_database, EMPTY_HASH)
-        klass.allocate.init_with_attributes(attributes, new_record)
-      end
-    end
-
-    class Error < StandardError
-    end
-
-    class ClassMissingError < Error
-    end
-
-    class AssociationMissingError < Error
-    end
-
-    class InstanceTracker
-      def initialize
-        @instances = []
-        @ids = {}.compare_by_identity
-      end
-
-      def map(&block)
-        @instances.map(&block)
-      end
-
-      def fetch(...)
-        @instances.fetch(...)
-      end
-
-      def push(instance)
-        id = @ids[instance] = @instances.size
-        @instances << instance
-        id
-      end
-
-      def lookup(instance)
-        @ids[instance]
-      end
-    end
-  end
-
   class_methods do
     def vary_by(value, **kwargs)
       before_action(**kwargs) do |controller|
@@ -196,11 +52,7 @@ module CacheConcern
     raw = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
     return [] if raw.empty?
 
-    cached_keys_with_value = begin
-      Rails.cache.read_multi(*raw).transform_keys(&:id).transform_values { |r| ActiveRecordCoder.load(r) }
-    rescue ActiveRecordCoder::Error
-      {} # The serialization format may have changed, let's pretend it's a cache miss.
-    end
+    cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
 
     uncached_ids = raw.map(&:id) - cached_keys_with_value.keys
 
@@ -208,10 +60,7 @@ module CacheConcern
 
     unless uncached_ids.empty?
       uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id)
-
-      uncached.each_value do |item|
-        Rails.cache.write(item, ActiveRecordCoder.dump(item))
-      end
+      Rails.cache.write_multi(uncached.values.to_h { |i| [i, i] })
     end
 
     raw.filter_map { |item| cached_keys_with_value[item.id] || uncached[item.id] }
diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 0ee9e35328..371267fc28 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -17,23 +17,8 @@
 class CustomFilter < ApplicationRecord
   self.ignored_columns += %w(whole_word irreversible)
 
-  # NOTE: We previously used `alias_attribute` but this does not play nicely
-  # with cache
-  def title
-    phrase
-  end
-
-  def title=(value)
-    self.phrase = value
-  end
-
-  def filter_action
-    action
-  end
-
-  def filter_action=(value)
-    self.action = value
-  end
+  alias_attribute :title, :phrase
+  alias_attribute :filter_action, :action
 
   VALID_CONTEXTS = %w(
     home
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 1812a43081..3158b3b79a 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -17,15 +17,7 @@ class CustomFilterKeyword < ApplicationRecord
 
   validates :keyword, presence: true
 
-  # NOTE: We previously used `alias_attribute` but this does not play nicely
-  # with cache
-  def phrase
-    keyword
-  end
-
-  def phrase=(value)
-    self.keyword = value
-  end
+  alias_attribute :phrase, :keyword
 
   before_save :prepare_cache_invalidation!
   before_destroy :prepare_cache_invalidation!
diff --git a/config/application.rb b/config/application.rb
index 990a89383e..bab1b46cb0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,6 +63,8 @@ module Mastodon
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
 
+    config.active_record.marshalling_format_version = 7.1
+
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
     # Common ones are `templates`, `generators`, or `middleware`, for example.
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index e885712f89..10672a5358 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -34,7 +34,7 @@ REDIS_CACHE_PARAMS = {
   driver: :hiredis,
   url: ENV['CACHE_REDIS_URL'],
   expires_in: 10.minutes,
-  namespace: cache_namespace,
+  namespace: "#{cache_namespace}:7.1",
   connect_timeout: 5,
   pool: {
     size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),

From 8a312ad79bb756d92b5ca4c9a176bd96c702e73e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:57:12 +0100
Subject: [PATCH 220/436] Update dependency puma to v6.4.2 (#28640)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 009293167f..45d228e48f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -544,7 +544,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
-    puma (6.4.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)

From 352625c49107e2e25c802e24a1631e173432832b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:59:06 +0100
Subject: [PATCH 221/436] Update libretranslate/libretranslate Docker tag to
 v1.5.3 (#28639)

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

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 40dc72c12d..21ee078d60 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.2
+    image: libretranslate/libretranslate:v1.5.3
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From a27a82939dffe06134327468a192b2badf4aee46 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 05:16:33 -0500
Subject: [PATCH 222/436] Remove the 7.1 marshalling format "todo" from
 new_framework_defaults (#28625)

---
 config/initializers/new_framework_defaults_7_1.rb | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
index 2fa0e42746..1475fe2fd9 100644
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -158,15 +158,6 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 # rather than to rely on a global default.
 # Rails.application.config.active_record.default_column_serializer = nil
 
-# Enable a performance optimization that serializes Active Record models
-# in a faster and more compact way.
-#
-# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have
-# not yet been upgraded must be able to read caches from upgraded servers,
-# leave this optimization off on the first deploy, then enable it on a
-# subsequent deploy.
-# Rails.application.config.active_record.marshalling_format_version = 7.1
-
 # Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
 # This matches the behaviour of all other callbacks.
 # In previous versions of Rails, they ran in the inverse order.

From e09419f22a98266be029c5121b7302ab439c0a3a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 05:17:38 -0500
Subject: [PATCH 223/436] Move old framework defaults file to regular config
 value (#28623)

---
 config/initializers/new_framework_defaults_7_0.rb | 10 ----------
 config/initializers/open_redirects.rb             | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 config/initializers/new_framework_defaults_7_0.rb
 create mode 100644 config/initializers/open_redirects.rb

diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
deleted file mode 100644
index edaf819447..0000000000
--- a/config/initializers/new_framework_defaults_7_0.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# TODO
-# The Rails 7.0 framework default here is to set this true. However, we have a
-# location in devise that redirects where we don't have an easy ability to
-# override a method or set a config option, but where the redirect does not
-# provide this option.
-# https://github.com/heartcombo/devise/blob/v4.9.2/app/controllers/devise/confirmations_controller.rb#L28
-# Once a solution is found, this line can be removed.
-Rails.application.config.action_controller.raise_on_open_redirects = false
diff --git a/config/initializers/open_redirects.rb b/config/initializers/open_redirects.rb
new file mode 100644
index 0000000000..c953a990c6
--- /dev/null
+++ b/config/initializers/open_redirects.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# TODO
+# Starting with Rails 7.0, the framework default here is to set this true.
+# However, we have a location in devise that redirects where we don't have an
+# easy ability to override the method or set a config option, and where the
+# redirect does not supply this option itself.
+# https://github.com/heartcombo/devise/blob/v4.9.2/app/controllers/devise/confirmations_controller.rb#L28
+# Once a solution is found, this line can be removed.
+Rails.application.config.action_controller.raise_on_open_redirects = false

From 8d06baf8127d453c889279ab413f2ecfac4192aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:17:53 +0000
Subject: [PATCH 224/436] Update dependency strong_migrations to v1.7.0
 (#28621)

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

diff --git a/Gemfile b/Gemfile
index cfcbcc0d3c..a56702fad2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'simple-navigation', '~> 4.4'
 gem 'simple_form', '~> 5.2'
 gem 'stoplight', '~> 3.0.1'
-gem 'strong_migrations', '1.6.4'
+gem 'strong_migrations', '1.7.0'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
 gem 'tzinfo-data', '~> 1.2023'
diff --git a/Gemfile.lock b/Gemfile.lock
index 45d228e48f..fd6fa563c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -748,7 +748,7 @@ GEM
     stoplight (3.0.2)
       redlock (~> 1.0)
     stringio (3.1.0)
-    strong_migrations (1.6.4)
+    strong_migrations (1.7.0)
       activerecord (>= 5.2)
     swd (1.3.0)
       activesupport (>= 3)
@@ -952,7 +952,7 @@ DEPENDENCIES
   simplecov-lcov (~> 0.8)
   stackprof
   stoplight (~> 3.0.1)
-  strong_migrations (= 1.6.4)
+  strong_migrations (= 1.7.0)
   test-prof
   thor (~> 1.2)
   tty-prompt (~> 0.23)

From c9e67521583ac0e393c8dafef561e9eff528bf58 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:18:57 +0100
Subject: [PATCH 225/436] Update dependency rubocop-rspec to v2.26.1 (#28611)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index fd6fa563c2..f032850eb8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -688,7 +688,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.0)
+    rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

From fe2667bb0d3487a32b9da5250402a90482a85fe2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:19:33 +0100
Subject: [PATCH 226/436] Update dependency rubocop-performance to v1.20.2
 (#28641)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index f032850eb8..e694dce0fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -680,7 +680,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.20.1)
+    rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rails (2.23.1)

From a0e237a96fca2774d3c9ed43063a45e395bb7f40 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Mon, 8 Jan 2024 11:57:40 +0100
Subject: [PATCH 227/436] Upgrade Redux packages (#28585)

---
 .eslintrc.js                                  |  11 +-
 .../emoji_picker_dropdown_container.js        |   3 +-
 .../containers/language_dropdown_container.js |   3 +-
 .../containers/announcements_container.js     |   3 +-
 .../mastodon/features/home_timeline/index.jsx |   2 +-
 .../mastodon/features/list_adder/index.jsx    |   2 +-
 .../mastodon/features/lists/index.jsx         |   2 +-
 .../mastodon/features/notifications/index.jsx |   2 +-
 .../mastodon/features/report/comment.jsx      |   2 +-
 .../mastodon/features/status/index.jsx        |   2 +-
 .../subscribed_languages_modal/index.jsx      |   2 +-
 .../features/ui/components/list_panel.jsx     |   2 +-
 .../ui/containers/status_list_container.js    |   2 +-
 app/javascript/mastodon/reducers/accounts.ts  |   3 +-
 app/javascript/mastodon/reducers/modal.ts     |   3 +-
 .../mastodon/reducers/relationships.ts        |   5 +-
 app/javascript/mastodon/selectors/accounts.ts |   2 +-
 app/javascript/mastodon/selectors/index.js    |   2 +-
 .../mastodon/store/middlewares/errors.ts      |  32 ++++--
 .../mastodon/store/middlewares/loading_bar.ts |  24 +++-
 .../mastodon/store/middlewares/sounds.ts      |  35 ++++--
 .../mastodon/store/typed_functions.ts         |   6 +-
 config/webpack/rules/babel.js                 |   8 +-
 package.json                                  |   9 +-
 yarn.lock                                     | 104 +++++++++---------
 25 files changed, 167 insertions(+), 104 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index e2d16a54a8..1b36bcee25 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -245,7 +245,7 @@ module.exports = defineConfig({
           },
           // Immutable / Redux / data store
           {
-            pattern: '{immutable,react-redux,react-immutable-proptypes,react-immutable-pure-component,reselect}',
+            pattern: '{immutable,@reduxjs/toolkit,react-redux,react-immutable-proptypes,react-immutable-pure-component}',
             group: 'external',
             position: 'before',
           },
@@ -353,7 +353,14 @@ module.exports = defineConfig({
         '@typescript-eslint/consistent-type-exports': 'error',
         '@typescript-eslint/consistent-type-imports': 'error',
         "@typescript-eslint/prefer-nullish-coalescing": ['error', { ignorePrimitives: { boolean: true } }],
-
+        "@typescript-eslint/no-restricted-imports": [
+          "warn",
+          {
+            "name": "react-redux",
+            "importNames": ["useSelector", "useDispatch"],
+            "message": "Use typed hooks `useAppDispatch` and `useAppSelector` instead."
+          }
+        ],
         'jsdoc/require-jsdoc': 'off',
 
         // Those rules set stricter rules for TS files
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index a0e50029df..8cf906b20a 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -1,6 +1,7 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { Map as ImmutableMap } from 'immutable';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
+
 
 import { useEmoji } from '../../../actions/emojis';
 import { changeSetting } from '../../../actions/settings';
diff --git a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
index e1e2f04024..ba4b5f05a5 100644
--- a/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/language_dropdown_container.js
@@ -1,6 +1,7 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { Map as ImmutableMap } from 'immutable';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
+
 
 import { changeComposeLanguage } from 'mastodon/actions/compose';
 import { useLanguage } from 'mastodon/actions/languages';
diff --git a/app/javascript/mastodon/features/getting_started/containers/announcements_container.js b/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
index c33e624324..3bb1b8e8d1 100644
--- a/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
+++ b/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
@@ -1,6 +1,7 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { Map as ImmutableMap } from 'immutable';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
+
 
 import { addReaction, removeReaction, dismissAnnouncement } from 'mastodon/actions/announcements';
 
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 7c9c7a4e52..613eb4b896 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -6,9 +6,9 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 
+import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as CampaignIcon } from '@material-symbols/svg-600/outlined/campaign.svg';
 import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
diff --git a/app/javascript/mastodon/features/list_adder/index.jsx b/app/javascript/mastodon/features/list_adder/index.jsx
index 1ba9972e00..4e7bd46bdf 100644
--- a/app/javascript/mastodon/features/list_adder/index.jsx
+++ b/app/javascript/mastodon/features/list_adder/index.jsx
@@ -2,10 +2,10 @@ import PropTypes from 'prop-types';
 
 import { injectIntl } from 'react-intl';
 
+import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { setupListAdder, resetListAdder } from '../../actions/lists';
 import NewListForm from '../lists/components/new_list_form';
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index 58e85b4d28..9014394351 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -4,10 +4,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
+import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
 
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 379932b7b7..762c96ccca 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -5,10 +5,10 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
+import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as DoneAllIcon } from '@material-symbols/svg-600/outlined/done_all.svg';
 import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications-fill.svg';
diff --git a/app/javascript/mastodon/features/report/comment.jsx b/app/javascript/mastodon/features/report/comment.jsx
index ec59746923..b80c14fcb9 100644
--- a/app/javascript/mastodon/features/report/comment.jsx
+++ b/app/javascript/mastodon/features/report/comment.jsx
@@ -3,10 +3,10 @@ import { useCallback, useEffect, useRef } from 'react';
 
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
+import { createSelector } from '@reduxjs/toolkit';
 import { OrderedSet, List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { shallowEqual } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import Toggle from 'react-toggle';
 
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index c581255c99..3832489764 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -6,11 +6,11 @@ import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { withRouter } from 'react-router-dom';
 
+import { createSelector } from '@reduxjs/toolkit';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as VisibilityIcon } from '@material-symbols/svg-600/outlined/visibility.svg';
 import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
index 147e11d1be..ac34f7986c 100644
--- a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
@@ -2,11 +2,11 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
+import { createSelector } from '@reduxjs/toolkit';
 import { is, List as ImmutableList, Set as ImmutableSet } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
 
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index 8dbd28f094..ff600730a0 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
 
+import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
 
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 36a8f58f8b..3e7ae2add0 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -1,6 +1,6 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 
 import { debounce } from 'lodash';
 
diff --git a/app/javascript/mastodon/reducers/accounts.ts b/app/javascript/mastodon/reducers/accounts.ts
index f7270eb60a..e6f07340c0 100644
--- a/app/javascript/mastodon/reducers/accounts.ts
+++ b/app/javascript/mastodon/reducers/accounts.ts
@@ -1,7 +1,6 @@
+import type { Reducer } from '@reduxjs/toolkit';
 import { Map as ImmutableMap } from 'immutable';
 
-import type { Reducer } from 'redux';
-
 import {
   followAccountSuccess,
   unfollowAccountSuccess,
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
index 73a2afb916..368f26542c 100644
--- a/app/javascript/mastodon/reducers/modal.ts
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -1,6 +1,5 @@
-import { Record as ImmutableRecord, Stack } from 'immutable';
-
 import type { Reducer } from '@reduxjs/toolkit';
+import { Record as ImmutableRecord, Stack } from 'immutable';
 
 import { COMPOSE_UPLOAD_CHANGE_SUCCESS } from '../actions/compose';
 import type { ModalType } from '../actions/modal';
diff --git a/app/javascript/mastodon/reducers/relationships.ts b/app/javascript/mastodon/reducers/relationships.ts
index 2ba61839c7..dcca11b203 100644
--- a/app/javascript/mastodon/reducers/relationships.ts
+++ b/app/javascript/mastodon/reducers/relationships.ts
@@ -1,7 +1,6 @@
-import { Map as ImmutableMap } from 'immutable';
-
 import { isFulfilled } from '@reduxjs/toolkit';
-import type { Reducer } from 'redux';
+import type { Reducer } from '@reduxjs/toolkit';
+import { Map as ImmutableMap } from 'immutable';
 
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 import type { Account } from 'mastodon/models/account';
diff --git a/app/javascript/mastodon/selectors/accounts.ts b/app/javascript/mastodon/selectors/accounts.ts
index 66193136c4..cee3a87bca 100644
--- a/app/javascript/mastodon/selectors/accounts.ts
+++ b/app/javascript/mastodon/selectors/accounts.ts
@@ -1,5 +1,5 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { Record as ImmutableRecord } from 'immutable';
-import { createSelector } from 'reselect';
 
 import { accountDefaultValues } from 'mastodon/models/account';
 import type { Account, AccountShape } from 'mastodon/models/account';
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 8a07ba774d..b1c60403e9 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,5 +1,5 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
-import { createSelector } from 'reselect';
 
 import { toServerSideType } from 'mastodon/utils/filters';
 
diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index 9f28f5ff53..e11aa78178 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -1,20 +1,34 @@
-import type { AnyAction, Middleware } from 'redux';
+import { isAction } from '@reduxjs/toolkit';
+import type { Action, Middleware } from '@reduxjs/toolkit';
 
 import type { RootState } from '..';
 import { showAlertForError } from '../../actions/alerts';
 
 const defaultFailSuffix = 'FAIL';
+const isFailedAction = new RegExp(`${defaultFailSuffix}$`, 'g');
 
-export const errorsMiddleware: Middleware<unknown, RootState> =
+interface ActionWithMaybeAlertParams extends Action {
+  skipAlert?: boolean;
+  skipNotFound?: boolean;
+  error?: unknown;
+}
+
+function isActionWithmaybeAlertParams(
+  action: unknown,
+): action is ActionWithMaybeAlertParams {
+  return isAction(action);
+}
+
+export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
   ({ dispatch }) =>
   (next) =>
-  (action: AnyAction & { skipAlert?: boolean; skipNotFound?: boolean }) => {
-    if (action.type && !action.skipAlert) {
-      const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
-
-      if (typeof action.type === 'string' && action.type.match(isFail)) {
-        dispatch(showAlertForError(action.error, action.skipNotFound));
-      }
+  (action) => {
+    if (
+      isActionWithmaybeAlertParams(action) &&
+      !action.skipAlert &&
+      action.type.match(isFailedAction)
+    ) {
+      dispatch(showAlertForError(action.error, action.skipNotFound));
     }
 
     return next(action);
diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts
index 83056ee49f..d259be899b 100644
--- a/app/javascript/mastodon/store/middlewares/loading_bar.ts
+++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts
@@ -3,9 +3,11 @@ import {
   isPending as isThunkActionPending,
   isFulfilled as isThunkActionFulfilled,
   isRejected as isThunkActionRejected,
+  isAction,
 } from '@reduxjs/toolkit';
+import type { Middleware, UnknownAction } from '@reduxjs/toolkit';
+
 import { showLoading, hideLoading } from 'react-redux-loading-bar';
-import type { AnyAction, Middleware } from 'redux';
 
 import type { RootState } from '..';
 
@@ -19,14 +21,28 @@ const defaultTypeSuffixes: Config['promiseTypeSuffixes'] = [
   'REJECTED',
 ];
 
+interface ActionWithSkipLoading extends UnknownAction {
+  skipLoading: boolean;
+}
+
+function isActionWithSkipLoading(
+  action: unknown,
+): action is ActionWithSkipLoading {
+  return (
+    isAction(action) &&
+    'skipLoading' in action &&
+    typeof action.skipLoading === 'boolean'
+  );
+}
+
 export const loadingBarMiddleware = (
   config: Config = {},
-): Middleware<unknown, RootState> => {
+): Middleware<{ skipLoading?: boolean }, RootState> => {
   const promiseTypeSuffixes = config.promiseTypeSuffixes ?? defaultTypeSuffixes;
 
   return ({ dispatch }) =>
     (next) =>
-    (action: AnyAction) => {
+    (action) => {
       let isPending = false;
       let isFulfilled = false;
       let isRejected = false;
@@ -39,7 +55,7 @@ export const loadingBarMiddleware = (
         else if (isThunkActionFulfilled(action)) isFulfilled = true;
         else if (isThunkActionRejected(action)) isRejected = true;
       } else if (
-        action.type &&
+        isActionWithSkipLoading(action) &&
         !action.skipLoading &&
         typeof action.type === 'string'
       ) {
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 09ade7d753..51839f427a 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -1,4 +1,5 @@
-import type { Middleware, AnyAction } from 'redux';
+import { isAction } from '@reduxjs/toolkit';
+import type { Middleware, UnknownAction } from '@reduxjs/toolkit';
 
 import ready from 'mastodon/ready';
 import { assetHost } from 'mastodon/utils/config';
@@ -10,6 +11,21 @@ interface AudioSource {
   type: string;
 }
 
+interface ActionWithMetaSound extends UnknownAction {
+  meta: { sound: string };
+}
+
+function isActionWithMetaSound(action: unknown): action is ActionWithMetaSound {
+  return (
+    isAction(action) &&
+    'meta' in action &&
+    typeof action.meta === 'object' &&
+    !!action.meta &&
+    'sound' in action.meta &&
+    typeof action.meta.sound === 'string'
+  );
+}
+
 const createAudio = (sources: AudioSource[]) => {
   const audio = new Audio();
   sources.forEach(({ type, src }) => {
@@ -34,7 +50,10 @@ const play = (audio: HTMLAudioElement) => {
   void audio.play();
 };
 
-export const soundsMiddleware = (): Middleware<unknown, RootState> => {
+export const soundsMiddleware = (): Middleware<
+  Record<string, never>,
+  RootState
+> => {
   const soundCache: Record<string, HTMLAudioElement> = {};
 
   void ready(() => {
@@ -50,15 +69,15 @@ export const soundsMiddleware = (): Middleware<unknown, RootState> => {
     ]);
   });
 
-  return () =>
-    (next) =>
-    (action: AnyAction & { meta?: { sound?: string } }) => {
-      const sound = action.meta?.sound;
+  return () => (next) => (action) => {
+    if (isActionWithMetaSound(action)) {
+      const sound = action.meta.sound;
 
       if (sound && Object.hasOwn(soundCache, sound)) {
         play(soundCache[sound]);
       }
+    }
 
-      return next(action);
-    };
+    return next(action);
+  };
 };
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index f1e71385a8..46a10b8b47 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,7 +1,7 @@
-import type { TypedUseSelectorHook } from 'react-redux';
-import { useDispatch, useSelector } from 'react-redux';
-
 import { createAsyncThunk } from '@reduxjs/toolkit';
+import type { TypedUseSelectorHook } from 'react-redux';
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import { useDispatch, useSelector } from 'react-redux';
 
 import type { AppDispatch, RootState } from './store';
 
diff --git a/config/webpack/rules/babel.js b/config/webpack/rules/babel.js
index 2811a1674d..c7bf886e79 100644
--- a/config/webpack/rules/babel.js
+++ b/config/webpack/rules/babel.js
@@ -7,8 +7,14 @@ module.exports = {
   include: [
     settings.source_path,
     ...settings.resolved_paths,
+    'node_modules/@reduxjs'
   ].map(p => resolve(p)),
-  exclude: /node_modules/,
+  exclude: function(modulePath) {
+    return (
+      /node_modules/.test(modulePath) &&
+      !/@reduxjs/.test(modulePath)
+    );
+  },
   use: [
     {
       loader: 'babel-loader',
diff --git a/package.json b/package.json
index a5b6a228ca..16ed4decaa 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@github/webauthn-json": "^2.1.1",
     "@material-symbols/svg-600": "^0.14.0",
     "@rails/ujs": "^7.1.1",
-    "@reduxjs/toolkit": "^1.9.5",
+    "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
     "arrow-key-navigation": "^1.2.0",
     "async-mutex": "^0.4.0",
@@ -106,8 +106,8 @@
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.5",
     "react-overlays": "^5.2.1",
-    "react-redux": "^8.0.4",
-    "react-redux-loading-bar": "^5.0.4",
+    "react-redux": "^9.0.4",
+    "react-redux-loading-bar": "^5.0.8",
     "react-router": "^5.3.4",
     "react-router-dom": "^5.3.4",
     "react-router-scroll-4": "^1.0.0-beta.1",
@@ -116,12 +116,9 @@
     "react-swipeable-views": "^0.14.0",
     "react-textarea-autosize": "^8.4.1",
     "react-toggle": "^4.1.3",
-    "redux": "^4.2.1",
     "redux-immutable": "^4.0.0",
-    "redux-thunk": "^2.4.2",
     "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
-    "reselect": "^4.1.8",
     "rimraf": "^5.0.1",
     "sass": "^1.62.1",
     "sass-loader": "^10.2.0",
diff --git a/yarn.lock b/yarn.lock
index 70d98332ad..71ed44a446 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1483,7 +1483,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
   version: 7.23.7
   resolution: "@babel/runtime@npm:7.23.7"
   dependencies:
@@ -2302,7 +2302,7 @@ __metadata:
     "@github/webauthn-json": "npm:^2.1.1"
     "@material-symbols/svg-600": "npm:^0.14.0"
     "@rails/ujs": "npm:^7.1.1"
-    "@reduxjs/toolkit": "npm:^1.9.5"
+    "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
     "@testing-library/jest-dom": "npm:^6.0.0"
     "@testing-library/react": "npm:^14.0.0"
@@ -2410,8 +2410,8 @@ __metadata:
     react-motion: "npm:^0.5.2"
     react-notification: "npm:^6.8.5"
     react-overlays: "npm:^5.2.1"
-    react-redux: "npm:^8.0.4"
-    react-redux-loading-bar: "npm:^5.0.4"
+    react-redux: "npm:^9.0.4"
+    react-redux-loading-bar: "npm:^5.0.8"
     react-router: "npm:^5.3.4"
     react-router-dom: "npm:^5.3.4"
     react-router-scroll-4: "npm:^1.0.0-beta.1"
@@ -2421,12 +2421,9 @@ __metadata:
     react-test-renderer: "npm:^18.2.0"
     react-textarea-autosize: "npm:^8.4.1"
     react-toggle: "npm:^4.1.3"
-    redux: "npm:^4.2.1"
     redux-immutable: "npm:^4.0.0"
-    redux-thunk: "npm:^2.4.2"
     regenerator-runtime: "npm:^0.14.0"
     requestidlecallback: "npm:^0.3.0"
-    reselect: "npm:^4.1.8"
     rimraf: "npm:^5.0.1"
     sass: "npm:^1.62.1"
     sass-loader: "npm:^10.2.0"
@@ -2622,23 +2619,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@reduxjs/toolkit@npm:^1.9.5":
-  version: 1.9.7
-  resolution: "@reduxjs/toolkit@npm:1.9.7"
+"@reduxjs/toolkit@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@reduxjs/toolkit@npm:2.0.1"
   dependencies:
-    immer: "npm:^9.0.21"
-    redux: "npm:^4.2.1"
-    redux-thunk: "npm:^2.4.2"
-    reselect: "npm:^4.1.8"
+    immer: "npm:^10.0.3"
+    redux: "npm:^5.0.0"
+    redux-thunk: "npm:^3.1.0"
+    reselect: "npm:^5.0.1"
   peerDependencies:
     react: ^16.9.0 || ^17.0.0 || ^18
-    react-redux: ^7.2.1 || ^8.0.2
+    react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
   peerDependenciesMeta:
     react:
       optional: true
     react-redux:
       optional: true
-  checksum: fa0aa4b7c6973ac87ce0ac7e45faa02c73b66c4ee0bc950d178494539a42a1bb908d109297102458b7ea14d5e7dae356e7a7ce9a1b9849b0e8451e6dd70fca9c
+  checksum: 161b9b8e11d9688890ab97b604a4c10c0d41b1369425a5fa821586932db4cd5a391d15799732b3612e6120a6336458ff577ff254219315c05ecd68da5d15fd79
   languageName: node
   linkType: hard
 
@@ -9128,10 +9125,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immer@npm:^9.0.21":
-  version: 9.0.21
-  resolution: "immer@npm:9.0.21"
-  checksum: 03ea3ed5d4d72e8bd428df4a38ad7e483ea8308e9a113d3b42e0ea2cc0cc38340eb0a6aca69592abbbf047c685dbda04e3d34bf2ff438ab57339ed0a34cc0a05
+"immer@npm:^10.0.3":
+  version: 10.0.3
+  resolution: "immer@npm:10.0.3"
+  checksum: 282a4f8479a40f7d12b2b3243c095e3e892bf99058e2ffcdd6b8e9fd143e6a90f2717ab9b6c8b97c927ffb8054465c8f647056f41660dbfd672e240cf1063503
   languageName: node
   linkType: hard
 
@@ -13104,7 +13101,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+  version: 6.0.13
+  resolution: "postcss-selector-parser@npm:6.0.13"
+  dependencies:
+    cssesc: "npm:^3.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: 51f099b27f7c7198ea1826470ef0adfa58b3bd3f59b390fda123baa0134880a5fa9720137b6009c4c1373357b144f700b0edac73335d0067422063129371444e
+  languageName: node
+  linkType: hard
+
+"postcss-selector-parser@npm:^6.0.15":
   version: 6.0.15
   resolution: "postcss-selector-parser@npm:6.0.15"
   dependencies:
@@ -13693,7 +13700,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-redux-loading-bar@npm:^5.0.4":
+"react-redux-loading-bar@npm:^5.0.8":
   version: 5.0.8
   resolution: "react-redux-loading-bar@npm:5.0.8"
   dependencies:
@@ -13708,35 +13715,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-redux@npm:^8.0.4":
-  version: 8.1.3
-  resolution: "react-redux@npm:8.1.3"
+"react-redux@npm:^9.0.4":
+  version: 9.0.4
+  resolution: "react-redux@npm:9.0.4"
   dependencies:
-    "@babel/runtime": "npm:^7.12.1"
-    "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/use-sync-external-store": "npm:^0.0.3"
-    hoist-non-react-statics: "npm:^3.3.2"
-    react-is: "npm:^18.0.0"
     use-sync-external-store: "npm:^1.0.0"
   peerDependencies:
-    "@types/react": ^16.8 || ^17.0 || ^18.0
-    "@types/react-dom": ^16.8 || ^17.0 || ^18.0
-    react: ^16.8 || ^17.0 || ^18.0
-    react-dom: ^16.8 || ^17.0 || ^18.0
-    react-native: ">=0.59"
-    redux: ^4 || ^5.0.0-beta.0
+    "@types/react": ^18.2.25
+    react: ^18.0
+    react-native: ">=0.69"
+    redux: ^5.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-    "@types/react-dom":
-      optional: true
-    react-dom:
-      optional: true
     react-native:
       optional: true
     redux:
       optional: true
-  checksum: 64c8be2765568dc66a3c442a41dd0ed74fe048d5ceb7a4fe72e5bac3d3687996a7115f57b5156af7406521087065a0e60f9194318c8ca99c55e9ce48558980ce
+  checksum: 23af10014b129aeb051de729bde01de21175170b860deefb7ad83483feab5816253f770a4cea93333fc22a53ac9ac699b27f5c3705c388dab53dbcb2906a571a
   languageName: node
   linkType: hard
 
@@ -14039,16 +14036,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redux-thunk@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "redux-thunk@npm:2.4.2"
+"redux-thunk@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "redux-thunk@npm:3.1.0"
   peerDependencies:
-    redux: ^4
-  checksum: e202d6ef7dfa7df08ed24cb221aa89d6c84dbaa7d65fe90dbd8e826d0c10d801f48388f9a7598a4fd970ecbc93d335014570a61ca7bc8bf569eab5de77b31a3c
+    redux: ^5.0.0
+  checksum: 21557f6a30e1b2e3e470933247e51749be7f1d5a9620069a3125778675ce4d178d84bdee3e2a0903427a5c429e3aeec6d4df57897faf93eb83455bc1ef7b66fd
   languageName: node
   linkType: hard
 
-"redux@npm:^4.0.0, redux@npm:^4.2.1":
+"redux@npm:^4.0.0":
   version: 4.2.1
   resolution: "redux@npm:4.2.1"
   dependencies:
@@ -14057,6 +14054,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"redux@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "redux@npm:5.0.1"
+  checksum: b10c28357194f38e7d53b760ed5e64faa317cc63de1fb95bc5d9e127fab956392344368c357b8e7a9bedb0c35b111e7efa522210cfdc3b3c75e5074718e9069c
+  languageName: node
+  linkType: hard
+
 "reflect.getprototypeof@npm:^1.0.4":
   version: 1.0.4
   resolution: "reflect.getprototypeof@npm:1.0.4"
@@ -14226,10 +14230,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^4.1.8":
-  version: 4.1.8
-  resolution: "reselect@npm:4.1.8"
-  checksum: 06a305a504affcbb67dd0561ddc8306b35796199c7e15b38934c80606938a021eadcf68cfd58e7bb5e17786601c37602a3362a4665c7bf0a96c1041ceee9d0b7
+"reselect@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "reselect@npm:5.0.1"
+  checksum: 0724b4555cd6411849de334a75177780f127af849eb71c4b709966d07ade8090d125c0c926dc6cf936866d23ebadda6aad1da93cd8340525323b889f25d56d51
   languageName: node
   linkType: hard
 

From 4ed663a94fc53e5bd352e92afaff55f187218078 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:02:55 +0000
Subject: [PATCH 228/436] Update DefinitelyTyped types (non-major) (#28638)

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

diff --git a/yarn.lock b/yarn.lock
index 71ed44a446..da8ddf214a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3027,11 +3027,11 @@ __metadata:
   linkType: hard
 
 "@types/cors@npm:^2.8.16":
-  version: 2.8.16
-  resolution: "@types/cors@npm:2.8.16"
+  version: 2.8.17
+  resolution: "@types/cors@npm:2.8.17"
   dependencies:
     "@types/node": "npm:*"
-  checksum: ebcfb325b102739249bbaa4845cf1cf4830baf5490a32bcd1a85cd9b8c4d4b9eaaaea94423e454b5b7c9da77e46a64db80d2381d3bc3f940d15d13814e87b70a
+  checksum: 457364c28c89f3d9ed34800e1de5c6eaaf344d1bb39af122f013322a50bc606eb2aa6f63de4e41a7a08ba7ef454473926c94a830636723da45bf786df032696d
   languageName: node
   linkType: hard
 
@@ -3490,13 +3490,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.46
-  resolution: "@types/react@npm:18.2.46"
+  version: 18.2.47
+  resolution: "@types/react@npm:18.2.47"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 814cc67107e5e69501d65bfc371cc2c716665d2a3608d395a2f81e24c3a2875db28e2cad717dfb17017eabcffd1d68ee2c9e09ecaba3f7108d5b7fbb9888ebab
+  checksum: e98ea1827fe60636d0f7ce206397159a29fc30613fae43e349e32c10ad3c0b7e0ed2ded2f3239e07bd5a3cba8736b6114ba196acccc39905ca4a06f56a8d2841
   languageName: node
   linkType: hard
 

From 8a44b182e8c4890517ba978393a65a0a8f2a3579 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:03:04 +0100
Subject: [PATCH 229/436] Update dependency axios to v1.6.5 (#28620)

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

diff --git a/yarn.lock b/yarn.lock
index da8ddf214a..f50fa76d1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4686,13 +4686,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.4
-  resolution: "axios@npm:1.6.4"
+  version: 1.6.5
+  resolution: "axios@npm:1.6.5"
   dependencies:
     follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: daac697fa1ea9865cb48e9edb7eacd99e8a9214997f2d8e886cb61c380a613e5c270078bfc153ac96206680106c223f005f0e4bf2f3b2ddd88e559ecf970521f
+  checksum: aeb9acf87590d8aa67946072ced38e01ca71f5dfe043782c0ccea667e5dd5c45830c08afac9be3d7c894f09684b8ab2a458f497d197b73621233bcf202d9d468
   languageName: node
   linkType: hard
 

From 2ae53e655c3431336ce685c091e212b70db7792c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:04:25 +0100
Subject: [PATCH 230/436] Update dependency jsdom to v23.2.0 (#28612)

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

diff --git a/yarn.lock b/yarn.lock
index f50fa76d1a..bec7709804 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,6 +42,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@asamuzakjp/dom-selector@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@asamuzakjp/dom-selector@npm:2.0.1"
+  dependencies:
+    bidi-js: "npm:^1.0.3"
+    css-tree: "npm:^2.3.1"
+    is-potential-custom-element-name: "npm:^1.0.1"
+  checksum: 232895f16f2f9dfc637764df2529084d16e1c122057766a79b16e1d40808e09fffae28c0f0cc8376f8a1564a85dba9d4b2f140a9a0b65f4f95c960192b797037
+  languageName: node
+  linkType: hard
+
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -4950,6 +4961,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bidi-js@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "bidi-js@npm:1.0.3"
+  dependencies:
+    require-from-string: "npm:^2.0.2"
+  checksum: fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
+  languageName: node
+  linkType: hard
+
 "big-integer@npm:^1.6.44":
   version: 1.6.51
   resolution: "big-integer@npm:1.6.51"
@@ -6376,12 +6396,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cssstyle@npm:3.0.0"
+"cssstyle@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssstyle@npm:4.0.1"
   dependencies:
     rrweb-cssom: "npm:^0.6.0"
-  checksum: 23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807
+  checksum: cadf9a8b23e11f4c6d63f21291096a0b0be868bd4ab9c799daa2c5b18330e39e5281605f01da906e901b42f742df0f3b3645af6465e83377ff7d15a88ee432a0
   languageName: node
   linkType: hard
 
@@ -10637,10 +10657,11 @@ __metadata:
   linkType: hard
 
 "jsdom@npm:^23.0.0":
-  version: 23.0.1
-  resolution: "jsdom@npm:23.0.1"
+  version: 23.2.0
+  resolution: "jsdom@npm:23.2.0"
   dependencies:
-    cssstyle: "npm:^3.0.0"
+    "@asamuzakjp/dom-selector": "npm:^2.0.1"
+    cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
     form-data: "npm:^4.0.0"
@@ -10648,7 +10669,6 @@ __metadata:
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.2"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.7"
     parse5: "npm:^7.1.2"
     rrweb-cssom: "npm:^0.6.0"
     saxes: "npm:^6.0.0"
@@ -10659,14 +10679,14 @@ __metadata:
     whatwg-encoding: "npm:^3.1.1"
     whatwg-mimetype: "npm:^4.0.0"
     whatwg-url: "npm:^14.0.0"
-    ws: "npm:^8.14.2"
+    ws: "npm:^8.16.0"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^2.11.2
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 13b2b3693ccb40215d1cce77bac7a295414ee4c0a06e30167f8087c9867145ba23dbd592bd95a801cadd7b3698bfd20b9c3f2c26fd8422607f22609ed2e404ef
+  checksum: b062af50f7be59d914ba75236b7817c848ef3cd007aea1d6b8020a41eb263b7d5bd2652298106e9756b56892f773d990598778d02adab7d0d0d8e58726fc41d3
   languageName: node
   linkType: hard
 
@@ -11964,7 +11984,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
+"nwsapi@npm:^2.2.2":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
   checksum: 44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
@@ -17577,7 +17597,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.14.2":
+"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0":
   version: 8.16.0
   resolution: "ws@npm:8.16.0"
   peerDependencies:

From 832b92ac3eebb5d65f5c6a6a3d90129e26f2d59f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 06:05:10 -0500
Subject: [PATCH 231/436] Add attachment check to
 spec/service/suspend_account_service spec (#28619)

---
 spec/services/suspend_account_service_spec.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index b309ce511e..dcc8dbfd37 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -16,17 +16,24 @@ RSpec.describe SuspendAccountService, type: :service do
       list.accounts << account
 
       account.suspend!
+
+      Fabricate(:media_attachment, file: attachment_fixture('boop.ogg'), account: account)
     end
 
-    it 'unmerges from feeds of local followers and preserves suspended flag' do
+    it 'unmerges from feeds of local followers and changes file mode and preserves suspended flag' do
       expect { subject }
-        .to_not change_suspended_flag
+        .to change_file_mode
+        .and not_change_suspended_flag
       expect(FeedManager.instance).to have_received(:unmerge_from_home).with(account, local_follower)
       expect(FeedManager.instance).to have_received(:unmerge_from_list).with(account, list)
     end
 
-    def change_suspended_flag
-      change(account, :suspended?)
+    def change_file_mode
+      change { File.stat(account.media_attachments.first.file.path).mode }
+    end
+
+    def not_change_suspended_flag
+      not_change(account, :suspended?)
     end
   end
 

From 57f49c819184d7ecb6d789889671d5d6c7b4167a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 06:09:50 -0500
Subject: [PATCH 232/436] Use Arel `nulls_first` method in ordering
 CustomEmojiFilter scope (#28614)

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

diff --git a/app/models/custom_emoji_filter.rb b/app/models/custom_emoji_filter.rb
index ed7a8dda15..870cc71974 100644
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@@ -31,7 +31,7 @@ class CustomEmojiFilter
   def scope_for(key, value)
     case key.to_s
     when 'local'
-      CustomEmoji.local.left_joins(:category).reorder(Arel.sql('custom_emoji_categories.name ASC NULLS FIRST, custom_emojis.shortcode ASC'))
+      CustomEmoji.local.left_joins(:category).reorder(CustomEmojiCategory.arel_table[:name].asc.nulls_first).order(shortcode: :asc)
     when 'remote'
       CustomEmoji.remote
     when 'by_domain'

From 202951e6d97e808a487499b1e680887309fab61a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 06:15:36 -0500
Subject: [PATCH 233/436] Use Arel `in_order_of` method to generate CASE for
 `DomainBlock.by_severity` (#28617)

---
 app/models/domain_block.rb      | 2 +-
 lib/mastodon/cli/maintenance.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index ff23f8fcc4..f8058324a3 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -31,7 +31,7 @@ class DomainBlock < ApplicationRecord
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
   scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
   scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
-  scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) }
+  scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
 
   def to_log_human_identifier
     domain
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 7b3a9852a6..f37662aa06 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -41,7 +41,8 @@ module Mastodon::CLI
     class SoftwareUpdate < ApplicationRecord; end
 
     class DomainBlock < ApplicationRecord
-      scope :by_severity, -> { order(Arel.sql('(CASE severity WHEN 0 THEN 1 WHEN 1 THEN 2 WHEN 2 THEN 0 END), domain')) }
+      enum severity: { silence: 0, suspend: 1, noop: 2 }
+      scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
     end
 
     class PreviewCard < ApplicationRecord

From aa6d07dbd9c9ae20e690c88f34d3764d91ee2cef Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 06:20:59 -0500
Subject: [PATCH 234/436] Use normalizes to prepare CustomEmoji `domain` value
 (#28624)

---
 app/models/custom_emoji.rb       |  6 +-----
 spec/models/custom_emoji_spec.rb | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 97b1c63bf3..550f005d59 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -41,7 +41,7 @@ class CustomEmoji < ApplicationRecord
 
   has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' } }, validate_media_type: false
 
-  before_validation :downcase_domain
+  normalizes :domain, with: ->(domain) { domain.downcase }
 
   validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true, size: { less_than: LIMIT }
   validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: 2 }
@@ -95,8 +95,4 @@ class CustomEmoji < ApplicationRecord
   def remove_entity_cache
     Rails.cache.delete(EntityCache.instance.to_key(:emoji, shortcode, domain))
   end
-
-  def downcase_domain
-    self.domain = domain.downcase unless domain.nil?
-  end
 end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 06affd634a..a0903e5978 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -78,12 +78,23 @@ RSpec.describe CustomEmoji do
     end
   end
 
-  describe 'pre_validation' do
-    let(:custom_emoji) { Fabricate(:custom_emoji, domain: 'wWw.MaStOdOn.CoM') }
+  describe 'Normalizations' do
+    describe 'downcase domain value' do
+      context 'with a mixed case domain value' do
+        it 'normalizes the value to downcased' do
+          custom_emoji = Fabricate.build(:custom_emoji, domain: 'wWw.MaStOdOn.CoM')
 
-    it 'downcases' do
-      custom_emoji.valid?
-      expect(custom_emoji.domain).to eq('www.mastodon.com')
+          expect(custom_emoji.domain).to eq('www.mastodon.com')
+        end
+      end
+
+      context 'with a nil domain value' do
+        it 'leaves the value as nil' do
+          custom_emoji = Fabricate.build(:custom_emoji, domain: nil)
+
+          expect(custom_emoji.domain).to be_nil
+        end
+      end
     end
   end
 end

From 1bc5a52139b4a33568c7c9bab96bd24a291fc482 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 06:22:16 -0500
Subject: [PATCH 235/436] Extract SQL heredoc method for Announcement scopes
 (#28613)

---
 app/models/announcement.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 83a8d3682c..00529766a4 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -21,8 +21,8 @@ class Announcement < ApplicationRecord
   scope :unpublished, -> { where(published: false) }
   scope :published, -> { where(published: true) }
   scope :without_muted, ->(account) { joins("LEFT OUTER JOIN announcement_mutes ON announcement_mutes.announcement_id = announcements.id AND announcement_mutes.account_id = #{account.id}").where(announcement_mutes: { id: nil }) }
-  scope :chronological, -> { order(Arel.sql('COALESCE(announcements.starts_at, announcements.scheduled_at, announcements.published_at, announcements.created_at) ASC')) }
-  scope :reverse_chronological, -> { order(Arel.sql('COALESCE(announcements.starts_at, announcements.scheduled_at, announcements.published_at, announcements.created_at) DESC')) }
+  scope :chronological, -> { order(coalesced_chronology_timestamps.asc) }
+  scope :reverse_chronological, -> { order(coalesced_chronology_timestamps.desc) }
 
   has_many :announcement_mutes, dependent: :destroy
   has_many :announcement_reactions, dependent: :destroy
@@ -33,6 +33,16 @@ class Announcement < ApplicationRecord
 
   before_validation :set_published, on: :create
 
+  class << self
+    def coalesced_chronology_timestamps
+      Arel.sql(
+        <<~SQL.squish
+          COALESCE(announcements.starts_at, announcements.scheduled_at, announcements.published_at, announcements.created_at)
+        SQL
+      )
+    end
+  end
+
   def to_log_human_identifier
     text
   end

From 157fc699547e409a2849a1842456ce36d5d545b1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 8 Jan 2024 13:29:05 +0100
Subject: [PATCH 236/436] Make request_pool_spec tests more robust (#28610)

---
 spec/lib/request_pool_spec.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec/lib/request_pool_spec.rb b/spec/lib/request_pool_spec.rb
index bdb0859d76..a31d078327 100644
--- a/spec/lib/request_pool_spec.rb
+++ b/spec/lib/request_pool_spec.rb
@@ -33,14 +33,12 @@ describe RequestPool do
 
       subject
 
-      threads = Array.new(3) do
+      threads = Array.new(5) do
         Thread.new do
-          2.times do
-            subject.with('http://example.com') do |http_client|
-              http_client.get('/').flush
-              # Nudge scheduler to yield and exercise the full pool
-              sleep(0)
-            end
+          subject.with('http://example.com') do |http_client|
+            http_client.get('/').flush
+            # Nudge scheduler to yield and exercise the full pool
+            sleep(0.01)
           end
         end
       end

From cc67943df293e3d3d721cc416e613ed3ac1cff7f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 13:46:25 +0100
Subject: [PATCH 237/436] New Crowdin Translations (automated) (#28627)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/br.json  |  97 ++++++++++--
 app/javascript/mastodon/locales/de.json  |   2 +-
 app/javascript/mastodon/locales/ia.json  | 193 ++++++++++++++++++++++-
 app/javascript/mastodon/locales/ja.json  |   4 +-
 app/javascript/mastodon/locales/lad.json |   1 +
 app/javascript/mastodon/locales/vi.json  |  38 ++---
 config/locales/bg.yml                    |   1 +
 config/locales/br.yml                    |  30 +++-
 config/locales/de.yml                    |   1 +
 config/locales/devise.ia.yml             |   6 +
 config/locales/devise.ie.yml             |  24 +++
 config/locales/doorkeeper.br.yml         |   1 +
 config/locales/doorkeeper.ia.yml         |  13 ++
 config/locales/doorkeeper.ie.yml         |  21 +++
 config/locales/et.yml                    |   1 +
 config/locales/fr-QC.yml                 |   1 +
 config/locales/fr.yml                    |   1 +
 config/locales/ia.yml                    |  47 ++++++
 config/locales/ie.yml                    |  18 +++
 config/locales/is.yml                    |   1 +
 config/locales/ja.yml                    |   1 +
 config/locales/lad.yml                   |   1 +
 config/locales/nl.yml                    |   2 +-
 config/locales/nn.yml                    |   2 +-
 config/locales/simple_form.br.yml        |   7 +-
 config/locales/simple_form.ie.yml        |  27 ++++
 config/locales/sk.yml                    |   2 +
 config/locales/sv.yml                    |   1 +
 config/locales/vi.yml                    |   4 +-
 config/locales/zh-TW.yml                 |   1 +
 30 files changed, 510 insertions(+), 39 deletions(-)

diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index bea8b27b77..462a5b3393 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -21,6 +21,7 @@
   "account.blocked": "Stanket",
   "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
+  "account.copy": "Eilañ al liamm war-zu ho profil",
   "account.disable_notifications": "Paouez d'am c'hemenn pa vez embannet traoù gant @{name}",
   "account.domain_blocked": "Domani stanket",
   "account.edit_profile": "Kemmañ ar profil",
@@ -28,8 +29,9 @@
   "account.endorse": "Lakaat war-wel war ar profil",
   "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
   "account.featured_tags.last_status_never": "Toud ebet",
-  "account.featured_tags.title": "Penngerioù-klik {name}",
+  "account.featured_tags.title": "Hashtagoù pennañ {name}",
   "account.follow": "Heuliañ",
+  "account.follow_back": "Heuliañ d'ho tro",
   "account.followers": "Tud koumanantet",
   "account.followers.empty": "Den na heul an implijer·ez-mañ c'hoazh.",
   "account.followers_counter": "{count, plural, other{{counter} Heulier·ez}}",
@@ -38,6 +40,7 @@
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
   "account.go_to_profile": "Gwelet ar profil",
   "account.hide_reblogs": "Kuzh skignadennoù gant @{name}",
+  "account.in_memoriam": "E koun.",
   "account.joined_short": "Amañ abaoe",
   "account.languages": "Cheñch ar yezhoù koumanantet",
   "account.link_verified_on": "Gwiriet eo bet perc'hennidigezh al liamm d'an deiziad-mañ : {date}",
@@ -49,11 +52,13 @@
   "account.mute_notifications_short": "Kuzhat ar c'hemennoù",
   "account.mute_short": "Kuzhat",
   "account.muted": "Kuzhet",
+  "account.no_bio": "Deskrivadur ebet da gaout.",
   "account.open_original_page": "Digeriñ ar bajenn orin",
-  "account.posts": "Toudoù",
-  "account.posts_with_replies": "Toudoù ha respontoù",
+  "account.posts": "Embannadurioù",
+  "account.posts_with_replies": "Embannadurioù ha respontoù",
   "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.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toud} two {{counter} Doud} other {{counter} a Doudoù}}",
@@ -102,6 +107,7 @@
   "column.community": "Red-amzer lec'hel",
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
+  "column.favourites": "Muiañ-karet",
   "column.follow_requests": "Rekedoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
@@ -122,6 +128,9 @@
   "community.column_settings.remote_only": "Nemet a-bell",
   "compose.language.change": "Cheñch yezh",
   "compose.language.search": "Klask yezhoù...",
+  "compose.published.body": "Embannet.",
+  "compose.published.open": "Digeriñ",
+  "compose.saved.body": "Enrollet.",
   "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
   "compose_form.encryption_warning": "Toudoù war Mastodon na vezont ket sifret penn-da-benn. Na rannit ket titouroù kizidik dre Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
@@ -158,6 +167,7 @@
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
   "confirmations.domain_block.confirm": "Berzañ an domani a-bezh",
   "confirmations.domain_block.message": "Ha sur oc'h e fell deoc'h berzañ an {domain} a-bezh? Peurvuiañ eo trawalc'h berzañ pe mudañ un nebeud implijer·ezed·ien. Ne welot danvez ebet o tont eus an domani-mañ. Dilamet e vo ar c'houmanantoù war an domani-mañ.",
+  "confirmations.edit.confirm": "Kemmañ",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
@@ -172,7 +182,9 @@
   "conversation.mark_as_read": "Merkañ evel lennet",
   "conversation.open": "Gwelout ar gaozeadenn",
   "conversation.with": "Gant {names}",
+  "copy_icon_button.copied": "Eilet er golver",
   "copypaste.copied": "Eilet",
+  "copypaste.copy_to_clipboard": "Eilañ er golver",
   "directory.federated": "Eus ar fedibed anavezet",
   "directory.local": "Eus {domain} hepken",
   "directory.new_arrivals": "Degouezhet a-nevez",
@@ -209,7 +221,8 @@
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
   "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
   "empty_column.follow_requests": "N'ho peus reked heuliañ ebet c'hoazh. Pa vo resevet unan e teuio war wel amañ.",
-  "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.",
+  "empty_column.followed_tags": "N'emaoc'h oc'h heuliañ hashtag ebet evit poent. Pa vioc'h e vo d'o gwelet amañ.",
+  "empty_column.hashtag": "N'eus netra en hashtag-mañ c'hoazh.",
   "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.",
   "empty_column.list": "Goullo eo al listenn-mañ evit c'hoazh. Pa vo embannet toudoù nevez gant e izili e teuint war wel amañ.",
   "empty_column.lists": "N'ho peus roll ebet c'hoazh. Pa vo krouet unan ganeoc'h e vo diskouezet amañ.",
@@ -223,7 +236,11 @@
   "errors.unexpected_crash.copy_stacktrace": "Eilañ ar roudoù diveugañ er golver",
   "errors.unexpected_crash.report_issue": "Danevellañ ur fazi",
   "explore.search_results": "Disoc'hoù an enklask",
+  "explore.suggested_follows": "Tud",
   "explore.title": "Furchal",
+  "explore.trending_links": "Keleier",
+  "explore.trending_statuses": "Embannadurioù",
+  "explore.trending_tags": "Hashtagoù",
   "filter_modal.added.context_mismatch_title": "Kenarroud digenglotus !",
   "filter_modal.added.expired_title": "Sil deuet d'e dermen !",
   "filter_modal.added.review_and_configure_title": "Arventennoù ar sil",
@@ -237,9 +254,13 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
+  "firehose.all": "Pep tra",
+  "firehose.local": "Ar servijer-mañ",
+  "firehose.remote": "Servijerioù all",
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
   "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "followed_tags": "Hashtagoù o heuliañ",
   "footer.about": "Diwar-benn",
   "footer.directory": "Kavlec'h ar profiloù",
   "footer.get_app": "Pellgargañ an arload",
@@ -247,29 +268,40 @@
   "footer.keyboard_shortcuts": "Berradennoù klavier",
   "footer.privacy_policy": "Reolennoù prevezded",
   "footer.source_code": "Gwelet kod mammenn",
+  "footer.status": "Statud",
   "generic.saved": "Enrollet",
   "getting_started.heading": "Loc'hañ",
-  "hashtag.column_header.tag_mode.all": "ha {additional}",
+  "hashtag.column_header.tag_mode.all": "ha(g) {additional}",
   "hashtag.column_header.tag_mode.any": "pe {additional}",
   "hashtag.column_header.tag_mode.none": "hep {additional}",
   "hashtag.column_settings.select.no_options_message": "N'eus bet kavet ali ebet",
-  "hashtag.column_settings.select.placeholder": "Ouzhpennañ gerioù-klik…",
-  "hashtag.column_settings.tag_mode.all": "An holl elfennoù-mañ",
+  "hashtag.column_settings.select.placeholder": "Ouzhpennañ hashtagoù…",
+  "hashtag.column_settings.tag_mode.all": "An holl anezho",
   "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
   "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
   "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} embannadur} other {{counter} embannadur}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} embannadur} other {{counter} embannadur}} hiziv",
   "hashtag.follow": "Heuliañ ar ger-klik",
-  "hashtag.unfollow": "Diheuliañ ar ger-klik",
+  "hashtag.unfollow": "Paouez heuliañ an hashtag",
+  "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
+  "home.actions.go_to_explore": "Gwelet petra zo diouzh ar c'hiz",
+  "home.actions.go_to_suggestions": "Kavout tud da heuliañ",
   "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
+  "home.explore_prompt.title": "Homañ eo ho pajenn degemer e-barzh Mastodon.",
   "home.hide_announcements": "Kuzhat ar c'hemennoù",
+  "home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
+  "home.pending_critical_update.link": "Gwelet an hizivadennoù",
   "home.show_announcements": "Diskouez ar c'hemennoù",
   "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
   "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
   "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
+  "interaction_modal.no_account_yet": "N'eo ket war vMastodon?",
   "interaction_modal.on_another_server": "War ur servijer all",
   "interaction_modal.on_this_server": "War ar servijer-mañ",
+  "interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
   "interaction_modal.title.follow": "Heuliañ {name}",
   "interaction_modal.title.reblog": "Skignañ toud {name}",
   "interaction_modal.title.reply": "Respont da doud {name}",
@@ -285,6 +317,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Diskennañ er roll",
   "keyboard_shortcuts.enter": "Digeriñ an toud",
+  "keyboard_shortcuts.favourite": "Ouzhpennañ an embannadur d'ar re vuiañ-karet",
+  "keyboard_shortcuts.favourites": "Digeriñ roll an embannadurioù muiañ-karet",
   "keyboard_shortcuts.federated": "Digeriñ ar red-amzer kevredet",
   "keyboard_shortcuts.heading": "Berradennoù klavier",
   "keyboard_shortcuts.home": "Digeriñ ho red-amzer degemer",
@@ -314,6 +348,7 @@
   "lightbox.next": "Da-heul",
   "lightbox.previous": "A-raok",
   "limited_account_hint.action": "Diskouez an aelad memes tra",
+  "link_preview.author": "Gant {name}",
   "lists.account.add": "Ouzhpennañ d'al listenn",
   "lists.account.remove": "Lemel kuit eus al listenn",
   "lists.delete": "Dilemel al listenn",
@@ -328,6 +363,7 @@
   "lists.search": "Klask e-touez tud heuliet ganeoc'h",
   "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
+  "loading_indicator.label": "O kargañ…",
   "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
   "mute_modal.duration": "Padelezh",
   "mute_modal.hide_notifications": "Kuzhat kemenadennoù eus an implijer-se ?",
@@ -341,8 +377,10 @@
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
   "navigation_bar.edit_profile": "Kemmañ ar profil",
   "navigation_bar.explore": "Furchal",
+  "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
   "navigation_bar.follow_requests": "Pedadoù heuliañ",
+  "navigation_bar.followed_tags": "Hashtagoù o heuliañ",
   "navigation_bar.follows_and_followers": "Heuliadennoù ha heulier·ezed·ien",
   "navigation_bar.lists": "Listennoù",
   "navigation_bar.logout": "Digennaskañ",
@@ -369,6 +407,7 @@
   "notifications.column_settings.admin.report": "Disklêriadurioù nevez :",
   "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
+  "notifications.column_settings.favourite": "Muiañ-karet:",
   "notifications.column_settings.filter_bar.advanced": "Skrammañ an-holl rummadoù",
   "notifications.column_settings.filter_bar.category": "Barrenn siloù prim",
   "notifications.column_settings.filter_bar.show_bar": "Diskouezh barrenn siloù",
@@ -386,6 +425,7 @@
   "notifications.column_settings.update": "Kemmoù :",
   "notifications.filter.all": "Pep tra",
   "notifications.filter.boosts": "Skignadennoù",
+  "notifications.filter.favourites": "Muiañ-karet",
   "notifications.filter.follows": "Heuliañ",
   "notifications.filter.mentions": "Menegoù",
   "notifications.filter.polls": "Disoc'hoù ar sontadegoù",
@@ -399,15 +439,28 @@
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
+  "onboarding.action.back": "Distreiñ",
+  "onboarding.actions.back": "Distreiñ",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.compose.template": "Salud #Mastodon!",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Anv diskouezet",
+  "onboarding.profile.display_name_hint": "Hoc'h anv klok pe hoc'h anv fentus…",
+  "onboarding.profile.note": "Berr-ha-berr",
+  "onboarding.profile.note_hint": "Gallout a rit @menegiñ tud all pe #hashtagoù…",
+  "onboarding.profile.save_and_continue": "Enrollañ ha kenderc'hel",
+  "onboarding.profile.upload_avatar": "Enporzhiañ ur skeudenn profil",
+  "onboarding.share.message": "Me a zo {username} war #Mastodon! Heuilhit ac'hanon war {url}",
+  "onboarding.share.title": "Skignañ ho profil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.title": "Deuet oc'h a-benn!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Grit hoc'h embannadur kentañ",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -415,6 +468,7 @@
   "picture_in_picture.restore": "Adlakaat",
   "poll.closed": "Serret",
   "poll.refresh": "Azbevaat",
+  "poll.reveal": "Gwelet an disoc'hoù",
   "poll.total_people": "{count, plural, one {# den} other {# a zen}}",
   "poll.total_votes": "{count, plural, one {# votadenn} other {# votadenn}}",
   "poll.vote": "Mouezhiañ",
@@ -433,6 +487,7 @@
   "privacy.unlisted.short": "Anlistennet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
+  "recommended": "Erbedet",
   "refresh": "Freskaat",
   "regeneration_indicator.label": "O kargañ…",
   "regeneration_indicator.sublabel": "War brientiñ emañ ho red degemer!",
@@ -450,6 +505,7 @@
   "reply_indicator.cancel": "Nullañ",
   "report.block": "Stankañ",
   "report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
+  "report.categories.legal": "Lezennel",
   "report.categories.other": "All",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Torret e vez gant an endalc'had unan pe meur a reolenn",
@@ -467,6 +523,7 @@
   "report.placeholder": "Askelennoù ouzhpenn",
   "report.reasons.dislike": "Ne blij ket din",
   "report.reasons.dislike_description": "An dra-se na fell ket deoc'h gwelet",
+  "report.reasons.legal": "Enep al lezenn eo",
   "report.reasons.other": "Un abeg all eo",
   "report.reasons.other_description": "Ar gudenn na glot ket gant ar rummadoù all",
   "report.reasons.spam": "Spam eo",
@@ -482,16 +539,31 @@
   "report.thanks.title": "Ne fell ket deoc'h gwelet an dra-se ?",
   "report.thanks.title_actionable": "Trugarez evit bezañ disklêriet, emaomp o vont da glask pelloc'h.",
   "report.unfollow": "Diheuliañ @{name}",
-  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} embannadur} other {{count} embannadur}} stag",
+  "report_notification.categories.legal": "Lezennel",
   "report_notification.categories.other": "All",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Torradur da reolennoù ar servijer",
   "report_notification.open": "Digeriñ an disklêriadur",
   "search.placeholder": "Klask",
+  "search.quick_action.account_search": "Profiloù a glot gant {x}",
+  "search.quick_action.go_to_account": "Mont d'ar profil {x}",
+  "search.quick_action.go_to_hashtag": "Mont d'an hashtag {x}",
+  "search.quick_action.open_url": "Digeriñ an URL e-barzh Mastodon",
+  "search.quick_action.status_search": "Embannadurioù a glot gant {x}",
   "search.search_or_paste": "Klask pe pegañ un URL",
+  "search_popout.full_text_search_disabled_message": "N'eo ket da gaout war {domain}.",
+  "search_popout.language_code": "Kod yezh ISO",
+  "search_popout.options": "Dibarzhioù klask",
+  "search_popout.quick_actions": "Oberoù prim",
+  "search_popout.recent": "Klaskoù nevesañ",
+  "search_popout.specific_date": "deiziad resis",
+  "search_popout.user": "implijer·ez",
+  "search_results.accounts": "Profiloù",
   "search_results.all": "Pep tra",
-  "search_results.hashtags": "Gerioù-klik",
+  "search_results.hashtags": "Hashtagoù",
   "search_results.nothing_found": "Disoc'h ebet gant ar gerioù-se",
+  "search_results.see_all": "Gwelet pep tra",
   "search_results.statuses": "Toudoù",
   "search_results.title": "Klask {q}",
   "server_banner.active_users": "implijerien·ezed oberiant",
@@ -513,11 +585,15 @@
   "status.edited": "Aozet {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Enframmañ",
+  "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
   "status.filtered": "Silet",
+  "status.hide": "Kuzhat an embannadur",
   "status.history.created": "Krouet gant {name} {date}",
   "status.history.edited": "Kemmet gant {name} {date}",
   "status.load_more": "Kargañ muioc'h",
+  "status.media.open": "Klikit evit digeriñ",
+  "status.media.show": "Klikit evit diskouez",
   "status.media_hidden": "Media kuzhet",
   "status.mention": "Menegiñ @{name}",
   "status.more": "Muioc'h",
@@ -592,6 +668,7 @@
   "upload_modal.preview_label": "Rakwel ({ratio})",
   "upload_progress.label": "O pellgargañ...",
   "upload_progress.processing": "War ober…",
+  "username.taken": "Tapet eo an anv implijer-mañ dija. Klaskit skrivañ unan all",
   "video.close": "Serriñ ar video",
   "video.download": "Pellgargañ ar restr",
   "video.exit_fullscreen": "Kuitaat ar mod skramm leun",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index ddcbc58cee..2608b91563 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -62,7 +62,7 @@
   "account.requested": "Die Genehmigung steht noch aus. Klicke hier, um die Follower-Anfrage zurückzuziehen",
   "account.requested_follow": "{name} möchte dir folgen",
   "account.share": "Profil von @{name} teilen",
-  "account.show_reblogs": "Geteilte Beiträge von @{name} wieder anzeigen",
+  "account.show_reblogs": "Geteilte Beiträge von @{name} anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "account.unblock": "Blockierung von @{name} aufheben",
   "account.unblock_domain": "Blockierung von {domain} aufheben",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 00cafe260b..e790306e9c 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -2,6 +2,7 @@
   "about.blocks": "Servitores moderate",
   "about.contact": "Contacto:",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
+  "about.rules": "Regulas del servitor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Adder o remover ab listas",
   "account.badges.group": "Gruppo",
@@ -10,14 +11,43 @@
   "account.blocked": "Blocate",
   "account.copy": "Copiar ligamine a profilo",
   "account.edit_profile": "Modificar profilo",
+  "account.endorse": "Evidentiar sur le profilo",
+  "account.featured_tags.last_status_at": "Ultime message in {date}",
+  "account.featured_tags.last_status_never": "Necun messages",
+  "account.follow": "Sequer",
+  "account.follow_back": "Sequer etiam",
+  "account.followers": "Sequitores",
+  "account.following": "Sequente",
   "account.go_to_profile": "Vader al profilo",
+  "account.hide_reblogs": "Celar boosts de @{name}",
+  "account.languages": "Cambiar le linguas subscribite",
+  "account.link_verified_on": "Le proprietate de iste ligamine esseva verificate le {date}",
+  "account.locked_info": "Le stato de confidentialitate de iste conto es definite a blocate. Le proprietario revisa manualmente qui pote sequer lo.",
+  "account.mention": "Mentionar @{name}",
   "account.moved_to": "{name} indicava que lor nove conto ora es:",
+  "account.mute": "Silentiar @{name}",
+  "account.mute_notifications_short": "Silentiar le notificationes",
+  "account.mute_short": "Silentiar",
+  "account.muted": "Silentiate",
+  "account.no_bio": "Nulle description fornite.",
+  "account.posts": "Messages",
+  "account.posts_with_replies": "Messages e responsas",
   "account.share": "Compartir profilo de @{name}",
+  "account.show_reblogs": "Monstrar responsas de @{name}",
   "account.unblock": "Disblocar @{name}",
+  "account.unblock_domain": "Disblocar dominio {domain}",
   "account.unblock_short": "Disblocar",
   "account.unendorse": "Non evidentiar sur le profilo",
+  "account.unmute": "Non plus silentiar @{name}",
+  "account.unmute_notifications_short": "Non plus silentiar le notificationes",
+  "account.unmute_short": "Non plus silentiar",
   "account_note.placeholder": "Clicca pro adder un nota",
   "admin.dashboard.retention.cohort_size": "Nove usatores",
+  "admin.impact_report.instance_followers": "Sequitores que nostre usatores poterea perder",
+  "admin.impact_report.instance_follows": "Sequitores que lor usatores poterea perder",
+  "alert.rate_limited.message": "Retenta depost {retry_time, time, medium}.",
+  "alert.unexpected.message": "Ocurreva un error inexpectate.",
+  "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
   "autosuggest_hashtag.per_week": "{count} per septimana",
   "bundle_column_error.network.title": "Error de rete",
@@ -25,99 +55,260 @@
   "bundle_column_error.return": "Retornar al initio",
   "bundle_modal_error.close": "Clauder",
   "bundle_modal_error.retry": "Tentar novemente",
+  "closed_registrations_modal.find_another_server": "Trovar altere servitor",
   "column.about": "A proposito de",
   "column.blocks": "Usatores blocate",
   "column.bookmarks": "Marcapaginas",
+  "column.community": "Chronologia local",
+  "column.direct": "Mentiones private",
   "column.directory": "Navigar profilos",
+  "column.domain_blocks": "Dominios blocate",
   "column.favourites": "Favoritos",
   "column.firehose": "Fluxos in directe",
   "column.home": "Initio",
   "column.lists": "Listas",
+  "column.mutes": "Usatores silentiate",
   "column.notifications": "Notificationes",
+  "column.public": "Chronologia federate",
   "column_header.hide_settings": "Celar le parametros",
+  "column_header.moveLeft_settings": "Mover columna al sinistra",
+  "column_header.moveRight_settings": "Mover columna al dextra",
   "column_header.show_settings": "Monstrar le parametros",
   "column_subheading.settings": "Parametros",
   "compose.language.change": "Cambiar le lingua",
   "compose.language.search": "Cercar linguas...",
+  "compose.published.body": "Message publicate.",
   "compose.published.open": "Aperir",
+  "compose.saved.body": "Message salvate.",
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
+  "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
+  "compose_form.lock_disclaimer.lock": "blocate",
   "compose_form.poll.add_option": "Adder un option",
   "compose_form.poll.remove_option": "Remover iste option",
+  "compose_form.publish": "Publicar",
+  "compose_form.publish_form": "Nove message",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Salvar le cambiamentos",
+  "compose_form.spoiler.marked": "Remover advertimento de contento",
+  "compose_form.spoiler.unmarked": "Adder advertimento de contento",
+  "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
   "confirmation_modal.cancel": "Cancellar",
+  "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Deler",
+  "confirmations.delete.message": "Es tu secur que tu vole deler iste message?",
   "confirmations.delete_list.confirm": "Deler",
+  "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
+  "confirmations.domain_block.confirm": "Blocar le dominio complete",
   "confirmations.edit.confirm": "Modificar",
   "confirmations.logout.confirm": "Clauder le session",
+  "confirmations.logout.message": "Es tu secur que tu vole clauder le session?",
+  "confirmations.mute.confirm": "Silentiar",
+  "confirmations.mute.message": "Es tu secur que tu vole silentiar {name}?",
+  "confirmations.reply.confirm": "Responder",
+  "conversation.delete": "Deler conversation",
+  "conversation.mark_as_read": "Marcar como legite",
+  "conversation.open": "Vider conversation",
+  "conversation.with": "Con {names}",
   "copy_icon_button.copied": "Copiate al area de transferentia",
   "copypaste.copied": "Copiate",
   "copypaste.copy_to_clipboard": "Copiar al area de transferentia",
+  "directory.federated": "Ab le fediverso cognoscite",
+  "directory.local": "Solmente ab {domain}",
+  "directory.recently_active": "Recentemente active",
   "disabled_account_banner.account_settings": "Parametros de conto",
+  "disabled_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate.",
   "dismissable_banner.dismiss": "Dimitter",
   "emoji_button.activity": "Activitate",
   "emoji_button.clear": "Rader",
   "emoji_button.custom": "Personalisate",
+  "emoji_button.recent": "Frequentemente usate",
+  "emoji_button.search": "Cercar...",
   "emoji_button.search_results": "Resultatos de recerca",
+  "empty_column.account_suspended": "Conto suspendite",
+  "empty_column.account_timeline": "Nulle messages hic!",
   "empty_column.account_unavailable": "Profilo non disponibile",
+  "empty_column.blocks": "Tu non ha blocate alcun usator ancora.",
   "errors.unexpected_crash.report_issue": "Signalar un defecto",
   "explore.search_results": "Resultatos de recerca",
+  "explore.title": "Explorar",
   "explore.trending_links": "Novas",
+  "explore.trending_statuses": "Messages",
+  "explore.trending_tags": "Hashtags",
+  "filter_modal.added.review_and_configure_title": "Parametros de filtro",
+  "filter_modal.added.settings_link": "pagina de parametros",
+  "filter_modal.added.short_explanation": "Iste message esseva addite al sequente categoria de filtros: {title}.",
+  "filter_modal.added.title": "Filtro addite!",
   "filter_modal.select_filter.prompt_new": "Nove categoria: {name}",
+  "filter_modal.select_filter.search": "Cercar o crear",
+  "filter_modal.select_filter.title": "Filtrar iste message",
+  "filter_modal.title.status": "Filtrar un message",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
   "firehose.remote": "Altere servitores",
   "footer.about": "A proposito de",
   "footer.directory": "Directorio de profilos",
+  "footer.get_app": "Obtene le application",
+  "footer.keyboard_shortcuts": "Accessos directe de claviero",
   "footer.privacy_policy": "Politica de confidentialitate",
   "footer.source_code": "Vider le codice fonte",
   "footer.status": "Stato",
+  "generic.saved": "Salvate",
+  "getting_started.heading": "Prime passos",
+  "hashtag.column_header.tag_mode.all": "e {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_settings.select.no_options_message": "Nulle suggestiones trovate",
+  "hashtag.column_settings.select.placeholder": "Insere hashtags…",
+  "hashtag.follow": "Sequer hashtag",
+  "home.column_settings.show_reblogs": "Monstrar boosts",
+  "home.column_settings.show_replies": "Monstrar responsas",
+  "home.hide_announcements": "Celar annuncios",
+  "home.pending_critical_update.body": "Actualisa tu servitor de Mastodon le plus tosto possibile!",
   "home.pending_critical_update.link": "Vider actualisationes",
+  "home.show_announcements": "Monstrar annuncios",
+  "interaction_modal.no_account_yet": "Non sur Mstodon?",
+  "interaction_modal.on_another_server": "In un servitor differente",
+  "interaction_modal.on_this_server": "In iste servitor",
+  "interaction_modal.title.follow": "Sequer {name}",
+  "interaction_modal.title.reblog": "Facer boost al message de {name}",
+  "interaction_modal.title.reply": "Responder al message de {name}",
+  "keyboard_shortcuts.blocked": "Aperir lista de usatores blocate",
+  "keyboard_shortcuts.boost": "Facer boost al message",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.enter": "Aperir message",
+  "keyboard_shortcuts.favourites": "Aperir lista de favoritos",
+  "keyboard_shortcuts.federated": "Aperir le chronologia federate",
+  "keyboard_shortcuts.heading": "Accessos directe de claviero",
+  "keyboard_shortcuts.home": "Aperir le chronologia de initio",
+  "keyboard_shortcuts.local": "Aperir le chronologia local",
+  "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
+  "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
+  "keyboard_shortcuts.reply": "Responder al message",
+  "keyboard_shortcuts.spoilers": "Monstrar/celar le campo CW",
+  "keyboard_shortcuts.toot": "Initiar un nove message",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
   "link_preview.author": "Per {name}",
   "lists.account.add": "Adder al lista",
+  "lists.account.remove": "Remover ab le lista",
   "lists.delete": "Deler lista",
   "lists.edit": "Modificar lista",
+  "lists.edit.submit": "Cambiar titulo",
+  "lists.exclusive": "Celar iste messages ab le initio",
   "lists.new.create": "Adder lista",
+  "lists.new.title_placeholder": "Nove titulo del lista",
+  "lists.replies_policy.title": "Monstrar responsas a:",
   "lists.subheading": "Tu listas",
   "mute_modal.duration": "Duration",
   "mute_modal.hide_notifications": "Celar notificationes de iste usator?",
   "navigation_bar.about": "A proposito de",
   "navigation_bar.advanced_interface": "Aperir in un interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
+  "navigation_bar.bookmarks": "Marcapaginas",
+  "navigation_bar.community_timeline": "Chronologia local",
+  "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
+  "navigation_bar.domain_blocks": "Dominios blocate",
   "navigation_bar.edit_profile": "Modificar profilo",
   "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Clauder le session",
+  "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.preferences": "Preferentias",
+  "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
   "navigation_bar.security": "Securitate",
+  "notification.update": "{name} modificava un message",
+  "notifications.clear": "Rader notificationes",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
+  "notifications.column_settings.follow": "Nove sequitores:",
+  "notifications.column_settings.mention": "Mentiones:",
+  "notifications.column_settings.push": "Notificationes push",
   "notifications.column_settings.sound": "Reproducer sono",
+  "notifications.column_settings.status": "Nove messages:",
   "notifications.filter.all": "Toto",
   "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.mentions": "Mentiones",
   "notifications.grant_permission": "Conceder permission.",
   "notifications.group": "{count} notificationes",
   "onboarding.compose.template": "Salute #Mastodon!",
   "onboarding.profile.save_and_continue": "Salvar e continuar",
+  "onboarding.share.next_steps": "Sequente passos possibile:",
   "onboarding.share.title": "Compartir tu profilo",
+  "onboarding.steps.follow_people.title": "Personalisa tu fluxo de initio",
+  "onboarding.steps.publish_status.title": "Face tu prime message",
+  "onboarding.steps.setup_profile.title": "Personalisa tu profilo",
   "onboarding.steps.share_profile.title": "Compartir tu profilo de Mastodon",
+  "poll.closed": "Claudite",
+  "poll.reveal": "Vider le resultatos",
+  "privacy.change": "Cambiar privacitate del message",
+  "privacy.private.long": "Visibile solmente pro sequitores",
+  "privacy.public.long": "Visibile pro totos",
+  "privacy.public.short": "Public",
+  "privacy_policy.last_updated": "Ultime actualisation {date}",
+  "privacy_policy.title": "Politica de confidentialitate",
   "relative_time.just_now": "ora",
   "relative_time.today": "hodie",
   "reply_indicator.cancel": "Cancellar",
+  "report.block": "Blocar",
+  "report.categories.other": "Alteres",
+  "report.category.title_account": "profilo",
+  "report.category.title_status": "message",
+  "report.close": "Preste",
+  "report.mute": "Silentiar",
   "report.next": "Sequente",
   "report.placeholder": "Commentos additional",
   "report.reasons.dislike": "Non me place",
+  "report_notification.categories.other": "Alteres",
   "search.quick_action.go_to_account": "Vader al profilo {x}",
+  "search.quick_action.go_to_hashtag": "Vader al hashtag {x}",
+  "search.quick_action.open_url": "Aperir URL in Mastodon",
+  "search_popout.full_text_search_disabled_message": "Non disponibile sur {domain}.",
+  "search_popout.language_code": "Codice de lingua ISO",
+  "search_popout.options": "Optiones de recerca",
+  "search_popout.quick_actions": "Actiones rapide",
+  "search_popout.recent": "Recercas recente",
+  "search_popout.user": "usator",
   "search_results.accounts": "Profilos",
+  "search_results.hashtags": "Hashtags",
   "search_results.see_all": "Vider toto",
+  "search_results.statuses": "Messages",
+  "server_banner.learn_more": "Apprender plus",
+  "sign_in_banner.create_account": "Crear un conto",
+  "sign_in_banner.sign_in": "Initiar le session",
+  "status.block": "Blocar @{name}",
+  "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
+  "status.direct_indicator": "Mention private",
+  "status.edit": "Modificar",
+  "status.filter": "Filtrar iste message",
+  "status.hide": "Celar le message",
+  "status.history.created": "create per {name} le {date}",
+  "status.history.edited": "modificate per {name} le {date}",
+  "status.media.open": "Clicca pro aperir",
+  "status.media.show": "Clicca pro monstrar",
+  "status.more": "Plus",
+  "status.mute_conversation": "Silentiar conversation",
+  "status.read_more": "Leger plus",
   "status.share": "Compartir",
   "status.translate": "Traducer",
   "status.translated_from_with": "Traducite ab {lang} usante {provider}",
   "tabs_bar.home": "Initio",
-  "tabs_bar.notifications": "Notificationes"
+  "tabs_bar.notifications": "Notificationes",
+  "timeline_hint.resources.statuses": "Messages ancian",
+  "trends.trending_now": "Ora in tendentias",
+  "upload_form.undo": "Deler",
+  "upload_modal.choose_image": "Seliger un imagine",
+  "upload_modal.detect_text": "Deteger texto ab un pictura",
+  "video.close": "Clauder le video",
+  "video.download": "Discargar le file",
+  "video.fullscreen": "Schermo plen",
+  "video.hide": "Celar video",
+  "video.mute": "Silentiar le sono",
+  "video.pause": "Pausa",
+  "video.play": "Reproducer",
+  "video.unmute": "Non plus silentiar le sono"
 }
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 3246415759..e7aafe852a 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "投稿がありません",
   "account.featured_tags.title": "{name}の注目ハッシュタグ",
   "account.follow": "フォロー",
+  "account.follow_back": "フォローバック",
   "account.followers": "フォロワー",
   "account.followers.empty": "まだ誰もフォローしていません。",
   "account.followers_counter": "{counter} フォロワー",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "通知をオフにする",
   "account.mute_short": "ミュート",
   "account.muted": "ミュート済み",
+  "account.mutual": "相互フォロー中",
   "account.no_bio": "説明が提供されていません。",
   "account.open_original_page": "元のページを開く",
   "account.posts": "投稿",
@@ -486,7 +488,7 @@
   "onboarding.profile.display_name_hint": "フルネーム、あるいは面白い名前など",
   "onboarding.profile.lead": "あとでいつでも修正できますし、設定画面にはこれ以外のカスタマイズ項目もあります。",
   "onboarding.profile.note": "自己紹介",
-  "onboarding.profile.note_hint": "ほかの人に @言及 したり、#ハッシュタグ を付けたりできます",
+  "onboarding.profile.note_hint": "ほかのユーザーへのメンション (@mention) や、 #ハッシュタグ が使用できます",
   "onboarding.profile.save_and_continue": "保存して続ける",
   "onboarding.profile.title": "プロフィールの設定",
   "onboarding.profile.upload_avatar": "プロフィール画像をアップロード",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2067edcc70..2a911483de 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -501,6 +501,7 @@
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
   "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
+  "password_confirmation.exceeds_maxlength": "La konfirmasyon de kod es demaziado lunga",
   "password_confirmation.mismatching": "Los dos kodes son desferentes",
   "picture_in_picture.restore": "Restora",
   "poll.closed": "Serrado",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 03c6502651..9de043bb20 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -240,7 +240,7 @@
   "empty_column.follow_requests": "Bạn chưa có yêu cầu theo dõi nào.",
   "empty_column.followed_tags": "Bạn chưa theo dõi hashtag nào. Khi bạn theo dõi, chúng sẽ hiện lên ở đây.",
   "empty_column.hashtag": "Chưa có tút nào dùng hashtag này.",
-  "empty_column.home": "Trang chính của bạn đang trống! Hãy theo dõi nhiều người hơn để lấp đầy.",
+  "empty_column.home": "Trang chủ của bạn đang trống! Hãy theo dõi nhiều người hơn để lấp đầy.",
   "empty_column.list": "Chưa có tút. Khi những người trong danh sách này đăng tút mới, chúng sẽ xuất hiện ở đây.",
   "empty_column.lists": "Bạn chưa tạo danh sách nào.",
   "empty_column.mutes": "Bạn chưa ẩn bất kỳ ai.",
@@ -336,38 +336,38 @@
   "intervals.full.days": "{number, plural, other {# ngày}}",
   "intervals.full.hours": "{number, plural, other {# giờ}}",
   "intervals.full.minutes": "{number, plural, other {# phút}}",
-  "keyboard_shortcuts.back": "trở lại",
+  "keyboard_shortcuts.back": "quay lại",
   "keyboard_shortcuts.blocked": "mở danh sách người đã chặn",
   "keyboard_shortcuts.boost": "đăng lại",
-  "keyboard_shortcuts.column": "mở các mục",
+  "keyboard_shortcuts.column": "mở các cột",
   "keyboard_shortcuts.compose": "mở khung soạn tút",
   "keyboard_shortcuts.description": "Mô tả",
-  "keyboard_shortcuts.direct": "mở mục nhắn riêng",
+  "keyboard_shortcuts.direct": "mở nhắn riêng",
   "keyboard_shortcuts.down": "di chuyển xuống dưới danh sách",
-  "keyboard_shortcuts.enter": "viết tút mới",
+  "keyboard_shortcuts.enter": "mở tút",
   "keyboard_shortcuts.favourite": "thích tút",
   "keyboard_shortcuts.favourites": "mở lượt thích",
   "keyboard_shortcuts.federated": "mở mạng liên hợp",
   "keyboard_shortcuts.heading": "Danh sách phím tắt",
-  "keyboard_shortcuts.home": "mở trang chính",
+  "keyboard_shortcuts.home": "mở trang chủ",
   "keyboard_shortcuts.hotkey": "Phím tắt",
   "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này",
   "keyboard_shortcuts.local": "mở máy chủ của bạn",
   "keyboard_shortcuts.mention": "nhắc đến ai đó",
   "keyboard_shortcuts.muted": "mở danh sách người đã ẩn",
   "keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
-  "keyboard_shortcuts.notifications": "mở mục thông báo",
+  "keyboard_shortcuts.notifications": "mở thông báo",
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
-  "keyboard_shortcuts.pinned": "mở danh sách tút ghim",
-  "keyboard_shortcuts.profile": "mở hồ sơ của người viết tút",
+  "keyboard_shortcuts.pinned": "mở những tút đã ghim",
+  "keyboard_shortcuts.profile": "mở trang của người đăng tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
   "keyboard_shortcuts.search": "mở tìm kiếm",
   "keyboard_shortcuts.spoilers": "hiện/ẩn nội dung nhạy cảm",
-  "keyboard_shortcuts.start": "mở mục \"Dành cho người mới\"",
-  "keyboard_shortcuts.toggle_hidden": "ẩn/hiện văn bản bên dưới spoil",
+  "keyboard_shortcuts.start": "mở \"Dành cho người mới\"",
+  "keyboard_shortcuts.toggle_hidden": "ẩn/hiện nội dung ẩn",
   "keyboard_shortcuts.toggle_sensitivity": "ẩn/hiện ảnh hoặc video",
-  "keyboard_shortcuts.toot": "viết tút mới",
+  "keyboard_shortcuts.toot": "soạn tút mới",
   "keyboard_shortcuts.unfocus": "đưa con trỏ ra khỏi ô soạn thảo hoặc ô tìm kiếm",
   "keyboard_shortcuts.up": "di chuyển lên trên danh sách",
   "lightbox.close": "Đóng",
@@ -404,7 +404,7 @@
   "navigation_bar.blocks": "Người đã chặn",
   "navigation_bar.bookmarks": "Đã lưu",
   "navigation_bar.community_timeline": "Cộng đồng",
-  "navigation_bar.compose": "Viết tút mới",
+  "navigation_bar.compose": "Soạn tút mới",
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
@@ -436,7 +436,7 @@
   "notification.poll": "Cuộc bình chọn đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.status": "{name} đăng tút mới",
-  "notification.update": "{name} đã viết lại một tút",
+  "notification.update": "{name} đã sửa tút",
   "notifications.clear": "Xóa hết thông báo",
   "notifications.clear_confirmation": "Bạn thật sự muốn xóa vĩnh viễn tất cả thông báo của mình?",
   "notifications.column_settings.admin.report": "Báo cáo mới:",
@@ -477,7 +477,7 @@
   "onboarding.action.back": "Quay lại",
   "onboarding.actions.back": "Quay lại",
   "onboarding.actions.go_to_explore": "Xem những gì đang thịnh hành",
-  "onboarding.actions.go_to_home": "Đến trang chính",
+  "onboarding.actions.go_to_home": "Đến trang chủ",
   "onboarding.compose.template": "Xin chào #Mastodon!",
   "onboarding.follows.empty": "Không có kết quả có thể được hiển thị lúc này. Bạn có thể thử sử dụng tính năng tìm kiếm hoặc duyệt qua trang khám phá để tìm những người theo dõi hoặc thử lại sau.",
   "onboarding.follows.lead": "Bạn quản lý bảng tin của riêng bạn. Bạn càng theo dõi nhiều người, nó sẽ càng sôi động và thú vị. Để bắt đầu, đây là vài gợi ý:",
@@ -501,7 +501,7 @@
   "onboarding.start.skip": "Muốn bỏ qua luôn?",
   "onboarding.start.title": "Xong rồi bạn!",
   "onboarding.steps.follow_people.body": "Theo dõi những người thú vị trên Mastodon.",
-  "onboarding.steps.follow_people.title": "Cá nhân hóa trang chính",
+  "onboarding.steps.follow_people.title": "Cá nhân hóa trang chủ",
   "onboarding.steps.publish_status.body": "Chào cộng đồng bằng lời nói, ảnh hoặc video {emoji}",
   "onboarding.steps.publish_status.title": "Đăng tút đầu tiên",
   "onboarding.steps.setup_profile.body": "Tạo sự tương tác bằng một hồ sơ hoàn chỉnh.",
@@ -539,7 +539,7 @@
   "recommended": "Đề xuất",
   "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
-  "regeneration_indicator.sublabel": "Trang chính của bạn đang được cập nhật!",
+  "regeneration_indicator.sublabel": "Trang chủ của bạn đang được cập nhật!",
   "relative_time.days": "{number} ngày",
   "relative_time.full.days": "{number, plural, other {# ngày}}",
   "relative_time.full.hours": "{number, plural, other {# giờ}}",
@@ -591,7 +591,7 @@
   "report.thanks.title": "Không muốn xem thứ này?",
   "report.thanks.title_actionable": "Cảm ơn đã báo cáo, chúng tôi sẽ xem xét kỹ.",
   "report.unfollow": "Bỏ theo dõi @{name}",
-  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trên trang chính nữa, hãy bỏ theo dõi.",
+  "report.unfollow_explanation": "Bạn đang theo dõi người này. Để không thấy tút của họ trên trang chủ nữa, hãy bỏ theo dõi.",
   "report_notification.attached_statuses": "{count, plural, other {{count} tút}} đính kèm",
   "report_notification.categories.legal": "Pháp lý",
   "report_notification.categories.other": "Khác",
@@ -692,7 +692,7 @@
   "subscribed_languages.lead": "Chỉ các tút đăng bằng các ngôn ngữ đã chọn mới được xuất hiện trên bảng tin của bạn. Không chọn gì cả để đọc tút đăng bằng mọi ngôn ngữ.",
   "subscribed_languages.save": "Lưu thay đổi",
   "subscribed_languages.target": "Đổi ngôn ngữ mong muốn cho {target}",
-  "tabs_bar.home": "Trang chính",
+  "tabs_bar.home": "Trang chủ",
   "tabs_bar.notifications": "Thông báo",
   "time_remaining.days": "{number, plural, other {# ngày}}",
   "time_remaining.hours": "{number, plural, other {# giờ}}",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b06c5404c7..1865aa5fca 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -425,6 +425,7 @@ bg:
       view: Преглед на блокиране на домейн
     email_domain_blocks:
       add_new: Добавяне на ново
+      allow_registrations_with_approval: Позволяване на регистрации с одобрение
       attempts_over_week:
         one: "%{count} опит за изминалата седмица"
         other: "%{count} опита за регистрация през изминалата седмица"
diff --git a/config/locales/br.yml b/config/locales/br.yml
index e869374573..8a70a90cfe 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -40,8 +40,10 @@ br:
       change_role:
         no_role: Roll ebet
       confirm: Kadarnaat
+      confirmed: Kadarnaet
       confirming: O kadarnaat
       custom: Personelaet
+      delete: Dilemel ar roadennoù
       deleted: Dilamet
       demote: Argilañ
       disable: Skornañ
@@ -61,6 +63,7 @@ br:
         all: Pep tra
         local: Lec'hel
         remote: A-bell
+      media_attachments: Restroù media stag
       moderation:
         active: Oberiant
         all: Pep tra
@@ -68,6 +71,7 @@ br:
         silenced: Bevennet
         suspended: Astalet
         title: Habaskadur
+      most_recent_activity: Obererezh nevesañ
       perform_full_suspension: Astalañ
       promote: Brudañ
       protocol: Komenad
@@ -76,15 +80,19 @@ br:
       remove_header: Dilemel an talbenn
       reset: Adderaouekaat
       reset_password: Adderaouekaat ar ger-tremen
+      resubscribe: Adkoumanantiñ
       role: Roll
       search: Klask
+      security: Surentez
       silence: Bevenniñ
       silenced: Bevennet
       statuses: Toudoù
+      subscribe: Koumanantiñ
       suspend: Astalañ
       suspended: Astalet
       title: Kontoù
       undo_silenced: Dizober ar bevennañ
+      unsubscribe: Digoumanantiñ
       username: Anv
       warn: Diwall
       web: Web
@@ -167,6 +175,7 @@ br:
         title: Habaskadur
       purge: Spurjañ
       title: Kevread
+      total_storage: Restroù media stag
     invites:
       filter:
         all: Pep tra
@@ -265,6 +274,8 @@ br:
       tags:
         dashboard:
           tag_uses_measure: implijoù hollek
+        not_usable: N'haller ket en implijout
+        title: Hashtagoù diouzh ar c'hiz
       title: Luskadoù
     warning_presets:
       add_new: Ouzhpenniñ unan nevez
@@ -281,6 +292,9 @@ br:
     new_appeal:
       actions:
         none: ur c'hemenn diwall
+    new_trends:
+      new_trending_tags:
+        title: Hashtagoù diouzh ar c'hiz
   appearance:
     discovery: Dizoloadur
   application_mailer:
@@ -289,6 +303,8 @@ br:
   auth:
     delete_account: Dilemel ar gont
     delete_account_html: Ma fell deoc'h dilemel ho kont e c'hellit <a href="%{path}">klikañ amañ</a>. Goulennet e vo ganeoc'h kadarnaat an obererezh.
+    description:
+      prefix_invited_by_user: Pedet oc'h gant @%{name} da zont e-barzh ar servijer Mastodon-mañ!
     login: Mont tre
     logout: Digennaskañ
     migrate_account_html: Ma fell deoc'h adkas ar gont-mañ war-zu unan all e c'hellit <a href="%{path}">arventenniñ an dra-se amañ</a>.
@@ -383,6 +399,10 @@ br:
     table:
       uses: Implijoù
     title: Pediñ tud
+  media_attachments:
+    validations:
+      images_and_video: N'haller stagañ ur video ouzh un embannadur a zo fotoioù gantañ dija
+      too_many: N'haller ket stagañ muioc'h eget 4 restr
   migrations:
     incoming_migrations_html: Evit dilojañ ur gont all da homañ e rankit <a href="%{path}">sevel un alias</a> da gentañ.
   moderation:
@@ -417,13 +437,16 @@ br:
     next: Da-heul
     older: Koshoc'h
     prev: A-raok
+  polls:
+    errors:
+      self_vote: N'hallit ket votiñ en ho sontadegoù deoc'h-c'hwi
   preferences:
     other: All
     posting_defaults: Arventennoù embann dre ziouer
   relationships:
     dormant: O kousket
     followers: Heulier·ezed·ien
-    following: O heuliañ
+    following: Koumanantoù
     invited: Pedet
     moved: Dilojet
     mutual: Kenetre
@@ -463,6 +486,7 @@ br:
     account_settings: Arventennoù ar gont
     development: Diorren
     edit_profile: Kemmañ ar profil
+    featured_tags: Hashtagoù pennañ
     import: Enporzhiañ
     import_and_export: Enporzhiañ hag ezporzhiañ
     preferences: Gwellvezioù
@@ -475,6 +499,8 @@ br:
         one: "%{count} skeudenn"
         other: "%{count} skeudenn"
         two: "%{count} skeudenn"
+    pin_errors:
+      ownership: N'hallit ket spilhennañ embannadurioù ar re all
     poll:
       vote: Mouezhiañ
     show_more: Diskouez muioc'h
@@ -483,6 +509,7 @@ br:
       public: Publik
   statuses_cleanup:
     keep_direct: Mirout ar c'hannadoù eeun
+    keep_media: Derc'hel an embannadurioù gant restroù stag
     min_age:
       '1209600': 2 sizhunvezh
       '2629746': 1 mizvezh
@@ -514,6 +541,7 @@ br:
       subject: Donemat e Mastodoñ
       title: Degemer mat e bourzh, %{name}!
   users:
+    follow_limit_reached: N'hallit ket heulian muioc'h eget %{limit} a zen
     signed_in_as: 'Aet-tre evel:'
   verification:
     verification: Amprouadur
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e084fdf702..4542871d80 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -425,6 +425,7 @@ de:
       view: Domain-Sperre ansehen
     email_domain_blocks:
       add_new: Neue hinzufügen
+      allow_registrations_with_approval: Registrierungen mit Genehmigung erlauben
       attempts_over_week:
         one: "%{count} Registrierungsversuch in der vergangenen Woche"
         other: "%{count} Registrierungsversuche in der vergangenen Woche"
diff --git a/config/locales/devise.ia.yml b/config/locales/devise.ia.yml
index 7b0ec29579..c45994160c 100644
--- a/config/locales/devise.ia.yml
+++ b/config/locales/devise.ia.yml
@@ -1,6 +1,8 @@
 ---
 ia:
   devise:
+    failure:
+      locked: Tu conto es blocate.
     mailer:
       confirmation_instructions:
         action: Verificar adresse de e-mail
@@ -8,6 +10,8 @@ ia:
         title: Verificar adresse de e-mail
       email_changed:
         title: Nove adresse de e-mail
+      password_change:
+        title: Contrasigno cambiate
       reconfirmation_instructions:
         title: Verificar adresse de e-mail
       reset_password_instructions:
@@ -15,6 +19,8 @@ ia:
         title: Reinitialisar contrasigno
       two_factor_disabled:
         title: 2FA disactivate
+      two_factor_enabled:
+        title: 2FA activate
     registrations:
       updated: Tu conto ha essite actualisate con successo.
     unlocks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index c6468d34c2..05a41147d8 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -3,6 +3,8 @@ ie:
   devise:
     confirmations:
       confirmed: Tui e-mail adresse ha esset confirmat successosimen.
+      send_instructions: Pos quelc minutes tu va reciver un e-posta con instructiones pri qualmen confirmar tui adresse electronic. Ples confirmar tui spamiere si tu ne vide li e-posta.
+      send_paranoid_instructions: Si tui email-adresse existe in nor database, pos quelc minutes tu va reciver un e-posta con instructiones pri qualmen confirmar tui adresse electronic. Ples confirmar tui spamiere si tu ne recivet ti-ci email.
     failure:
       already_authenticated: Tu ha ja intrat.
       inactive: Tui conto ancor ne ha esset activat.
@@ -20,6 +22,8 @@ ie:
         action_with_app: Confirma e retorna a%{app}
         explanation: Tu ha creat un conto sur %{host} con ti-ci e-posta, quel tu posse activar per un sol clicc. Si it ne esset tu qui creat li conto, ples ignorar ti-ci missage.
         explanation_when_pending: Tu ha demandat un invitation a %{host} con ti-ci e-posta. Pos confirmation de tui adresse, noi va inspecter tui aplication. Tu posse inloggar por changear detallies o deleter li conto, ma li pluparte del functiones va restar ínusabil til quande tui conto es aprobat. Tui data va esser deletet si tui conto es rejectet, e in ti casu tu ne besona far quelcunc cose. Si it ne esset tu qui creat li conto, ples ignorar ti-ci missage.
+        extra_html: Ples vider anc <a href="%{terms_path}">li regules del servitor</a> e <a href="%{policy_path}">nor termines de servicie</a>.
+        subject: 'Mastodon: Instructiones de confirmation por %{instance}'
         title: Verificar e-posta
       email_changed:
         explanation: 'Li e-mail adresse de tui es changeat a:'
@@ -33,6 +37,7 @@ ie:
         title: Passa-parol changeat
       reconfirmation_instructions:
         explanation: Confirmar li nov adresse por changeat tui e-posta.
+        extra: Ples ignorar ti-ci e-posta si li change ne esset efectuat per te. Li adresse electronic por li conto Mastodon ne va changear se si tu ne accesse li ligament in supra.
         subject: 'Mastodon: E-posta de confirmation por %{instance}'
         title: Verificar e-posta
       reset_password_instructions:
@@ -43,8 +48,11 @@ ie:
         title: Reiniciar passa-parol
       two_factor_disabled:
         explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+        subject: 'Mastodon: 2-factor autentication desactivat'
         title: 2FA desvalidat
       two_factor_enabled:
+        explanation: 2-factor autentication ha esset activat por tui conto. Un gage generat per li acuplat apli TOTP va esser besonat por intrar.
+        subject: 'Mastodon: 2-factor autentication activat'
         title: 2FA permisset
       two_factor_recovery_codes_changed:
         explanation: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
@@ -54,14 +62,20 @@ ie:
         subject: 'Mastodon: Desserral instructiones'
       webauthn_credential:
         added:
+          explanation: Li sequent clave de securitá ha esset adjuntet a tui conto
           subject: 'Mastodon: Nov clave de securitá'
           title: Un nov clave de securitá ha esset adjuntet
         deleted:
+          explanation: Li sequent clave de securitá ha esset deletet de tui conto
           subject: 'Mastodon: Clave de securitá deletet'
+          title: Un ex tui claves de securitá ha esset deletet
       webauthn_disabled:
+        explanation: Autentication per claves de securitá ha esset desactivat por tui conto. Ja on posse intrar solmen con li gage generat per li acuplat apli TOTP.
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
       webauthn_enabled:
+        explanation: Autentication per clave de securitá ha esset activat por tui conto. Ja li clave de securitá posse esser usat por intrar.
+        subject: 'Mastodon: Autentication per clave de securitá activat'
         title: Claves de securitá activisat
     omniauth_callbacks:
       failure: Ne posset autenticar te de %{kind} pro "%{reason}".
@@ -73,12 +87,22 @@ ie:
       updated: Tui passa-parol ha esset changeat successosimen. Tu nu ha apertet session.
       updated_not_active: Tui passa-parol ha esset changeat successosimen.
     registrations:
+      destroyed: Adío! Tui conto ha esset anullat con successe. Noi espera revider te pos ne long.
       signed_up: Benevenit! Tu ha successat registrar te.
+      signed_up_but_inactive: Tu ha registrat te con successe, támen noi ne posset far te intrar pro que tui conto ancor ne ha esset activat.
+      signed_up_but_locked: Tu ha registrat te con successe, támen noi ne posset far te intrar pro que tui conto es serrat.
+      signed_up_but_pending: Un missage con un ligament de confirmation ha esset inviat a tui adresse electronic. Pos har cliccat sur li ligament, noi va inspecter tui aplication. Tu va reciver un notification si it es aprobat.
+      signed_up_but_unconfirmed: Un missage con un ligament de confirmation ha esset inviat a tui adresse electronic. Ples sequer li ligament por activar tui conto, e confirmar tui spamiere si tu ne ha recivet li e-posta.
+      update_needs_confirmation: Tu ha actualisat tui conto con successe, ma noi deve verificar tui nov adresse electronic. Ples confirmar tui e-postas e sequer li ligament de confirmation por confirmar li nov adresse, e inspecter tui spamiere si tu ne ha recivet li e-posta.
       updated: Tui conto ha esset actualisat successosimen.
     sessions:
       already_signed_out: Exeat successosimen.
       signed_in: Intrat successosimen.
       signed_out: Exeat successosimen.
+    unlocks:
+      send_instructions: Pos quelc minutes tu va reciver un e-posta con instructiones pri qualmen desserrar tui adresse electronic. Ples confirmar tui spamiere si tu ne vide li e-posta.
+      send_paranoid_instructions: Si tui conto existe, pos quelc minutes tu va reciver un e-posta con instructiones pri qualmen desserrar it. Ples confirmar tui spamiere si tu ne recive li e-posta.
+      unlocked: Tui conto ha esset desserrat con successe. Ples intrar por continuar.
   errors:
     messages:
       already_confirmed: esset ja confirmat, ples prova intrar
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index 3de6230d4c..7b7f4155bd 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -102,6 +102,7 @@ br:
         bookmarks: Sinedoù
         filters: Siloù
         lists: Listennoù
+        media: Restroù media stag
         mutes: Kuzhet
         search: Klask
         statuses: Toudoù
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index 55f28634a5..ec85df24fc 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -10,6 +10,8 @@ ia:
       buttons:
         cancel: Cancellar
         edit: Modificar
+      confirmations:
+        destroy: Es tu secur?
       edit:
         title: Modificar application
       index:
@@ -45,11 +47,22 @@ ia:
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
+        bookmarks: Marcapaginas
+        conversations: Conversationes
         favourites: Favoritos
         lists: Listas
         notifications: Notificationes
         push: Notificationes push
+        search: Cercar
+        statuses: Messages
     layouts:
       admin:
         nav:
           applications: Applicationes
+          oauth2_provider: Fornitor OAuth2
+    scopes:
+      write:accounts: modificar tu profilo
+      write:favourites: messages favorite
+      write:lists: crear listas
+      write:notifications: rader tu notificationes
+      write:statuses: publicar messages
diff --git a/config/locales/doorkeeper.ie.yml b/config/locales/doorkeeper.ie.yml
index f49eb1d968..0119f3573f 100644
--- a/config/locales/doorkeeper.ie.yml
+++ b/config/locales/doorkeeper.ie.yml
@@ -28,7 +28,10 @@ ie:
         destroy: Es tu cert?
       edit:
         title: Modificar aplication
+      form:
+        error: Ups! Ples inspecter tui formul por possibil erras
       help:
+        native_redirect_uri: Usar %{native_redirect_uri} por local provas
         redirect_uri: Usar un linea per URI
         scopes: Separar scopes con intersticies. Lassar blanc por usar li scopes predefinit.
       index:
@@ -57,8 +60,11 @@ ie:
       error:
         title: Alquo ha errat
       new:
+        prompt_html: "%{client_name}, un aplication de triesim partise, vole permission por accesser tui conto. <strong>Si tu ne fide it, ne autorisa it.</strong>"
         review_permissions: Inspecter permissiones
         title: Autorisation besonat
+      show:
+        title: Copiar ti-ci code de autorisation e glutinar it al demanda.
     authorized_applications:
       buttons:
         revoke: Revocar
@@ -66,6 +72,7 @@ ie:
         revoke: Es tu cert?
       index:
         authorized_at: Autorisat ye %{date}
+        description_html: Hay aplicationes queles posse accesser tui conto tra li API. Si trova si aplicationes queles tu ne reconosse, o un aplication quel ha conduit se mal, tu posse revocar su accesse.
         last_used_at: Ultimmen usat ye %{date}
         never_used: Nequande usat
         scopes: Permissiones
@@ -73,14 +80,25 @@ ie:
         title: Tui autorisat aplicationes
     errors:
       messages:
+        access_denied: Demanda negat per li proprietario del ressurse o servitor de autorisation.
+        credential_flow_not_configured: Falliment de flution Resource Owner Pasword Credentials pro ínconfigurat Doorkeeper.configure.resource_owner_from_credentials.
         invalid_client: Fallit autentification pro ínconosset client, manca de client-autentification, o ne subtenet metode de autentification.
+        invalid_grant: Li providet autorisation ó es ínvalid, expirat, revocat, ne acorda con li URI de redirection usat in li demanda de autorisation, ó ha esset emisset a un altri client.
         invalid_redirect_uri: Li uri de redirection includet ne es valid.
         invalid_request:
+          missing_param: 'Mancant postulat parametre: %{value}.'
+          request_not_authorized: Demanda besonant autorisation. Hay un mancant o ínvalid parametre besonat por autorisar li demanda.
           unknown: Li petition manca un postulat parametre, include un ne apoyat parametre-valore, o es altrimen mal format.
+        invalid_resource_owner: Sive li credentiales de ressurse-proprietario providet es ínvalid, sive li ressurse-proprietario ne posse esser trovat
+        invalid_scope: Li scope demandat es ínvalid, ínconosset, o malformat.
         invalid_token:
           expired: Li access-clave expirat
           revoked: Li access-clave esset revocat
           unknown: Li accesse-clave es ínvalid
+        resource_owner_authenticator_not_configured: Sercha por Proprietario de Ressurse fallit pro ínconfigurat Doorkeeper.configure.resource_owner_authenticator.
+        server_error: Li servitor de autorisation incontrat un ínexpectat condition quel impedit it a plenar li demanda.
+        temporarily_unavailable: Li servitor de autorisation actualmen ne posse tractar li demanda pro un temporari supercargada o mantention del servitor.
+        unauthorized_client: Li client ne es autorisat a efectuar li demanda con ti-ci metode.
         unsupported_grant_type: Li tip de autorisation concedet ne es subtenet per li autorisant servitor.
         unsupported_response_type: Li autorisant servitor ne subtene ti-ci tip de response.
     flash:
@@ -108,6 +126,7 @@ ie:
         blocks: Bloccas
         bookmarks: Marcatores
         conversations: Conversationes
+        crypto: Incription del cap al fine
         favourites: Favorites
         filters: Filtres
         follow: Seques, silentias e bloccas
@@ -144,6 +163,7 @@ ie:
       admin:write:email_domain_blocks: far actiones de moderation sur bloccas de dominia basat sur e-posta
       admin:write:ip_blocks: fa moderatori actiones sur bloccas de IP
       admin:write:reports: far moderatori actiones sur raportes
+      crypto: usar incription del cap al fine
       follow: modifica li relationes del conto
       push: reciver tui pussa-notificationes
       read: lee omni datas de tui conto
@@ -162,6 +182,7 @@ ie:
       write: modificar li tot data de tui conto
       write:accounts: modifica tui profile
       write:blocks: bloccar contos e dominias
+      write:bookmarks: marcar postas
       write:conversations: silentiar e deleter conversationes
       write:favourites: favorit postas
       write:filters: crea filtres
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 2d48edc295..806238431d 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -425,6 +425,7 @@ et:
       view: Vaata domeeniblokeeringut
     email_domain_blocks:
       add_new: Lisa uus
+      allow_registrations_with_approval: Luba kinnitamisega registreerimine
       attempts_over_week:
         one: "%{count} katse viimase nädala kestel"
         other: "%{count} liitumiskatset viimase nädala kestel"
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-QC.yml
index 00a59463cd..3d85ced151 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@@ -425,6 +425,7 @@ fr-QC:
       view: Afficher les blocages de domaines
     email_domain_blocks:
       add_new: Ajouter
+      allow_registrations_with_approval: Autoriser les inscriptions avec approbation
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0a6601bbc1..5c6166ddc3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -425,6 +425,7 @@ fr:
       view: Afficher les blocages de domaines
     email_domain_blocks:
       add_new: Ajouter
+      allow_registrations_with_approval: Autoriser les inscriptions avec approbation
       attempts_over_week:
         one: "%{count} tentative au cours de la dernière semaine"
         other: "%{count} tentatives au cours de la dernière semaine"
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 795ed8cc94..c4f236881d 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,28 +1,61 @@
 ---
 ia:
+  about:
+    contact_missing: Non definite
   admin:
     accounts:
+      are_you_sure: Es tu secur?
+      by_domain: Dominio
+      custom: Personalisate
       delete: Deler datos
       deleted: Delite
+      disable_two_factor_authentication: Disactivar 2FA
       display_name: Nomine visibile
+      domain: Dominio
       enabled: Activate
       location:
         all: Toto
         title: Location
       moderation:
         disabled: Disactivate
+      most_recent_activity: Activitate plus recente
+      most_recent_ip: IP plus recente
+      public: Public
       reset: Reinitialisar
       reset_password: Reinitialisar contrasigno
       search: Cercar
       security: Securitate
+      security_measures:
+        only_password: Solmente contrasigno
+        password_and_2fa: Contrasigno e 2FA
+      statuses: Messages
+      title: Contos
       username: Nomine de usator
+    action_logs:
+      action_types:
+        reset_password_user: Reinitialisar contrasigno
+    announcements:
+      new:
+        create: Crear annuncio
+        title: Nove annuncio
+      title: Annuncios
     custom_emojis:
+      by_domain: Dominio
       copy: Copiar
       create_new_category: Crear nove categoria
       delete: Deler
+      disable: Disactivar
+      disabled: Disactivate
+    dashboard:
+      active_users: usatores active
+      new_users: nove usatores
+      website: Sito web
+    domain_allows:
+      add_new: Permitter federation con dominio
     domain_blocks:
       confirm_suspension:
         cancel: Cancellar
+      domain: Dominio
       export: Exportar
       import: Importar
     email_domain_blocks:
@@ -38,9 +71,11 @@ ia:
         instance_languages_dimension: Linguas principal
       delivery:
         unavailable: Non disponibile
+      empty: Necun dominios trovate.
       private_comment: Commento private
       public_comment: Commento public
     invites:
+      deactivate_all: Disactivar toto
       filter:
         available: Disponibile
     ip_blocks:
@@ -50,6 +85,18 @@ ia:
         '15778476': 6 menses
         '2629746': 1 mense
         '86400': 1 die
+      new:
+        title: Crear un nove regula IP
+      title: Regulas IP
+    relays:
+      delete: Deler
+      disable: Disactivar
+      disabled: Disactivate
+      enable: Activar
+      enabled: Activate
+    reports:
+      are_you_sure: Es tu secur?
+      cancel: Cancellar
   statuses_cleanup:
     min_age:
       '1209600': 2 septimanas
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 638205a7f4..c85e97b51d 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -288,6 +288,7 @@ ie:
         update_status_html: "%{name} actualisat posta de %{target}"
         update_user_role_html: "%{name} changeat li rol %{target}"
       deleted_account: deletet conto
+      empty: Null registres trovat.
       filter_by_action: Filtrar per action
       filter_by_user: Filtrar per usator
       title: Jurnale de audit
@@ -468,6 +469,9 @@ ie:
       unsuppress: Restaurar seque-recomandation
     instances:
       availability:
+        description_html:
+          one: Si liveration al dominia falli por <strong>%{count} die</strong> sin successe, null provas in plu va esser efectuat til quande un liveration <em>del</em> dominia es recivet.
+          other: Si liveration al dominia falli por <strong>%{count} dies</strong> sin successe, null provas in plu va esser efectuat til quande un liveration <em>del</em> dominia es recivet.
         failure_threshold_reached: Límite de falliment atinget ye %{date}.
         failures_recorded:
           one: Fallit prova por %{count} die.
@@ -523,6 +527,7 @@ ie:
       private_comment: Privat comenta
       public_comment: Public comenta
       purge: Purgar
+      purge_description_html: Si tu crede que ti-ci dominia es for linea por sempre, tu posse deleter omni archives de conto e associat data de ti-ci dominia de tui magasinage. Alquant témpor va esser possibilmen besonat.
       title: Federation
       total_blocked_by_us: Bloccat de nos
       total_followed_by_them: Sequet de les
@@ -737,6 +742,7 @@ ie:
         preamble: Customisar li interfacie web de Mastodon.
         title: Aspecte
       branding:
+        preamble: Li reclamage de tui servitor diferentia it de altri servitores in li retage. Ti-ci information posse esser monstrat tra mult ambientes, tales quam li interfacie web de Mastodon, nativ aplicationes, previsiones de ligamentes sur altri web-situs, altri missage-aplicationes, etc. Pro to it es recomendat a mantener li information clar, curt, e concis.
         title: Marca
       captcha_enabled:
         desc_html: To ci usa extern scrites de hCaptcha, quel posse esser ínquietant pro rasones de securitá e privatie. In plu, <strong>it posse far li processu de registration mult plu desfacil (particularimen por tis con deshabilitás)</strong>. Pro ti rasones, ples considerar alternativ mesuras, tales quam registration per aprobation o invitation.
@@ -746,6 +752,7 @@ ie:
         title: Retention de contenete
       default_noindex:
         desc_html: Afecta omni usatores qui ne ha changeat ti parametre personalmen
+        title: Predefinir que usatores ne apari in índexes de serchatores
       discovery:
         follow_recommendations: Seque-recomandationes
         preamble: Exposir interessant contenete es importantissim por incorporar nov usatores qui fórsan conosse nequi che Mastodon. Decider qualmen diferent utensiles de decovrition functiona che vor servitor.
@@ -832,12 +839,16 @@ ie:
         message_html: Li cluster Elasticsearch es ínsalubri (statu rubi), functiones por serchar ne disponibil
       elasticsearch_health_yellow:
         message_html: Li cluster Elasticsearch es ínsalubri (statu yelb); investigar li rason vell esser un bon idé
+      elasticsearch_index_mismatch:
+        message_html: Índex-mappamentes de Elasticsearch es oldijat. Ples executer <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Vider li documentation
         message_html: Tui cluster Elasticsearch have plu quam un node, ma Mastodon ne es configurat por usar les.
       elasticsearch_preset_single_node:
         action: Vider li documentation
         message_html: Tui cluster Elasticsearch have solmen un node, ples configurar <code>ES_PRESET</code> quam <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Tui sistema-índex por Elasticsearch ha oldijat pro un change de parametres. Ples executer <code>tootctl search deploy --reset-chewy</code> por actualisar it.
       elasticsearch_running_check:
         message_html: Ne posset conexer a Elasticsearch. Ples confirmar que it ha esset executet, o desactivar serchada de plen textu
       elasticsearch_version_check:
@@ -846,6 +857,8 @@ ie:
       rules_check:
         action: Gerer regules de servitor
         message_html: Tu ancor ne ha definit quelcunc regules de servitor.
+      sidekiq_process_check:
+        message_html: Null processe Sidekiq executet por li caude %{value}(s). Ples reviser tui configuration Sidekiq
       software_version_critical_check:
         action: Vider actualisationes disponibil
         message_html: Un critical actualisation por Mastodon es disposibil, ples actualisar tam rapidmen possibil.
@@ -935,6 +948,7 @@ ie:
     webhooks:
       add_new: Adjunter punctu terminal
       delete: Deleter
+      description_html: Un <strong>webhook</strong> possibilisa que Mastodon pussa <strong>actual notificationes</strong> pri selectet evenimentes a tui propri aplication, por que it mey <strong>automaticmen activar reactiones</strong>.
       disable: Desactivisar
       disabled: Desactivisat
       edit: Redacter punctu terminal
@@ -1409,6 +1423,7 @@ ie:
       missing_also_known_as: ne es un alias de ti-ci conto
       move_to_self: ne posse esser li conto actual
       not_found: ne posset esser trovat
+      on_cooldown: Tu es in un periode de refrigidation
     followers_count: Sequitores al témpor de translocation
     incoming_migrations: Translocant de un conto diferent
     incoming_migrations_html: Por mover de un altri conto a ti-ci, erstmen tu deve <a href="%{path}">crear un alias de conto</a>.
@@ -1483,7 +1498,9 @@ ie:
         units:
           billion: B
           million: M
+          quadrillion: Q
           thousand: m
+          trillion: T
   otp_authentication:
     code_hint: Inmetter li code generat de tui aplication de autentication por confirmar
     description_html: Si tu activisa <strong>2-factor autentication</strong> per un aplication de autentication, aperter un session va postular que tu have possession de tui telefon, quel va generar codes por que tu mey inmetter les.
@@ -1843,6 +1860,7 @@ ie:
       error: Un problema evenit durant li deletion de tui clave de securitá. Ples provar denov.
       success: Tui clave de securitá esset successosimen deletet.
     invalid_credential: Ínvalid clave de securitá
+    nickname_hint: Scrir li moc-nómine de tui nov clave de securitá
     not_enabled: Tu ancor ne ha possibilisat WebAuthn
     not_supported: Ti-ci navigator ne subtene claves de securitá
     otp_required: Por usar claves de securitá, ples activisar 2-factor autentication.
diff --git a/config/locales/is.yml b/config/locales/is.yml
index bf16d877db..7083a226dd 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -425,6 +425,7 @@ is:
       view: Skoða útilokun á léni
     email_domain_blocks:
       add_new: Bæta við nýju
+      allow_registrations_with_approval: Leyfa skráningar með samþykki
       attempts_over_week:
         one: "%{count} tilraun síðustu viku"
         other: "%{count} tilraunir til nýskráningar í síðustu viku"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8682f37eec..97ec886112 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -418,6 +418,7 @@ ja:
       view: ドメインブロックを表示
     email_domain_blocks:
       add_new: 新規追加
+      allow_registrations_with_approval: 承認制での新規登録を可能にする
       attempts_over_week:
         other: 先週は%{count}回サインアップが試みられました
       created_msg: メールドメインブロックに追加しました
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 323ade8ddb..550036b340 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -421,6 +421,7 @@ lad:
       view: Ve domeno blokado
     email_domain_blocks:
       add_new: Adjustar muevo
+      allow_registrations_with_approval: Permite enrejistrasyones kon aprovasyon
       attempts_over_week:
         one: "\"%{count} prova durante la ultima semana"
         other: "%{count} provas de enrejistrarse durante la ultima semana"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b2894e4abb..34769e08ec 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -425,7 +425,7 @@ nl:
       view: Domeinblokkade bekijken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
-      allow_registrations_with_approval: Inschrijvingen met toestemming toestaan
+      allow_registrations_with_approval: Inschrijvingen met goedkeuring toestaan
       attempts_over_week:
         one: "%{count} registratiepoging tijdens de afgelopen week"
         other: "%{count} registratiepogingen tijdens de afgelopen week"
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 70cbc27d6d..de23096ed1 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -425,7 +425,7 @@ nn:
       view: Vis domeneblokkering
     email_domain_blocks:
       add_new: Lag ny
-      allow_registrations_with_approval: Tillat registreringer med godkjenning
+      allow_registrations_with_approval: Tillat registreringar med godkjenning
       attempts_over_week:
         one: "%{count} forsøk i løpet av den siste uken"
         other: "%{count} forsøk på å opprette konto i løpet av den siste uken"
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index 09fe1f6d1d..9e8aefad49 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -54,9 +54,11 @@ br:
         username: Anv
         whole_word: Ger a-bezh
       featured_tag:
-        name: Ger-klik
+        name: Hashtag
       invite:
         comment: Evezhiadenn
+      invite_request:
+        text: Perak e fell deoc'h enskrivañ?
       ip_block:
         comment: Evezhiadenn
         ip: IP
@@ -66,8 +68,9 @@ br:
       rule:
         text: Reolenn
       tag:
-        name: Ger-klik
+        name: Hashtag
         trendable: Aotren an hashtag-mañ da zont war wel dindan tuadurioù
+        usable: Aotren an embannadurioù da implijout an hashtag-mañ
       user:
         role: Roll
       user_role:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 72797bde5e..dfd0836412 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -62,6 +62,7 @@ ie:
         setting_use_blurhash: Gradientes es basat sur li colores del celat visuales ma obscura omni detallies
         setting_use_pending_items: Celar nov postas detra un clicc vice rular li témpor-linea automaticmen
         username: Tu posse usar lítteres, númeres e sublineas
+        whole_word: Quande li clave-parol o frase es solmen alfanumeric, it va esser aplicat solmen si it egala al tot parol
       domain_allow:
         domain: Ti dominia va posser obtener data de ti-ci servitor, e data venient de it va esser tractat e inmagasinat
       email_domain_block:
@@ -82,20 +83,29 @@ ie:
         content_cache_retention_period: Omni postas e boosts de altri servitores va esser deletet pos li specificat quantitá de dies. Quelc postas fórsan va esser ínrestaurabil. Omni pertinent marcatores, favorites e boosts anc va esser perdit e ínpossibil a restaurar.
         custom_css: On posse aplicar customisat stiles al web-version de Mastodon.
         mascot: Substitue li ilustration in li avansat interfacie web.
+        media_cache_retention_period: Descargat files de media va esser deletet pos li specificat quantitá de dies quande li valore es positiv, e re-descargat sur demanda.
         peers_api_enabled: Un liste de nómines de dominia queles ti-ci servitor ha incontrat in li fediverse. Ci null data es includet pri ca tu confedera con un cert servitor o ne; it indica solmen que tui servitor conosse it. Usat per servicies colectent general statisticas pri federation.
         profile_directory: Li profilarium monstra omni usatores volent esser decovribil.
+        require_invite_text: Quande registrationes besona manual aprobation, fa que li textu "Pro quo tu vole registrar te?" es obligatori vice facultativ
         site_contact_email: Qualmen on posse contacter te por inquestes legal o de apoy.
         site_contact_username: Qualmen li gente posse atinger te sur Mastodon.
+        site_extended_description: Quelcunc information in plu quel posse esser util a visitores e a tui usatores. On posse structurar it con li sintaxe Markdown.
         site_short_description: Un curt descrition por auxiliar identificar tui servitor. Qui gere it, por qual persones it es?
+        site_terms: Usar tui propri politica de privatie, o lassar blanc por usar li predefinitiones. Posse esser structurat con li sintaxe Markdown.
         site_title: Quant persones posse aluder a tui servitor ultra su nómine de dominia.
         status_page_url: URL de un págine monstrant li statu de ti-ci servitor durant un ruptura de servicie
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
         thumbnail: Un image de dimensiones circa 2:1 monstrat along tui servitor-information.
         timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
+        trendable_by_default: Pretersaltar un manual revision de contenete in tendentie. Mem pos to on posse remover índividual pezzes de tendentie.
         trends: Tendenties monstra quel postas, hashtags e novas es ganiant atention sur tui servitor.
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
       form_challenge:
         current_password: Tu nu intra un area secur
+      imports:
+        data: File CSV exportat de un altri servitor Mastodon
+      invite_request:
+        text: To va auxiliar nos a reviser tui aplication
       ip_block:
         comment: Facultativ. Ne obliviar pro quo tu adjuntet ti-ci regul.
         expires_in: IP-adresses es un ressurse finit, quelcvez partit e transferet de manu a manu. Pro to, un índefinit bloccada de IP ne es recomandat.
@@ -109,15 +119,21 @@ ie:
         text: Descrir un regul o postulation por usatores sur ti-ci servitor. Prova scrir un descrition curt e simplic
       sessions:
         otp: 'Intrar li 2-factor code generat del app sur tui portabile o usar un de tui codes de recuperation:'
+        webauthn: Si it es un clave USB, inserter it con certitá e, si necessi, tappa it.
       settings:
+        indexable: Tui págine de profil va posser aparir in sercha-resultates sur Google, Bing, e altres.
         show_application: Totvez, tu va sempre posser vider quel app ha publicat tui posta.
+      tag:
+        name: Tu posse changear solmen li minu/majusculitá del lítteres, por exemple, por far it plu leibil
       user:
+        chosen_languages: Quande selectet, solmen postas in ti lingues va esser monstrat in public témpor-lineas
         role: Permissiones de usator decidet per su rol
       user_role:
         color: Color a usar por li rol tra li UI, quam RGB (rubi-verdi-blu) in formate hex
         highlighted: Va far li rol publicmen visibil
         name: Public nómine del rol, si li rol va esser monstrat quam signe
         permissions_as_keys: Usatores con ti-ci rol va haver accesse a...
+        position: Plu alt roles decide un resolution de conflict in cert situationes. Cert actiones posse esser efectuat solmen a roles con plu bass prioritá
       webhook:
         events: Selecter evenimentes a misser
         template: Composir tui propri carga JSON usant interpolation de variabiles. Lassa blanc por JSON predefinit.
@@ -129,6 +145,7 @@ ie:
           name: Etiquette
           value: Contenete
         indexable: Includer public postas in resultates de sercha
+        show_collections: Monstrar persones queles on seque e sequitores sur profil
         unlocked: Automaticmen acceptar nov sequitores
       account_alias:
         acct: Usator-nómine del anteyan conto
@@ -138,6 +155,7 @@ ie:
         text: Textu prefigurat
         title: Titul
       admin_account_action:
+        include_statuses: Includer raportat postas in li e-posta
         send_email_notification: Notificar li usator per e-posta
         text: Admonition customisat
         type: Action
@@ -172,6 +190,7 @@ ie:
         fields: Campes aditional
         header: Cap-image
         honeypot: "%{label} (ne plenar)"
+        inbox_url: URL del inbuxe de relé
         irreversible: Lassar cader vice celar
         locale: Lingue del interfacie
         max_uses: Max grand númere de usas
@@ -181,10 +200,15 @@ ie:
         password: Passa-parol
         phrase: Clave-parol o frase
         setting_advanced_layout: Possibilisar web-interfacie avansat
+        setting_aggregate_reblogs: Gruppar boosts in témpor-lineas
         setting_always_send_emails: Sempre misser notificationes de e-posta
+        setting_auto_play_gif: Reproducter automaticmen animat GIFs
+        setting_boost_modal: Monstrar dialog de confirmation ante boostar
         setting_default_language: Lingue in quel postar
         setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
+        setting_delete_modal: Monstrar dialog de confirmation ante deleter un posta
+        setting_disable_swiping: Desactivar motiones de glissar
         setting_display_media: Exposition de medie
         setting_display_media_default: Predefinitiones
         setting_display_media_hide_all: Celar omno
@@ -196,6 +220,7 @@ ie:
         setting_theme: Tema de situ
         setting_trends: Monstrar li hodial tendenties
         setting_unfollow_modal: Monstrar dialog de confirmation ante dessequer alquem
+        setting_use_blurhash: Monstrar colorosi gradientes por celat medie
         setting_use_pending_items: Mode lent
         severity: Severitá
         sign_in_token_attempt: Code de securitá
@@ -219,6 +244,7 @@ ie:
         closed_registrations_message: Customisat missage quande registration ne disponibil
         content_cache_retention_period: Periode de retention por cachat contenete
         custom_css: Custom CSS
+        mascot: Customisat mascot (hereditat)
         media_cache_retention_period: Periode de retention por cachat medie
         peers_api_enabled: Publicar liste de conosset servitores per li API
         profile_directory: Possibilisar profilarium
@@ -293,6 +319,7 @@ ie:
         position: Prioritá
       webhook:
         events: Evenimentes activisat
+        template: Modelle de carga
         url: URL de punctu terminal
     'no': 'No'
     not_recommended: Ne recomandat
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index cfc5ee7087..89d41b4616 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -548,6 +548,7 @@ sk:
           delete_html: Vymaž pohoršujúce príspevky
           mark_as_sensitive_html: Označ médiá pohoršujúcich príspevkov za chúlostivé
         close_report: 'Označ hlásenie #%{id} za vyriešené'
+      target_origin: Pôvod nahláseného účtu
       title: Hlásenia
       unassign: Odober
       unknown_action_msg: 'Neznáma akcia: %{action}'
@@ -636,6 +637,7 @@ sk:
       application: Aplikácia
       back_to_account: Späť na účet
       batch:
+        remove_from_report: Vymaž z hlásenia
         report: Hlásenie
       deleted: Vymazané
       favourites: Obľúbené
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f7a6f33a08..9a2bedbdfe 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -425,6 +425,7 @@ sv:
       view: Visa domänblock
     email_domain_blocks:
       add_new: Lägg till ny
+      allow_registrations_with_approval: Tillåt registreringar med godkännande
       attempts_over_week:
         one: "%{count} försök under den senaste veckan"
         other: "%{count} registreringsförsök under den senaste veckan"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 85aabe7176..f37132b6eb 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1217,7 +1217,7 @@ vi:
   filters:
     contexts:
       account: Trang hồ sơ
-      home: Trang chính và danh sách
+      home: Trang chủ và danh sách
       notifications: Thông báo
       public: Tút công khai
       thread: Thảo luận
@@ -1796,7 +1796,7 @@ vi:
       edit_profile_action: Cài đặt trang hồ sơ
       edit_profile_step: Bạn có thể chỉnh sửa trang hồ sơ của mình bằng cách tải lên ảnh đại diện, ảnh bìa, đổi biệt danh và hơn thế nữa. Bạn cũng có thể tự phê duyệt những người theo dõi mới.
       explanation: Dưới đây là một số mẹo để giúp bạn bắt đầu
-      final_action: Viết tút mới
+      final_action: Soạn tút mới
       final_step: 'Viết tút mới! Ngay cả khi chưa có người theo dõi, người khác vẫn có thể xem tút công khai của bạn trên bảng tin máy chủ và qua hashtag. Hãy giới thiệu bản thân với hashtag #introductions.'
       full_handle: Tên đầy đủ của bạn
       full_handle_hint: Đây cũng là địa chỉ được dùng để giao tiếp với tất cả mọi người.
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 61650f8943..3f3057cc05 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -418,6 +418,7 @@ zh-TW:
       view: 顯示已封鎖網域
     email_domain_blocks:
       add_new: 加入新項目
+      allow_registrations_with_approval: 經允許後可註冊
       attempts_over_week:
         other: 上週共有 %{count} 次註冊嘗試
       created_msg: 已成功將電子郵件網域加入黑名單

From e827c4692c251e60509d30350660244b403b5760 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:26:12 -0500
Subject: [PATCH 238/436] Use Arel `matches` method in CustomEmoji search
 (#28615)

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

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 550f005d59..1c9b443959 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -86,7 +86,7 @@ class CustomEmoji < ApplicationRecord
     end
 
     def search(shortcode)
-      where('"custom_emojis"."shortcode" ILIKE ?', "%#{shortcode}%")
+      where(arel_table[:shortcode].matches("%#{sanitize_sql_like(shortcode)}%"))
     end
   end
 

From c52a593a3071d6a81e5ba00bc49c00f71a2aed6d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:33:45 -0500
Subject: [PATCH 239/436] Remove unused scope `User.emailable` (#28647)

---
 app/models/user.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index be1e84b49c..55f654137a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,7 +117,6 @@ class User < ApplicationRecord
   scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
-  scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
 
   before_validation :sanitize_languages
   before_validation :sanitize_role

From 4ccba94489a0bb69b549b3c4356a390a1751854a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:35:53 -0500
Subject: [PATCH 240/436] Remove unused `*_silenced_accounts` scopes on Status
 (#28644)

---
 app/models/status.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 3faa507000..a498da288a 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -108,8 +108,6 @@ class Status < ApplicationRecord
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :with_public_visibility, -> { where(visibility: :public) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
-  scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
-  scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
   scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
   scope :tagged_with_all, lambda { |tag_ids|

From 3e7a9266ea0d30960ef9ad537443bb66c64d1bb5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:36:47 -0500
Subject: [PATCH 241/436] Remove unused `EmojiFormatter#count_tag_nesting`
 method (#28643)

---
 app/lib/emoji_formatter.rb | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index 15b98dc57e..2a3683c499 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -66,16 +66,6 @@ class EmojiFormatter
     @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
   end
 
-  def count_tag_nesting(tag)
-    if tag[1] == '/'
-      -1
-    elsif tag[-2] == '/'
-      0
-    else
-      1
-    end
-  end
-
   def tag_for_emoji(shortcode, emoji)
     return content_tag(:span, ":#{shortcode}:", translate: 'no') if raw_shortcode?
 

From cd58e37b25ae42aea55db2ed57c09c1263054fd0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:38:52 -0500
Subject: [PATCH 242/436] Remove unused `DomainBlock#affected_accounts_count`
 method (#28642)

---
 app/models/domain_block.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index f8058324a3..8da099256a 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -85,11 +85,6 @@ class DomainBlock < ApplicationRecord
     (reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports)
   end
 
-  def affected_accounts_count
-    scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at)
-    scope.count
-  end
-
   def public_domain
     return domain unless obfuscate?
 

From 9322396e58d9a715744d01d48fdb495c8d0e9037 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 08:48:31 -0500
Subject: [PATCH 243/436] Use normalizes to prepare `Account#username` value
 (#28646)

---
 app/models/account.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 2145cfcb64..886b29b873 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -108,6 +108,8 @@ class Account < ApplicationRecord
   validates :shared_inbox_url, absence: true, if: :local?, on: :create
   validates :followers_url, absence: true, if: :local?, on: :create
 
+  normalizes :username, with: ->(username) { username.squish }
+
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
@@ -475,7 +477,6 @@ class Account < ApplicationRecord
   end
 
   before_validation :prepare_contents, if: :local?
-  before_validation :prepare_username, on: :create
   before_create :generate_keys
   before_destroy :clean_feed_manager
 
@@ -493,10 +494,6 @@ class Account < ApplicationRecord
     note&.strip!
   end
 
-  def prepare_username
-    username&.squish!
-  end
-
   def generate_keys
     return unless local? && private_key.blank? && public_key.blank?
 

From 3e43cd095c5e1ad20bbb70d0e8d2cc09fff776f1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 10:26:14 -0500
Subject: [PATCH 244/436] Remove unused scope `Announcement.without_muted`
 (#28645)

---
 app/models/announcement.rb       |  1 -
 spec/models/announcement_spec.rb | 16 ----------------
 2 files changed, 17 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 00529766a4..cbcaef3daa 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -20,7 +20,6 @@
 class Announcement < ApplicationRecord
   scope :unpublished, -> { where(published: false) }
   scope :published, -> { where(published: true) }
-  scope :without_muted, ->(account) { joins("LEFT OUTER JOIN announcement_mutes ON announcement_mutes.announcement_id = announcements.id AND announcement_mutes.account_id = #{account.id}").where(announcement_mutes: { id: nil }) }
   scope :chronological, -> { order(coalesced_chronology_timestamps.asc) }
   scope :reverse_chronological, -> { order(coalesced_chronology_timestamps.desc) }
 
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index e37b81a52e..c016a316cd 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -25,22 +25,6 @@ describe Announcement do
       end
     end
 
-    describe '#without_muted' do
-      let!(:announcement) { Fabricate(:announcement) }
-      let(:account) { Fabricate(:account) }
-      let(:muted_announcement) { Fabricate(:announcement) }
-
-      before do
-        Fabricate(:announcement_mute, account: account, announcement: muted_announcement)
-      end
-
-      it 'returns the announcements not muted by the account' do
-        results = described_class.without_muted(account)
-        expect(results).to include(announcement)
-        expect(results).to_not include(muted_announcement)
-      end
-    end
-
     context 'with timestamped announcements' do
       let!(:adam_announcement) { Fabricate(:announcement, starts_at: 100.days.ago, scheduled_at: 10.days.ago, published_at: 10.days.ago, ends_at: 5.days.from_now) }
       let!(:brenda_announcement) { Fabricate(:announcement, starts_at: 10.days.ago, scheduled_at: 100.days.ago, published_at: 10.days.ago, ends_at: 5.days.from_now) }

From e677eb164cfb69c11692ca5cd2072c26ca1d9509 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 10:26:30 -0500
Subject: [PATCH 245/436] Remove unused `Announcement#time_range?` (#28648)

---
 app/models/announcement.rb       |  4 ----
 spec/models/announcement_spec.rb | 26 --------------------------
 2 files changed, 30 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index cbcaef3daa..86f7037a56 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -54,10 +54,6 @@ class Announcement < ApplicationRecord
     update!(published: false, scheduled_at: nil)
   end
 
-  def time_range?
-    starts_at? && ends_at?
-  end
-
   def mentions
     @mentions ||= Account.from_text(text)
   end
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index c016a316cd..612ba8bb0d 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -113,32 +113,6 @@ describe Announcement do
     end
   end
 
-  describe '#time_range?' do
-    it 'returns false when starts_at and ends_at are missing' do
-      record = Fabricate.build(:announcement, starts_at: nil, ends_at: nil)
-
-      expect(record.time_range?).to be(false)
-    end
-
-    it 'returns false when starts_at is present and ends_at is missing' do
-      record = Fabricate.build(:announcement, starts_at: 5.days.from_now, ends_at: nil)
-
-      expect(record.time_range?).to be(false)
-    end
-
-    it 'returns false when starts_at is missing and ends_at is present' do
-      record = Fabricate.build(:announcement, starts_at: nil, ends_at: 5.days.from_now)
-
-      expect(record.time_range?).to be(false)
-    end
-
-    it 'returns true when starts_at and ends_at are present' do
-      record = Fabricate.build(:announcement, starts_at: 5.days.from_now, ends_at: 10.days.from_now)
-
-      expect(record.time_range?).to be(true)
-    end
-  end
-
   describe '#reactions' do
     context 'with announcement_reactions present' do
       let!(:account) { Fabricate(:account) }

From cd4b4d47346b4d874315fc2560f4cb1e0b1cb2a0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 10:31:13 -0500
Subject: [PATCH 246/436] Replace unused `by_recent_sign_in` scope (#28616)

---
 app/models/account.rb        | 10 +++++++++-
 app/models/account_filter.rb | 10 +---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 886b29b873..003b41b015 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -131,7 +131,7 @@ class Account < ApplicationRecord
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
   scope :followable_by, ->(account) { joins(arel_table.join(Follow.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(Follow.arel_table[:target_account_id]).and(Follow.arel_table[:account_id].eq(account.id))).join_sources).where(Follow.arel_table[:id].eq(nil)).joins(arel_table.join(FollowRequest.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(FollowRequest.arel_table[:target_account_id]).and(FollowRequest.arel_table[:account_id].eq(account.id))).join_sources).where(FollowRequest.arel_table[:id].eq(nil)) }
   scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
-  scope :by_recent_sign_in, -> { order(Arel.sql('users.current_sign_in_at DESC NULLS LAST')) }
+  scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
   scope :popular, -> { order('account_stats.followers_count desc') }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
@@ -444,6 +444,14 @@ class Account < ApplicationRecord
       DeliveryFailureTracker.without_unavailable(urls)
     end
 
+    def coalesced_activity_timestamps
+      Arel.sql(
+        <<~SQL.squish
+          COALESCE(users.current_sign_in_at, account_stats.last_status_at, to_timestamp(0))
+        SQL
+      )
+    end
+
     def from_text(text)
       return [] if text.blank?
 
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index 55d34e85c3..42b1c49538 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -104,15 +104,7 @@ class AccountFilter
   def order_scope(value)
     case value.to_s
     when 'active'
-      accounts_with_users
-        .left_joins(:account_stat)
-        .order(
-          Arel.sql(
-            <<~SQL.squish
-              COALESCE(users.current_sign_in_at, account_stats.last_status_at, to_timestamp(0)) DESC, accounts.id DESC
-            SQL
-          )
-        )
+      Account.by_recent_activity
     when 'recent'
       Account.recent
     else

From 557c27e03b8a646644d1b1878d45d60931ace5a3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 8 Jan 2024 11:43:38 -0500
Subject: [PATCH 247/436] Update haml_lint to version 0.53.0 (#28652)

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e694dce0fb..442022e81a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,8 +336,8 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.52.0)
-      haml (>= 4.0)
+    haml_lint (0.53.0)
+      haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)

From f7b61959cf932de6d1c0317b5b46a4b0a34a6b22 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 09:05:16 +0100
Subject: [PATCH 248/436] Update babel monorepo to v7.23.8 (#28656)

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

diff --git a/yarn.lock b/yarn.lock
index bec7709804..7bf70258be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -746,22 +746,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/plugin-transform-classes@npm:7.23.5"
+"@babel/plugin-transform-classes@npm:^7.23.8":
+  version: 7.23.8
+  resolution: "@babel/plugin-transform-classes@npm:7.23.8"
   dependencies:
     "@babel/helper-annotate-as-pure": "npm:^7.22.5"
-    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
     "@babel/helper-environment-visitor": "npm:^7.22.20"
     "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
     "@babel/helper-plugin-utils": "npm:^7.22.5"
     "@babel/helper-replace-supers": "npm:^7.22.20"
     "@babel/helper-split-export-declaration": "npm:^7.22.6"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 07988f52b4893151887d1ea6ff79e5fe834078c5731bd09babd5659edbbae21ea4e2de326a02443a63fd776b4c945da6177f07875b56fe66e0b7899e830a9e92
+  checksum: 227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043
   languageName: node
   linkType: hard
 
@@ -1345,8 +1344,8 @@ __metadata:
   linkType: hard
 
 "@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.22.4":
-  version: 7.23.7
-  resolution: "@babel/preset-env@npm:7.23.7"
+  version: 7.23.8
+  resolution: "@babel/preset-env@npm:7.23.8"
   dependencies:
     "@babel/compat-data": "npm:^7.23.5"
     "@babel/helper-compilation-targets": "npm:^7.23.6"
@@ -1381,7 +1380,7 @@ __metadata:
     "@babel/plugin-transform-block-scoping": "npm:^7.23.4"
     "@babel/plugin-transform-class-properties": "npm:^7.23.3"
     "@babel/plugin-transform-class-static-block": "npm:^7.23.4"
-    "@babel/plugin-transform-classes": "npm:^7.23.5"
+    "@babel/plugin-transform-classes": "npm:^7.23.8"
     "@babel/plugin-transform-computed-properties": "npm:^7.23.3"
     "@babel/plugin-transform-destructuring": "npm:^7.23.3"
     "@babel/plugin-transform-dotall-regex": "npm:^7.23.3"
@@ -1430,7 +1429,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ac9def873cec52ee02a550bde6e22eced16d1ae331bb8ebc82c03e4c91c12ac17e3e4027647e61612937bcc25ac46e71370aaf99dc2e85dbd11f7777ffeed54e
+  checksum: e602ad954645f1a509644e3d2c72b3c63bdc2273c377e7a83b78f076eca215887ea3624ffc36aaad03deb9ac8acd89e247fd4562b96e0f2b679485e20d8ff25f
   languageName: node
   linkType: hard
 
@@ -1495,11 +1494,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.23.7
-  resolution: "@babel/runtime@npm:7.23.7"
+  version: 7.23.8
+  resolution: "@babel/runtime@npm:7.23.8"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 3e304133ee55b0750e03e53cb4efb47fb2bdcdb5795f85bbffa10595196c34b9be60eb65bd6d833c87f49fc827f0365f86f95f51d85b188004d3128bb5129c93
+  checksum: ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8
   languageName: node
   linkType: hard
 
@@ -13121,17 +13120,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.13
-  resolution: "postcss-selector-parser@npm:6.0.13"
-  dependencies:
-    cssesc: "npm:^3.0.0"
-    util-deprecate: "npm:^1.0.2"
-  checksum: 51f099b27f7c7198ea1826470ef0adfa58b3bd3f59b390fda123baa0134880a5fa9720137b6009c4c1373357b144f700b0edac73335d0067422063129371444e
-  languageName: node
-  linkType: hard
-
-"postcss-selector-parser@npm:^6.0.15":
+"postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.15, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.15
   resolution: "postcss-selector-parser@npm:6.0.15"
   dependencies:

From 8e7d5fe2acf7282b0284f3f598c630e5eb58d0eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 10:30:33 +0100
Subject: [PATCH 249/436] New Crowdin Translations (automated) (#28658)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fi.json | 10 +++++-----
 config/locales/fi.yml                   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 004898651b..00df0e537a 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -21,7 +21,7 @@
   "account.blocked": "Estetty",
   "account.browse_more_on_origin_server": "Selaile lisää alkuperäisellä palvelimella",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
-  "account.copy": "Kopioi profiililinkki",
+  "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
   "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} julkaisee",
   "account.domain_blocked": "Verkkotunnus estetty",
@@ -53,7 +53,7 @@
   "account.mute_notifications_short": "Mykistä ilmoitukset",
   "account.mute_short": "Mykistä",
   "account.muted": "Mykistetty",
-  "account.mutual": "Molemmat",
+  "account.mutual": "Seuraatte toisianne",
   "account.no_bio": "Kuvausta ei ole annettu.",
   "account.open_original_page": "Avaa alkuperäinen sivu",
   "account.posts": "Julkaisut",
@@ -193,7 +193,7 @@
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
   "conversation.with": "{names} kanssa",
-  "copy_icon_button.copied": "Kopioitiin leikepöydälle",
+  "copy_icon_button.copied": "Sisältö kopioitiin leikepöydälle",
   "copypaste.copied": "Kopioitu",
   "copypaste.copy_to_clipboard": "Kopioi leikepöydälle",
   "directory.federated": "Koko tunnettu fediversumi",
@@ -483,10 +483,10 @@
   "onboarding.follows.lead": "Kokoat oman kotisyötteesi itse. Mitä enemmän ihmisiä seuraat, sitä aktiivisempi ja kiinnostavampi syöte on. Nämä profiilit voivat olla alkuun hyvä lähtökohta — voit aina lopettaa niiden seuraamisen myöhemmin!",
   "onboarding.follows.title": "Mukauta kotisyötettäsi",
   "onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
-  "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa ja profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneet samoista aiheista kuin sinä.",
+  "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa. Lisäksi profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneita kanssasi samoista aiheista.",
   "onboarding.profile.display_name": "Näyttönimi",
   "onboarding.profile.display_name_hint": "Koko nimesi tai lempinimesi…",
-  "onboarding.profile.lead": "Voit viimeistellä tämän milloin tahansa asetuksista, jotka tarjoavat vielä enemmän mukautusvalintoja.",
+  "onboarding.profile.lead": "Voit viimeistellä tämän milloin tahansa asetuksista. Sieltä löydät myös lisää mukautusvaihtoehtoja.",
   "onboarding.profile.note": "Elämäkerta",
   "onboarding.profile.note_hint": "Voit @mainita muita käyttäjiä tai #aihetunnisteita…",
   "onboarding.profile.save_and_continue": "Tallenna ja jatka",
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 93545b6a1b..75052c949d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -425,6 +425,7 @@ fi:
       view: Näytä verkkotunnuksen esto
     email_domain_blocks:
       add_new: Lisää uusi
+      allow_registrations_with_approval: Salli rekisteröitymiset hyväksynnällä
       attempts_over_week:
         one: "%{count} yritystä viimeisen viikon aikana"
         other: "%{count} rekisteröitymisyritystä viimeisen viikon aikana"

From 68f06f1fd4ef6173c22b61f2ea7ce22b76f85076 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jan 2024 04:31:32 -0500
Subject: [PATCH 250/436] Fix haml-lint `LineLength` cop for
 `settings/preferences/notifications/show` (#28655)

---
 .haml-lint_todo.yml                                       | 5 ++---
 .../settings/preferences/notifications/show.html.haml     | 8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 29646f28e8..09764c2f30 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2023-12-15 11:02:19 -0500 using Haml-Lint version 0.52.0.
+# on 2024-01-08 14:02:57 -0500 using Haml-Lint version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 11
+  # Offense count: 10
   LineLength:
     exclude:
       - 'app/views/admin/roles/_form.html.haml'
@@ -17,5 +17,4 @@ linters:
       - 'app/views/settings/applications/_fields.html.haml'
       - 'app/views/settings/imports/index.html.haml'
       - 'app/views/settings/preferences/appearance/show.html.haml'
-      - 'app/views/settings/preferences/notifications/show.html.haml'
       - 'app/views/settings/preferences/other/show.html.haml'
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index 5cc101069c..d9d496c7fa 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -33,7 +33,13 @@
 
       - if SoftwareUpdate.check_enabled? && current_user.can?(:view_devops)
         .fields-group
-          = ff.input :'notification_emails.software_updates', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.software_updates.label'), collection: %w(none critical patch all), label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") }, include_blank: false, hint: false
+          = ff.input :'notification_emails.software_updates',
+                     collection: %w(none critical patch all),
+                     hint: false,
+                     include_blank: false,
+                     label_method: ->(setting) { I18n.t("simple_form.labels.notification_emails.software_updates.#{setting}") },
+                     label: I18n.t('simple_form.labels.notification_emails.software_updates.label'),
+                     wrapper: :with_label
 
   %h4= t 'notifications.other_settings'
 

From 5dc634796aba951f6a085e1ed0e1b807e25d7d41 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jan 2024 04:40:08 -0500
Subject: [PATCH 251/436] Misc coverage improvements re: sidekiq/inline
 (#28651)

---
 spec/models/notification_spec.rb              | 82 +++++++++++++++++++
 .../services/fan_out_on_write_service_spec.rb |  3 +
 spec/services/remove_status_service_spec.rb   | 11 ++-
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index d6e2282022..172d1c65b9 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -58,6 +58,88 @@ RSpec.describe Notification do
     end
   end
 
+  describe 'Setting account from activity_type' do
+    context 'when activity_type is a Status' do
+      it 'sets the notification from_account correctly' do
+        status = Fabricate(:status)
+
+        notification = Fabricate.build(:notification, activity_type: 'Status', activity: status)
+
+        expect(notification.from_account).to eq(status.account)
+      end
+    end
+
+    context 'when activity_type is a Follow' do
+      it 'sets the notification from_account correctly' do
+        follow = Fabricate(:follow)
+
+        notification = Fabricate.build(:notification, activity_type: 'Follow', activity: follow)
+
+        expect(notification.from_account).to eq(follow.account)
+      end
+    end
+
+    context 'when activity_type is a Favourite' do
+      it 'sets the notification from_account correctly' do
+        favourite = Fabricate(:favourite)
+
+        notification = Fabricate.build(:notification, activity_type: 'Favourite', activity: favourite)
+
+        expect(notification.from_account).to eq(favourite.account)
+      end
+    end
+
+    context 'when activity_type is a FollowRequest' do
+      it 'sets the notification from_account correctly' do
+        follow_request = Fabricate(:follow_request)
+
+        notification = Fabricate.build(:notification, activity_type: 'FollowRequest', activity: follow_request)
+
+        expect(notification.from_account).to eq(follow_request.account)
+      end
+    end
+
+    context 'when activity_type is a Poll' do
+      it 'sets the notification from_account correctly' do
+        poll = Fabricate(:poll)
+
+        notification = Fabricate.build(:notification, activity_type: 'Poll', activity: poll)
+
+        expect(notification.from_account).to eq(poll.account)
+      end
+    end
+
+    context 'when activity_type is a Report' do
+      it 'sets the notification from_account correctly' do
+        report = Fabricate(:report)
+
+        notification = Fabricate.build(:notification, activity_type: 'Report', activity: report)
+
+        expect(notification.from_account).to eq(report.account)
+      end
+    end
+
+    context 'when activity_type is a Mention' do
+      it 'sets the notification from_account correctly' do
+        mention = Fabricate(:mention)
+
+        notification = Fabricate.build(:notification, activity_type: 'Mention', activity: mention)
+
+        expect(notification.from_account).to eq(mention.status.account)
+      end
+    end
+
+    context 'when activity_type is an Account' do
+      it 'sets the notification from_account correctly' do
+        account = Fabricate(:account)
+
+        notification = Fabricate.build(:notification, activity_type: 'Account', account: account)
+
+        expect(notification.account).to eq(account)
+      end
+    end
+  end
+
   describe '.preload_cache_collection_target_statuses' do
     subject do
       described_class.preload_cache_collection_target_statuses(notifications) do |target_statuses|
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index f657f298de..6ad041193b 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -20,6 +20,8 @@ RSpec.describe FanOutOnWriteService, type: :service do
     ProcessMentionsService.new.call(status)
     ProcessHashtagsService.new.call(status)
 
+    Fabricate(:media_attachment, status: status, account: alice)
+
     allow(redis).to receive(:publish)
 
     subject.call(status)
@@ -49,6 +51,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
     it 'is broadcast to the public stream' do
       expect(redis).to have_received(:publish).with('timeline:public', anything)
       expect(redis).to have_received(:publish).with('timeline:public:local', anything)
+      expect(redis).to have_received(:publish).with('timeline:public:media', anything)
     end
   end
 
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 08ce0b0456..cd3224e028 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -20,7 +20,8 @@ RSpec.describe RemoveStatusService, type: :service do
   end
 
   context 'when removed status is not a reblog' do
-    let!(:status) { PostStatusService.new.call(alice, text: "Hello @#{bob.pretty_acct} ThisIsASecret") }
+    let!(:media_attachment) { Fabricate(:media_attachment, account: alice) }
+    let!(:status) { PostStatusService.new.call(alice, text: "Hello @#{bob.pretty_acct} ThisIsASecret", media_ids: [media_attachment.id]) }
 
     before do
       FavouriteService.new.call(jeff, status)
@@ -37,6 +38,14 @@ RSpec.describe RemoveStatusService, type: :service do
       expect(HomeFeed.new(jeff).get(10).pluck(:id)).to_not include(status.id)
     end
 
+    it 'publishes to public media timeline' do
+      allow(redis).to receive(:publish).with(any_args)
+
+      subject.call(status)
+
+      expect(redis).to have_received(:publish).with('timeline:public:media', Oj.dump(event: :delete, payload: status.id.to_s))
+    end
+
     it 'sends Delete activity to followers' do
       subject.call(status)
       expect(a_request(:post, hank.inbox_url).with(

From 173953c23e8a988679e48e098e825af5be374bbe Mon Sep 17 00:00:00 2001
From: gunchleoc <fios@foramnagaidhlig.net>
Date: Tue, 9 Jan 2024 11:56:13 +0100
Subject: [PATCH 252/436] Fix ISO code for Canadian French (#26015)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/languages_helper.rb               |  2 +-
 .../locales/{fr-QC.json => fr-CA.json}        |  0
 config/initializers/i18n.rb                   |  2 +-
 ...ecord.fr-QC.yml => activerecord.fr-CA.yml} |  2 +-
 .../{devise.fr-QC.yml => devise.fr-CA.yml}    |  2 +-
 ...rkeeper.fr-QC.yml => doorkeeper.fr-CA.yml} |  2 +-
 config/locales/{fr-QC.yml => fr-CA.yml}       |  2 +-
 ...e_form.fr-QC.yml => simple_form.fr-CA.yml} |  2 +-
 ...240109103012_fix_canadian_french_locale.rb | 21 +++++++++++++++++++
 db/schema.rb                                  |  2 +-
 lib/tasks/tests.rake                          | 13 +++++++++++-
 11 files changed, 41 insertions(+), 9 deletions(-)
 rename app/javascript/mastodon/locales/{fr-QC.json => fr-CA.json} (100%)
 rename config/locales/{activerecord.fr-QC.yml => activerecord.fr-CA.yml} (99%)
 rename config/locales/{devise.fr-QC.yml => devise.fr-CA.yml} (99%)
 rename config/locales/{doorkeeper.fr-QC.yml => doorkeeper.fr-CA.yml} (99%)
 rename config/locales/{fr-QC.yml => fr-CA.yml} (99%)
 rename config/locales/{simple_form.fr-QC.yml => simple_form.fr-CA.yml} (99%)
 create mode 100644 db/migrate/20240109103012_fix_canadian_french_locale.rb

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 0d4edceb7b..87f0f288d3 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -224,7 +224,7 @@ module LanguagesHelper
     'en-GB': 'English (British)',
     'es-AR': 'Español (Argentina)',
     'es-MX': 'Español (México)',
-    'fr-QC': 'Français (Canadien)',
+    'fr-CA': 'Français (Canadien)',
     'pt-BR': 'Português (Brasil)',
     'pt-PT': 'Português (Portugal)',
     'sr-Latn': 'Srpski (latinica)',
diff --git a/app/javascript/mastodon/locales/fr-QC.json b/app/javascript/mastodon/locales/fr-CA.json
similarity index 100%
rename from app/javascript/mastodon/locales/fr-QC.json
rename to app/javascript/mastodon/locales/fr-CA.json
diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 39b7a3cc40..1c1cea1b94 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -31,7 +31,7 @@ Rails.application.configure do
     :fi,
     :fo,
     :fr,
-    :'fr-QC',
+    :'fr-CA',
     :fy,
     :ga,
     :gd,
diff --git a/config/locales/activerecord.fr-QC.yml b/config/locales/activerecord.fr-CA.yml
similarity index 99%
rename from config/locales/activerecord.fr-QC.yml
rename to config/locales/activerecord.fr-CA.yml
index 607758add6..1a83a0e9e2 100644
--- a/config/locales/activerecord.fr-QC.yml
+++ b/config/locales/activerecord.fr-CA.yml
@@ -1,5 +1,5 @@
 ---
-fr-QC:
+fr-CA:
   activerecord:
     attributes:
       poll:
diff --git a/config/locales/devise.fr-QC.yml b/config/locales/devise.fr-CA.yml
similarity index 99%
rename from config/locales/devise.fr-QC.yml
rename to config/locales/devise.fr-CA.yml
index 8c1a94dab6..4c69360024 100644
--- a/config/locales/devise.fr-QC.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -1,5 +1,5 @@
 ---
-fr-QC:
+fr-CA:
   devise:
     confirmations:
       confirmed: Votre adresse de courriel a été validée avec succès.
diff --git a/config/locales/doorkeeper.fr-QC.yml b/config/locales/doorkeeper.fr-CA.yml
similarity index 99%
rename from config/locales/doorkeeper.fr-QC.yml
rename to config/locales/doorkeeper.fr-CA.yml
index 043b4a6cda..9d671569f5 100644
--- a/config/locales/doorkeeper.fr-QC.yml
+++ b/config/locales/doorkeeper.fr-CA.yml
@@ -1,5 +1,5 @@
 ---
-fr-QC:
+fr-CA:
   activerecord:
     attributes:
       doorkeeper/application:
diff --git a/config/locales/fr-QC.yml b/config/locales/fr-CA.yml
similarity index 99%
rename from config/locales/fr-QC.yml
rename to config/locales/fr-CA.yml
index 3d85ced151..c43fa013c7 100644
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-CA.yml
@@ -1,5 +1,5 @@
 ---
-fr-QC:
+fr-CA:
   about:
     about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !'
     contact_missing: Non défini
diff --git a/config/locales/simple_form.fr-QC.yml b/config/locales/simple_form.fr-CA.yml
similarity index 99%
rename from config/locales/simple_form.fr-QC.yml
rename to config/locales/simple_form.fr-CA.yml
index 7a95a1c882..f5a2a428e9 100644
--- a/config/locales/simple_form.fr-QC.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -1,5 +1,5 @@
 ---
-fr-QC:
+fr-CA:
   simple_form:
     hints:
       account:
diff --git a/db/migrate/20240109103012_fix_canadian_french_locale.rb b/db/migrate/20240109103012_fix_canadian_french_locale.rb
new file mode 100644
index 0000000000..1b8ef7a4af
--- /dev/null
+++ b/db/migrate/20240109103012_fix_canadian_french_locale.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FixCanadianFrenchLocale < ActiveRecord::Migration[7.0]
+  class User < ApplicationRecord
+    # Dummy class, to make migration possible across version changes
+  end
+
+  disable_ddl_transaction!
+
+  def up
+    User.where(locale: 'fr-QC').in_batches do |users|
+      users.update_all(locale: 'fr-CA')
+    end
+  end
+
+  def down
+    User.where(locale: 'fr-CA').in_batches do |users|
+      users.update_all(locale: 'fr-QC')
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4ea9744f40..cbe54c1db7 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[7.1].define(version: 2023_12_22_100226) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 209a73efa5..c3a9dbfd73 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -83,6 +83,11 @@ namespace :tests do
         puts 'Default posting language not migrated as expected for kmr users'
         exit(1)
       end
+
+      unless Account.find_local('qcuser').user.locale == 'fr-CA'
+        puts 'Locale for fr-QC users not updated to fr-CA as expected'
+        exit(1)
+      end
     end
 
     desc 'Populate the database with test data for 2.4.3'
@@ -142,13 +147,19 @@ namespace :tests do
         INSERT INTO "accounts"
           (id, username, domain, private_key, public_key, created_at, updated_at)
         VALUES
-          (10, 'kmruser', NULL, #{user_private_key}, #{user_public_key}, now(), now());
+          (10, 'kmruser', NULL, #{user_private_key}, #{user_public_key}, now(), now()),
+          (11, 'qcuser', NULL, #{user_private_key}, #{user_public_key}, now(), now());
 
         INSERT INTO "users"
           (id, account_id, email, created_at, updated_at, admin, locale, chosen_languages)
         VALUES
           (4, 10, 'kmruser@localhost', now(), now(), false, 'ku', '{en,kmr,ku,ckb}');
 
+        INSERT INTO "users"
+          (id, account_id, email, created_at, updated_at, locale)
+        VALUES
+          (5, 11, 'qcuser@localhost', now(), now(), 'fr-QC');
+
         INSERT INTO "settings"
           (id, thing_type, thing_id, var, value, created_at, updated_at)
         VALUES

From 01ca84e5418183af477a1a8317f367f46113657e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:48:19 +0100
Subject: [PATCH 253/436] New Crowdin Translations (automated) (#28660)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/devise.fr-CA.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index 4c69360024..e9f09a6980 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -20,8 +20,8 @@ fr-CA:
       confirmation_instructions:
         action: Vérifier l’adresse courriel
         action_with_app: Confirmer et retourner à %{app}
-        explanation: Vous avez créé un compte sur %{host} avec cette adresse courriel. Vous êtes à un clic de l’activer. Si ce n'était pas vous, veuiller ignorer ce courriel.
-        explanation_when_pending: Vous avez demandé à vous inscrire à %{host} avec cette adresse courriel. Une fois que vous aurez confirmé cette adresse, nous étudierons votre demande. Vous pouvez vous connecter pour changer vos détails ou supprimer votre compte, mais vous ne pouvez pas accéder à la plupart des fonctionalités du compte avant que votre compte ne soit approuvé. Si votre demande est rejetée, vos données seront supprimées, donc aucune action supplémentaire ne sera requise de votre part. Si ce n'était pas vous, veuiller ignorer ce courriel.
+        explanation: Vous avez créé un compte sur %{host} avec cette adresse courriel. Vous êtes à un clic de l’activer. Si ce n'était pas vous, veuillez ignorer ce courriel.
+        explanation_when_pending: Vous avez demandé à vous inscrire à %{host} avec cette adresse courriel. Une fois que vous aurez confirmé cette adresse, nous étudierons votre demande. Vous pouvez vous connecter pour changer vos détails ou supprimer votre compte, mais vous ne pouvez pas accéder à la plupart des fonctionnalités du compte avant que votre compte ne soit approuvé. Si votre demande est rejetée, vos données seront supprimées, donc aucune action supplémentaire ne sera requise de votre part. Si ce n'était pas vous, veuillez ignorer ce courriel.
         extra_html: Veuillez également consulter <a href="%{terms_path}">les règles du serveur</a> et <a href="%{policy_path}">nos conditions d’utilisation</a>.
         subject: 'Mastodon: Instructions de confirmation pour %{instance}'
         title: Vérifier l’adresse courriel

From 17818498847c934a9a29f664c1e8fd0472061b38 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Tue, 9 Jan 2024 12:50:21 +0100
Subject: [PATCH 254/436] Inline what remains of the rails-settings-cached gem
 (#28618)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 Gemfile                     |   1 -
 Gemfile.lock                |   9 --
 app/models/setting.rb       | 153 +++++++++++++++++++-------
 spec/models/setting_spec.rb | 208 ++++++++----------------------------
 4 files changed, 157 insertions(+), 214 deletions(-)

diff --git a/Gemfile b/Gemfile
index a56702fad2..e0980c0720 100644
--- a/Gemfile
+++ b/Gemfile
@@ -75,7 +75,6 @@ gem 'premailer-rails'
 gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 2.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 7.0'
-gem 'rails-settings-cached', '~> 0.6', git: 'https://github.com/mastodon/rails-settings-cached.git', branch: 'v0.6.6-aliases-true'
 gem 'redcarpet', '~> 3.6'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
diff --git a/Gemfile.lock b/Gemfile.lock
index 442022e81a..50a6412a1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,14 +18,6 @@ GIT
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
 
-GIT
-  remote: https://github.com/mastodon/rails-settings-cached.git
-  revision: 86328ef0bd04ce21cc0504ff5e334591e8c2ccab
-  branch: v0.6.6-aliases-true
-  specs:
-    rails-settings-cached (0.6.6)
-      rails (>= 4.2.0)
-
 GIT
   remote: https://github.com/stanhu/omniauth-cas.git
   revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
@@ -922,7 +914,6 @@ DEPENDENCIES
   rails (~> 7.1.1)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 7.0)
-  rails-settings-cached (~> 0.6)!
   rdf-normalize (~> 0.5)
   redcarpet (~> 3.6)
   redis (~> 4.5)
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 3bdc6ffb40..ecd9d2d737 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -13,49 +13,120 @@
 #  thing_id   :bigint(8)
 #
 
-class Setting < RailsSettings::Base
-  source Rails.root.join('config', 'settings.yml')
+# This file is derived from a fork of the `rails-settings-cached` gem available at
+# https://github.com/mastodon/rails-settings-cached/tree/v0.6.6-aliases-true, with
+# the original available at:
+# https://github.com/huacnlee/rails-settings-cached/tree/0.x
+
+# It is licensed as follows:
+
+# Copyright (c) 2006 Alex Wayne
+# Some additional features added 2009 by Georg Ledermann
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOa AND
+# NONINFRINGEMENT. IN NO EVENT SaALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Setting < ApplicationRecord
+  after_commit :rewrite_cache, on: %i(create update)
+  after_commit :expire_cache, on: %i(destroy)
+
+  # Settings are server-wide settings only, but they were previously
+  # used for users too. This can be dropped later with a database
+  # migration dropping any scoped setting.
+  default_scope { where(thing_type: nil, thing_id: nil) }
+
+  class << self
+    # get or set a variable with the variable as the called method
+    # rubocop:disable Style/MissingRespondToMissing
+    def method_missing(method, *args)
+      # set a value for a variable
+      if method.end_with?('=')
+        var_name = method.to_s.chomp('=')
+        value = args.first
+        self[var_name] = value
+      else
+        # retrieve a value
+        self[method.to_s]
+      end
+    end
+    # rubocop:enable Style/MissingRespondToMissing
+
+    def object(var_name)
+      find_by(var: var_name.to_s)
+    end
+
+    def cache_prefix_by_startup
+      @cache_prefix_by_startup ||= Digest::MD5.hexdigest(default_settings.to_s)
+    end
+
+    def cache_key(var_name)
+      "rails_settings_cached/#{cache_prefix_by_startup}/#{var_name}"
+    end
+
+    def [](key)
+      Rails.cache.fetch(cache_key(key)) do
+        db_val = object(key)
+        db_val ? db_val.value : default_settings[key]
+      end
+    end
+
+    # set a setting value by [] notation
+    def []=(var_name, value)
+      var_name = var_name.to_s
+
+      record = object(var_name) || new(var: var_name)
+      record.value = value
+      record.save!
+    end
+
+    def default_settings
+      return @default_settings if defined?(@default_settings)
+
+      content = Rails.root.join('config', 'settings.yml').read
+      hash = content.empty? ? {} : YAML.safe_load(ERB.new(content).result, aliases: true).to_hash
+      @default_settings = hash[Rails.env] || {}
+    end
+  end
+
+  # get the value field, YAML decoded
+  def value
+    YAML.safe_load(self[:value], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol]) if self[:value].present?
+  end
+
+  # set the value field, YAML encoded
+  def value=(new_value)
+    self[:value] = new_value.to_yaml
+  end
+
+  def rewrite_cache
+    Rails.cache.write(cache_key, value)
+  end
+
+  def expire_cache
+    Rails.cache.delete(cache_key)
+  end
+
+  def cache_key
+    self.class.cache_key(var)
+  end
 
   def to_param
     var
   end
-
-  class << self
-    def [](key)
-      return super(key) unless rails_initialized?
-
-      Rails.cache.fetch(cache_key(key, nil)) do
-        db_val = object(key)
-
-        if db_val
-          default_value = default_settings[key]
-
-          return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash)
-
-          db_val.value
-        else
-          default_settings[key]
-        end
-      end
-    end
-
-    def all_as_records
-      vars    = thing_scoped
-      records = vars.index_by(&:var)
-
-      default_settings.each do |key, default_value|
-        next if records.key?(key) || default_value.is_a?(Hash)
-
-        records[key] = Setting.new(var: key, value: default_value)
-      end
-
-      records
-    end
-
-    def default_settings
-      return {} unless RailsSettings::Default.enabled?
-
-      RailsSettings::Default.instance
-    end
-  end
 end
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index e98062810e..ca9c65511d 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -13,189 +13,71 @@ RSpec.describe Setting do
   end
 
   describe '.[]' do
+    let(:key)         { 'key' }
+    let(:cache_key)   { 'cache-key' }
+    let(:cache_value) { 'cache-value' }
+
     before do
-      allow(described_class).to receive(:rails_initialized?).and_return(rails_initialized)
+      allow(described_class).to receive(:cache_key).with(key).and_return(cache_key)
     end
 
-    let(:key) { 'key' }
-
-    context 'when rails_initialized? is falsey' do
-      let(:rails_initialized) { false }
-
-      it 'calls RailsSettings::Base#[]' do
-        allow(RailsSettings::Base).to receive(:[]).with(key)
-
-        described_class[key]
-
-        expect(RailsSettings::Base).to have_received(:[]).with(key)
-      end
-    end
-
-    context 'when rails_initialized? is truthy' do
+    context 'when Rails.cache does not exists' do
       before do
-        allow(RailsSettings::Base).to receive(:cache_key).with(key, nil).and_return(cache_key)
+        allow(described_class).to receive(:object).with(key).and_return(object)
+        allow(described_class).to receive(:default_settings).and_return(default_settings)
+
+        Fabricate(:setting, var: key, value: nil)
+
+        Rails.cache.delete(cache_key)
       end
 
-      let(:rails_initialized) { true }
-      let(:cache_key)         { 'cache-key' }
-      let(:cache_value)       { 'cache-value' }
+      let(:object)           { nil }
+      let(:default_value)    { 'default_value' }
+      let(:default_settings) { { key => default_value } }
 
-      it 'calls not RailsSettings::Base#[]' do
-        allow(RailsSettings::Base).to receive(:[]).with(key)
+      it 'calls Setting.object' do
+        allow(described_class).to receive(:object).with(key)
 
         described_class[key]
 
-        expect(RailsSettings::Base).to_not have_received(:[]).with(key)
+        expect(described_class).to have_received(:object).with(key)
       end
 
-      context 'when Rails.cache does not exists' do
-        before do
-          allow(RailsSettings::Settings).to receive(:object).with(key).and_return(object)
-          allow(described_class).to receive(:default_settings).and_return(default_settings)
-          settings_double = instance_double(Settings::ScopedSettings, thing_scoped: records)
-          allow(Settings::ScopedSettings).to receive(:new).and_return(settings_double)
-          Rails.cache.delete(cache_key)
+      context 'when Setting.object returns truthy' do
+        let(:object) { db_val }
+        let(:db_val) { instance_double(described_class, value: 'db_val') }
+        let(:default_value) { 'default_value' }
+
+        it 'returns db_val.value' do
+          expect(described_class[key]).to be db_val.value
         end
+      end
 
-        let(:object)           { nil }
-        let(:default_value)    { 'default_value' }
-        let(:default_settings) { { key => default_value } }
-        let(:records)          { [Fabricate(:setting, var: key, value: nil)] }
+      context 'when Setting.object returns falsey' do
+        let(:object) { nil }
 
-        it 'calls RailsSettings::Settings.object' do
-          allow(RailsSettings::Settings).to receive(:object).with(key)
+        it 'returns default_settings[key]' do
+          expect(described_class[key]).to be default_settings[key]
+        end
+      end
+    end
 
+    context 'when Rails.cache exists' do
+      before do
+        Rails.cache.write(cache_key, cache_value)
+      end
+
+      it 'does not query the database' do
+        callback = double
+        allow(callback).to receive(:call)
+        ActiveSupport::Notifications.subscribed callback, 'sql.active_record' do
           described_class[key]
-
-          expect(RailsSettings::Settings).to have_received(:object).with(key)
-        end
-
-        context 'when RailsSettings::Settings.object returns truthy' do
-          let(:object) { db_val }
-          let(:db_val) { instance_double(described_class, value: 'db_val') }
-
-          context 'when default_value is a Hash' do
-            let(:default_value) { { default_value: 'default_value' } }
-
-            it 'calls default_value.with_indifferent_access.merge!' do
-              indifferent_hash = instance_double(Hash, merge!: nil)
-              allow(default_value).to receive(:with_indifferent_access).and_return(indifferent_hash)
-
-              described_class[key]
-
-              expect(default_value).to have_received(:with_indifferent_access)
-              expect(indifferent_hash).to have_received(:merge!).with(db_val.value)
-            end
-          end
-
-          context 'when default_value is not a Hash' do
-            let(:default_value) { 'default_value' }
-
-            it 'returns db_val.value' do
-              expect(described_class[key]).to be db_val.value
-            end
-          end
-        end
-
-        context 'when RailsSettings::Settings.object returns falsey' do
-          let(:object) { nil }
-
-          it 'returns default_settings[key]' do
-            expect(described_class[key]).to be default_settings[key]
-          end
         end
+        expect(callback).to_not have_received(:call)
       end
 
-      context 'when Rails.cache exists' do
-        before do
-          Rails.cache.write(cache_key, cache_value)
-        end
-
-        it 'does not query the database' do
-          callback = double
-          allow(callback).to receive(:call)
-          ActiveSupport::Notifications.subscribed callback, 'sql.active_record' do
-            described_class[key]
-          end
-          expect(callback).to_not have_received(:call)
-        end
-
-        it 'returns the cached value' do
-          expect(described_class[key]).to eq cache_value
-        end
-      end
-    end
-  end
-
-  describe '.all_as_records' do
-    before do
-      settings_double = instance_double(Settings::ScopedSettings, thing_scoped: records)
-      allow(Settings::ScopedSettings).to receive(:new).and_return(settings_double)
-      allow(described_class).to receive(:default_settings).and_return(default_settings)
-    end
-
-    let(:key)              { 'key' }
-    let(:default_value)    { 'default_value' }
-    let(:default_settings) { { key => default_value } }
-    let(:original_setting) { Fabricate(:setting, var: key, value: nil) }
-    let(:records)          { [original_setting] }
-
-    it 'returns a Hash' do
-      expect(described_class.all_as_records).to be_a Hash
-    end
-
-    context 'when records includes Setting with var as the key' do
-      let(:records) { [original_setting] }
-
-      it 'includes the original Setting' do
-        setting = described_class.all_as_records[key]
-        expect(setting).to eq original_setting
-      end
-    end
-
-    context 'when records includes nothing' do
-      let(:records) { [] }
-
-      context 'when default_value is not a Hash' do
-        it 'includes Setting with value of default_value' do
-          setting = described_class.all_as_records[key]
-
-          expect(setting).to be_a described_class
-          expect(setting).to have_attributes(var: key)
-          expect(setting).to have_attributes(value: 'default_value')
-        end
-      end
-
-      context 'when default_value is a Hash' do
-        let(:default_value) { { 'foo' => 'fuga' } }
-
-        it 'returns {}' do
-          expect(described_class.all_as_records).to eq({})
-        end
-      end
-    end
-  end
-
-  describe '.default_settings' do
-    subject { described_class.default_settings }
-
-    before do
-      allow(RailsSettings::Default).to receive(:enabled?).and_return(enabled)
-    end
-
-    context 'when RailsSettings::Default.enabled? is false' do
-      let(:enabled) { false }
-
-      it 'returns {}' do
-        expect(subject).to eq({})
-      end
-    end
-
-    context 'when RailsSettings::Settings.enabled? is true' do
-      let(:enabled) { true }
-
-      it 'returns instance of RailsSettings::Default' do
-        expect(subject).to be_a RailsSettings::Default
+      it 'returns the cached value' do
+        expect(described_class[key]).to eq cache_value
       end
     end
   end

From 1ad908e0c08c236389967d86b4f238f428de9fef Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 13:06:19 +0100
Subject: [PATCH 255/436] Update dependency fog-core to v2.4.0 (#28582)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 50a6412a1d..2d54ac33ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.104.0)
+    excon (0.109.0)
     fabrication (2.31.0)
     faker (3.2.2)
       i18n (>= 1.8.11, < 2)
@@ -299,7 +299,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fog-core (2.3.0)
+    fog-core (2.4.0)
       builder
       excon (~> 0.71)
       formatador (>= 0.2, < 2.0)

From 4e02838832a1b1dec9330c5c70b47529f1db256f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jan 2024 07:50:57 -0500
Subject: [PATCH 256/436] Enable "low risk" Rails 7.1 setting defaults (#28626)

---
 .../new_framework_defaults_7_1.rb             | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
index 1475fe2fd9..bcc300c89f 100644
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -29,7 +29,7 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 
 # Do not treat an `ActionController::Parameters` instance
 # as equal to an equivalent `Hash` by default.
-# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
+Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false
 
 # Active Record Encryption now uses SHA-256 as its hash digest algorithm. Important: If you have
 # data encrypted with previous Rails versions, there are two scenarios to consider:
@@ -50,7 +50,7 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 # Instead, run these callbacks on the instance most likely to have internal
 # state which matches what was committed to the database, typically the last
 # instance to save.
-# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
+Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false
 
 # Configures SQLite with a strict strings mode, which disables double-quoted string literals.
 #
@@ -59,10 +59,10 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 # it then considers them as string literals. Because of this, typos can silently go unnoticed.
 # For example, it is possible to create an index for a non existing column.
 # See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details.
-# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
+Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true
 
 # Disable deprecated singular associations names
-# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
+Rails.application.config.active_record.allow_deprecated_singular_associations_name = false
 
 # Enable the Active Job `BigDecimal` argument serializer, which guarantees
 # roundtripping. Without this serializer, some queue adapters may serialize
@@ -78,12 +78,12 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 # `write` are given an invalid `expires_at` or `expires_in` time.
 # Options are `true`, and `false`. If `false`, the exception will be reported
 # as `handled` and logged instead.
-# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
+Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true
 
 # Specify whether Query Logs will format tags using the SQLCommenter format
 # (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format.
 # Options are `:legacy` and `:sqlcommenter`.
-# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
+Rails.application.config.active_record.query_log_tags_format = :sqlcommenter
 
 # Specify the default serializer used by `MessageEncryptor` and `MessageVerifier`
 # instances.
@@ -129,39 +129,37 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 # `config.load_defaults 7.1` does not set this value for environments other than
 # development and test.
 #
-# if Rails.env.local?
-#   Rails.application.config.log_file_size = 100 * 1024 * 1024
-# end
+Rails.application.config.log_file_size = 100 * 1024 * 1024 if Rails.env.local?
 
 # Enable raising on assignment to attr_readonly attributes. The previous
 # behavior would allow assignment but silently not persist changes to the
 # database.
-# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
+Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true
 
 # Enable validating only parent-related columns for presence when the parent is mandatory.
 # The previous behavior was to validate the presence of the parent record, which performed an extra query
 # to get the parent every time the child record was updated, even when parent has not changed.
-# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
+Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false
 
 # Enable precompilation of `config.filter_parameters`. Precompilation can
 # improve filtering performance, depending on the quantity and types of filters.
-# Rails.application.config.precompile_filter_parameters = true
+Rails.application.config.precompile_filter_parameters = true
 
 # Enable before_committed! callbacks on all enrolled records in a transaction.
 # The previous behavior was to only run the callbacks on the first copy of a record
 # if there were multiple copies of the same record enrolled in the transaction.
-# Rails.application.config.active_record.before_committed_on_all_records = true
+Rails.application.config.active_record.before_committed_on_all_records = true
 
 # Disable automatic column serialization into YAML.
 # To keep the historic behavior, you can set it to `YAML`, however it is
 # recommended to explicitly define the serialization method for each column
 # rather than to rely on a global default.
-# Rails.application.config.active_record.default_column_serializer = nil
+Rails.application.config.active_record.default_column_serializer = nil
 
 # Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
 # This matches the behaviour of all other callbacks.
 # In previous versions of Rails, they ran in the inverse order.
-# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
+Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true
 
 # Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`.
 #
@@ -169,7 +167,7 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 
 # Controls when to generate a value for <tt>has_secure_token</tt> declarations.
 #
-# Rails.application.config.active_record.generate_secure_token_on = :initialize
+Rails.application.config.active_record.generate_secure_token_on = :initialize
 
 # ** Please read carefully, this must be configured in config/application.rb **
 # Change the format of the cache entry.
@@ -190,7 +188,7 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 #
 # In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor.
 #
-# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
+Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor
 
 # Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your
 # platform.
@@ -213,4 +211,4 @@ Rails.application.config.add_autoload_paths_to_load_path = false
 #
 # In previous versions of Rails, these test helpers always used an HTML4 parser.
 #
-# Rails.application.config.dom_testing_default_html_version = :html5
+Rails.application.config.dom_testing_default_html_version = :html5

From 10203bd57a13b243b03491f107efbe9566e89ed6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 9 Jan 2024 15:01:53 +0100
Subject: [PATCH 257/436] Clean up `Setting` model and remove dead code
 (#28661)

---
 app/lib/settings/scoped_settings.rb | 79 -----------------------------
 app/models/setting.rb               | 12 ++---
 spec/models/setting_spec.rb         | 30 +++++------
 3 files changed, 15 insertions(+), 106 deletions(-)
 delete mode 100644 app/lib/settings/scoped_settings.rb

diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
deleted file mode 100644
index 3ad57cc1ea..0000000000
--- a/app/lib/settings/scoped_settings.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
-  class ScopedSettings
-    DEFAULTING_TO_UNSCOPED = %w(
-      theme
-      noindex
-    ).freeze
-
-    def initialize(object)
-      @object = object
-    end
-
-    def method_missing(method, *args)
-      method_name = method.to_s
-      # set a value for a variable
-      if method_name[-1] == '='
-        var_name = method_name.sub('=', '')
-        value = args.first
-        self[var_name] = value
-      else
-        # retrieve a value
-        self[method_name]
-      end
-    end
-
-    def respond_to_missing?(*)
-      true
-    end
-
-    def all_as_records
-      vars = thing_scoped
-      records = vars.index_by(&:var)
-
-      Setting.default_settings.each do |key, default_value|
-        next if records.key?(key) || default_value.is_a?(Hash)
-
-        records[key] = Setting.new(var: key, value: default_value)
-      end
-
-      records
-    end
-
-    def []=(key, value)
-      key = key.to_s
-      record = thing_scoped.find_or_initialize_by(var: key)
-      record.update!(value: value)
-
-      Rails.cache.write(Setting.cache_key(key, @object), value)
-    end
-
-    def [](key)
-      Rails.cache.fetch(Setting.cache_key(key, @object)) do
-        db_val = thing_scoped.find_by(var: key.to_s)
-        if db_val
-          default_value = ScopedSettings.default_settings[key]
-          return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash)
-
-          db_val.value
-        else
-          ScopedSettings.default_settings[key]
-        end
-      end
-    end
-
-    class << self
-      def default_settings
-        defaulting = DEFAULTING_TO_UNSCOPED.index_with { |k| Setting[k] }
-        Setting.default_settings.merge!(defaulting)
-      end
-    end
-
-    protected
-
-    def thing_scoped
-      Setting.unscoped.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
-    end
-  end
-end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index ecd9d2d737..6af7a98c6d 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -67,10 +67,6 @@ class Setting < ApplicationRecord
     end
     # rubocop:enable Style/MissingRespondToMissing
 
-    def object(var_name)
-      find_by(var: var_name.to_s)
-    end
-
     def cache_prefix_by_startup
       @cache_prefix_by_startup ||= Digest::MD5.hexdigest(default_settings.to_s)
     end
@@ -81,16 +77,14 @@ class Setting < ApplicationRecord
 
     def [](key)
       Rails.cache.fetch(cache_key(key)) do
-        db_val = object(key)
+        db_val = find_by(var: key)
         db_val ? db_val.value : default_settings[key]
       end
     end
 
     # set a setting value by [] notation
     def []=(var_name, value)
-      var_name = var_name.to_s
-
-      record = object(var_name) || new(var: var_name)
+      record = find_or_initialize_by(var: var_name.to_s)
       record.value = value
       record.save!
     end
@@ -100,7 +94,7 @@ class Setting < ApplicationRecord
 
       content = Rails.root.join('config', 'settings.yml').read
       hash = content.empty? ? {} : YAML.safe_load(ERB.new(content).result, aliases: true).to_hash
-      @default_settings = hash[Rails.env] || {}
+      @default_settings = (hash[Rails.env] || {}).freeze
     end
   end
 
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index ca9c65511d..a1e24e8350 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -23,38 +23,32 @@ RSpec.describe Setting do
 
     context 'when Rails.cache does not exists' do
       before do
-        allow(described_class).to receive(:object).with(key).and_return(object)
         allow(described_class).to receive(:default_settings).and_return(default_settings)
 
-        Fabricate(:setting, var: key, value: nil)
+        Fabricate(:setting, var: key, value: 42) if save_setting
 
         Rails.cache.delete(cache_key)
       end
 
-      let(:object)           { nil }
       let(:default_value)    { 'default_value' }
       let(:default_settings) { { key => default_value } }
+      let(:save_setting)     { true }
 
-      it 'calls Setting.object' do
-        allow(described_class).to receive(:object).with(key)
+      context 'when the setting has been saved to database' do
+        it 'returns the value from database' do
+          callback = double
+          allow(callback).to receive(:call)
 
-        described_class[key]
+          ActiveSupport::Notifications.subscribed callback, 'sql.active_record' do
+            expect(described_class[key]).to eq 42
+          end
 
-        expect(described_class).to have_received(:object).with(key)
-      end
-
-      context 'when Setting.object returns truthy' do
-        let(:object) { db_val }
-        let(:db_val) { instance_double(described_class, value: 'db_val') }
-        let(:default_value) { 'default_value' }
-
-        it 'returns db_val.value' do
-          expect(described_class[key]).to be db_val.value
+          expect(callback).to have_received(:call)
         end
       end
 
-      context 'when Setting.object returns falsey' do
-        let(:object) { nil }
+      context 'when the setting has not been saved to database' do
+        let(:save_setting) { false }
 
         it 'returns default_settings[key]' do
           expect(described_class[key]).to be default_settings[key]

From 93938751eb34b194148236d3a3f907c3b71d0870 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 15:40:24 +0100
Subject: [PATCH 258/436] Update dependency ruby-prof to v1.7.0 (#28637)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 2d54ac33ed..7b9d3579e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -684,7 +684,7 @@ GEM
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
-    ruby-prof (1.6.3)
+    ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     ruby-saml (1.15.0)
       nokogiri (>= 1.13.10)

From 9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:17:18 +0100
Subject: [PATCH 259/436] Update dependency irb to v1.11.1 (#28662)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 7b9d3579e5..549781aed4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,9 +370,9 @@ GEM
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
     io-console (0.7.1)
-    irb (1.11.0)
+    irb (1.11.1)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jmespath (1.6.2)
     json (2.7.1)
     json-canonicalization (1.0.0)
@@ -616,7 +616,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.8.3)
-    reline (0.4.1)
+    reline (0.4.2)
       io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)

From 09ab073f0cc5a8963c6d34fb76d3af84e0c0f40e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jan 2024 10:28:56 -0500
Subject: [PATCH 260/436] Fix `LineLength` haml-lint in `app/views/settings`
 area (#28663)

---
 .haml-lint_todo.yml                           |  8 +---
 .../settings/applications/_fields.html.haml   | 25 ++++++++--
 .../settings/featured_tags/index.html.haml    |  4 +-
 app/views/settings/imports/index.html.haml    | 22 +++++++--
 .../migration/redirects/new.html.haml         |  6 ++-
 .../preferences/appearance/show.html.haml     | 46 ++++++++++++++++---
 .../settings/preferences/other/show.html.haml | 39 ++++++++++++++--
 app/views/settings/profiles/show.html.haml    | 10 +++-
 .../confirmations/new.html.haml               |  7 ++-
 9 files changed, 137 insertions(+), 30 deletions(-)

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 09764c2f30..13ee2baaab 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,20 +1,16 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2024-01-08 14:02:57 -0500 using Haml-Lint version 0.53.0.
+# on 2024-01-09 10:00:31 -0500 using Haml-Lint version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 10
+  # Offense count: 5
   LineLength:
     exclude:
       - 'app/views/admin/roles/_form.html.haml'
       - 'app/views/auth/registrations/edit.html.haml'
       - 'app/views/auth/registrations/new.html.haml'
       - 'app/views/media/player.html.haml'
-      - 'app/views/settings/applications/_fields.html.haml'
-      - 'app/views/settings/imports/index.html.haml'
-      - 'app/views/settings/preferences/appearance/show.html.haml'
-      - 'app/views/settings/preferences/other/show.html.haml'
diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml
index 29e2bcb5a3..ed97e880fc 100644
--- a/app/views/settings/applications/_fields.html.haml
+++ b/app/views/settings/applications/_fields.html.haml
@@ -1,11 +1,17 @@
 .fields-group
-  = f.input :name, wrapper: :with_label, label: t('activerecord.attributes.doorkeeper/application.name')
+  = f.input :name,
+            label: t('activerecord.attributes.doorkeeper/application.name'),
+            wrapper: :with_label
 
 .fields-group
-  = f.input :website, wrapper: :with_label, label: t('activerecord.attributes.doorkeeper/application.website')
+  = f.input :website,
+            label: t('activerecord.attributes.doorkeeper/application.website'),
+            wrapper: :with_label
 
 .fields-group
-  = f.input :redirect_uri, wrapper: :with_block_label, label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri')
+  = f.input :redirect_uri,
+            label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri'),
+            wrapper: :with_block_label
 
   %p.hint= t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: content_tag(:code, Doorkeeper.configuration.native_redirect_uri)).html_safe
 
@@ -15,4 +21,15 @@
     %span.hint= t('simple_form.hints.defaults.scopes')
 
   - Doorkeeper.configuration.scopes.group_by { |s| s.split(':').first }.each_value do |value|
-    = f.input :scopes, label: false, hint: false, collection: value.sort, wrapper: :with_block_label, include_blank: false, label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) }, selected: f.object.scopes.all, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+    = f.input :scopes,
+              as: :check_boxes,
+              collection_wrapper_tag: 'ul',
+              collection: value.sort,
+              hint: false,
+              include_blank: false,
+              item_wrapper_tag: 'li',
+              label_method: ->(scope) { safe_join([content_tag(:samp, scope, class: class_for_scope(scope)), content_tag(:span, t("doorkeeper.scopes.#{scope}"), class: 'hint')]) },
+              label: false,
+              required: false,
+              selected: f.object.scopes.all,
+              wrapper: :with_block_label
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index 387eb290e3..22f9180129 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -11,7 +11,9 @@
   %p.lead= t('featured_tags.hint_html')
 
   .fields-group
-    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.display_name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')
+    = f.input :name,
+              hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.display_name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' '),
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('featured_tags.add_new'), type: :submit
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index 5f7950b598..d5ca252dc1 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -3,13 +3,29 @@
 
 = simple_form_for @import, url: settings_imports_path do |f|
   .field-group
-    = f.input :type, as: :grouped_select, collection: { constructive: %i(following bookmarks lists), destructive: %i(muting blocking domain_blocking) }, wrapper: :with_block_label, include_blank: false, label_method: ->(type) { I18n.t("imports.types.#{type}") }, group_label_method: ->(group) { I18n.t("imports.type_groups.#{group.first}") }, group_method: :last, hint: t('imports.preface')
+    = f.input :type,
+              as: :grouped_select,
+              collection: { constructive: %i(following bookmarks lists), destructive: %i(muting blocking domain_blocking) },
+              group_label_method: ->(group) { I18n.t("imports.type_groups.#{group.first}") },
+              group_method: :last,
+              hint: t('imports.preface'),
+              include_blank: false,
+              label_method: ->(type) { I18n.t("imports.types.#{type}") },
+              wrapper: :with_block_label
 
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :data, as: :file, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data')
+      = f.input :data,
+                as: :file,
+                hint: t('simple_form.hints.imports.data'),
+                wrapper: :with_block_label
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :mode, as: :radio_buttons, collection: Import::MODES, label_method: ->(mode) { safe_join([I18n.t("imports.modes.#{mode}"), content_tag(:span, I18n.t("imports.modes.#{mode}_long"), class: 'hint')]) }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+      = f.input :mode,
+                as: :radio_buttons,
+                collection_wrapper_tag: 'ul',
+                collection: Import::MODES,
+                item_wrapper_tag: 'li',
+                label_method: ->(mode) { safe_join([I18n.t("imports.modes.#{mode}"), content_tag(:span, I18n.t("imports.modes.#{mode}_long"), class: 'hint')]) }
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/settings/migration/redirects/new.html.haml b/app/views/settings/migration/redirects/new.html.haml
index 3700878799..731acb9dbc 100644
--- a/app/views/settings/migration/redirects/new.html.haml
+++ b/app/views/settings/migration/redirects/new.html.haml
@@ -15,7 +15,11 @@
 
   .fields-row
     .fields-row__column.fields-group.fields-row__column-6
-      = f.input :acct, wrapper: :with_block_label, input_html: { autocapitalize: 'none', autocorrect: 'off' }, label: t('simple_form.labels.account_migration.acct'), hint: t('simple_form.hints.account_migration.acct')
+      = f.input :acct,
+                hint: t('simple_form.hints.account_migration.acct'),
+                input_html: { autocapitalize: 'none', autocorrect: 'off' },
+                label: t('simple_form.labels.account_migration.acct'),
+                wrapper: :with_block_label
 
     .fields-row__column.fields-group.fields-row__column-6
       - if current_user.encrypted_password.present?
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 11fa2bfc43..76cd4381d8 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -7,13 +7,28 @@
 = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :locale, collection: ui_languages, wrapper: :with_label, include_blank: false, label_method: ->(locale) { native_locale_name(locale) }, selected: I18n.locale, hint: false
+      = f.input :locale,
+                collection: ui_languages,
+                hint: false,
+                include_blank: false,
+                label_method: ->(locale) { native_locale_name(locale) },
+                selected: I18n.locale,
+                wrapper: :with_label
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :time_zone, wrapper: :with_label, collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] }, hint: false
+      = f.input :time_zone,
+                collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] },
+                hint: false,
+                wrapper: :with_label
 
   .fields-group
     = f.simple_fields_for :settings, current_user.settings do |ff|
-      = ff.input :theme, collection: Themes.instance.names, label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_theme'), include_blank: false, hint: false
+      = ff.input :theme,
+                 collection: Themes.instance.names,
+                 hint: false,
+                 include_blank: false,
+                 label_method: ->(theme) { I18n.t("themes.#{theme}", default: theme) },
+                 label: I18n.t('simple_form.labels.defaults.setting_theme'),
+                 wrapper: :with_label
 
   - unless I18n.locale == :en
     .flash-message.translation-prompt
@@ -25,11 +40,17 @@
     %p.hint= t 'appearance.advanced_web_interface_hint'
 
     .fields-group
-      = ff.input :'web.advanced_layout', wrapper: :with_label, hint: false, label: I18n.t('simple_form.labels.defaults.setting_advanced_layout')
+      = ff.input :'web.advanced_layout',
+                 hint: false,
+                 label: I18n.t('simple_form.labels.defaults.setting_advanced_layout'),
+                 wrapper: :with_label
     %h4= t 'appearance.animations_and_accessibility'
 
     .fields-group
-      = ff.input :'web.use_pending_items', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_use_pending_items'), hint: I18n.t('simple_form.hints.defaults.setting_use_pending_items')
+      = ff.input :'web.use_pending_items',
+                 hint: I18n.t('simple_form.hints.defaults.setting_use_pending_items'),
+                 label: I18n.t('simple_form.labels.defaults.setting_use_pending_items'),
+                 wrapper: :with_label
 
     .fields-group
       = ff.input :'web.auto_play', wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_auto_play_gif')
@@ -52,10 +73,21 @@
     %h4= t 'appearance.sensitive_content'
 
     .fields-group
-      = ff.input :'web.display_media', collection: %w(default show_all hide_all), label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label, label: I18n.t('simple_form.labels.defaults.setting_display_media')
+      = ff.input :'web.display_media',
+                 as: :radio_buttons,
+                 collection_wrapper_tag: 'ul',
+                 collection: %w(default show_all hide_all),
+                 hint: false,
+                 item_wrapper_tag: 'li',
+                 label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") },
+                 label: I18n.t('simple_form.labels.defaults.setting_display_media'),
+                 wrapper: :with_floating_label
 
     .fields-group
-      = ff.input :'web.use_blurhash', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_use_blurhash'), hint: I18n.t('simple_form.hints.defaults.setting_use_blurhash')
+      = ff.input :'web.use_blurhash',
+                 hint: I18n.t('simple_form.hints.defaults.setting_use_blurhash'),
+                 label: I18n.t('simple_form.labels.defaults.setting_use_blurhash'),
+                 wrapper: :with_label
 
     .fields-group
       = ff.input :'web.expand_content_warnings', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_expand_spoilers')
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 5228ce1190..e2888f7212 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -9,24 +9,53 @@
 
   = f.simple_fields_for :settings, current_user.settings do |ff|
     .fields-group
-      = ff.input :aggregate_reblogs, wrapper: :with_label, recommended: true, label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'), hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs')
+      = ff.input :aggregate_reblogs,
+                 hint: I18n.t('simple_form.hints.defaults.setting_aggregate_reblogs'),
+                 label: I18n.t('simple_form.labels.defaults.setting_aggregate_reblogs'),
+                 recommended: true,
+                 wrapper: :with_label
 
     %h4= t 'preferences.posting_defaults'
 
     .fields-row
       .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_privacy, collection: Status.selectable_visibilities, wrapper: :with_label, include_blank: false, label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') }, required: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_privacy')
+        = ff.input :default_privacy,
+                   collection: Status.selectable_visibilities,
+                   hint: false,
+                   include_blank: false,
+                   label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
+                   label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
+                   required: false,
+                   wrapper: :with_label
 
       .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_language, collection: [nil] + filterable_languages, wrapper: :with_label, label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) }, required: false, include_blank: false, hint: false, label: I18n.t('simple_form.labels.defaults.setting_default_language')
+        = ff.input :default_language,
+                   collection: [nil] + filterable_languages,
+                   hint: false,
+                   include_blank: false,
+                   label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) },
+                   label: I18n.t('simple_form.labels.defaults.setting_default_language'),
+                   required: false,
+                   wrapper: :with_label
 
     .fields-group
-      = ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive')
+      = ff.input :default_sensitive,
+                 hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),
+                 label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
+                 wrapper: :with_label
 
   %h4= t 'preferences.public_timelines'
 
   .fields-group
-    = f.input :chosen_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: ->(locale) { native_locale_name(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+    = f.input :chosen_languages,
+              as: :check_boxes,
+              collection_wrapper_tag: 'ul',
+              collection: filterable_languages,
+              include_blank: false,
+              item_wrapper_tag: 'li',
+              label_method: ->(locale) { native_locale_name(locale) },
+              required: false,
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 5f9613c939..b7b0a0da92 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -33,7 +33,10 @@
   .fields-row
     .fields-row__column.fields-row__column-6
       .fields-group
-        = f.input :avatar, wrapper: :with_block_label, input_html: { accept: Account::Avatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(Account::Avatar::LIMIT))
+        = f.input :avatar,
+                  hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(Account::Avatar::LIMIT)),
+                  input_html: { accept: Account::Avatar::IMAGE_MIME_TYPES.join(',') },
+                  wrapper: :with_block_label
 
     .fields-row__column.fields-row__column-6
       .fields-group
@@ -46,7 +49,10 @@
   .fields-row
     .fields-row__column.fields-row__column-6
       .fields-group
-        = f.input :header, wrapper: :with_block_label, input_html: { accept: Account::Header::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(Account::Header::LIMIT))
+        = f.input :header,
+                  hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(Account::Header::LIMIT)),
+                  input_html: { accept: Account::Header::IMAGE_MIME_TYPES.join(',') },
+                  wrapper: :with_block_label
 
     .fields-row__column.fields-row__column-6
       .fields-group
diff --git a/app/views/settings/two_factor_authentication/confirmations/new.html.haml b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
index 43830ac27f..0b8278a104 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -12,7 +12,12 @@
       %samp.qr-alternative__code= @new_otp_secret.scan(/.{4}/).join(' ')
 
   .fields-group
-    = f.input :otp_attempt, wrapper: :with_label, hint: t('otp_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { autocomplete: 'off' }, required: true
+    = f.input :otp_attempt,
+              hint: t('otp_authentication.code_hint'),
+              input_html: { autocomplete: 'off' },
+              label: t('simple_form.labels.defaults.otp_attempt'),
+              required: true,
+              wrapper: :with_label
 
   .actions
     = f.button :button, t('otp_authentication.enable'), type: :submit

From eed4eef39a92464459496a476e5e3cccfbe084ab Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 9 Jan 2024 11:03:16 -0500
Subject: [PATCH 261/436] Fix `LineLength` haml-lint in `app/views/auth` area
 (#28664)

---
 .haml-lint_todo.yml                           |  6 +--
 app/views/auth/challenges/new.html.haml       |  6 ++-
 app/views/auth/confirmations/new.html.haml    |  8 ++-
 app/views/auth/passwords/edit.html.haml       | 13 ++++-
 app/views/auth/passwords/new.html.haml        |  7 ++-
 .../registrations/_account_warning.html.haml  |  4 +-
 .../auth/registrations/_session.html.haml     |  4 +-
 app/views/auth/registrations/edit.html.haml   | 26 ++++++++--
 app/views/auth/registrations/new.html.haml    | 52 ++++++++++++++++---
 app/views/auth/sessions/new.html.haml         | 20 +++++--
 .../_otp_authentication_form.html.haml        |  7 ++-
 app/views/auth/setup/show.html.haml           |  5 +-
 12 files changed, 130 insertions(+), 28 deletions(-)

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 13ee2baaab..ac9f763758 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,16 +1,14 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2024-01-09 10:00:31 -0500 using Haml-Lint version 0.53.0.
+# on 2024-01-09 10:48:44 -0500 using Haml-Lint version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 5
+  # Offense count: 3
   LineLength:
     exclude:
       - 'app/views/admin/roles/_form.html.haml'
-      - 'app/views/auth/registrations/edit.html.haml'
-      - 'app/views/auth/registrations/new.html.haml'
       - 'app/views/media/player.html.haml'
diff --git a/app/views/auth/challenges/new.html.haml b/app/views/auth/challenges/new.html.haml
index 4f21e4af6e..50dcebb00c 100644
--- a/app/views/auth/challenges/new.html.haml
+++ b/app/views/auth/challenges/new.html.haml
@@ -5,7 +5,11 @@
   = f.input :return_to, as: :hidden
 
   .field-group
-    = f.input :current_password, wrapper: :with_block_label, input_html: { autocomplete: 'current-password', autofocus: true }, label: t('challenge.prompt'), required: true
+    = f.input :current_password,
+              input_html: { autocomplete: 'current-password', autofocus: true },
+              label: t('challenge.prompt'),
+              required: true,
+              wrapper: :with_block_label
 
   .actions
     = f.button :button, t('challenge.confirm'), type: :submit
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index 0cb82a1f86..eaa9d9add0 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -21,7 +21,13 @@
     = render 'shared/error_messages', object: resource
 
     .fields-group
-      = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, readonly: current_user.present?, hint: current_user.present? && t('auth.confirmations.wrong_email_hint')
+      = f.input :email,
+                autofocus: true,
+                hint: current_user.present? && t('auth.confirmations.wrong_email_hint'),
+                input_html: { 'aria-label': t('simple_form.labels.defaults.email') },
+                label: t('simple_form.labels.defaults.email'),
+                readonly: current_user.present?,
+                wrapper: :with_label
 
     .actions
       = f.button :button, t('auth.resend_confirmation'), type: :submit
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index b95a9b676b..a75dc2d9fb 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -8,9 +8,18 @@
     = f.input :reset_password_token, as: :hidden
 
     .fields-group
-      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, required: true
+      = f.input :password,
+                autofocus: true,
+                input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
+                label: t('simple_form.labels.defaults.new_password'),
+                required: true,
+                wrapper: :with_label
     .fields-group
-      = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' }, required: true
+      = f.input :password_confirmation,
+                input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' },
+                label: t('simple_form.labels.defaults.confirm_new_password'),
+                required: true,
+                wrapper: :with_label
 
     .actions
       = f.button :button, t('auth.set_new_password'), type: :submit
diff --git a/app/views/auth/passwords/new.html.haml b/app/views/auth/passwords/new.html.haml
index 10ad108eaf..8d5adaf3b9 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -5,7 +5,12 @@
   = render 'shared/error_messages', object: resource
 
   .fields-group
-    = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false
+    = f.input :email,
+              autofocus: true,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.email') },
+              label: t('simple_form.labels.defaults.email'),
+              wrapper: :with_label
 
   .actions
     = f.button :button, t('auth.reset_password'), type: :submit
diff --git a/app/views/auth/registrations/_account_warning.html.haml b/app/views/auth/registrations/_account_warning.html.haml
index 40e7e12968..19e5746ff6 100644
--- a/app/views/auth/registrations/_account_warning.html.haml
+++ b/app/views/auth/registrations/_account_warning.html.haml
@@ -5,7 +5,9 @@
         = fa_icon 'warning'
     .log-entry__content
       .log-entry__title
-        = t('disputes.strikes.title', action: t(account_warning.action, scope: 'disputes.strikes.title_actions'), date: l(account_warning.created_at.to_date))
+        = t 'disputes.strikes.title',
+            action: t(account_warning.action, scope: 'disputes.strikes.title_actions'),
+            date: l(account_warning.created_at.to_date)
       .log-entry__timestamp
         %time.formatted{ datetime: account_warning.created_at.iso8601 }= l(account_warning.created_at)
 
diff --git a/app/views/auth/registrations/_session.html.haml b/app/views/auth/registrations/_session.html.haml
index 28499a7c91..2fa7db70c7 100644
--- a/app/views/auth/registrations/_session.html.haml
+++ b/app/views/auth/registrations/_session.html.haml
@@ -3,7 +3,9 @@
     %span{ title: session.user_agent }<
       = fa_icon "#{session_device_icon(session)} fw", 'aria-label': session_device_icon(session)
       &nbsp;
-      = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}", default: session.browser.to_s), platform: t("sessions.platforms.#{session.platform}", default: session.platform.to_s)
+      = t 'sessions.description',
+          browser: t("sessions.browsers.#{session.browser}", default: session.browser.to_s),
+          platform: t("sessions.platforms.#{session.platform}", default: session.platform.to_s)
   %td
     %samp= session.ip
   %td
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index f5ef4e97e4..48350f478e 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -15,15 +15,33 @@
   - if (!use_seamless_external_login? || resource.encrypted_password.present?) && !omniauth_only?
     .fields-row
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :email, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, required: true, disabled: current_account.suspended?
+        = f.input :email,
+                  disabled: current_account.suspended?,
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.email') },
+                  required: true,
+                  wrapper: :with_label
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :current_password, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.current_password'), autocomplete: 'current-password' }, required: true, disabled: current_account.suspended?, hint: false
+        = f.input :current_password,
+                  disabled: current_account.suspended?,
+                  hint: false,
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.current_password'), autocomplete: 'current-password' },
+                  required: true,
+                  wrapper: :with_label
 
     .fields-row
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, hint: t('simple_form.hints.defaults.password'), disabled: current_account.suspended?
+        = f.input :password,
+                  disabled: current_account.suspended?,
+                  hint: t('simple_form.hints.defaults.password'),
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.new_password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
+                  label: t('simple_form.labels.defaults.new_password'),
+                  wrapper: :with_label
       .fields-row__column.fields-group.fields-row__column-6
-        = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' }, disabled: current_account.suspended?
+        = f.input :password_confirmation,
+                  disabled: current_account.suspended?,
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_new_password'), autocomplete: 'new-password' },
+                  label: t('simple_form.labels.defaults.confirm_new_password'),
+                  wrapper: :with_label
 
     .actions
       = f.button :button, t('generic.save_changes'), type: :submit, class: 'button', disabled: current_account.suspended?
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 4cac7b51bd..1e5aac2976 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -19,25 +19,61 @@
 
   .fields-group
     = f.simple_fields_for :account do |ff|
-      = ff.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.username'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 }, append: "@#{site_hostname}"
-    = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'username' }, hint: false
-    = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last }, hint: false
-    = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' }, hint: false
-    = f.input :confirm_password, as: :string, placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), required: false, input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), autocomplete: 'off' }, hint: false
-    = f.input :website, as: :url, wrapper: :with_label, label: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: 'Website'), autocomplete: 'off' }
+      = ff.input :username,
+                 append: "@#{site_hostname}",
+                 input_html: { 'aria-label': t('simple_form.labels.defaults.username'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.username'), pattern: '[a-zA-Z0-9_]+', maxlength: 30 },
+                 label: false,
+                 required: true,
+                 wrapper: :with_label
+    = f.input :email,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'username' },
+              placeholder: t('simple_form.labels.defaults.email'),
+              required: true
+    = f.input :password,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'new-password', minlength: User.password_length.first, maxlength: User.password_length.last },
+              placeholder: t('simple_form.labels.defaults.password'),
+              required: true
+    = f.input :password_confirmation,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' },
+              placeholder: t('simple_form.labels.defaults.confirm_password'),
+              required: true
+    = f.input :confirm_password,
+              as: :string,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')), autocomplete: 'off' },
+              placeholder: t('simple_form.labels.defaults.honeypot', label: t('simple_form.labels.defaults.password')),
+              required: false
+    = f.input :website,
+              as: :url,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.honeypot', label: 'Website'), autocomplete: 'off' },
+              label: t('simple_form.labels.defaults.honeypot', label: 'Website'),
+              required: false,
+              wrapper: :with_label
 
   - if approved_registrations? && @invite.blank?
     %p.lead= t('auth.sign_up.manual_review', domain: site_hostname)
 
     .fields-group
       = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
-        = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text, label: false, hint: false
+        = invite_request_fields.input :text,
+                                      as: :text,
+                                      hint: false,
+                                      label: false,
+                                      required: Setting.require_invite_text,
+                                      wrapper: :with_block_label
 
   = hidden_field_tag :accept, params[:accept]
   = f.input :invite_code, as: :hidden
 
   .fields-group
-    = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path), required: true
+    = f.input :agreement,
+              as: :boolean,
+              label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path),
+              required: true,
+              wrapper: :with_label
 
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 7914e0157f..89903581a2 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -10,11 +10,25 @@
     %p.lead= t('auth.sign_in.preamble_html', domain: site_hostname)
     .fields-group
       - if use_seamless_external_login?
-        = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label': t('simple_form.labels.defaults.username_or_email') }, hint: false
+        = f.input :email,
+                  autofocus: true,
+                  hint: false,
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.username_or_email') },
+                  label: t('simple_form.labels.defaults.username_or_email'),
+                  wrapper: :with_label
       - else
-        = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false
+        = f.input :email,
+                  autofocus: true,
+                  hint: false,
+                  input_html: { 'aria-label': t('simple_form.labels.defaults.email') },
+                  label: t('simple_form.labels.defaults.email'),
+                  wrapper: :with_label
     .fields-group
-      = f.input :password, wrapper: :with_label, label: t('simple_form.labels.defaults.password'), input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'current-password' }, hint: false
+      = f.input :password,
+                hint: false,
+                input_html: { 'aria-label': t('simple_form.labels.defaults.password'), autocomplete: 'current-password' },
+                label: t('simple_form.labels.defaults.password'),
+                wrapper: :with_label
 
     .actions
       = f.button :button, t('auth.login'), type: :submit
diff --git a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
index 8cc2c85610..30e97a68c1 100644
--- a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
+++ b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
@@ -5,7 +5,12 @@
   %p.hint.authentication-hint= t('simple_form.hints.sessions.otp')
 
   .fields-group
-    = f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label': t('simple_form.labels.defaults.otp_attempt'), autocomplete: 'one-time-code' }, autofocus: true
+    = f.input :otp_attempt,
+              autofocus: true,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.otp_attempt'), autocomplete: 'one-time-code' },
+              label: t('simple_form.labels.defaults.otp_attempt'),
+              type: :number,
+              wrapper: :with_label
 
   .actions
     = f.button :button, t('auth.login'), type: :submit
diff --git a/app/views/auth/setup/show.html.haml b/app/views/auth/setup/show.html.haml
index 97c826d704..713f77470d 100644
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@@ -16,7 +16,10 @@
   %p.lead= t('auth.setup.email_below_hint_html')
 
   .fields-group
-    = f.input :email, required: true, hint: false, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' }
+    = f.input :email,
+              hint: false,
+              input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' },
+              required: true
 
   .actions
     = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true

From 1f44903991168858d7cc00b3e3255617cd31154c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 22:08:02 +0100
Subject: [PATCH 262/436] Update dependency sidekiq-unique-jobs to v7.1.31
 (#27818)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 549781aed4..91b3bf701f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -716,7 +716,7 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.30)
+    sidekiq-unique-jobs (7.1.31)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (< 5.0)

From 63d0b52cf3641a819853197bf837937b9f67ef8e Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 9 Jan 2024 22:58:19 +0100
Subject: [PATCH 263/436] Add a system spec for the `/share` endpoint (#28672)

---
 spec/system/share_entrypoint_spec.rb | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 spec/system/share_entrypoint_spec.rb

diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
new file mode 100644
index 0000000000..fd02d1120c
--- /dev/null
+++ b/spec/system/share_entrypoint_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'ShareEntrypoint' do
+  include ProfileStories
+
+  subject { page }
+
+  let(:email)               { 'test@example.com' }
+  let(:password)            { 'password' }
+  let(:confirmed_at)        { Time.zone.now }
+  let(:finished_onboarding) { true }
+
+  before do
+    as_a_logged_in_user
+    visit share_path
+  end
+
+  it 'can be used to post a new status' do
+    expect(subject).to have_css('div#mastodon-compose')
+    expect(subject).to have_css('.compose-form__publish-button-wrapper > button')
+
+    status_text = 'This is a new status!'
+
+    within('.compose-form') do
+      fill_in "What's on your mind?", with: status_text
+      click_on 'Publish!'
+    end
+
+    expect(subject).to have_css('.notification-bar-message', text: 'Post published.')
+  end
+end

From a71e918e958de85e8295212d1a48925e93fae4e0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 04:35:01 -0500
Subject: [PATCH 264/436] Fix `LineLength` haml-lint in `media/player` view
 (#28667)

---
 .haml-lint_todo.yml              |  5 ++---
 app/views/media/player.html.haml | 31 ++++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index ac9f763758..af2d2e8f4e 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,14 +1,13 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2024-01-09 10:48:44 -0500 using Haml-Lint version 0.53.0.
+# on 2024-01-09 11:30:07 -0500 using Haml-Lint version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 3
+  # Offense count: 1
   LineLength:
     exclude:
       - 'app/views/admin/roles/_form.html.haml'
-      - 'app/views/media/player.html.haml'
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index f00c8f040b..df02cc4110 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -6,14 +6,39 @@
   meta = @media_attachment.file.meta || {}
 
 - if @media_attachment.video?
-  = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), frameRate: meta.dig('original', 'frame_rate'), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description, media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer)].as_json do
+  = react_component :video,
+                    alt: @media_attachment.description,
+                    blurhash: @media_attachment.blurhash,
+                    detailed: true,
+                    editable: true,
+                    frameRate: meta.dig('original', 'frame_rate'),
+                    height: 380,
+                    inline: true,
+                    media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer)].as_json,
+                    preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small),
+                    src: @media_attachment.file.url(:original),
+                    width: 670 do
     %video{ controls: 'controls' }
       %source{ src: @media_attachment.file.url(:original) }
 - elsif @media_attachment.gifv?
-  = react_component :media_gallery, height: 380, standalone: true, autoplay: true, media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer).as_json] do
+  = react_component :media_gallery,
+                    autoplay: true,
+                    height: 380,
+                    media: [ActiveModelSerializers::SerializableResource.new(@media_attachment, serializer: REST::MediaAttachmentSerializer).as_json],
+                    standalone: true do
     %video{ autoplay: 'autoplay', muted: 'muted', loop: 'loop' }
       %source{ src: @media_attachment.file.url(:original) }
 - elsif @media_attachment.audio?
-  = react_component :audio, src: @media_attachment.file.url(:original), poster: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.account.avatar_static_url, backgroundColor: meta.dig('colors', 'background'), foregroundColor: meta.dig('colors', 'foreground'), accentColor: meta.dig('colors', 'accent'), width: 670, height: 380, fullscreen: true, alt: @media_attachment.description, duration: meta.dig(:original, :duration) do
+  = react_component :audio,
+                    accentColor: meta.dig('colors', 'accent'),
+                    alt: @media_attachment.description,
+                    backgroundColor: meta.dig('colors', 'background'),
+                    duration: meta.dig(:original, :duration),
+                    foregroundColor: meta.dig('colors', 'foreground'),
+                    fullscreen: true,
+                    height: 380,
+                    poster: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.account.avatar_static_url,
+                    src: @media_attachment.file.url(:original),
+                    width: 670 do
     %audio{ controls: 'controls' }
       %source{ src: @media_attachment.file.url(:original) }

From 742d8d30e2bdbd2bb42676fc8ab7ebf0ecf21966 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 04:36:12 -0500
Subject: [PATCH 265/436] Add coverage for `--days` option to CLI `media
 refresh` command (#28669)

---
 spec/lib/mastodon/cli/media_spec.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spec/lib/mastodon/cli/media_spec.rb b/spec/lib/mastodon/cli/media_spec.rb
index 071bcd9e34..10005107aa 100644
--- a/spec/lib/mastodon/cli/media_spec.rb
+++ b/spec/lib/mastodon/cli/media_spec.rb
@@ -183,6 +183,21 @@ describe Mastodon::CLI::Media do
           .to output_results('Downloaded 1 media')
       end
     end
+
+    context 'with --days option' do
+      before do
+        Fabricate(:media_attachment, remote_url: 'https://example.com/image.jpg', id: Mastodon::Snowflake.id_at(50.days.ago))
+        Fabricate(:media_attachment, remote_url: 'https://example.com/image.jpg', id: Mastodon::Snowflake.id_at(5.days.ago))
+        Fabricate(:media_attachment, remote_url: '', id: Mastodon::Snowflake.id_at(5.days.ago))
+      end
+
+      let(:options) { { days: 10 } }
+
+      it 'redownloads the attachment file for the remote records more recent than the option' do
+        expect { subject }
+          .to output_results('Downloaded 1 media')
+      end
+    end
   end
 
   describe '#remove_orphans' do

From 36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e Mon Sep 17 00:00:00 2001
From: zunda <zundan@gmail.com>
Date: Wed, 10 Jan 2024 09:37:31 +0000
Subject: [PATCH 266/436] bundle add csv (#28671)

---
 Gemfile      | 1 +
 Gemfile.lock | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index e0980c0720..e096a5d685 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,7 @@ gem 'omniauth', '~> 2.0'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 
 gem 'color_diff', '~> 0.1'
+gem 'csv', '~> 3.2'
 gem 'discard', '~> 1.2'
 gem 'doorkeeper', '~> 5.6'
 gem 'ed25519', '~> 1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 91b3bf701f..595c9fd279 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,6 +208,7 @@ GEM
     crass (1.0.6)
     css_parser (1.14.0)
       addressable
+    csv (3.2.8)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
@@ -845,6 +846,7 @@ DEPENDENCIES
   color_diff (~> 0.1)
   concurrent-ruby
   connection_pool
+  csv (~> 3.2)
   database_cleaner-active_record
   debug (~> 1.8)
   devise (~> 4.9)

From ea1c0feb86e3b1213b0808cef43446b5146d50da Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 05:35:06 -0500
Subject: [PATCH 267/436] Remove `add_column_with_default` migration helper
 (#28654)

---
 ...16191202_add_hide_notifications_to_mute.rb |  6 +--
 ...005171936_add_disabled_to_custom_emojis.rb |  6 +--
 .../20171028221157_add_reblogs_to_follows.rb  |  8 +---
 ...20171107143332_add_memorial_to_accounts.rb |  6 +--
 .../20171107143624_add_disabled_to_users.rb   |  6 +--
 ...0171109012327_add_moderator_to_accounts.rb |  6 +--
 ...30000000_add_embed_url_to_preview_cards.rb |  6 +--
 ...0180615122121_add_autofollow_to_invites.rb |  6 +--
 ...7154237_add_whole_word_to_custom_filter.rb |  6 +--
 ..._confidential_to_doorkeeper_application.rb |  8 +---
 .../20181010141500_add_silent_to_mentions.rb  |  8 +---
 ...937_add_reject_reports_to_domain_blocks.rb |  6 +--
 ...649_add_unread_to_account_conversations.rb |  8 +---
 ...0181127165847_add_show_replies_to_lists.rb |  8 +---
 ...20190201012802_add_overwrite_to_imports.rb |  6 +--
 ...0190306145741_add_lock_version_to_polls.rb |  8 +---
 .../20190307234537_add_approved_to_users.rb   |  8 +---
 ...13028_add_lock_version_to_account_stats.rb |  6 +--
 ...58_add_title_to_account_warning_presets.rb |  6 +--
 .../20200917192924_add_notify_to_follows.rb   |  8 +---
 ...18054746_add_obfuscate_to_domain_blocks.rb |  6 +--
 .../20211231080958_add_category_to_reports.rb |  6 +--
 ...0613110834_add_action_to_custom_filters.rb |  6 +--
 .../20230605085710_add_exclusive_to_lists.rb  |  6 +--
 ..._add_image_description_to_preview_cards.rb |  6 +--
 ...0230814223300_add_indexable_to_accounts.rb |  6 +--
 ...2_remove_whole_word_from_custom_filters.rb |  6 +--
 ...remove_irreversible_from_custom_filters.rb |  6 +--
 lib/mastodon/migration_helpers.rb             | 41 +------------------
 29 files changed, 37 insertions(+), 188 deletions(-)

diff --git a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
index b817d512de..2ef5d25791 100644
--- a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
+++ b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
+    add_column :mutes, :hide_notifications, :boolean, default: true, null: false
   end
 
   def down
diff --git a/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb b/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
index d6fd228f95..eaf5f4ef2d 100644
--- a/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
+++ b/db/migrate/20171005171936_add_disabled_to_custom_emojis.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddDisabledToCustomEmojis < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :custom_emojis, :disabled, :bool, default: false }
+    safety_assured { add_column :custom_emojis, :disabled, :bool, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
index 0dab84c799..068d66d1da 100644
--- a/db/migrate/20171028221157_add_reblogs_to_follows.rb
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddReblogsToFollows < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :follows, :show_reblogs, :boolean, default: true, allow_null: false
-      add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
+      add_column :follows, :show_reblogs, :boolean, default: true, null: false
+      add_column :follow_requests, :show_reblogs, :boolean, default: true, null: false
     end
   end
 
diff --git a/db/migrate/20171107143332_add_memorial_to_accounts.rb b/db/migrate/20171107143332_add_memorial_to_accounts.rb
index 3cf782b81f..35a98f45e8 100644
--- a/db/migrate/20171107143332_add_memorial_to_accounts.rb
+++ b/db/migrate/20171107143332_add_memorial_to_accounts.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddMemorialToAccounts < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :accounts, :memorial, :bool, default: false }
+    safety_assured { add_column :accounts, :memorial, :bool, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20171107143624_add_disabled_to_users.rb b/db/migrate/20171107143624_add_disabled_to_users.rb
index 4ab4df7372..055d05b109 100644
--- a/db/migrate/20171107143624_add_disabled_to_users.rb
+++ b/db/migrate/20171107143624_add_disabled_to_users.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddDisabledToUsers < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :users, :disabled, :bool, default: false }
+    safety_assured { add_column :users, :disabled, :bool, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20171109012327_add_moderator_to_accounts.rb b/db/migrate/20171109012327_add_moderator_to_accounts.rb
index e8fc313c8c..6a29e5aafe 100644
--- a/db/migrate/20171109012327_add_moderator_to_accounts.rb
+++ b/db/migrate/20171109012327_add_moderator_to_accounts.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddModeratorToAccounts < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :users, :moderator, :bool, default: false }
+    safety_assured { add_column :users, :moderator, :bool, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
index e78373b24c..f2336e8e25 100644
--- a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
+++ b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddEmbedURLToPreviewCards < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :preview_cards, :embed_url, :string, default: '', allow_null: false
+      add_column :preview_cards, :embed_url, :string, default: '', null: false
     end
   end
 
diff --git a/db/migrate/20180615122121_add_autofollow_to_invites.rb b/db/migrate/20180615122121_add_autofollow_to_invites.rb
index ef129003a1..19a5f0d171 100644
--- a/db/migrate/20180615122121_add_autofollow_to_invites.rb
+++ b/db/migrate/20180615122121_add_autofollow_to_invites.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddAutofollowToInvites < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :invites, :autofollow, :bool, default: false, allow_null: false
+      add_column :invites, :autofollow, :bool, default: false, null: false
     end
   end
 
diff --git a/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb b/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
index 793c3e6cfb..519dfdfae1 100644
--- a/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
+++ b/db/migrate/20180707154237_add_whole_word_to_custom_filter.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddWholeWordToCustomFilter < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def change
     safety_assured do
-      add_column_with_default :custom_filters, :whole_word, :boolean, default: true, allow_null: false
+      add_column :custom_filters, :whole_word, :boolean, default: true, null: false
     end
   end
 
diff --git a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
index 7360c71ac9..6544b81c8e 100644
--- a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
+++ b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :oauth_applications,
         :confidential,
         :boolean,
-        allow_null: false,
+        null: false,
         default: true # maintaining backwards compatibility: require secrets
       )
     end
diff --git a/db/migrate/20181010141500_add_silent_to_mentions.rb b/db/migrate/20181010141500_add_silent_to_mentions.rb
index f9bfc51694..029119e79b 100644
--- a/db/migrate/20181010141500_add_silent_to_mentions.rb
+++ b/db/migrate/20181010141500_add_silent_to_mentions.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddSilentToMentions < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :mentions,
         :silent,
         :boolean,
-        allow_null: false,
+        null: false,
         default: false
       )
     end
diff --git a/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
index b6cfd31d25..49bd2b02f7 100644
--- a/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
+++ b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddRejectReportsToDomainBlocks < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :domain_blocks, :reject_reports, :boolean, default: false, allow_null: false
+      add_column :domain_blocks, :reject_reports, :boolean, default: false, null: false
     end
   end
 
diff --git a/db/migrate/20181018205649_add_unread_to_account_conversations.rb b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
index fec9476398..ae4576255d 100644
--- a/db/migrate/20181018205649_add_unread_to_account_conversations.rb
+++ b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddUnreadToAccountConversations < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :account_conversations,
         :unread,
         :boolean,
-        allow_null: false,
+        null: false,
         default: false
       )
     end
diff --git a/db/migrate/20181127165847_add_show_replies_to_lists.rb b/db/migrate/20181127165847_add_show_replies_to_lists.rb
index 45d457b748..a391d9f6f0 100644
--- a/db/migrate/20181127165847_add_show_replies_to_lists.rb
+++ b/db/migrate/20181127165847_add_show_replies_to_lists.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddShowRepliesToLists < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :lists,
         :replies_policy,
         :integer,
-        allow_null: false,
+        null: false,
         default: 0
       )
     end
diff --git a/db/migrate/20190201012802_add_overwrite_to_imports.rb b/db/migrate/20190201012802_add_overwrite_to_imports.rb
index fe9423ed04..b497950eef 100644
--- a/db/migrate/20190201012802_add_overwrite_to_imports.rb
+++ b/db/migrate/20190201012802_add_overwrite_to_imports.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddOverwriteToImports < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :imports, :overwrite, :boolean, default: false, allow_null: false
+      add_column :imports, :overwrite, :boolean, default: false, null: false
     end
   end
 
diff --git a/db/migrate/20190306145741_add_lock_version_to_polls.rb b/db/migrate/20190306145741_add_lock_version_to_polls.rb
index 760818d97b..ec4430ea94 100644
--- a/db/migrate/20190306145741_add_lock_version_to_polls.rb
+++ b/db/migrate/20190306145741_add_lock_version_to_polls.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddLockVersionToPolls < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :polls,
         :lock_version,
         :integer,
-        allow_null: false,
+        null: false,
         default: 0
       )
     end
diff --git a/db/migrate/20190307234537_add_approved_to_users.rb b/db/migrate/20190307234537_add_approved_to_users.rb
index 9abab29c93..ffdc24716e 100644
--- a/db/migrate/20190307234537_add_approved_to_users.rb
+++ b/db/migrate/20190307234537_add_approved_to_users.rb
@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddApprovedToUsers < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default(
+      add_column(
         :users,
         :approved,
         :bool,
-        allow_null: false,
+        null: false,
         default: true
       )
     end
diff --git a/db/migrate/20191001213028_add_lock_version_to_account_stats.rb b/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
index 0dc1655596..3ffbacf25f 100644
--- a/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
+++ b/db/migrate/20191001213028_add_lock_version_to_account_stats.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddLockVersionToAccountStats < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :account_stats, :lock_version, :integer, allow_null: false, default: 0 }
+    safety_assured { add_column :account_stats, :lock_version, :integer, null: false, default: 0 }
   end
 
   def down
diff --git a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
index 78b854f82c..63d339c49c 100644
--- a/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
+++ b/db/migrate/20200312144258_add_title_to_account_warning_presets.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddTitleToAccountWarningPresets < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :account_warning_presets, :title, :string, default: '', allow_null: false }
+    safety_assured { add_column :account_warning_presets, :title, :string, default: '', null: false }
   end
 
   def down
diff --git a/db/migrate/20200917192924_add_notify_to_follows.rb b/db/migrate/20200917192924_add_notify_to_follows.rb
index a57bb36dc2..1dc831dc47 100644
--- a/db/migrate/20200917192924_add_notify_to_follows.rb
+++ b/db/migrate/20200917192924_add_notify_to_follows.rb
@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddNotifyToFollows < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :follows, :notify, :boolean, default: false, allow_null: false
-      add_column_with_default :follow_requests, :notify, :boolean, default: false, allow_null: false
+      add_column :follows, :notify, :boolean, default: false, null: false
+      add_column :follow_requests, :notify, :boolean, default: false, null: false
     end
   end
 
diff --git a/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
index 91bba38c58..d7038c83dc 100644
--- a/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
+++ b/db/migrate/20201218054746_add_obfuscate_to_domain_blocks.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddObfuscateToDomainBlocks < ActiveRecord::Migration[5.2]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :domain_blocks, :obfuscate, :boolean, default: false, allow_null: false }
+    safety_assured { add_column :domain_blocks, :obfuscate, :boolean, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20211231080958_add_category_to_reports.rb b/db/migrate/20211231080958_add_category_to_reports.rb
index f114cda615..a20a3155d6 100644
--- a/db/migrate/20211231080958_add_category_to_reports.rb
+++ b/db/migrate/20211231080958_add_category_to_reports.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddCategoryToReports < ActiveRecord::Migration[6.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :reports, :category, :int, default: 0, allow_null: false
+      add_column :reports, :category, :int, default: 0, null: false
       change_table(:reports, bulk: true) do |t|
         t.column :action_taken_at, :datetime
         t.column :rule_ids, :bigint, array: true
diff --git a/db/migrate/20220613110834_add_action_to_custom_filters.rb b/db/migrate/20220613110834_add_action_to_custom_filters.rb
index c1daf3c948..ab2f7c65e7 100644
--- a/db/migrate/20220613110834_add_action_to_custom_filters.rb
+++ b/db/migrate/20220613110834_add_action_to_custom_filters.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddActionToCustomFilters < ActiveRecord::Migration[6.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
     safety_assured do
-      add_column_with_default :custom_filters, :action, :integer, allow_null: false, default: 0
+      add_column :custom_filters, :action, :integer, null: false, default: 0
       execute 'UPDATE custom_filters SET action = 1 WHERE irreversible IS TRUE'
     end
   end
diff --git a/db/migrate/20230605085710_add_exclusive_to_lists.rb b/db/migrate/20230605085710_add_exclusive_to_lists.rb
index 315c9d4872..abcb8fae1e 100644
--- a/db/migrate/20230605085710_add_exclusive_to_lists.rb
+++ b/db/migrate/20230605085710_add_exclusive_to_lists.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddExclusiveToLists < ActiveRecord::Migration[6.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :lists, :exclusive, :boolean, default: false, allow_null: false }
+    safety_assured { add_column :lists, :exclusive, :boolean, default: false, null: false }
   end
 
   def down
diff --git a/db/migrate/20230725213448_add_image_description_to_preview_cards.rb b/db/migrate/20230725213448_add_image_description_to_preview_cards.rb
index 03020db655..7445a0e7fc 100644
--- a/db/migrate/20230725213448_add_image_description_to_preview_cards.rb
+++ b/db/migrate/20230725213448_add_image_description_to_preview_cards.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddImageDescriptionToPreviewCards < ActiveRecord::Migration[7.0]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :preview_cards, :image_description, :string, default: '', allow_null: false }
+    safety_assured { add_column :preview_cards, :image_description, :string, default: '', null: false }
   end
 
   def down
diff --git a/db/migrate/20230814223300_add_indexable_to_accounts.rb b/db/migrate/20230814223300_add_indexable_to_accounts.rb
index 6729c05ef2..0544eb92fe 100644
--- a/db/migrate/20230814223300_add_indexable_to_accounts.rb
+++ b/db/migrate/20230814223300_add_indexable_to_accounts.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class AddIndexableToAccounts < ActiveRecord::Migration[7.0]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
-    safety_assured { add_column_with_default :accounts, :indexable, :boolean, default: false, allow_null: false }
+    safety_assured { add_column :accounts, :indexable, :boolean, default: false, null: false }
   end
 
   def down
diff --git a/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb b/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb
index 99c3366a20..5e477d9b11 100644
--- a/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb
+++ b/db/post_migrate/20220613110802_remove_whole_word_from_custom_filters.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class RemoveWholeWordFromCustomFilters < ActiveRecord::Migration[6.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
@@ -15,7 +11,7 @@ class RemoveWholeWordFromCustomFilters < ActiveRecord::Migration[6.1]
 
   def down
     safety_assured do
-      add_column_with_default :custom_filters, :whole_word, :boolean, default: true, allow_null: false
+      add_column :custom_filters, :whole_word, :boolean, default: true, null: false
     end
   end
 end
diff --git a/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb b/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb
index 1c366ee53c..1ed009fe99 100644
--- a/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb
+++ b/db/post_migrate/20220613110903_remove_irreversible_from_custom_filters.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class RemoveIrreversibleFromCustomFilters < ActiveRecord::Migration[6.1]
-  include Mastodon::MigrationHelpers
-
   disable_ddl_transaction!
 
   def up
@@ -15,7 +11,7 @@ class RemoveIrreversibleFromCustomFilters < ActiveRecord::Migration[6.1]
 
   def down
     safety_assured do
-      add_column_with_default :custom_filters, :irreversible, :boolean, allow_null: false, default: false
+      add_column :custom_filters, :irreversible, :boolean, null: false, default: false
     end
   end
 end
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 7bc1298838..1a2ce6420f 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -104,18 +104,7 @@ module Mastodon
             'in the body of your migration class'
         end
 
-        # If default value is presented, use `add_column_with_default` method instead.
-        if options[:default]
-          add_column_with_default(
-            table_name,
-            column_name,
-            :datetime_with_timezone,
-            default: options[:default],
-            allow_null: options[:null]
-          )
-        else
-          add_column(table_name, column_name, :datetime_with_timezone, **options)
-        end
+        add_column(table_name, column_name, :datetime_with_timezone, **options)
       end
     end
 
@@ -377,34 +366,6 @@ module Mastodon
       end
     end
 
-    # Adds a column with a default value without locking an entire table.
-    #
-    # This method runs the following steps:
-    #
-    # 1. Add the column with a default value of NULL.
-    # 2. Change the default value of the column to the specified value.
-    # 3. Update all existing rows in batches.
-    # 4. Set a `NOT NULL` constraint on the column if desired (the default).
-    #
-    # These steps ensure a column can be added to a large and commonly used
-    # table without locking the entire table for the duration of the table
-    # modification.
-    #
-    # table - The name of the table to update.
-    # column - The name of the column to add.
-    # type - The column type (e.g. `:integer`).
-    # default - The default value for the column.
-    # limit - Sets a column limit. For example, for :integer, the default is
-    #         4-bytes. Set `limit: 8` to allow 8-byte integers.
-    # allow_null - When set to `true` the column will allow NULL values, the
-    #              default is to not allow NULL values.
-    #
-    # This method can also take a block which is passed directly to the
-    # `update_column_in_batches` method.
-    def add_column_with_default(table, column, type, default:, limit: nil, allow_null: false, &block)
-      add_column(table, column, type, default: default, limit: limit, null: allow_null)
-    end
-
     # Renames a column without requiring downtime.
     #
     # Concurrent renames work by using database triggers to ensure both the

From 00341c70ffea2cdef9d6e73f6897ffbab04401f0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 06:06:58 -0500
Subject: [PATCH 268/436] Use Sidekiq `fake!` instead of `inline!` in specs
 (#25369)

---
 .../admin/disputes/appeals_controller_spec.rb        |  4 ++--
 .../admin/domain_blocks_controller_spec.rb           |  2 +-
 spec/controllers/admin/resets_controller_spec.rb     |  2 +-
 .../api/v1/conversations_controller_spec.rb          |  2 +-
 .../api/v1/statuses/reblogs_controller_spec.rb       |  4 ++--
 spec/controllers/auth/sessions_controller_spec.rb    |  2 +-
 .../concerns/user_tracking_concern_spec.rb           |  2 +-
 spec/controllers/disputes/appeals_controller_spec.rb |  2 +-
 spec/controllers/settings/deletes_controller_spec.rb |  2 +-
 spec/controllers/settings/exports_controller_spec.rb |  2 +-
 spec/features/admin/accounts_spec.rb                 |  2 +-
 spec/lib/activitypub/activity/create_spec.rb         |  2 +-
 spec/lib/activitypub/activity/delete_spec.rb         |  2 +-
 spec/lib/activitypub/activity/move_spec.rb           |  2 +-
 spec/models/admin/account_action_spec.rb             |  2 +-
 spec/models/user_spec.rb                             |  4 ++--
 spec/rails_helper.rb                                 |  8 ++------
 spec/requests/api/v1/featured_tags_spec.rb           |  2 +-
 spec/requests/api/v1/notifications_spec.rb           |  2 +-
 spec/requests/api/v1/statuses/favourites_spec.rb     |  8 ++------
 spec/requests/api/v1/timelines/home_spec.rb          |  2 +-
 .../models/concerns/account/statuses_search_spec.rb  |  2 +-
 .../activitypub/fetch_remote_status_service_spec.rb  |  2 +-
 .../activitypub/process_account_service_spec.rb      |  2 +-
 spec/services/authorize_follow_service_spec.rb       |  2 +-
 spec/services/batched_remove_status_service_spec.rb  |  2 +-
 spec/services/block_domain_service_spec.rb           |  2 +-
 spec/services/block_service_spec.rb                  |  2 +-
 spec/services/bulk_import_service_spec.rb            |  2 +-
 spec/services/delete_account_service_spec.rb         |  4 ++--
 spec/services/fan_out_on_write_service_spec.rb       | 12 +++++-------
 spec/services/favourite_service_spec.rb              |  2 +-
 spec/services/follow_service_spec.rb                 |  2 +-
 spec/services/import_service_spec.rb                 |  2 +-
 spec/services/mute_service_spec.rb                   |  2 +-
 spec/services/notify_service_spec.rb                 |  2 +-
 spec/services/reblog_service_spec.rb                 |  2 +-
 spec/services/reject_follow_service_spec.rb          |  2 +-
 spec/services/remove_from_followers_service_spec.rb  |  2 +-
 spec/services/remove_status_service_spec.rb          |  2 +-
 spec/services/report_service_spec.rb                 |  2 +-
 spec/services/resolve_account_service_spec.rb        |  2 +-
 spec/services/suspend_account_service_spec.rb        |  2 +-
 spec/services/unallow_domain_service_spec.rb         |  2 +-
 spec/services/unblock_service_spec.rb                |  2 +-
 spec/services/unfollow_service_spec.rb               |  4 ++--
 spec/services/unsuspend_account_service_spec.rb      |  2 +-
 spec/services/update_account_service_spec.rb         |  2 +-
 spec/services/update_status_service_spec.rb          |  2 +-
 spec/system/new_statuses_spec.rb                     |  2 +-
 spec/workers/backup_worker_spec.rb                   |  2 +-
 spec/workers/move_worker_spec.rb                     |  6 +++---
 spec/workers/poll_expiration_notify_worker_spec.rb   |  2 +-
 53 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/spec/controllers/admin/disputes/appeals_controller_spec.rb b/spec/controllers/admin/disputes/appeals_controller_spec.rb
index 4581d00d6f..f830c3b95c 100644
--- a/spec/controllers/admin/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/admin/disputes/appeals_controller_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Admin::Disputes::AppealsController do
       expect(response).to redirect_to(disputes_strike_path(appeal.strike))
     end
 
-    it 'notifies target account about approved appeal' do
+    it 'notifies target account about approved appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at)))
@@ -62,7 +62,7 @@ RSpec.describe Admin::Disputes::AppealsController do
       expect(response).to redirect_to(disputes_strike_path(appeal.strike))
     end
 
-    it 'notifies target account about rejected appeal' do
+    it 'notifies target account about rejected appeal', :sidekiq_inline do
       expect(UserMailer.deliveries.size).to eq(1)
       expect(UserMailer.deliveries.first.to.first).to eq(target_account.user.email)
       expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at)))
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 22960f5312..87b08323da 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -176,7 +176,7 @@ RSpec.describe Admin::DomainBlocksController do
     end
   end
 
-  describe 'PUT #update' do
+  describe 'PUT #update', :sidekiq_inline do
     subject do
       post :update, params: { :id => domain_block.id, :domain_block => { domain: 'example.com', severity: new_severity }, 'confirm' => '' }
     end
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index 14826973c1..e82a3a6afa 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -11,7 +11,7 @@ describe Admin::ResetsController do
     sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
   end
 
-  describe 'POST #create' do
+  describe 'POST #create', :sidekiq_inline do
     it 'redirects to admin accounts page' do
       expect do
         post :create, params: { account_id: account.id }
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
index 50e2a62efd..2734e4a07b 100644
--- a/spec/controllers/api/v1/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/conversations_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Api::V1::ConversationsController do
     allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
+  describe 'GET #index', :sidekiq_inline do
     let(:scopes) { 'read:statuses' }
 
     before do
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
index e3a9bdb502..014a03c1a2 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
@@ -9,7 +9,7 @@ describe Api::V1::Statuses::ReblogsController do
   let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
 
-  context 'with an oauth token', :sidekiq_fake do
+  context 'with an oauth token' do
     before do
       allow(controller).to receive(:doorkeeper_token) { token }
     end
@@ -46,7 +46,7 @@ describe Api::V1::Statuses::ReblogsController do
       end
     end
 
-    describe 'POST #destroy' do
+    describe 'POST #destroy', :sidekiq_inline do
       context 'with public status' do
         let(:status) { Fabricate(:status, account: user.account) }
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index 212cc4d5e5..e3f2b278bd 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -138,7 +138,7 @@ RSpec.describe Auth::SessionsController do
           expect(controller.current_user).to eq user
         end
 
-        it 'sends a suspicious sign-in mail' do
+        it 'sends a suspicious sign-in mail', :sidekiq_inline do
           expect(UserMailer.deliveries.size).to eq(1)
           expect(UserMailer.deliveries.first.to.first).to eq(user.email)
           expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.suspicious_sign_in.subject'))
diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index dd0b3c042a..b1de3cf4e2 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -75,7 +75,7 @@ describe UserTrackingConcern do
         expect(redis.ttl("account:#{user.account_id}:regeneration")).to be >= 0
       end
 
-      it 'regenerates feed when sign in is older than two weeks' do
+      it 'regenerates feed when sign in is older than two weeks', :sidekiq_inline do
         get :show
 
         expect_updated_sign_in_at(user)
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index c8444a2a96..452bd60dc5 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Disputes::AppealsController do
       post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
     end
 
-    it 'notifies staff about new appeal' do
+    it 'notifies staff about new appeal', :sidekiq_inline do
       expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
     end
 
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 2c1532ecd8..ccca4564e7 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -50,7 +50,7 @@ describe Settings::DeletesController do
           delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } }
         end
 
-        it 'removes user record and redirects', :aggregate_failures do
+        it 'removes user record and redirects', :aggregate_failures, :sidekiq_inline do
           expect(response).to redirect_to '/auth/sign_in'
           expect(User.find_by(id: user.id)).to be_nil
           expect(user.account.reload).to be_suspended
diff --git a/spec/controllers/settings/exports_controller_spec.rb b/spec/controllers/settings/exports_controller_spec.rb
index 0bd1e80c3c..3399f78ac5 100644
--- a/spec/controllers/settings/exports_controller_spec.rb
+++ b/spec/controllers/settings/exports_controller_spec.rb
@@ -38,7 +38,7 @@ describe Settings::ExportsController do
       expect(response).to redirect_to(settings_export_path)
     end
 
-    it 'queues BackupWorker job by 1', :sidekiq_fake do
+    it 'queues BackupWorker job by 1' do
       expect do
         post :create
       end.to change(BackupWorker.jobs, :size).by(1)
diff --git a/spec/features/admin/accounts_spec.rb b/spec/features/admin/accounts_spec.rb
index 6d7bab1844..54d755b914 100644
--- a/spec/features/admin/accounts_spec.rb
+++ b/spec/features/admin/accounts_spec.rb
@@ -48,7 +48,7 @@ describe 'Admin::Accounts' do
       end
     end
 
-    context 'with action of `reject`' do
+    context 'with action of `reject`', :sidekiq_inline do
       it 'rejects and removes the account' do
         batch_checkbox_for(unapproved_user_account).check
 
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 8084427d06..3e3a4978c8 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe ActivityPub::Activity::Create do
     stub_request(:get, 'http://example.com/emojib.png').to_return(body: attachment_fixture('emojo.png'), headers: { 'Content-Type' => 'application/octet-stream' })
   end
 
-  describe 'processing posts received out of order', :sidekiq_fake do
+  describe 'processing posts received out of order' do
     let(:follower) { Fabricate(:account, username: 'bob') }
 
     let(:object_json) do
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index aec2c71e58..48421a1162 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe ActivityPub::Activity::Delete do
         expect(Status.find_by(id: status.id)).to be_nil
       end
 
-      it 'sends delete activity to followers of rebloggers' do
+      it 'sends delete activity to followers of rebloggers', :sidekiq_inline do
         expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
       end
 
diff --git a/spec/lib/activitypub/activity/move_spec.rb b/spec/lib/activitypub/activity/move_spec.rb
index f3973c70ce..4dda014a06 100644
--- a/spec/lib/activitypub/activity/move_spec.rb
+++ b/spec/lib/activitypub/activity/move_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe ActivityPub::Activity::Move do
       subject.perform
     end
 
-    context 'when all conditions are met' do
+    context 'when all conditions are met', :sidekiq_inline do
       it 'sets moved account on old account' do
         expect(old_account.reload.moved_to_account_id).to eq new_account.id
       end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 5d64d565fc..9bc9f8061d 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Admin::AccountAction do
         expect(target_account).to be_suspended
       end
 
-      it 'queues Admin::SuspensionWorker by 1', :sidekiq_fake do
+      it 'queues Admin::SuspensionWorker by 1' do
         expect do
           subject
         end.to change { Admin::SuspensionWorker.jobs.size }.by 1
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ab5bd39b7b..c8415df92a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe User do
     end
   end
 
-  describe 'scopes' do
+  describe 'scopes', :sidekiq_inline do
     describe 'recent' do
       it 'returns an array of recent users ordered by id' do
         first_user = Fabricate(:user)
@@ -452,7 +452,7 @@ RSpec.describe User do
         expect(user.confirmed_at).to be_present
       end
 
-      it 'delivers mails' do
+      it 'delivers mails', :sidekiq_inline do
         expect(ActionMailer::Base.deliveries.count).to eq 2
       end
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e5d432b45f..783258b3af 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -26,7 +26,6 @@ Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!(allow: Chewy.settings[:host], allow_localhost: RUN_SYSTEM_SPECS)
-Sidekiq::Testing.inline!
 Sidekiq.logger = nil
 
 # System tests config
@@ -96,11 +95,8 @@ RSpec.configure do |config|
     self.use_transactional_tests = true
   end
 
-  config.around(:each, :sidekiq_fake) do |example|
-    Sidekiq::Testing.fake! do
-      example.run
-      Sidekiq::Worker.clear_all
-    end
+  config.around(:each, :sidekiq_inline) do |example|
+    Sidekiq::Testing.inline!(&example)
   end
 
   config.before :each, type: :cli do
diff --git a/spec/requests/api/v1/featured_tags_spec.rb b/spec/requests/api/v1/featured_tags_spec.rb
index c4aa2c0a2d..f499dd1d09 100644
--- a/spec/requests/api/v1/featured_tags_spec.rb
+++ b/spec/requests/api/v1/featured_tags_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe 'FeaturedTags' do
       expect(body).to be_empty
     end
 
-    it 'deletes the featured tag' do
+    it 'deletes the featured tag', :sidekiq_inline do
       delete "/api/v1/featured_tags/#{id}", headers: headers
 
       featured_tag = FeaturedTag.find_by(id: id)
diff --git a/spec/requests/api/v1/notifications_spec.rb b/spec/requests/api/v1/notifications_spec.rb
index 7a904816e0..222ff67fc8 100644
--- a/spec/requests/api/v1/notifications_spec.rb
+++ b/spec/requests/api/v1/notifications_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe 'Notifications' do
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v1/notifications' do
+  describe 'GET /api/v1/notifications', :sidekiq_inline do
     subject do
       get '/api/v1/notifications', headers: headers, params: params
     end
diff --git a/spec/requests/api/v1/statuses/favourites_spec.rb b/spec/requests/api/v1/statuses/favourites_spec.rb
index 8f3e6e5c42..033aed7e28 100644
--- a/spec/requests/api/v1/statuses/favourites_spec.rb
+++ b/spec/requests/api/v1/statuses/favourites_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Favourites' do
+RSpec.describe 'Favourites', :sidekiq_inline do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'write:favourites' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
@@ -70,7 +70,7 @@ RSpec.describe 'Favourites' do
     end
   end
 
-  describe 'POST /api/v1/statuses/:status_id/unfavourite', :sidekiq_fake do
+  describe 'POST /api/v1/statuses/:status_id/unfavourite' do
     subject do
       post "/api/v1/statuses/#{status.id}/unfavourite", headers: headers
     end
@@ -88,9 +88,7 @@ RSpec.describe 'Favourites' do
         subject
 
         expect(response).to have_http_status(200)
-        expect(user.account.favourited?(status)).to be true
 
-        UnfavouriteWorker.drain
         expect(user.account.favourited?(status)).to be false
       end
 
@@ -113,9 +111,7 @@ RSpec.describe 'Favourites' do
         subject
 
         expect(response).to have_http_status(200)
-        expect(user.account.favourited?(status)).to be true
 
-        UnfavouriteWorker.drain
         expect(user.account.favourited?(status)).to be false
       end
 
diff --git a/spec/requests/api/v1/timelines/home_spec.rb b/spec/requests/api/v1/timelines/home_spec.rb
index 5834b90955..e57e9643bf 100644
--- a/spec/requests/api/v1/timelines/home_spec.rb
+++ b/spec/requests/api/v1/timelines/home_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Home' do
+describe 'Home', :sidekiq_inline do
   let(:user)    { Fabricate(:user) }
   let(:scopes)  { 'read:statuses' }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/search/models/concerns/account/statuses_search_spec.rb b/spec/search/models/concerns/account/statuses_search_spec.rb
index bf2606eece..915bc094cb 100644
--- a/spec/search/models/concerns/account/statuses_search_spec.rb
+++ b/spec/search/models/concerns/account/statuses_search_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Account::StatusesSearch do
+describe Account::StatusesSearch, :sidekiq_inline do
   describe 'a non-indexable account becoming indexable' do
     let(:account) { Account.find_by(username: 'search_test_account_1') }
 
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 3c64feaeec..0fb32d20b1 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -225,7 +225,7 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
     end
   end
 
-  context 'with statuses referencing other statuses' do
+  context 'with statuses referencing other statuses', :sidekiq_inline do
     before do
       stub_const 'ActivityPub::FetchRemoteStatusService::DISCOVERIES_PER_REQUEST', 5
     end
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 58dd2badbb..9abe03181e 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -193,7 +193,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
       end
     end
 
-    it 'creates accounts without exceeding rate limit' do
+    it 'creates accounts without exceeding rate limit', :sidekiq_inline do
       expect { subject.call('user1', 'foo.test', payload) }
         .to create_some_remote_accounts
         .and create_fewer_than_rate_limit_accounts
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index d07645ab6b..602250ee96 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe AuthorizeFollowService, type: :service do
       expect(bob.following?(sender)).to be true
     end
 
-    it 'sends an accept activity' do
+    it 'sends an accept activity', :sidekiq_inline do
       expect(a_request(:post, bob.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 991a852f0e..1c59d5ed06 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe BatchedRemoveStatusService, type: :service do
+RSpec.describe BatchedRemoveStatusService, :sidekiq_inline, type: :service do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index fc3a1397d9..7ad00fff68 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe BlockDomainService, type: :service do
       expect(already_banned_account.reload.silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
     end
 
-    it 'leaves the domains status and attachments, but clears media' do
+    it 'leaves the domains status and attachments, but clears media', :sidekiq_inline do
       expect { bad_status_plain.reload }.to_not raise_error
       expect { bad_status_with_attachment.reload }.to_not raise_error
       expect { bad_attachment.reload }.to_not raise_error
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 5f7c2e8da0..9e4ff8e598 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe BlockService, type: :service do
       expect(sender.blocking?(bob)).to be true
     end
 
-    it 'sends a block activity' do
+    it 'sends a block activity', :sidekiq_inline do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index f703650c37..c3a7160580 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe BulkImportService do
     import.update(total_items: import.rows.count)
   end
 
-  describe '#call', :sidekiq_fake do
+  describe '#call' do
     context 'when importing follows' do
       let(:import_type) { 'following' }
       let(:overwrite)   { false }
diff --git a/spec/services/delete_account_service_spec.rb b/spec/services/delete_account_service_spec.rb
index f04ba9cf14..1965b7daab 100644
--- a/spec/services/delete_account_service_spec.rb
+++ b/spec/services/delete_account_service_spec.rb
@@ -62,7 +62,7 @@ RSpec.describe DeleteAccountService, type: :service do
     end
   end
 
-  describe '#call on local account' do
+  describe '#call on local account', :sidekiq_inline do
     before do
       stub_request(:post, remote_alice.inbox_url).to_return(status: 201)
       stub_request(:post, remote_bob.inbox_url).to_return(status: 201)
@@ -83,7 +83,7 @@ RSpec.describe DeleteAccountService, type: :service do
     end
   end
 
-  describe '#call on remote account' do
+  describe '#call on remote account', :sidekiq_inline do
     before do
       stub_request(:post, account.inbox_url).to_return(status: 201)
     end
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 6ad041193b..77237dffbd 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of a follower' do
+    it 'is added to the home feed of a follower', :sidekiq_inline do
       expect(home_feed_of(bob)).to include status.id
       expect(home_feed_of(tom)).to include status.id
     end
@@ -62,7 +62,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of the mentioned follower' do
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
       expect(home_feed_of(bob)).to include status.id
     end
 
@@ -83,7 +83,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of a follower' do
+    it 'is added to the home feed of a follower', :sidekiq_inline do
       expect(home_feed_of(bob)).to include status.id
       expect(home_feed_of(tom)).to include status.id
     end
@@ -101,7 +101,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(home_feed_of(alice)).to include status.id
     end
 
-    it 'is added to the home feed of the mentioned follower' do
+    it 'is added to the home feed of the mentioned follower', :sidekiq_inline do
       expect(home_feed_of(bob)).to include status.id
     end
 
@@ -114,7 +114,7 @@ RSpec.describe FanOutOnWriteService, type: :service do
       expect(redis).to_not have_received(:publish).with('timeline:public', anything)
     end
 
-    context 'when handling status updates', :sidekiq_fake do
+    context 'when handling status updates' do
       before do
         subject.call(status)
 
@@ -123,8 +123,6 @@ RSpec.describe FanOutOnWriteService, type: :service do
         status.snapshot!(account_id: status.account_id)
 
         redis.set("subscribed:timeline:#{eve.id}:notifications", '1')
-
-        Sidekiq::Worker.clear_all
       end
 
       it 'pushes the update to mentioned users through the notifications streaming channel' do
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index 782c235c41..3143e7b669 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe FavouriteService, type: :service do
       expect(status.favourites.first).to_not be_nil
     end
 
-    it 'sends a like activity' do
+    it 'sends a like activity', :sidekiq_inline do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index c2ad0d7173..cf4de34c89 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe FollowService, type: :service do
       expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
     end
 
-    it 'sends a follow activity to the inbox' do
+    it 'sends a follow activity to the inbox', :sidekiq_inline do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index d67da66caf..7d005c8a11 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ImportService, type: :service do
+RSpec.describe ImportService, :sidekiq_inline, type: :service do
   include RoutingHelper
 
   let!(:account) { Fabricate(:account, locked: false) }
diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb
index 50f74ff277..a2ca2ffe13 100644
--- a/spec/services/mute_service_spec.rb
+++ b/spec/services/mute_service_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe MuteService, type: :service do
       redis.del(home_timeline_key)
     end
 
-    it "clears account's statuses" do
+    it "clears account's statuses", :sidekiq_inline do
       FeedManager.instance.push_to_home(account, status)
       FeedManager.instance.push_to_home(account, other_account_status)
 
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 50055dafc7..38a33c522d 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -166,7 +166,7 @@ RSpec.describe NotifyService, type: :service do
     context 'when email notification is enabled' do
       let(:enabled) { true }
 
-      it 'sends email' do
+      it 'sends email', :sidekiq_inline do
         expect { subject }.to change(ActionMailer::Base.deliveries, :count).by(1)
       end
     end
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index 7b85e37ed8..c6d13e5a12 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -87,7 +87,7 @@ RSpec.describe ReblogService, type: :service do
       expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
     end
 
-    it 'sends an announce activity to the author' do
+    it 'sends an announce activity to the author', :sidekiq_inline do
       expect(a_request(:post, bob.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index d28104b2c7..48316a6c4d 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe RejectFollowService, type: :service do
       expect(bob.following?(sender)).to be false
     end
 
-    it 'sends a reject activity' do
+    it 'sends a reject activity', :sidekiq_inline do
       expect(a_request(:post, bob.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index 1b29cdcbea..21da38a97b 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe RemoveFromFollowersService, type: :service do
       expect(bob.followed_by?(sender)).to be false
     end
 
-    it 'sends a reject activity' do
+    it 'sends a reject activity', :sidekiq_inline do
       expect(a_request(:post, sender.inbox_url)).to have_been_made.once
     end
   end
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index cd3224e028..63a9df548f 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe RemoveStatusService, type: :service do
+RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
   subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 2a919f6405..39e14a6a1c 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe ReportService, type: :service do
       stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
     end
 
-    context 'when forward is true' do
+    context 'when forward is true', :sidekiq_inline do
       let(:forward) { true }
 
       it 'sends ActivityPub payload when forward is true' do
diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb
index 3c4b182e29..1c4c3b4016 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -195,7 +195,7 @@ RSpec.describe ResolveAccountService, type: :service do
       expect(account.uri).to eq 'https://ap.example.com/users/foo'
     end
 
-    it 'merges accounts' do
+    it 'merges accounts', :sidekiq_inline do
       account = subject.call('foo@ap.example.com')
 
       expect(status.reload.account_id).to eq account.id
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index dcc8dbfd37..4a5f8a0b6b 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe SuspendAccountService, type: :service do
+RSpec.describe SuspendAccountService, :sidekiq_inline, type: :service do
   shared_examples 'common behavior' do
     subject { described_class.new.call(account) }
 
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index d96e354187..6ac6bc4016 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe UnallowDomainService, type: :service do
   let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
   let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
 
-  context 'with limited federation mode' do
+  context 'with limited federation mode', :sidekiq_inline do
     before do
       allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
     end
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index 86632c3938..9813c5e7fa 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe UnblockService, type: :service do
       expect(sender.blocking?(bob)).to be false
     end
 
-    it 'sends an unblock activity' do
+    it 'sends an unblock activity', :sidekiq_inline do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   end
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index 3e65e610ba..18a25a676d 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe UnfollowService, type: :service do
     end
   end
 
-  describe 'remote ActivityPub' do
+  describe 'remote ActivityPub', :sidekiq_inline do
     let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
@@ -38,7 +38,7 @@ RSpec.describe UnfollowService, type: :service do
     end
   end
 
-  describe 'remote ActivityPub (reverse)' do
+  describe 'remote ActivityPub (reverse)', :sidekiq_inline do
     let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
     before do
diff --git a/spec/services/unsuspend_account_service_spec.rb b/spec/services/unsuspend_account_service_spec.rb
index 211c39e6c7..c848767cd1 100644
--- a/spec/services/unsuspend_account_service_spec.rb
+++ b/spec/services/unsuspend_account_service_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe UnsuspendAccountService, type: :service do
         remote_follower.follow!(account)
       end
 
-      it 'merges back into feeds of local followers and sends update' do
+      it 'merges back into feeds of local followers and sends update', :sidekiq_inline do
         subject
 
         expect_feeds_merged
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 6318cc95fb..9f4e36862d 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe UpdateAccountService, type: :service do
   subject { described_class.new }
 
-  describe 'switching form locked to unlocked accounts' do
+  describe 'switching form locked to unlocked accounts', :sidekiq_inline do
     let(:account) { Fabricate(:account, locked: true) }
     let(:alice)   { Fabricate(:account) }
     let(:bob)     { Fabricate(:account) }
diff --git a/spec/services/update_status_service_spec.rb b/spec/services/update_status_service_spec.rb
index 7f9f746c2a..55651c305d 100644
--- a/spec/services/update_status_service_spec.rb
+++ b/spec/services/update_status_service_spec.rb
@@ -111,7 +111,7 @@ RSpec.describe UpdateStatusService, type: :service do
     end
   end
 
-  context 'when poll changes', :sidekiq_fake do
+  context 'when poll changes' do
     let(:account) { Fabricate(:account) }
     let!(:status) { Fabricate(:status, text: 'Foo', account: account, poll_attributes: { options: %w(Foo Bar), account: account, multiple: false, hide_totals: false, expires_at: 7.days.from_now }) }
     let!(:poll)   { status.poll }
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index 02f2e28393..a3b816b4d5 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'NewStatuses' do
+describe 'NewStatuses', :sidekiq_inline do
   include ProfileStories
 
   subject { page }
diff --git a/spec/workers/backup_worker_spec.rb b/spec/workers/backup_worker_spec.rb
index 1a169513e9..987cbc7d60 100644
--- a/spec/workers/backup_worker_spec.rb
+++ b/spec/workers/backup_worker_spec.rb
@@ -14,7 +14,7 @@ describe BackupWorker do
     let(:backup) { Fabricate(:backup) }
     let!(:other_backup) { Fabricate(:backup, user: backup.user) }
 
-    it 'sends the backup to the service and removes other backups' do
+    it 'sends the backup to the service and removes other backups', :sidekiq_inline do
       expect do
         worker.perform(backup.id)
       end.to change(UserMailer.deliveries, :size).by(1)
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index 34b342710b..0513dc42e5 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -104,7 +104,7 @@ describe MoveWorker do
   end
 
   shared_examples 'lists handling' do
-    it 'puts the new account on the list and makes valid lists', sidekiq: :inline do
+    it 'puts the new account on the list and makes valid lists', :sidekiq_inline do
       subject.perform(source_account.id, target_account.id)
 
       expect(list.accounts.include?(target_account)).to be true
@@ -159,7 +159,7 @@ describe MoveWorker do
 
   describe '#perform' do
     context 'when both accounts are distant' do
-      it 'calls UnfollowFollowWorker', :sidekiq_fake do
+      it 'calls UnfollowFollowWorker' do
         subject.perform(source_account.id, target_account.id)
         expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, false)
       end
@@ -170,7 +170,7 @@ describe MoveWorker do
     context 'when target account is local' do
       let(:target_account) { Fabricate(:account) }
 
-      it 'calls UnfollowFollowWorker', :sidekiq_fake do
+      it 'calls UnfollowFollowWorker' do
         subject.perform(source_account.id, target_account.id)
         expect(UnfollowFollowWorker).to have_enqueued_sidekiq_job(local_follower.id, source_account.id, target_account.id, true)
       end
diff --git a/spec/workers/poll_expiration_notify_worker_spec.rb b/spec/workers/poll_expiration_notify_worker_spec.rb
index ca36a37590..4bd90270d8 100644
--- a/spec/workers/poll_expiration_notify_worker_spec.rb
+++ b/spec/workers/poll_expiration_notify_worker_spec.rb
@@ -10,7 +10,7 @@ describe PollExpirationNotifyWorker do
   let(:remote?) { false }
   let(:poll_vote) { Fabricate(:poll_vote, poll: poll) }
 
-  describe '#perform', :sidekiq_fake do
+  describe '#perform' do
     it 'runs without error for missing record' do
       expect { worker.perform(nil) }.to_not raise_error
     end

From 543d7890fd818ed8871b0f8e6adbf19b605edf70 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 08:36:06 -0500
Subject: [PATCH 269/436] Use normalizes to prepare `User` values (#28650)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/models/user.rb       | 22 ++++--------------
 spec/models/user_spec.rb | 50 ++++++++++++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 55f654137a..0c589f8068 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -118,14 +118,15 @@ class User < ApplicationRecord
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') }
 
-  before_validation :sanitize_languages
   before_validation :sanitize_role
-  before_validation :sanitize_time_zone
-  before_validation :sanitize_locale
   before_create :set_approved
   after_commit :send_pending_devise_notifications
   after_create_commit :trigger_webhooks
 
+  normalizes :locale, with: ->(locale) { I18n.available_locales.exclude?(locale.to_sym) ? nil : locale }
+  normalizes :time_zone, with: ->(time_zone) { ActiveSupport::TimeZone[time_zone].nil? ? nil : time_zone }
+  normalizes :chosen_languages, with: ->(chosen_languages) { chosen_languages.compact_blank.presence }
+
   # This avoids a deprecation warning from Rails 5.1
   # It seems possible that a future release of devise-two-factor will
   # handle this itself, and this can be removed from our User class.
@@ -447,25 +448,10 @@ class User < ApplicationRecord
     @bypass_invite_request_check
   end
 
-  def sanitize_languages
-    return if chosen_languages.nil?
-
-    chosen_languages.compact_blank!
-    self.chosen_languages = nil if chosen_languages.empty?
-  end
-
   def sanitize_role
     self.role = nil if role.present? && role.everyone?
   end
 
-  def sanitize_time_zone
-    self.time_zone = nil if time_zone.present? && ActiveSupport::TimeZone[time_zone].nil?
-  end
-
-  def sanitize_locale
-    self.locale = nil if locale.present? && I18n.available_locales.exclude?(locale.to_sym)
-  end
-
   def prepare_new_user!
     BootstrapTimelineWorker.perform_async(account_id)
     ActivityTracker.increment('activity:accounts:local')
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c8415df92a..7f68671df4 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -38,23 +38,49 @@ RSpec.describe User do
       user.save(validate: false)
       expect(user.valid?).to be true
     end
+  end
 
-    it 'cleans out invalid locale' do
-      user = Fabricate.build(:user, locale: 'toto')
-      expect(user.valid?).to be true
-      expect(user.locale).to be_nil
+  describe 'Normalizations' do
+    describe 'locale' do
+      it 'preserves valid locale' do
+        user = Fabricate.build(:user, locale: 'en')
+
+        expect(user.locale).to eq('en')
+      end
+
+      it 'cleans out invalid locale' do
+        user = Fabricate.build(:user, locale: 'toto')
+
+        expect(user.locale).to be_nil
+      end
     end
 
-    it 'cleans out invalid timezone' do
-      user = Fabricate.build(:user, time_zone: 'toto')
-      expect(user.valid?).to be true
-      expect(user.time_zone).to be_nil
+    describe 'time_zone' do
+      it 'preserves valid timezone' do
+        user = Fabricate.build(:user, time_zone: 'UTC')
+
+        expect(user.time_zone).to eq('UTC')
+      end
+
+      it 'cleans out invalid timezone' do
+        user = Fabricate.build(:user, time_zone: 'toto')
+
+        expect(user.time_zone).to be_nil
+      end
     end
 
-    it 'cleans out empty string from languages' do
-      user = Fabricate.build(:user, chosen_languages: [''])
-      user.valid?
-      expect(user.chosen_languages).to be_nil
+    describe 'languages' do
+      it 'preserves valid options for languages' do
+        user = Fabricate.build(:user, chosen_languages: ['en', 'fr', ''])
+
+        expect(user.chosen_languages).to eq(['en', 'fr'])
+      end
+
+      it 'cleans out empty string from languages' do
+        user = Fabricate.build(:user, chosen_languages: [''])
+
+        expect(user.chosen_languages).to be_nil
+      end
     end
   end
 

From 8422b8ded0fa0ac1fdb70e6fb494ef5453b845d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 10 Jan 2024 09:54:11 -0500
Subject: [PATCH 270/436] Extract capybara config and improve headless_chrome
 driver config (#28681)

---
 spec/rails_helper.rb     |  2 --
 spec/support/capybara.rb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 spec/support/capybara.rb

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 783258b3af..aabb121fc3 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -108,8 +108,6 @@ RSpec.configure do |config|
   end
 
   config.around :each, type: :system do |example|
-    driven_by :selenium, using: :headless_chrome, screen_size: [1600, 1200]
-
     # The streaming server needs access to the database
     # but with use_transactional_tests every transaction
     # is rolled-back, so the streaming server never sees the data
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
new file mode 100644
index 0000000000..d4f27e209e
--- /dev/null
+++ b/spec/support/capybara.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Capybara.server_host = 'localhost'
+Capybara.server_port = 3000
+Capybara.app_host = "http://#{Capybara.server_host}:#{Capybara.server_port}"
+
+require 'selenium/webdriver'
+
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
+Capybara.register_driver :headless_chrome do |app|
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument '--headless=new'
+  options.add_argument '--window-size=1680,1050'
+
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    options: options
+  )
+end
+
+Capybara.javascript_driver = :headless_chrome
+
+RSpec.configure do |config|
+  config.before(:each, type: :system) do
+    driven_by Capybara.javascript_driver
+  end
+end

From d7e13e248380704895674949bf870ac5e8d8387b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 10 Jan 2024 16:05:46 +0100
Subject: [PATCH 271/436] Fix potential redirection loop of streaming endpoint
 (#28665)

---
 app/controllers/api/v1/streaming_controller.rb       | 7 ++++++-
 spec/controllers/api/v1/streaming_controller_spec.rb | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/v1/streaming_controller.rb b/app/controllers/api/v1/streaming_controller.rb
index 0cb6e856f2..adb14676e1 100644
--- a/app/controllers/api/v1/streaming_controller.rb
+++ b/app/controllers/api/v1/streaming_controller.rb
@@ -2,7 +2,7 @@
 
 class Api::V1::StreamingController < Api::BaseController
   def index
-    if Rails.configuration.x.streaming_api_base_url == request.host
+    if same_host?
       not_found
     else
       redirect_to streaming_api_url, status: 301, allow_other_host: true
@@ -11,6 +11,11 @@ class Api::V1::StreamingController < Api::BaseController
 
   private
 
+  def same_host?
+    base_url = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url)
+    request.host == base_url.host && request.port == (base_url.port || 80)
+  end
+
   def streaming_api_url
     Addressable::URI.parse(request.url).tap do |uri|
       base_url = Addressable::URI.parse(Rails.configuration.x.streaming_api_base_url)
diff --git a/spec/controllers/api/v1/streaming_controller_spec.rb b/spec/controllers/api/v1/streaming_controller_spec.rb
index c3e7153ce8..099f68a74e 100644
--- a/spec/controllers/api/v1/streaming_controller_spec.rb
+++ b/spec/controllers/api/v1/streaming_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Api::V1::StreamingController do
   around do |example|
     before = Rails.configuration.x.streaming_api_base_url
-    Rails.configuration.x.streaming_api_base_url = Rails.configuration.x.web_domain
+    Rails.configuration.x.streaming_api_base_url = "wss://#{Rails.configuration.x.web_domain}"
     example.run
     Rails.configuration.x.streaming_api_base_url = before
   end

From 0a7cff53c2577b3e79599e069eeb344f2613ad8d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 04:30:29 -0500
Subject: [PATCH 272/436] Add coverage for `Account.followable_by` scope
 (#28689)

---
 spec/models/account_spec.rb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 87aa8bc754..b4fcb805a6 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1009,4 +1009,27 @@ RSpec.describe Account do
       expect(subject.reload.followers_count).to eq 15
     end
   end
+
+  describe '.followable_by' do
+    context 'with follows and follow requests' do
+      let!(:account) { Fabricate(:account) }
+      let!(:eligible_account) { Fabricate(:account) }
+      let!(:following_account) { Fabricate(:account) }
+      let!(:follow_requested_account) { Fabricate(:account) }
+
+      before do
+        Fabricate :follow, account: account, target_account: following_account
+        Fabricate :follow_request, account: account, target_account: follow_requested_account
+      end
+
+      it 'returns accounts not already following or requested to follow' do
+        results = described_class.followable_by(account)
+
+        expect(results)
+          .to include(eligible_account)
+          .and not_include(following_account)
+          .and not_include(follow_requested_account)
+      end
+    end
+  end
 end

From 6daa69327b32a46cc36a03b18dede42154ca6ffa Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 04:32:32 -0500
Subject: [PATCH 273/436] Fix `LineLength` haml-lint in `t` usage (#28686)

---
 .../admin/account_warnings/_account_warning.html.haml     | 5 ++++-
 app/views/admin/action_logs/_action_log.html.haml         | 4 +++-
 app/views/mail_subscriptions/show.html.haml               | 6 +++++-
 app/views/user_mailer/appeal_approved.html.haml           | 4 +++-
 app/views/user_mailer/appeal_rejected.html.haml           | 4 +++-
 app/views/user_mailer/suspicious_sign_in.html.haml        | 8 ++++++--
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
index 85bac789f7..5702e4f6d2 100644
--- a/app/views/admin/account_warnings/_account_warning.html.haml
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -5,7 +5,10 @@
         = fa_icon 'warning'
     .log-entry__content
       .log-entry__title
-        = t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account ? account_warning.account.username : I18n.t('admin.action_logs.deleted_account'), class: 'username'), target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
+        = t(account_warning.action,
+            scope: 'admin.strikes.actions',
+            name: content_tag(:span, account_warning.account ? account_warning.account.username : I18n.t('admin.action_logs.deleted_account'), class: 'username'),
+            target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
       .log-entry__timestamp
         %time.formatted{ datetime: account_warning.created_at.iso8601 }
           = l(account_warning.created_at)
diff --git a/app/views/admin/action_logs/_action_log.html.haml b/app/views/admin/action_logs/_action_log.html.haml
index a2fce2d114..dcc3331809 100644
--- a/app/views/admin/action_logs/_action_log.html.haml
+++ b/app/views/admin/action_logs/_action_log.html.haml
@@ -4,6 +4,8 @@
       = image_tag action_log.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
     .log-entry__content
       .log-entry__title
-        = t("admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}_html", name: content_tag(:span, action_log.account.username, class: 'username'), target: content_tag(:span, log_target(action_log), class: 'target'))
+        = t "admin.action_logs.actions.#{action_log.action}_#{action_log.target_type.underscore}_html",
+            name: content_tag(:span, action_log.account.username, class: 'username'),
+            target: content_tag(:span, log_target(action_log), class: 'target')
       .log-entry__timestamp
         %time.formatted{ datetime: action_log.created_at.iso8601 }
diff --git a/app/views/mail_subscriptions/show.html.haml b/app/views/mail_subscriptions/show.html.haml
index afa2ab6ed7..776d561d70 100644
--- a/app/views/mail_subscriptions/show.html.haml
+++ b/app/views/mail_subscriptions/show.html.haml
@@ -4,7 +4,11 @@
 .simple_form
   %h1.title= t('mail_subscriptions.unsubscribe.title')
   %p.lead
-    = t('mail_subscriptions.unsubscribe.confirmation_html', domain: content_tag(:strong, site_hostname), type: content_tag(:strong, I18n.t(@type, scope: 'mail_subscriptions.unsubscribe.emails')), email: content_tag(:strong, @user.email), settings_path: settings_preferences_notifications_path)
+    = t 'mail_subscriptions.unsubscribe.confirmation_html',
+        domain: content_tag(:strong, site_hostname),
+        type: content_tag(:strong, I18n.t(@type, scope: 'mail_subscriptions.unsubscribe.emails')),
+        email: content_tag(:strong, @user.email),
+        settings_path: settings_preferences_notifications_path
 
   = form_tag unsubscribe_path, method: :post do
     = hidden_field_tag :token, params[:token]
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 3a2de822f4..223ba7f0b8 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -36,7 +36,9 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+                              %p= t 'user_mailer.appeal_approved.explanation',
+                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index ccbd1c4bad..59354f1d40 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -36,7 +36,9 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+                              %p= t 'user_mailer.appeal_rejected.explanation',
+                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index 5bafe9d1b2..0cd21b4e60 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -45,7 +45,10 @@
                                 = @remote_ip
                                 %br/
                                 %strong #{t('sessions.browser')}:
-                                %span{ title: @user_agent }= t 'sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s), platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+                                %span{ title: @user_agent }
+                                  = t 'sessions.description',
+                                      browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+                                      platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
                                 %br/
                                 = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
 
@@ -64,4 +67,5 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.suspicious_sign_in.further_actions_html', action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
+                              %p= t 'user_mailer.suspicious_sign_in.further_actions_html',
+                                    action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)

From 204bbf49d20ff34ad6559aa0166db68340b72d29 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 11:08:49 +0100
Subject: [PATCH 274/436] New Crowdin Translations (automated) (#28692)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/br.json | 22 +++++++++++++++++++---
 app/javascript/mastodon/locales/pl.json |  4 ++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 462a5b3393..ad6e55c5e1 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Servijerioù habaskaet",
+  "about.blocks": "Servijerioù evezhiet",
   "about.contact": "Darempred :",
   "about.disclaimer": "Mastodon zo ur meziant frank, open-source hag ur merk marilhet eus Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Abeg dihegerz",
@@ -22,6 +22,7 @@
   "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
   "account.copy": "Eilañ al liamm war-zu ho profil",
+  "account.direct": "Menegiñ @{name} ent-prevez",
   "account.disable_notifications": "Paouez d'am c'hemenn pa vez embannet traoù gant @{name}",
   "account.domain_blocked": "Domani stanket",
   "account.edit_profile": "Kemmañ ar profil",
@@ -68,6 +69,7 @@
   "account.unendorse": "Paouez da lakaat war-wel war ar profil",
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
+  "account.unmute_notifications_short": "Diguzhat ar c'hemennoù",
   "account.unmute_short": "Diguzhat",
   "account_note.placeholder": "Klikit evit ouzhpennañ un notenn",
   "admin.dashboard.daily_retention": "Feur azdalc'h an implijerien·ezed dre zeiz goude bezañ lakaet o anv",
@@ -75,6 +77,9 @@
   "admin.dashboard.retention.average": "Keidenn",
   "admin.dashboard.retention.cohort": "Miz an enrolladur",
   "admin.dashboard.retention.cohort_size": "Implijerien.erezed nevez",
+  "admin.impact_report.instance_accounts": "Profiloù kontoù a vefe dilamet",
+  "admin.impact_report.instance_followers": "Heulierien a gollfe hon implijerien",
+  "admin.impact_report.instance_follows": "Heulierien a gollfe o implijerien",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
   "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
@@ -105,6 +110,7 @@
   "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
+  "column.direct": "Menegoù prevez",
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
@@ -348,6 +354,7 @@
   "lightbox.next": "Da-heul",
   "lightbox.previous": "A-raok",
   "limited_account_hint.action": "Diskouez an aelad memes tra",
+  "limited_account_hint.title": "Kuzhet eo bet ar profil-mañ gant an evezhierien eus {domain}.",
   "link_preview.author": "Gant {name}",
   "lists.account.add": "Ouzhpennañ d'al listenn",
   "lists.account.remove": "Lemel kuit eus al listenn",
@@ -373,6 +380,7 @@
   "navigation_bar.bookmarks": "Sinedoù",
   "navigation_bar.community_timeline": "Red-amzer lec'hel",
   "navigation_bar.compose": "Skrivañ un toud nevez",
+  "navigation_bar.direct": "Menegoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
   "navigation_bar.edit_profile": "Kemmañ ar profil",
@@ -452,6 +460,7 @@
   "onboarding.profile.note_hint": "Gallout a rit @menegiñ tud all pe #hashtagoù…",
   "onboarding.profile.save_and_continue": "Enrollañ ha kenderc'hel",
   "onboarding.profile.upload_avatar": "Enporzhiañ ur skeudenn profil",
+  "onboarding.share.lead": "Roit da c'houzout d'an dud e c'hallont ho kavout war vMastondon!",
   "onboarding.share.message": "Me a zo {username} war #Mastodon! Heuilhit ac'hanon war {url}",
   "onboarding.share.title": "Skignañ ho profil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -465,6 +474,7 @@
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
+  "password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",
   "picture_in_picture.restore": "Adlakaat",
   "poll.closed": "Serret",
   "poll.refresh": "Azbevaat",
@@ -545,6 +555,7 @@
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Torradur da reolennoù ar servijer",
   "report_notification.open": "Digeriñ an disklêriadur",
+  "search.no_recent_searches": "Klask nevez ebet",
   "search.placeholder": "Klask",
   "search.quick_action.account_search": "Profiloù a glot gant {x}",
   "search.quick_action.go_to_account": "Mont d'ar profil {x}",
@@ -572,8 +583,10 @@
   "server_banner.server_stats": "Stadegoù ar servijer :",
   "sign_in_banner.create_account": "Krouiñ ur gont",
   "sign_in_banner.sign_in": "Kevreañ",
-  "status.admin_account": "Digeriñ etrefas evezherezh evit @{name}",
-  "status.admin_status": "Digeriñ an toud e-barzh an etrefas evezherezh",
+  "sign_in_banner.sso_redirect": "Kennaskañ pe lakaat hoc'h anv",
+  "status.admin_account": "Digeriñ etrefas evezhiañ evit @{name}",
+  "status.admin_domain": "Digeriñ an etrefas evezhiañ evit {domain}",
+  "status.admin_status": "Digeriñ an embannadenn e-barzh an etrefas evezhiañ",
   "status.block": "Berzañ @{name}",
   "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Nac'hañ ar skignadenn",
@@ -581,6 +594,8 @@
   "status.copy": "Eilañ liamm ar c'hannad",
   "status.delete": "Dilemel",
   "status.detailed_status": "Gwel kaozeadenn munudek",
+  "status.direct": "Menegiñ @{name} ent-prevez",
+  "status.direct_indicator": "Meneg prevez",
   "status.edit": "Kemmañ",
   "status.edited": "Aozet {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
@@ -624,6 +639,7 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Treiñ",
   "status.translated_from_with": "Troet diwar {lang} gant {provider}",
+  "status.uncached_media_warning": "Rakwel n'eo ket da gaout",
   "status.unmute_conversation": "Diguzhat ar gaozeadenn",
   "status.unpin": "Dispilhennañ eus ar profil",
   "subscribed_languages.save": "Enrollañ ar cheñchamantoù",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 9a3710da71..35dbc6661d 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -42,7 +42,7 @@
   "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
   "account.in_memoriam": "Ku pamięci.",
-  "account.joined_short": "Dołączony",
+  "account.joined_short": "Dołączył(a)",
   "account.languages": "Zmień subskrybowane języki",
   "account.link_verified_on": "Własność tego odnośnika została potwierdzona {date}",
   "account.locked_info": "To konto jest prywatne. Właściciel ręcznie wybiera kto może go obserwować.",
@@ -492,7 +492,7 @@
   "onboarding.profile.save_and_continue": "Zapisz i kontynuuj",
   "onboarding.profile.title": "Ustawienia profilu",
   "onboarding.profile.upload_avatar": "Dodaj zdjęcie profilowe",
-  "onboarding.profile.upload_header": "Dodaj zdjęcie nagłówkowe",
+  "onboarding.profile.upload_header": "Dodaj banner profilu",
   "onboarding.share.lead": "Daj znać ludziom, jak mogą cię znaleźć na Mastodonie!",
   "onboarding.share.message": "Jestem {username} na #Mastodon! Śledź mnie tutaj {url}",
   "onboarding.share.next_steps": "Możliwe dalsze kroki:",

From 55802242ce65dcea36b74fffcb3474e8254192f7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 05:36:27 -0500
Subject: [PATCH 275/436] Refactor login activity partial (remove inline ruby)
 (#28687)

---
 app/helpers/admin/settings_helper.rb          | 56 +++++++++++++++++++
 .../_login_activity.html.haml                 | 10 +---
 .../login_activities_controller_spec.rb       |  5 ++
 3 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb
index 552a3ee5a8..6937331e1a 100644
--- a/app/helpers/admin/settings_helper.rb
+++ b/app/helpers/admin/settings_helper.rb
@@ -4,4 +4,60 @@ module Admin::SettingsHelper
   def captcha_available?
     ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present?
   end
+
+  def login_activity_title(activity)
+    t(
+      "login_activities.#{login_activity_key(activity)}",
+      method: login_activity_method(activity),
+      ip: login_activity_ip(activity),
+      browser: login_activity_browser(activity)
+    )
+  end
+
+  private
+
+  def login_activity_key(activity)
+    activity.success? ? 'successful_sign_in_html' : 'failed_sign_in_html'
+  end
+
+  def login_activity_method(activity)
+    content_tag(
+      :span,
+      login_activity_method_string(activity),
+      class: 'target'
+    )
+  end
+
+  def login_activity_ip(activity)
+    content_tag(
+      :span,
+      activity.ip,
+      class: 'target'
+    )
+  end
+
+  def login_activity_browser(activity)
+    content_tag(
+      :span,
+      login_activity_browser_description(activity),
+      class: 'target',
+      title: activity.user_agent
+    )
+  end
+
+  def login_activity_method_string(activity)
+    if activity.omniauth?
+      t("auth.providers.#{activity.provider}")
+    else
+      t("login_activities.authentication_methods.#{activity.authentication_method}")
+    end
+  end
+
+  def login_activity_browser_description(activity)
+    t(
+      'sessions.description',
+      browser: t(activity.browser, scope: 'sessions.browsers', default: activity.browser.to_s),
+      platform: t(activity.platform, scope: 'sessions.platforms', default: activity.platform.to_s)
+    )
+  end
 end
diff --git a/app/views/settings/login_activities/_login_activity.html.haml b/app/views/settings/login_activities/_login_activity.html.haml
index 2e001cdcef..36314926a3 100644
--- a/app/views/settings/login_activities/_login_activity.html.haml
+++ b/app/views/settings/login_activities/_login_activity.html.haml
@@ -1,8 +1,3 @@
-:ruby
-  method_str = content_tag(:span, login_activity.omniauth? ? t(login_activity.provider, scope: 'auth.providers') : t(login_activity.authentication_method, scope: 'login_activities.authentication_methods'), class: 'target')
-  ip_str = content_tag(:span, login_activity.ip, class: 'target')
-  browser_str = content_tag(:span, t('sessions.description', browser: t("sessions.browsers.#{login_activity.browser}", default: login_activity.browser.to_s), platform: t("sessions.platforms.#{login_activity.platform}", default: login_activity.platform.to_s)), class: 'target', title: login_activity.user_agent)
-
 .log-entry
   .log-entry__header
     .log-entry__avatar
@@ -10,9 +5,6 @@
         = fa_icon login_activity.success? ? 'check' : 'times'
     .log-entry__content
       .log-entry__title
-        - if login_activity.success?
-          = t('login_activities.successful_sign_in_html', method: method_str, ip: ip_str, browser: browser_str)
-        - else
-          = t('login_activities.failed_sign_in_html', method: method_str, ip: ip_str, browser: browser_str)
+        = login_activity_title(login_activity)
       .log-entry__timestamp
         %time.formatted{ datetime: login_activity.created_at.iso8601 }= l(login_activity.created_at)
diff --git a/spec/controllers/settings/login_activities_controller_spec.rb b/spec/controllers/settings/login_activities_controller_spec.rb
index 4f266e03dd..294bf85c97 100644
--- a/spec/controllers/settings/login_activities_controller_spec.rb
+++ b/spec/controllers/settings/login_activities_controller_spec.rb
@@ -6,6 +6,7 @@ describe Settings::LoginActivitiesController do
   render_views
 
   let!(:user) { Fabricate(:user) }
+  let!(:login_activity) { Fabricate :login_activity, user: user }
 
   before do
     sign_in user, scope: :user
@@ -19,6 +20,10 @@ describe Settings::LoginActivitiesController do
     it 'returns http success with private cache control headers', :aggregate_failures do
       expect(response).to have_http_status(200)
       expect(response.headers['Cache-Control']).to include('private, no-store')
+      expect(response.body)
+        .to include(login_activity.user_agent)
+        .and include(login_activity.authentication_method)
+        .and include(login_activity.ip.to_s)
     end
   end
 end

From 87097a227c2ab24f27b0d87ec6808c07cb13d93a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 05:45:26 -0500
Subject: [PATCH 276/436] Clean up `settings/featured_tags/index` view (#28688)

---
 app/helpers/settings_helper.rb                | 27 +++++++++++++++++++
 .../settings/featured_tags/index.html.haml    |  2 +-
 .../settings/featured_tags_controller_spec.rb | 10 +++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 3c72b22c66..10863a316c 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -9,6 +9,19 @@ module SettingsHelper
     LanguagesHelper.sorted_locale_keys(I18n.available_locales)
   end
 
+  def featured_tags_hint(recently_used_tags)
+    safe_join(
+      [
+        t('simple_form.hints.featured_tag.name'),
+        safe_join(
+          links_for_featured_tags(recently_used_tags),
+          ', '
+        ),
+      ],
+      ' '
+    )
+  end
+
   def session_device_icon(session)
     device = session.detection.device
 
@@ -28,4 +41,18 @@ module SettingsHelper
       safe_join([image_tag(account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar'), content_tag(:span, account.acct, class: 'username')], ' ')
     end
   end
+
+  private
+
+  def links_for_featured_tags(tags)
+    tags.map { |tag| post_link_to_featured_tag(tag) }
+  end
+
+  def post_link_to_featured_tag(tag)
+    link_to(
+      "##{tag.display_name}",
+      settings_featured_tags_path(featured_tag: { name: tag.name }),
+      method: :post
+    )
+  end
 end
diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml
index 22f9180129..c8c9ec4069 100644
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@@ -12,7 +12,7 @@
 
   .fields-group
     = f.input :name,
-              hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.display_name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' '),
+              hint: featured_tags_hint(@recently_used_tags),
               wrapper: :with_block_label
 
   .actions
diff --git a/spec/controllers/settings/featured_tags_controller_spec.rb b/spec/controllers/settings/featured_tags_controller_spec.rb
index fc25e7aa88..4e1dd52945 100644
--- a/spec/controllers/settings/featured_tags_controller_spec.rb
+++ b/spec/controllers/settings/featured_tags_controller_spec.rb
@@ -43,10 +43,20 @@ describe Settings::FeaturedTagsController do
     end
 
     describe 'GET to #index' do
+      let(:tag) { Fabricate(:tag) }
+
+      before do
+        status = Fabricate :status, account: user.account
+        status.tags << tag
+      end
+
       it 'responds with success' do
         get :index
 
         expect(response).to have_http_status(200)
+        expect(response.body).to include(
+          settings_featured_tags_path(featured_tag: { name: tag.name })
+        )
       end
     end
 

From 4e08a4892f01188255e803b87f641ef019bdb883 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 05:54:42 -0500
Subject: [PATCH 277/436] Move streaming `around` config into manager class
 (#28684)

---
 spec/rails_helper.rb                     | 15 ---------------
 spec/support/streaming_server_manager.rb | 13 +++++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index aabb121fc3..aaf587f49b 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -107,21 +107,6 @@ RSpec.configure do |config|
     Capybara.current_driver = :rack_test
   end
 
-  config.around :each, type: :system do |example|
-    # The streaming server needs access to the database
-    # but with use_transactional_tests every transaction
-    # is rolled-back, so the streaming server never sees the data
-    # So we disable this feature for system tests, and use DatabaseCleaner to clean
-    # the database tables between each test
-    self.use_transactional_tests = false
-
-    DatabaseCleaner.cleaning do
-      example.run
-    end
-
-    self.use_transactional_tests = true
-  end
-
   config.before do |example|
     allow(Resolv::DNS).to receive(:open).and_raise('Real DNS queries are disabled, stub Resolv::DNS as needed') unless example.metadata[:type] == :system
   end
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index 2c535767e2..39657586f2 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -95,6 +95,19 @@ RSpec.configure do |config|
     end
   end
 
+  config.around :each, type: :system do |example|
+    # Streaming server needs DB access but `use_transactional_tests` rolls back
+    # every transaction. Disable this feature for streaming tests, and use
+    # DatabaseCleaner to clean the database tables between each test.
+    self.use_transactional_tests = false
+
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+
+    self.use_transactional_tests = true
+  end
+
   private
 
   def streaming_server_manager

From 3f3df9ab201c588a9a849a78f5cdccb9f16b5fac Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 05:57:52 -0500
Subject: [PATCH 278/436] Update omniauth-cas to version 3.0.0 (#28683)

---
 Gemfile      |  5 ++---
 Gemfile.lock | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index e096a5d685..a393b14471 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,9 +39,8 @@ end
 
 gem 'net-ldap', '~> 0.18'
 
-# TODO: Point back at released omniauth-cas gem when PR merged
-# https://github.com/dlindahl/omniauth-cas/pull/68
-gem 'omniauth-cas', github: 'stanhu/omniauth-cas', ref: '4211e6d05941b4a981f9a36b49ec166cecd0e271'
+# TODO: Point back at released omniauth-cas gem when new version is released
+gem 'omniauth-cas', github: 'dlindahl/omniauth-cas', ref: '9d9d3a91b316c55d49ab6e621977f2067010c5bf'
 gem 'omniauth-saml', '~> 2.0'
 gem 'omniauth_openid_connect', '~> 0.6.1'
 gem 'omniauth', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 595c9fd279..ccb9f4b115 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,16 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
+GIT
+  remote: https://github.com/dlindahl/omniauth-cas.git
+  revision: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
+  ref: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
+  specs:
+    omniauth-cas (3.0.0)
+      addressable (~> 2.8)
+      nokogiri (~> 1.12)
+      omniauth (~> 2.1)
+
 GIT
   remote: https://github.com/jhawthorn/nsa.git
   revision: e020fcc3a54d993ab45b7194d89ab720296c111b
@@ -18,16 +28,6 @@ GIT
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
 
-GIT
-  remote: https://github.com/stanhu/omniauth-cas.git
-  revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
-  ref: 4211e6d05941b4a981f9a36b49ec166cecd0e271
-  specs:
-    omniauth-cas (2.0.0)
-      addressable (~> 2.3)
-      nokogiri (~> 1.5)
-      omniauth (>= 1.2, < 3)
-
 GEM
   remote: https://rubygems.org/
   specs:

From 782a0165c700933840ba2297f8b67147979b8631 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:48:01 +0100
Subject: [PATCH 279/436] Update dependency node to 20.11 (#28670)

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

diff --git a/.nvmrc b/.nvmrc
index d4c3d320cc..a3597ecbd1 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.10
+20.11

From b68f185573158dedabe4b78bdf86a0cfaa5abb96 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 08:14:24 -0500
Subject: [PATCH 280/436] Reduce `LineLength` for `react_component` helper in
 views/admin (#28694)

---
 .../admin/reports/_media_attachments.html.haml     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
index 8ecd7444d2..3c52d69178 100644
--- a/app/views/admin/reports/_media_attachments.html.haml
+++ b/app/views/admin/reports/_media_attachments.html.haml
@@ -2,6 +2,16 @@
   = render_video_component(status, visible: false)
 - elsif status.ordered_media_attachments.first.audio?
   - audio = status.ordered_media_attachments.first
-  = react_component :audio, src: audio.file.url(:original), height: 110, alt: audio.description, lang: status.language, duration: audio.file.meta.dig(:original, :duration)
+  = react_component :audio,
+                    alt: audio.description,
+                    duration: audio.file.meta.dig(:original, :duration),
+                    height: 110,
+                    lang: status.language,
+                    src: audio.file.url(:original)
 - else
-  = react_component :media_gallery, height: 343, sensitive: status.sensitive?, visible: false, lang: status.language, media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+  = react_component :media_gallery,
+                    height: 343,
+                    lang: status.language,
+                    media: status.ordered_media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json },
+                    sensitive: status.sensitive?,
+                    visible: false

From 95bd46d32afaaccc78762f7fc9c6428c4880cbc0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 10:11:57 -0500
Subject: [PATCH 281/436] Remove double subject call in
 `api/v1/admin/ip_blocks` spec (#28696)

---
 spec/requests/api/v1/admin/ip_blocks_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spec/requests/api/v1/admin/ip_blocks_spec.rb b/spec/requests/api/v1/admin/ip_blocks_spec.rb
index fbcb39e3be..98b954dd49 100644
--- a/spec/requests/api/v1/admin/ip_blocks_spec.rb
+++ b/spec/requests/api/v1/admin/ip_blocks_spec.rb
@@ -177,7 +177,9 @@ RSpec.describe 'IP Blocks' do
     let(:params)    { { severity: 'sign_up_requires_approval', comment: 'Decreasing severity' } }
 
     it 'returns the correct ip block', :aggregate_failures do
-      subject
+      expect { subject }
+        .to change_severity_level
+        .and change_comment_value
 
       expect(response).to have_http_status(200)
       expect(body_as_json).to match(hash_including({
@@ -187,12 +189,12 @@ RSpec.describe 'IP Blocks' do
       }))
     end
 
-    it 'updates the severity correctly' do
-      expect { subject }.to change { ip_block.reload.severity }.from('no_access').to('sign_up_requires_approval')
+    def change_severity_level
+      change { ip_block.reload.severity }.from('no_access').to('sign_up_requires_approval')
     end
 
-    it 'updates the comment correctly' do
-      expect { subject }.to change { ip_block.reload.comment }.from('Spam').to('Decreasing severity')
+    def change_comment_value
+      change { ip_block.reload.comment }.from('Spam').to('Decreasing severity')
     end
 
     context 'when ip block does not exist' do

From 2954279e9c630a9d146575bf600978dc6c5279bd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 10:13:11 -0500
Subject: [PATCH 282/436] Remove double subject call in
 `api/v1/admin/trends/links/links` spec (#28695)

---
 .../api/v1/admin/trends/links/links_spec.rb   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/spec/requests/api/v1/admin/trends/links/links_spec.rb b/spec/requests/api/v1/admin/trends/links/links_spec.rb
index 05020b0fd0..48842828b3 100644
--- a/spec/requests/api/v1/admin/trends/links/links_spec.rb
+++ b/spec/requests/api/v1/admin/trends/links/links_spec.rb
@@ -32,18 +32,18 @@ describe 'Links' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
-      subject
+      expect { subject }
+        .to change_link_trendable_to_true
 
       expect(response).to have_http_status(200)
+      expects_correct_link_data
     end
 
-    it 'sets the link as trendable' do
-      expect { subject }.to change { preview_card.reload.trendable }.from(false).to(true)
+    def change_link_trendable_to_true
+      change { preview_card.reload.trendable }.from(false).to(true)
     end
 
-    it 'returns the link data' do
-      subject
-
+    def expects_correct_link_data
       expect(body_as_json).to match(
         a_hash_including(
           url: preview_card.url,
@@ -85,13 +85,14 @@ describe 'Links' do
     it_behaves_like 'forbidden for wrong role', ''
 
     it 'returns http success' do
-      subject
+      expect { subject }
+        .to_not change_link_trendable
 
       expect(response).to have_http_status(200)
     end
 
-    it 'does not set the link as trendable' do
-      expect { subject }.to_not(change { preview_card.reload.trendable })
+    def change_link_trendable
+      change { preview_card.reload.trendable }
     end
 
     it 'returns the link data' do

From 22d866ee1b0ec70cb80ac953a0ca3783f4e858f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:43:45 +0100
Subject: [PATCH 283/436] Update dependency @material-symbols/svg-600 to
 v0.14.4 (#28603)

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

diff --git a/yarn.lock b/yarn.lock
index 7bf70258be..feb2bed2b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2505,9 +2505,9 @@ __metadata:
   linkType: soft
 
 "@material-symbols/svg-600@npm:^0.14.0":
-  version: 0.14.3
-  resolution: "@material-symbols/svg-600@npm:0.14.3"
-  checksum: b9d1942790ee420d3464786fc7e748b3925d20c50aa34f2b289807badb85e49d52b4dcb36bed14c45e544a7d25fda81b33dd40d52aa134a6dea74b76805ea863
+  version: 0.14.4
+  resolution: "@material-symbols/svg-600@npm:0.14.4"
+  checksum: 3522055022b6e062399c9da3c701f0306f9f1bd8d5839fbf638fd2e56d97564528ca409901d7599730bf2f67df50754da859a9f499cb7156ead83890511f9d1f
   languageName: node
   linkType: hard
 

From b6e353537bf150c3aa0ed0777e8b53aff25303d9 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Thu, 11 Jan 2024 10:15:08 -0600
Subject: [PATCH 284/436] Add new emojis from `jdecked/twemoji` 15.0 (#28404)

---
 .../mastodon/features/emoji/emoji.js          |  4 ++--
 .../mastodon/features/emoji/emoji_map.json    |  2 +-
 lib/tasks/emojis.rake                         |  6 ++---
 public/emoji/1f1f2-1f1fe.svg                  |  2 +-
 public/emoji/1f301.svg                        |  2 +-
 public/emoji/1f3e5.svg                        |  2 +-
 public/emoji/1f426-200d-2b1b.svg              |  1 +
 public/emoji/1f426-200d-2b1b_border.svg       | 23 +++++++++++++++++++
 public/emoji/1f50f.svg                        |  2 +-
 public/emoji/1f510.svg                        |  2 +-
 public/emoji/1f512.svg                        |  2 +-
 public/emoji/1f513.svg                        |  2 +-
 public/emoji/1f691.svg                        |  2 +-
 public/emoji/1f6dc.svg                        |  1 +
 public/emoji/1f979.svg                        |  2 +-
 public/emoji/1f97a.svg                        |  2 +-
 public/emoji/1fa75.svg                        |  1 +
 public/emoji/1fa76.svg                        |  1 +
 public/emoji/1fa77.svg                        |  1 +
 public/emoji/1fa87.svg                        |  1 +
 public/emoji/1fa88.svg                        |  1 +
 public/emoji/1faad.svg                        |  1 +
 public/emoji/1faae.svg                        |  1 +
 public/emoji/1faae_border.svg                 |  9 ++++++++
 public/emoji/1faaf.svg                        |  1 +
 public/emoji/1fabb.svg                        |  1 +
 public/emoji/1fabc.svg                        |  1 +
 public/emoji/1fabd.svg                        |  1 +
 public/emoji/1fabd_border.svg                 |  9 ++++++++
 public/emoji/1fabf.svg                        |  1 +
 public/emoji/1fabf_border.svg                 | 17 ++++++++++++++
 public/emoji/1face.svg                        |  1 +
 public/emoji/1facf.svg                        |  1 +
 public/emoji/1fada.svg                        |  1 +
 public/emoji/1fadb.svg                        |  1 +
 public/emoji/1fae8.svg                        |  1 +
 public/emoji/1faf7-1f3fb.svg                  |  1 +
 public/emoji/1faf7-1f3fc.svg                  |  1 +
 public/emoji/1faf7-1f3fd.svg                  |  1 +
 public/emoji/1faf7-1f3fe.svg                  |  1 +
 public/emoji/1faf7-1f3ff.svg                  |  1 +
 public/emoji/1faf7.svg                        |  1 +
 public/emoji/1faf8-1f3fb.svg                  |  1 +
 public/emoji/1faf8-1f3fc.svg                  |  1 +
 public/emoji/1faf8-1f3fd.svg                  |  1 +
 public/emoji/1faf8-1f3fe.svg                  |  1 +
 public/emoji/1faf8-1f3ff.svg                  |  1 +
 public/emoji/1faf8.svg                        |  1 +
 48 files changed, 105 insertions(+), 16 deletions(-)
 create mode 100755 public/emoji/1f426-200d-2b1b.svg
 create mode 100644 public/emoji/1f426-200d-2b1b_border.svg
 create mode 100644 public/emoji/1f6dc.svg
 mode change 100755 => 100644 public/emoji/1f979.svg
 create mode 100755 public/emoji/1fa75.svg
 create mode 100755 public/emoji/1fa76.svg
 create mode 100755 public/emoji/1fa77.svg
 create mode 100644 public/emoji/1fa87.svg
 create mode 100755 public/emoji/1fa88.svg
 create mode 100644 public/emoji/1faad.svg
 create mode 100644 public/emoji/1faae.svg
 create mode 100644 public/emoji/1faae_border.svg
 create mode 100644 public/emoji/1faaf.svg
 create mode 100644 public/emoji/1fabb.svg
 create mode 100644 public/emoji/1fabc.svg
 create mode 100644 public/emoji/1fabd.svg
 create mode 100644 public/emoji/1fabd_border.svg
 create mode 100644 public/emoji/1fabf.svg
 create mode 100644 public/emoji/1fabf_border.svg
 create mode 100644 public/emoji/1face.svg
 create mode 100644 public/emoji/1facf.svg
 create mode 100644 public/emoji/1fada.svg
 create mode 100644 public/emoji/1fadb.svg
 create mode 100644 public/emoji/1fae8.svg
 create mode 100644 public/emoji/1faf7-1f3fb.svg
 create mode 100644 public/emoji/1faf7-1f3fc.svg
 create mode 100644 public/emoji/1faf7-1f3fd.svg
 create mode 100644 public/emoji/1faf7-1f3fe.svg
 create mode 100644 public/emoji/1faf7-1f3ff.svg
 create mode 100644 public/emoji/1faf7.svg
 create mode 100644 public/emoji/1faf8-1f3fb.svg
 create mode 100644 public/emoji/1faf8-1f3fc.svg
 create mode 100644 public/emoji/1faf8-1f3fd.svg
 create mode 100644 public/emoji/1faf8-1f3fe.svg
 create mode 100644 public/emoji/1faf8-1f3ff.svg
 create mode 100644 public/emoji/1faf8.svg

diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index dd51dc621e..5918a65ed7 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -14,8 +14,8 @@ const emojiFilenames = (emojis) => {
 };
 
 // Emoji requiring extra borders depending on theme
-const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂‍♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂‍♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲']);
-const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️']);
+const darkEmoji = emojiFilenames(['🎱', '🐜', '⚫', '🖤', '⬛', '◼️', '◾', '◼️', '✒️', '▪️', '💣', '🎳', '📷', '📸', '♣️', '🕶️', '✴️', '🔌', '💂‍♀️', '📽️', '🍳', '🦍', '💂', '🔪', '🕳️', '🕹️', '🕋', '🖊️', '🖋️', '💂‍♂️', '🎤', '🎓', '🎥', '🎼', '♠️', '🎩', '🦃', '📼', '📹', '🎮', '🐃', '🏴', '🐞', '🕺', '📱', '📲', '🚲', '🪮', '🐦‍⬛']);
+const lightEmoji = emojiFilenames(['👽', '⚾', '🐔', '☁️', '💨', '🕊️', '👀', '🍥', '👻', '🐐', '❕', '❔', '⛸️', '🌩️', '🔊', '🔇', '📃', '🌧️', '🐏', '🍚', '🍙', '🐓', '🐑', '💀', '☠️', '🌨️', '🔉', '🔈', '💬', '💭', '🏐', '🏳️', '⚪', '⬜', '◽', '◻️', '▫️', '🪽', '🪿']);
 
 const emojiFilename = (filename) => {
   const borderedEmoji = (document.body && document.body.classList.contains('theme-mastodon-light')) ? lightEmoji : darkEmoji;
diff --git a/app/javascript/mastodon/features/emoji/emoji_map.json b/app/javascript/mastodon/features/emoji/emoji_map.json
index 64f6615b79..ddb863d1d4 100644
--- a/app/javascript/mastodon/features/emoji/emoji_map.json
+++ b/app/javascript/mastodon/features/emoji/emoji_map.json
@@ -1 +1 @@
-{"😀":"1f600","😃":"1f603","😄":"1f604","😁":"1f601","😆":"1f606","😅":"1f605","🤣":"1f923","😂":"1f602","🙂":"1f642","🙃":"1f643","🫠":"1fae0","😉":"1f609","😊":"1f60a","😇":"1f607","🥰":"1f970","😍":"1f60d","🤩":"1f929","😘":"1f618","😗":"1f617","☺":"263a","😚":"1f61a","😙":"1f619","🥲":"1f972","😋":"1f60b","😛":"1f61b","😜":"1f61c","🤪":"1f92a","😝":"1f61d","🤑":"1f911","🤗":"1f917","🤭":"1f92d","🫢":"1fae2","🫣":"1fae3","🤫":"1f92b","🤔":"1f914","🫡":"1fae1","🤐":"1f910","🤨":"1f928","😐":"1f610","😑":"1f611","😶":"1f636","🫥":"1fae5","😏":"1f60f","😒":"1f612","🙄":"1f644","😬":"1f62c","🤥":"1f925","😌":"1f60c","😔":"1f614","😪":"1f62a","🤤":"1f924","😴":"1f634","😷":"1f637","🤒":"1f912","🤕":"1f915","🤢":"1f922","🤮":"1f92e","🤧":"1f927","🥵":"1f975","🥶":"1f976","🥴":"1f974","😵":"1f635","🤯":"1f92f","🤠":"1f920","🥳":"1f973","🥸":"1f978","😎":"1f60e","🤓":"1f913","🧐":"1f9d0","😕":"1f615","🫤":"1fae4","😟":"1f61f","🙁":"1f641","☹":"2639","😮":"1f62e","😯":"1f62f","😲":"1f632","😳":"1f633","🥺":"1f97a","🥹":"1f979","😦":"1f626","😧":"1f627","😨":"1f628","😰":"1f630","😥":"1f625","😢":"1f622","😭":"1f62d","😱":"1f631","😖":"1f616","😣":"1f623","😞":"1f61e","😓":"1f613","😩":"1f629","😫":"1f62b","🥱":"1f971","😤":"1f624","😡":"1f621","😠":"1f620","🤬":"1f92c","😈":"1f608","👿":"1f47f","💀":"1f480","☠":"2620","💩":"1f4a9","🤡":"1f921","👹":"1f479","👺":"1f47a","👻":"1f47b","👽":"1f47d","👾":"1f47e","🤖":"1f916","😺":"1f63a","😸":"1f638","😹":"1f639","😻":"1f63b","😼":"1f63c","😽":"1f63d","🙀":"1f640","😿":"1f63f","😾":"1f63e","🙈":"1f648","🙉":"1f649","🙊":"1f64a","💋":"1f48b","💌":"1f48c","💘":"1f498","💝":"1f49d","💖":"1f496","💗":"1f497","💓":"1f493","💞":"1f49e","💕":"1f495","💟":"1f49f","❣":"2763","💔":"1f494","❤":"2764","🧡":"1f9e1","💛":"1f49b","💚":"1f49a","💙":"1f499","💜":"1f49c","🤎":"1f90e","🖤":"1f5a4","🤍":"1f90d","💯":"1f4af","💢":"1f4a2","💥":"1f4a5","💫":"1f4ab","💦":"1f4a6","💨":"1f4a8","🕳":"1f573","💣":"1f4a3","💬":"1f4ac","🗨":"1f5e8","🗯":"1f5ef","💭":"1f4ad","💤":"1f4a4","👋":"1f44b","🤚":"1f91a","🖐":"1f590","✋":"270b","🖖":"1f596","🫱":"1faf1","🫲":"1faf2","🫳":"1faf3","🫴":"1faf4","👌":"1f44c","🤌":"1f90c","🤏":"1f90f","✌":"270c","🤞":"1f91e","🫰":"1faf0","🤟":"1f91f","🤘":"1f918","🤙":"1f919","👈":"1f448","👉":"1f449","👆":"1f446","🖕":"1f595","👇":"1f447","☝":"261d","🫵":"1faf5","👍":"1f44d","👎":"1f44e","✊":"270a","👊":"1f44a","🤛":"1f91b","🤜":"1f91c","👏":"1f44f","🙌":"1f64c","🫶":"1faf6","👐":"1f450","🤲":"1f932","🤝":"1f91d","🙏":"1f64f","✍":"270d","💅":"1f485","🤳":"1f933","💪":"1f4aa","🦾":"1f9be","🦿":"1f9bf","🦵":"1f9b5","🦶":"1f9b6","👂":"1f442","🦻":"1f9bb","👃":"1f443","🧠":"1f9e0","🫀":"1fac0","🫁":"1fac1","🦷":"1f9b7","🦴":"1f9b4","👀":"1f440","👁":"1f441","👅":"1f445","👄":"1f444","🫦":"1fae6","👶":"1f476","🧒":"1f9d2","👦":"1f466","👧":"1f467","🧑":"1f9d1","👱":"1f471","👨":"1f468","🧔":"1f9d4","👩":"1f469","🧓":"1f9d3","👴":"1f474","👵":"1f475","🙍":"1f64d","🙎":"1f64e","🙅":"1f645","🙆":"1f646","💁":"1f481","🙋":"1f64b","🧏":"1f9cf","🙇":"1f647","🤦":"1f926","🤷":"1f937","👮":"1f46e","🕵":"1f575","💂":"1f482","🥷":"1f977","👷":"1f477","🫅":"1fac5","🤴":"1f934","👸":"1f478","👳":"1f473","👲":"1f472","🧕":"1f9d5","🤵":"1f935","👰":"1f470","🤰":"1f930","🫃":"1fac3","🫄":"1fac4","🤱":"1f931","👼":"1f47c","🎅":"1f385","🤶":"1f936","🦸":"1f9b8","🦹":"1f9b9","🧙":"1f9d9","🧚":"1f9da","🧛":"1f9db","🧜":"1f9dc","🧝":"1f9dd","🧞":"1f9de","🧟":"1f9df","🧌":"1f9cc","💆":"1f486","💇":"1f487","🚶":"1f6b6","🧍":"1f9cd","🧎":"1f9ce","🏃":"1f3c3","💃":"1f483","🕺":"1f57a","🕴":"1f574","👯":"1f46f","🧖":"1f9d6","🧗":"1f9d7","🤺":"1f93a","🏇":"1f3c7","⛷":"26f7","🏂":"1f3c2","🏌":"1f3cc","🏄":"1f3c4","🚣":"1f6a3","🏊":"1f3ca","⛹":"26f9","🏋":"1f3cb","🚴":"1f6b4","🚵":"1f6b5","🤸":"1f938","🤼":"1f93c","🤽":"1f93d","🤾":"1f93e","🤹":"1f939","🧘":"1f9d8","🛀":"1f6c0","🛌":"1f6cc","👭":"1f46d","👫":"1f46b","👬":"1f46c","💏":"1f48f","💑":"1f491","👪":"1f46a","🗣":"1f5e3","👤":"1f464","👥":"1f465","🫂":"1fac2","👣":"1f463","🏻":"1f463","🏼":"1f463","🏽":"1f463","🏾":"1f463","🏿":"1f463","🦰":"1f463","🦱":"1f463","🦳":"1f463","🦲":"1f463","🐵":"1f435","🐒":"1f412","🦍":"1f98d","🦧":"1f9a7","🐶":"1f436","🐕":"1f415","🦮":"1f9ae","🐩":"1f429","🐺":"1f43a","🦊":"1f98a","🦝":"1f99d","🐱":"1f431","🐈":"1f408","🦁":"1f981","🐯":"1f42f","🐅":"1f405","🐆":"1f406","🐴":"1f434","🐎":"1f40e","🦄":"1f984","🦓":"1f993","🦌":"1f98c","🦬":"1f9ac","🐮":"1f42e","🐂":"1f402","🐃":"1f403","🐄":"1f404","🐷":"1f437","🐖":"1f416","🐗":"1f417","🐽":"1f43d","🐏":"1f40f","🐑":"1f411","🐐":"1f410","🐪":"1f42a","🐫":"1f42b","🦙":"1f999","🦒":"1f992","🐘":"1f418","🦣":"1f9a3","🦏":"1f98f","🦛":"1f99b","🐭":"1f42d","🐁":"1f401","🐀":"1f400","🐹":"1f439","🐰":"1f430","🐇":"1f407","🐿":"1f43f","🦫":"1f9ab","🦔":"1f994","🦇":"1f987","🐻":"1f43b","🐨":"1f428","🐼":"1f43c","🦥":"1f9a5","🦦":"1f9a6","🦨":"1f9a8","🦘":"1f998","🦡":"1f9a1","🐾":"1f43e","🦃":"1f983","🐔":"1f414","🐓":"1f413","🐣":"1f423","🐤":"1f424","🐥":"1f425","🐦":"1f426","🐧":"1f427","🕊":"1f54a","🦅":"1f985","🦆":"1f986","🦢":"1f9a2","🦉":"1f989","🦤":"1f9a4","🪶":"1fab6","🦩":"1f9a9","🦚":"1f99a","🦜":"1f99c","🐸":"1f438","🐊":"1f40a","🐢":"1f422","🦎":"1f98e","🐍":"1f40d","🐲":"1f432","🐉":"1f409","🦕":"1f995","🦖":"1f996","🐳":"1f433","🐋":"1f40b","🐬":"1f42c","🦭":"1f9ad","🐟":"1f41f","🐠":"1f420","🐡":"1f421","🦈":"1f988","🐙":"1f419","🐚":"1f41a","🪸":"1fab8","🐌":"1f40c","🦋":"1f98b","🐛":"1f41b","🐜":"1f41c","🐝":"1f41d","🪲":"1fab2","🐞":"1f41e","🦗":"1f997","🪳":"1fab3","🕷":"1f577","🕸":"1f578","🦂":"1f982","🦟":"1f99f","🪰":"1fab0","🪱":"1fab1","🦠":"1f9a0","💐":"1f490","🌸":"1f338","💮":"1f4ae","🪷":"1fab7","🏵":"1f3f5","🌹":"1f339","🥀":"1f940","🌺":"1f33a","🌻":"1f33b","🌼":"1f33c","🌷":"1f337","🌱":"1f331","🪴":"1fab4","🌲":"1f332","🌳":"1f333","🌴":"1f334","🌵":"1f335","🌾":"1f33e","🌿":"1f33f","☘":"2618","🍀":"1f340","🍁":"1f341","🍂":"1f342","🍃":"1f343","🪹":"1fab9","🪺":"1faba","🍇":"1f347","🍈":"1f348","🍉":"1f349","🍊":"1f34a","🍋":"1f34b","🍌":"1f34c","🍍":"1f34d","🥭":"1f96d","🍎":"1f34e","🍏":"1f34f","🍐":"1f350","🍑":"1f351","🍒":"1f352","🍓":"1f353","🫐":"1fad0","🥝":"1f95d","🍅":"1f345","🫒":"1fad2","🥥":"1f965","🥑":"1f951","🍆":"1f346","🥔":"1f954","🥕":"1f955","🌽":"1f33d","🌶":"1f336","🫑":"1fad1","🥒":"1f952","🥬":"1f96c","🥦":"1f966","🧄":"1f9c4","🧅":"1f9c5","🍄":"1f344","🥜":"1f95c","🫘":"1fad8","🌰":"1f330","🍞":"1f35e","🥐":"1f950","🥖":"1f956","🫓":"1fad3","🥨":"1f968","🥯":"1f96f","🥞":"1f95e","🧇":"1f9c7","🧀":"1f9c0","🍖":"1f356","🍗":"1f357","🥩":"1f969","🥓":"1f953","🍔":"1f354","🍟":"1f35f","🍕":"1f355","🌭":"1f32d","🥪":"1f96a","🌮":"1f32e","🌯":"1f32f","🫔":"1fad4","🥙":"1f959","🧆":"1f9c6","🥚":"1f95a","🍳":"1f373","🥘":"1f958","🍲":"1f372","🫕":"1fad5","🥣":"1f963","🥗":"1f957","🍿":"1f37f","🧈":"1f9c8","🧂":"1f9c2","🥫":"1f96b","🍱":"1f371","🍘":"1f358","🍙":"1f359","🍚":"1f35a","🍛":"1f35b","🍜":"1f35c","🍝":"1f35d","🍠":"1f360","🍢":"1f362","🍣":"1f363","🍤":"1f364","🍥":"1f365","🥮":"1f96e","🍡":"1f361","🥟":"1f95f","🥠":"1f960","🥡":"1f961","🦀":"1f980","🦞":"1f99e","🦐":"1f990","🦑":"1f991","🦪":"1f9aa","🍦":"1f366","🍧":"1f367","🍨":"1f368","🍩":"1f369","🍪":"1f36a","🎂":"1f382","🍰":"1f370","🧁":"1f9c1","🥧":"1f967","🍫":"1f36b","🍬":"1f36c","🍭":"1f36d","🍮":"1f36e","🍯":"1f36f","🍼":"1f37c","🥛":"1f95b","☕":"2615","🫖":"1fad6","🍵":"1f375","🍶":"1f376","🍾":"1f37e","🍷":"1f377","🍸":"1f378","🍹":"1f379","🍺":"1f37a","🍻":"1f37b","🥂":"1f942","🥃":"1f943","🫗":"1fad7","🥤":"1f964","🧋":"1f9cb","🧃":"1f9c3","🧉":"1f9c9","🧊":"1f9ca","🥢":"1f962","🍽":"1f37d","🍴":"1f374","🥄":"1f944","🔪":"1f52a","🫙":"1fad9","🏺":"1f3fa","🌍":"1f30d","🌎":"1f30e","🌏":"1f30f","🌐":"1f310","🗺":"1f5fa","🗾":"1f5fe","🧭":"1f9ed","🏔":"1f3d4","⛰":"26f0","🌋":"1f30b","🗻":"1f5fb","🏕":"1f3d5","🏖":"1f3d6","🏜":"1f3dc","🏝":"1f3dd","🏞":"1f3de","🏟":"1f3df","🏛":"1f3db","🏗":"1f3d7","🧱":"1f9f1","🪨":"1faa8","🪵":"1fab5","🛖":"1f6d6","🏘":"1f3d8","🏚":"1f3da","🏠":"1f3e0","🏡":"1f3e1","🏢":"1f3e2","🏣":"1f3e3","🏤":"1f3e4","🏥":"1f3e5","🏦":"1f3e6","🏨":"1f3e8","🏩":"1f3e9","🏪":"1f3ea","🏫":"1f3eb","🏬":"1f3ec","🏭":"1f3ed","🏯":"1f3ef","🏰":"1f3f0","💒":"1f492","🗼":"1f5fc","🗽":"1f5fd","⛪":"26ea","🕌":"1f54c","🛕":"1f6d5","🕍":"1f54d","⛩":"26e9","🕋":"1f54b","⛲":"26f2","⛺":"26fa","🌁":"1f301","🌃":"1f303","🏙":"1f3d9","🌄":"1f304","🌅":"1f305","🌆":"1f306","🌇":"1f307","🌉":"1f309","♨":"2668","🎠":"1f3a0","🛝":"1f6dd","🎡":"1f3a1","🎢":"1f3a2","💈":"1f488","🎪":"1f3aa","🚂":"1f682","🚃":"1f683","🚄":"1f684","🚅":"1f685","🚆":"1f686","🚇":"1f687","🚈":"1f688","🚉":"1f689","🚊":"1f68a","🚝":"1f69d","🚞":"1f69e","🚋":"1f68b","🚌":"1f68c","🚍":"1f68d","🚎":"1f68e","🚐":"1f690","🚑":"1f691","🚒":"1f692","🚓":"1f693","🚔":"1f694","🚕":"1f695","🚖":"1f696","🚗":"1f697","🚘":"1f698","🚙":"1f699","🛻":"1f6fb","🚚":"1f69a","🚛":"1f69b","🚜":"1f69c","🏎":"1f3ce","🏍":"1f3cd","🛵":"1f6f5","🦽":"1f9bd","🦼":"1f9bc","🛺":"1f6fa","🚲":"1f6b2","🛴":"1f6f4","🛹":"1f6f9","🛼":"1f6fc","🚏":"1f68f","🛣":"1f6e3","🛤":"1f6e4","🛢":"1f6e2","⛽":"26fd","🛞":"1f6de","🚨":"1f6a8","🚥":"1f6a5","🚦":"1f6a6","🛑":"1f6d1","🚧":"1f6a7","⚓":"2693","🛟":"1f6df","⛵":"26f5","🛶":"1f6f6","🚤":"1f6a4","🛳":"1f6f3","⛴":"26f4","🛥":"1f6e5","🚢":"1f6a2","✈":"2708","🛩":"1f6e9","🛫":"1f6eb","🛬":"1f6ec","🪂":"1fa82","💺":"1f4ba","🚁":"1f681","🚟":"1f69f","🚠":"1f6a0","🚡":"1f6a1","🛰":"1f6f0","🚀":"1f680","🛸":"1f6f8","🛎":"1f6ce","🧳":"1f9f3","⌛":"231b","⏳":"23f3","⌚":"231a","⏰":"23f0","⏱":"23f1","⏲":"23f2","🕰":"1f570","🕛":"1f55b","🕧":"1f567","🕐":"1f550","🕜":"1f55c","🕑":"1f551","🕝":"1f55d","🕒":"1f552","🕞":"1f55e","🕓":"1f553","🕟":"1f55f","🕔":"1f554","🕠":"1f560","🕕":"1f555","🕡":"1f561","🕖":"1f556","🕢":"1f562","🕗":"1f557","🕣":"1f563","🕘":"1f558","🕤":"1f564","🕙":"1f559","🕥":"1f565","🕚":"1f55a","🕦":"1f566","🌑":"1f311","🌒":"1f312","🌓":"1f313","🌔":"1f314","🌕":"1f315","🌖":"1f316","🌗":"1f317","🌘":"1f318","🌙":"1f319","🌚":"1f31a","🌛":"1f31b","🌜":"1f31c","🌡":"1f321","☀":"2600","🌝":"1f31d","🌞":"1f31e","🪐":"1fa90","⭐":"2b50","🌟":"1f31f","🌠":"1f320","🌌":"1f30c","☁":"2601","⛅":"26c5","⛈":"26c8","🌤":"1f324","🌥":"1f325","🌦":"1f326","🌧":"1f327","🌨":"1f328","🌩":"1f329","🌪":"1f32a","🌫":"1f32b","🌬":"1f32c","🌀":"1f300","🌈":"1f308","🌂":"1f302","☂":"2602","☔":"2614","⛱":"26f1","⚡":"26a1","❄":"2744","☃":"2603","⛄":"26c4","☄":"2604","🔥":"1f525","💧":"1f4a7","🌊":"1f30a","🎃":"1f383","🎄":"1f384","🎆":"1f386","🎇":"1f387","🧨":"1f9e8","✨":"2728","🎈":"1f388","🎉":"1f389","🎊":"1f38a","🎋":"1f38b","🎍":"1f38d","🎎":"1f38e","🎏":"1f38f","🎐":"1f390","🎑":"1f391","🧧":"1f9e7","🎀":"1f380","🎁":"1f381","🎗":"1f397","🎟":"1f39f","🎫":"1f3ab","🎖":"1f396","🏆":"1f3c6","🏅":"1f3c5","🥇":"1f947","🥈":"1f948","🥉":"1f949","⚽":"26bd","⚾":"26be","🥎":"1f94e","🏀":"1f3c0","🏐":"1f3d0","🏈":"1f3c8","🏉":"1f3c9","🎾":"1f3be","🥏":"1f94f","🎳":"1f3b3","🏏":"1f3cf","🏑":"1f3d1","🏒":"1f3d2","🥍":"1f94d","🏓":"1f3d3","🏸":"1f3f8","🥊":"1f94a","🥋":"1f94b","🥅":"1f945","⛳":"26f3","⛸":"26f8","🎣":"1f3a3","🤿":"1f93f","🎽":"1f3bd","🎿":"1f3bf","🛷":"1f6f7","🥌":"1f94c","🎯":"1f3af","🪀":"1fa80","🪁":"1fa81","🎱":"1f3b1","🔮":"1f52e","🪄":"1fa84","🧿":"1f9ff","🪬":"1faac","🎮":"1f3ae","🕹":"1f579","🎰":"1f3b0","🎲":"1f3b2","🧩":"1f9e9","🧸":"1f9f8","🪅":"1fa85","🪩":"1faa9","🪆":"1fa86","♠":"2660","♥":"2665","♦":"2666","♣":"2663","♟":"265f","🃏":"1f0cf","🀄":"1f004","🎴":"1f3b4","🎭":"1f3ad","🖼":"1f5bc","🎨":"1f3a8","🧵":"1f9f5","🪡":"1faa1","🧶":"1f9f6","🪢":"1faa2","👓":"1f453","🕶":"1f576","🥽":"1f97d","🥼":"1f97c","🦺":"1f9ba","👔":"1f454","👕":"1f455","👖":"1f456","🧣":"1f9e3","🧤":"1f9e4","🧥":"1f9e5","🧦":"1f9e6","👗":"1f457","👘":"1f458","🥻":"1f97b","🩱":"1fa71","🩲":"1fa72","🩳":"1fa73","👙":"1f459","👚":"1f45a","👛":"1f45b","👜":"1f45c","👝":"1f45d","🛍":"1f6cd","🎒":"1f392","🩴":"1fa74","👞":"1f45e","👟":"1f45f","🥾":"1f97e","🥿":"1f97f","👠":"1f460","👡":"1f461","🩰":"1fa70","👢":"1f462","👑":"1f451","👒":"1f452","🎩":"1f3a9","🎓":"1f393","🧢":"1f9e2","🪖":"1fa96","⛑":"26d1","📿":"1f4ff","💄":"1f484","💍":"1f48d","💎":"1f48e","🔇":"1f507","🔈":"1f508","🔉":"1f509","🔊":"1f50a","📢":"1f4e2","📣":"1f4e3","📯":"1f4ef","🔔":"1f514","🔕":"1f515","🎼":"1f3bc","🎵":"1f3b5","🎶":"1f3b6","🎙":"1f399","🎚":"1f39a","🎛":"1f39b","🎤":"1f3a4","🎧":"1f3a7","📻":"1f4fb","🎷":"1f3b7","🪗":"1fa97","🎸":"1f3b8","🎹":"1f3b9","🎺":"1f3ba","🎻":"1f3bb","🪕":"1fa95","🥁":"1f941","🪘":"1fa98","📱":"1f4f1","📲":"1f4f2","☎":"260e","📞":"1f4de","📟":"1f4df","📠":"1f4e0","🔋":"1f50b","🪫":"1faab","🔌":"1f50c","💻":"1f4bb","🖥":"1f5a5","🖨":"1f5a8","⌨":"2328","🖱":"1f5b1","🖲":"1f5b2","💽":"1f4bd","💾":"1f4be","💿":"1f4bf","📀":"1f4c0","🧮":"1f9ee","🎥":"1f3a5","🎞":"1f39e","📽":"1f4fd","🎬":"1f3ac","📺":"1f4fa","📷":"1f4f7","📸":"1f4f8","📹":"1f4f9","📼":"1f4fc","🔍":"1f50d","🔎":"1f50e","🕯":"1f56f","💡":"1f4a1","🔦":"1f526","🏮":"1f3ee","🪔":"1fa94","📔":"1f4d4","📕":"1f4d5","📖":"1f4d6","📗":"1f4d7","📘":"1f4d8","📙":"1f4d9","📚":"1f4da","📓":"1f4d3","📒":"1f4d2","📃":"1f4c3","📜":"1f4dc","📄":"1f4c4","📰":"1f4f0","🗞":"1f5de","📑":"1f4d1","🔖":"1f516","🏷":"1f3f7","💰":"1f4b0","🪙":"1fa99","💴":"1f4b4","💵":"1f4b5","💶":"1f4b6","💷":"1f4b7","💸":"1f4b8","💳":"1f4b3","🧾":"1f9fe","💹":"1f4b9","✉":"2709","📧":"1f4e7","📨":"1f4e8","📩":"1f4e9","📤":"1f4e4","📥":"1f4e5","📦":"1f4e6","📫":"1f4eb","📪":"1f4ea","📬":"1f4ec","📭":"1f4ed","📮":"1f4ee","🗳":"1f5f3","✏":"270f","✒":"2712","🖋":"1f58b","🖊":"1f58a","🖌":"1f58c","🖍":"1f58d","📝":"1f4dd","💼":"1f4bc","📁":"1f4c1","📂":"1f4c2","🗂":"1f5c2","📅":"1f4c5","📆":"1f4c6","🗒":"1f5d2","🗓":"1f5d3","📇":"1f4c7","📈":"1f4c8","📉":"1f4c9","📊":"1f4ca","📋":"1f4cb","📌":"1f4cc","📍":"1f4cd","📎":"1f4ce","🖇":"1f587","📏":"1f4cf","📐":"1f4d0","✂":"2702","🗃":"1f5c3","🗄":"1f5c4","🗑":"1f5d1","🔒":"1f512","🔓":"1f513","🔏":"1f50f","🔐":"1f510","🔑":"1f511","🗝":"1f5dd","🔨":"1f528","🪓":"1fa93","⛏":"26cf","⚒":"2692","🛠":"1f6e0","🗡":"1f5e1","⚔":"2694","🔫":"1f52b","🪃":"1fa83","🏹":"1f3f9","🛡":"1f6e1","🪚":"1fa9a","🔧":"1f527","🪛":"1fa9b","🔩":"1f529","⚙":"2699","🗜":"1f5dc","⚖":"2696","🦯":"1f9af","🔗":"1f517","⛓":"26d3","🪝":"1fa9d","🧰":"1f9f0","🧲":"1f9f2","🪜":"1fa9c","⚗":"2697","🧪":"1f9ea","🧫":"1f9eb","🧬":"1f9ec","🔬":"1f52c","🔭":"1f52d","📡":"1f4e1","💉":"1f489","🩸":"1fa78","💊":"1f48a","🩹":"1fa79","🩼":"1fa7c","🩺":"1fa7a","🩻":"1fa7b","🚪":"1f6aa","🛗":"1f6d7","🪞":"1fa9e","🪟":"1fa9f","🛏":"1f6cf","🛋":"1f6cb","🪑":"1fa91","🚽":"1f6bd","🪠":"1faa0","🚿":"1f6bf","🛁":"1f6c1","🪤":"1faa4","🪒":"1fa92","🧴":"1f9f4","🧷":"1f9f7","🧹":"1f9f9","🧺":"1f9fa","🧻":"1f9fb","🪣":"1faa3","🧼":"1f9fc","🫧":"1fae7","🪥":"1faa5","🧽":"1f9fd","🧯":"1f9ef","🛒":"1f6d2","🚬":"1f6ac","⚰":"26b0","🪦":"1faa6","⚱":"26b1","🗿":"1f5ff","🪧":"1faa7","🪪":"1faaa","🏧":"1f3e7","🚮":"1f6ae","🚰":"1f6b0","♿":"267f","🚹":"1f6b9","🚺":"1f6ba","🚻":"1f6bb","🚼":"1f6bc","🚾":"1f6be","🛂":"1f6c2","🛃":"1f6c3","🛄":"1f6c4","🛅":"1f6c5","⚠":"26a0","🚸":"1f6b8","⛔":"26d4","🚫":"1f6ab","🚳":"1f6b3","🚭":"1f6ad","🚯":"1f6af","🚱":"1f6b1","🚷":"1f6b7","📵":"1f4f5","🔞":"1f51e","☢":"2622","☣":"2623","⬆":"2b06","↗":"2197","➡":"27a1","↘":"2198","⬇":"2b07","↙":"2199","⬅":"2b05","↖":"2196","↕":"2195","↔":"2194","↩":"21a9","↪":"21aa","⤴":"2934","⤵":"2935","🔃":"1f503","🔄":"1f504","🔙":"1f519","🔚":"1f51a","🔛":"1f51b","🔜":"1f51c","🔝":"1f51d","🛐":"1f6d0","⚛":"269b","🕉":"1f549","✡":"2721","☸":"2638","☯":"262f","✝":"271d","☦":"2626","☪":"262a","☮":"262e","🕎":"1f54e","🔯":"1f52f","♈":"2648","♉":"2649","♊":"264a","♋":"264b","♌":"264c","♍":"264d","♎":"264e","♏":"264f","♐":"2650","♑":"2651","♒":"2652","♓":"2653","⛎":"26ce","🔀":"1f500","🔁":"1f501","🔂":"1f502","▶":"25b6","⏩":"23e9","⏭":"23ed","⏯":"23ef","◀":"25c0","⏪":"23ea","⏮":"23ee","🔼":"1f53c","⏫":"23eb","🔽":"1f53d","⏬":"23ec","⏸":"23f8","⏹":"23f9","⏺":"23fa","⏏":"23cf","🎦":"1f3a6","🔅":"1f505","🔆":"1f506","📶":"1f4f6","📳":"1f4f3","📴":"1f4f4","♀":"2640","♂":"2642","⚧":"26a7","✖":"2716","➕":"2795","➖":"2796","➗":"2797","🟰":"1f7f0","♾":"267e","‼":"203c","⁉":"2049","❓":"2753","❔":"2754","❕":"2755","❗":"2757","〰":"3030","💱":"1f4b1","💲":"1f4b2","⚕":"2695","♻":"267b","⚜":"269c","🔱":"1f531","📛":"1f4db","🔰":"1f530","⭕":"2b55","✅":"2705","☑":"2611","✔":"2714","❌":"274c","❎":"274e","➰":"27b0","➿":"27bf","〽":"303d","✳":"2733","✴":"2734","❇":"2747","©":"a9","®":"ae","™":"2122","🔟":"1f51f","🔠":"1f520","🔡":"1f521","🔢":"1f522","🔣":"1f523","🔤":"1f524","🅰":"1f170","🆎":"1f18e","🅱":"1f171","🆑":"1f191","🆒":"1f192","🆓":"1f193","ℹ":"2139","🆔":"1f194","Ⓜ":"24c2","🆕":"1f195","🆖":"1f196","🅾":"1f17e","🆗":"1f197","🅿":"1f17f","🆘":"1f198","🆙":"1f199","🆚":"1f19a","🈁":"1f201","🈂":"1f202","🈷":"1f237","🈶":"1f236","🈯":"1f22f","🉐":"1f250","🈹":"1f239","🈚":"1f21a","🈲":"1f232","🉑":"1f251","🈸":"1f238","🈴":"1f234","🈳":"1f233","㊗":"3297","㊙":"3299","🈺":"1f23a","🈵":"1f235","🔴":"1f534","🟠":"1f7e0","🟡":"1f7e1","🟢":"1f7e2","🔵":"1f535","🟣":"1f7e3","🟤":"1f7e4","⚫":"26ab","⚪":"26aa","🟥":"1f7e5","🟧":"1f7e7","🟨":"1f7e8","🟩":"1f7e9","🟦":"1f7e6","🟪":"1f7ea","🟫":"1f7eb","⬛":"2b1b","⬜":"2b1c","◼":"25fc","◻":"25fb","◾":"25fe","◽":"25fd","▪":"25aa","▫":"25ab","🔶":"1f536","🔷":"1f537","🔸":"1f538","🔹":"1f539","🔺":"1f53a","🔻":"1f53b","💠":"1f4a0","🔘":"1f518","🔳":"1f533","🔲":"1f532","🏁":"1f3c1","🚩":"1f6a9","🎌":"1f38c","🏴":"1f3f4","🏳":"1f3f3","☺️":"263a","☹️":"2639","☠️":"2620","❣️":"2763","❤️":"2764","🕳️":"1f573","🗨️":"1f5e8","🗯️":"1f5ef","👋🏻":"1f44b-1f3fb","👋🏼":"1f44b-1f3fc","👋🏽":"1f44b-1f3fd","👋🏾":"1f44b-1f3fe","👋🏿":"1f44b-1f3ff","🤚🏻":"1f91a-1f3fb","🤚🏼":"1f91a-1f3fc","🤚🏽":"1f91a-1f3fd","🤚🏾":"1f91a-1f3fe","🤚🏿":"1f91a-1f3ff","🖐️":"1f590","🖐🏻":"1f590-1f3fb","🖐🏼":"1f590-1f3fc","🖐🏽":"1f590-1f3fd","🖐🏾":"1f590-1f3fe","🖐🏿":"1f590-1f3ff","✋🏻":"270b-1f3fb","✋🏼":"270b-1f3fc","✋🏽":"270b-1f3fd","✋🏾":"270b-1f3fe","✋🏿":"270b-1f3ff","🖖🏻":"1f596-1f3fb","🖖🏼":"1f596-1f3fc","🖖🏽":"1f596-1f3fd","🖖🏾":"1f596-1f3fe","🖖🏿":"1f596-1f3ff","🫱🏻":"1faf1-1f3fb","🫱🏼":"1faf1-1f3fc","🫱🏽":"1faf1-1f3fd","🫱🏾":"1faf1-1f3fe","🫱🏿":"1faf1-1f3ff","🫲🏻":"1faf2-1f3fb","🫲🏼":"1faf2-1f3fc","🫲🏽":"1faf2-1f3fd","🫲🏾":"1faf2-1f3fe","🫲🏿":"1faf2-1f3ff","🫳🏻":"1faf3-1f3fb","🫳🏼":"1faf3-1f3fc","🫳🏽":"1faf3-1f3fd","🫳🏾":"1faf3-1f3fe","🫳🏿":"1faf3-1f3ff","🫴🏻":"1faf4-1f3fb","🫴🏼":"1faf4-1f3fc","🫴🏽":"1faf4-1f3fd","🫴🏾":"1faf4-1f3fe","🫴🏿":"1faf4-1f3ff","👌🏻":"1f44c-1f3fb","👌🏼":"1f44c-1f3fc","👌🏽":"1f44c-1f3fd","👌🏾":"1f44c-1f3fe","👌🏿":"1f44c-1f3ff","🤌🏻":"1f90c-1f3fb","🤌🏼":"1f90c-1f3fc","🤌🏽":"1f90c-1f3fd","🤌🏾":"1f90c-1f3fe","🤌🏿":"1f90c-1f3ff","🤏🏻":"1f90f-1f3fb","🤏🏼":"1f90f-1f3fc","🤏🏽":"1f90f-1f3fd","🤏🏾":"1f90f-1f3fe","🤏🏿":"1f90f-1f3ff","✌️":"270c","✌🏻":"270c-1f3fb","✌🏼":"270c-1f3fc","✌🏽":"270c-1f3fd","✌🏾":"270c-1f3fe","✌🏿":"270c-1f3ff","🤞🏻":"1f91e-1f3fb","🤞🏼":"1f91e-1f3fc","🤞🏽":"1f91e-1f3fd","🤞🏾":"1f91e-1f3fe","🤞🏿":"1f91e-1f3ff","🫰🏻":"1faf0-1f3fb","🫰🏼":"1faf0-1f3fc","🫰🏽":"1faf0-1f3fd","🫰🏾":"1faf0-1f3fe","🫰🏿":"1faf0-1f3ff","🤟🏻":"1f91f-1f3fb","🤟🏼":"1f91f-1f3fc","🤟🏽":"1f91f-1f3fd","🤟🏾":"1f91f-1f3fe","🤟🏿":"1f91f-1f3ff","🤘🏻":"1f918-1f3fb","🤘🏼":"1f918-1f3fc","🤘🏽":"1f918-1f3fd","🤘🏾":"1f918-1f3fe","🤘🏿":"1f918-1f3ff","🤙🏻":"1f919-1f3fb","🤙🏼":"1f919-1f3fc","🤙🏽":"1f919-1f3fd","🤙🏾":"1f919-1f3fe","🤙🏿":"1f919-1f3ff","👈🏻":"1f448-1f3fb","👈🏼":"1f448-1f3fc","👈🏽":"1f448-1f3fd","👈🏾":"1f448-1f3fe","👈🏿":"1f448-1f3ff","👉🏻":"1f449-1f3fb","👉🏼":"1f449-1f3fc","👉🏽":"1f449-1f3fd","👉🏾":"1f449-1f3fe","👉🏿":"1f449-1f3ff","👆🏻":"1f446-1f3fb","👆🏼":"1f446-1f3fc","👆🏽":"1f446-1f3fd","👆🏾":"1f446-1f3fe","👆🏿":"1f446-1f3ff","🖕🏻":"1f595-1f3fb","🖕🏼":"1f595-1f3fc","🖕🏽":"1f595-1f3fd","🖕🏾":"1f595-1f3fe","🖕🏿":"1f595-1f3ff","👇🏻":"1f447-1f3fb","👇🏼":"1f447-1f3fc","👇🏽":"1f447-1f3fd","👇🏾":"1f447-1f3fe","👇🏿":"1f447-1f3ff","☝️":"261d","☝🏻":"261d-1f3fb","☝🏼":"261d-1f3fc","☝🏽":"261d-1f3fd","☝🏾":"261d-1f3fe","☝🏿":"261d-1f3ff","🫵🏻":"1faf5-1f3fb","🫵🏼":"1faf5-1f3fc","🫵🏽":"1faf5-1f3fd","🫵🏾":"1faf5-1f3fe","🫵🏿":"1faf5-1f3ff","👍🏻":"1f44d-1f3fb","👍🏼":"1f44d-1f3fc","👍🏽":"1f44d-1f3fd","👍🏾":"1f44d-1f3fe","👍🏿":"1f44d-1f3ff","👎🏻":"1f44e-1f3fb","👎🏼":"1f44e-1f3fc","👎🏽":"1f44e-1f3fd","👎🏾":"1f44e-1f3fe","👎🏿":"1f44e-1f3ff","✊🏻":"270a-1f3fb","✊🏼":"270a-1f3fc","✊🏽":"270a-1f3fd","✊🏾":"270a-1f3fe","✊🏿":"270a-1f3ff","👊🏻":"1f44a-1f3fb","👊🏼":"1f44a-1f3fc","👊🏽":"1f44a-1f3fd","👊🏾":"1f44a-1f3fe","👊🏿":"1f44a-1f3ff","🤛🏻":"1f91b-1f3fb","🤛🏼":"1f91b-1f3fc","🤛🏽":"1f91b-1f3fd","🤛🏾":"1f91b-1f3fe","🤛🏿":"1f91b-1f3ff","🤜🏻":"1f91c-1f3fb","🤜🏼":"1f91c-1f3fc","🤜🏽":"1f91c-1f3fd","🤜🏾":"1f91c-1f3fe","🤜🏿":"1f91c-1f3ff","👏🏻":"1f44f-1f3fb","👏🏼":"1f44f-1f3fc","👏🏽":"1f44f-1f3fd","👏🏾":"1f44f-1f3fe","👏🏿":"1f44f-1f3ff","🙌🏻":"1f64c-1f3fb","🙌🏼":"1f64c-1f3fc","🙌🏽":"1f64c-1f3fd","🙌🏾":"1f64c-1f3fe","🙌🏿":"1f64c-1f3ff","🫶🏻":"1faf6-1f3fb","🫶🏼":"1faf6-1f3fc","🫶🏽":"1faf6-1f3fd","🫶🏾":"1faf6-1f3fe","🫶🏿":"1faf6-1f3ff","👐🏻":"1f450-1f3fb","👐🏼":"1f450-1f3fc","👐🏽":"1f450-1f3fd","👐🏾":"1f450-1f3fe","👐🏿":"1f450-1f3ff","🤲🏻":"1f932-1f3fb","🤲🏼":"1f932-1f3fc","🤲🏽":"1f932-1f3fd","🤲🏾":"1f932-1f3fe","🤲🏿":"1f932-1f3ff","🤝🏻":"1f91d-1f3fb","🤝🏼":"1f91d-1f3fc","🤝🏽":"1f91d-1f3fd","🤝🏾":"1f91d-1f3fe","🤝🏿":"1f91d-1f3ff","🙏🏻":"1f64f-1f3fb","🙏🏼":"1f64f-1f3fc","🙏🏽":"1f64f-1f3fd","🙏🏾":"1f64f-1f3fe","🙏🏿":"1f64f-1f3ff","✍️":"270d","✍🏻":"270d-1f3fb","✍🏼":"270d-1f3fc","✍🏽":"270d-1f3fd","✍🏾":"270d-1f3fe","✍🏿":"270d-1f3ff","💅🏻":"1f485-1f3fb","💅🏼":"1f485-1f3fc","💅🏽":"1f485-1f3fd","💅🏾":"1f485-1f3fe","💅🏿":"1f485-1f3ff","🤳🏻":"1f933-1f3fb","🤳🏼":"1f933-1f3fc","🤳🏽":"1f933-1f3fd","🤳🏾":"1f933-1f3fe","🤳🏿":"1f933-1f3ff","💪🏻":"1f4aa-1f3fb","💪🏼":"1f4aa-1f3fc","💪🏽":"1f4aa-1f3fd","💪🏾":"1f4aa-1f3fe","💪🏿":"1f4aa-1f3ff","🦵🏻":"1f9b5-1f3fb","🦵🏼":"1f9b5-1f3fc","🦵🏽":"1f9b5-1f3fd","🦵🏾":"1f9b5-1f3fe","🦵🏿":"1f9b5-1f3ff","🦶🏻":"1f9b6-1f3fb","🦶🏼":"1f9b6-1f3fc","🦶🏽":"1f9b6-1f3fd","🦶🏾":"1f9b6-1f3fe","🦶🏿":"1f9b6-1f3ff","👂🏻":"1f442-1f3fb","👂🏼":"1f442-1f3fc","👂🏽":"1f442-1f3fd","👂🏾":"1f442-1f3fe","👂🏿":"1f442-1f3ff","🦻🏻":"1f9bb-1f3fb","🦻🏼":"1f9bb-1f3fc","🦻🏽":"1f9bb-1f3fd","🦻🏾":"1f9bb-1f3fe","🦻🏿":"1f9bb-1f3ff","👃🏻":"1f443-1f3fb","👃🏼":"1f443-1f3fc","👃🏽":"1f443-1f3fd","👃🏾":"1f443-1f3fe","👃🏿":"1f443-1f3ff","👁️":"1f441","👶🏻":"1f476-1f3fb","👶🏼":"1f476-1f3fc","👶🏽":"1f476-1f3fd","👶🏾":"1f476-1f3fe","👶🏿":"1f476-1f3ff","🧒🏻":"1f9d2-1f3fb","🧒🏼":"1f9d2-1f3fc","🧒🏽":"1f9d2-1f3fd","🧒🏾":"1f9d2-1f3fe","🧒🏿":"1f9d2-1f3ff","👦🏻":"1f466-1f3fb","👦🏼":"1f466-1f3fc","👦🏽":"1f466-1f3fd","👦🏾":"1f466-1f3fe","👦🏿":"1f466-1f3ff","👧🏻":"1f467-1f3fb","👧🏼":"1f467-1f3fc","👧🏽":"1f467-1f3fd","👧🏾":"1f467-1f3fe","👧🏿":"1f467-1f3ff","🧑🏻":"1f9d1-1f3fb","🧑🏼":"1f9d1-1f3fc","🧑🏽":"1f9d1-1f3fd","🧑🏾":"1f9d1-1f3fe","🧑🏿":"1f9d1-1f3ff","👱🏻":"1f471-1f3fb","👱🏼":"1f471-1f3fc","👱🏽":"1f471-1f3fd","👱🏾":"1f471-1f3fe","👱🏿":"1f471-1f3ff","👨🏻":"1f468-1f3fb","👨🏼":"1f468-1f3fc","👨🏽":"1f468-1f3fd","👨🏾":"1f468-1f3fe","👨🏿":"1f468-1f3ff","🧔🏻":"1f9d4-1f3fb","🧔🏼":"1f9d4-1f3fc","🧔🏽":"1f9d4-1f3fd","🧔🏾":"1f9d4-1f3fe","🧔🏿":"1f9d4-1f3ff","👩🏻":"1f469-1f3fb","👩🏼":"1f469-1f3fc","👩🏽":"1f469-1f3fd","👩🏾":"1f469-1f3fe","👩🏿":"1f469-1f3ff","🧓🏻":"1f9d3-1f3fb","🧓🏼":"1f9d3-1f3fc","🧓🏽":"1f9d3-1f3fd","🧓🏾":"1f9d3-1f3fe","🧓🏿":"1f9d3-1f3ff","👴🏻":"1f474-1f3fb","👴🏼":"1f474-1f3fc","👴🏽":"1f474-1f3fd","👴🏾":"1f474-1f3fe","👴🏿":"1f474-1f3ff","👵🏻":"1f475-1f3fb","👵🏼":"1f475-1f3fc","👵🏽":"1f475-1f3fd","👵🏾":"1f475-1f3fe","👵🏿":"1f475-1f3ff","🙍🏻":"1f64d-1f3fb","🙍🏼":"1f64d-1f3fc","🙍🏽":"1f64d-1f3fd","🙍🏾":"1f64d-1f3fe","🙍🏿":"1f64d-1f3ff","🙎🏻":"1f64e-1f3fb","🙎🏼":"1f64e-1f3fc","🙎🏽":"1f64e-1f3fd","🙎🏾":"1f64e-1f3fe","🙎🏿":"1f64e-1f3ff","🙅🏻":"1f645-1f3fb","🙅🏼":"1f645-1f3fc","🙅🏽":"1f645-1f3fd","🙅🏾":"1f645-1f3fe","🙅🏿":"1f645-1f3ff","🙆🏻":"1f646-1f3fb","🙆🏼":"1f646-1f3fc","🙆🏽":"1f646-1f3fd","🙆🏾":"1f646-1f3fe","🙆🏿":"1f646-1f3ff","💁🏻":"1f481-1f3fb","💁🏼":"1f481-1f3fc","💁🏽":"1f481-1f3fd","💁🏾":"1f481-1f3fe","💁🏿":"1f481-1f3ff","🙋🏻":"1f64b-1f3fb","🙋🏼":"1f64b-1f3fc","🙋🏽":"1f64b-1f3fd","🙋🏾":"1f64b-1f3fe","🙋🏿":"1f64b-1f3ff","🧏🏻":"1f9cf-1f3fb","🧏🏼":"1f9cf-1f3fc","🧏🏽":"1f9cf-1f3fd","🧏🏾":"1f9cf-1f3fe","🧏🏿":"1f9cf-1f3ff","🙇🏻":"1f647-1f3fb","🙇🏼":"1f647-1f3fc","🙇🏽":"1f647-1f3fd","🙇🏾":"1f647-1f3fe","🙇🏿":"1f647-1f3ff","🤦🏻":"1f926-1f3fb","🤦🏼":"1f926-1f3fc","🤦🏽":"1f926-1f3fd","🤦🏾":"1f926-1f3fe","🤦🏿":"1f926-1f3ff","🤷🏻":"1f937-1f3fb","🤷🏼":"1f937-1f3fc","🤷🏽":"1f937-1f3fd","🤷🏾":"1f937-1f3fe","🤷🏿":"1f937-1f3ff","👮🏻":"1f46e-1f3fb","👮🏼":"1f46e-1f3fc","👮🏽":"1f46e-1f3fd","👮🏾":"1f46e-1f3fe","👮🏿":"1f46e-1f3ff","🕵️":"1f575","🕵🏻":"1f575-1f3fb","🕵🏼":"1f575-1f3fc","🕵🏽":"1f575-1f3fd","🕵🏾":"1f575-1f3fe","🕵🏿":"1f575-1f3ff","💂🏻":"1f482-1f3fb","💂🏼":"1f482-1f3fc","💂🏽":"1f482-1f3fd","💂🏾":"1f482-1f3fe","💂🏿":"1f482-1f3ff","🥷🏻":"1f977-1f3fb","🥷🏼":"1f977-1f3fc","🥷🏽":"1f977-1f3fd","🥷🏾":"1f977-1f3fe","🥷🏿":"1f977-1f3ff","👷🏻":"1f477-1f3fb","👷🏼":"1f477-1f3fc","👷🏽":"1f477-1f3fd","👷🏾":"1f477-1f3fe","👷🏿":"1f477-1f3ff","🫅🏻":"1fac5-1f3fb","🫅🏼":"1fac5-1f3fc","🫅🏽":"1fac5-1f3fd","🫅🏾":"1fac5-1f3fe","🫅🏿":"1fac5-1f3ff","🤴🏻":"1f934-1f3fb","🤴🏼":"1f934-1f3fc","🤴🏽":"1f934-1f3fd","🤴🏾":"1f934-1f3fe","🤴🏿":"1f934-1f3ff","👸🏻":"1f478-1f3fb","👸🏼":"1f478-1f3fc","👸🏽":"1f478-1f3fd","👸🏾":"1f478-1f3fe","👸🏿":"1f478-1f3ff","👳🏻":"1f473-1f3fb","👳🏼":"1f473-1f3fc","👳🏽":"1f473-1f3fd","👳🏾":"1f473-1f3fe","👳🏿":"1f473-1f3ff","👲🏻":"1f472-1f3fb","👲🏼":"1f472-1f3fc","👲🏽":"1f472-1f3fd","👲🏾":"1f472-1f3fe","👲🏿":"1f472-1f3ff","🧕🏻":"1f9d5-1f3fb","🧕🏼":"1f9d5-1f3fc","🧕🏽":"1f9d5-1f3fd","🧕🏾":"1f9d5-1f3fe","🧕🏿":"1f9d5-1f3ff","🤵🏻":"1f935-1f3fb","🤵🏼":"1f935-1f3fc","🤵🏽":"1f935-1f3fd","🤵🏾":"1f935-1f3fe","🤵🏿":"1f935-1f3ff","👰🏻":"1f470-1f3fb","👰🏼":"1f470-1f3fc","👰🏽":"1f470-1f3fd","👰🏾":"1f470-1f3fe","👰🏿":"1f470-1f3ff","🤰🏻":"1f930-1f3fb","🤰🏼":"1f930-1f3fc","🤰🏽":"1f930-1f3fd","🤰🏾":"1f930-1f3fe","🤰🏿":"1f930-1f3ff","🫃🏻":"1fac3-1f3fb","🫃🏼":"1fac3-1f3fc","🫃🏽":"1fac3-1f3fd","🫃🏾":"1fac3-1f3fe","🫃🏿":"1fac3-1f3ff","🫄🏻":"1fac4-1f3fb","🫄🏼":"1fac4-1f3fc","🫄🏽":"1fac4-1f3fd","🫄🏾":"1fac4-1f3fe","🫄🏿":"1fac4-1f3ff","🤱🏻":"1f931-1f3fb","🤱🏼":"1f931-1f3fc","🤱🏽":"1f931-1f3fd","🤱🏾":"1f931-1f3fe","🤱🏿":"1f931-1f3ff","👼🏻":"1f47c-1f3fb","👼🏼":"1f47c-1f3fc","👼🏽":"1f47c-1f3fd","👼🏾":"1f47c-1f3fe","👼🏿":"1f47c-1f3ff","🎅🏻":"1f385-1f3fb","🎅🏼":"1f385-1f3fc","🎅🏽":"1f385-1f3fd","🎅🏾":"1f385-1f3fe","🎅🏿":"1f385-1f3ff","🤶🏻":"1f936-1f3fb","🤶🏼":"1f936-1f3fc","🤶🏽":"1f936-1f3fd","🤶🏾":"1f936-1f3fe","🤶🏿":"1f936-1f3ff","🦸🏻":"1f9b8-1f3fb","🦸🏼":"1f9b8-1f3fc","🦸🏽":"1f9b8-1f3fd","🦸🏾":"1f9b8-1f3fe","🦸🏿":"1f9b8-1f3ff","🦹🏻":"1f9b9-1f3fb","🦹🏼":"1f9b9-1f3fc","🦹🏽":"1f9b9-1f3fd","🦹🏾":"1f9b9-1f3fe","🦹🏿":"1f9b9-1f3ff","🧙🏻":"1f9d9-1f3fb","🧙🏼":"1f9d9-1f3fc","🧙🏽":"1f9d9-1f3fd","🧙🏾":"1f9d9-1f3fe","🧙🏿":"1f9d9-1f3ff","🧚🏻":"1f9da-1f3fb","🧚🏼":"1f9da-1f3fc","🧚🏽":"1f9da-1f3fd","🧚🏾":"1f9da-1f3fe","🧚🏿":"1f9da-1f3ff","🧛🏻":"1f9db-1f3fb","🧛🏼":"1f9db-1f3fc","🧛🏽":"1f9db-1f3fd","🧛🏾":"1f9db-1f3fe","🧛🏿":"1f9db-1f3ff","🧜🏻":"1f9dc-1f3fb","🧜🏼":"1f9dc-1f3fc","🧜🏽":"1f9dc-1f3fd","🧜🏾":"1f9dc-1f3fe","🧜🏿":"1f9dc-1f3ff","🧝🏻":"1f9dd-1f3fb","🧝🏼":"1f9dd-1f3fc","🧝🏽":"1f9dd-1f3fd","🧝🏾":"1f9dd-1f3fe","🧝🏿":"1f9dd-1f3ff","💆🏻":"1f486-1f3fb","💆🏼":"1f486-1f3fc","💆🏽":"1f486-1f3fd","💆🏾":"1f486-1f3fe","💆🏿":"1f486-1f3ff","💇🏻":"1f487-1f3fb","💇🏼":"1f487-1f3fc","💇🏽":"1f487-1f3fd","💇🏾":"1f487-1f3fe","💇🏿":"1f487-1f3ff","🚶🏻":"1f6b6-1f3fb","🚶🏼":"1f6b6-1f3fc","🚶🏽":"1f6b6-1f3fd","🚶🏾":"1f6b6-1f3fe","🚶🏿":"1f6b6-1f3ff","🧍🏻":"1f9cd-1f3fb","🧍🏼":"1f9cd-1f3fc","🧍🏽":"1f9cd-1f3fd","🧍🏾":"1f9cd-1f3fe","🧍🏿":"1f9cd-1f3ff","🧎🏻":"1f9ce-1f3fb","🧎🏼":"1f9ce-1f3fc","🧎🏽":"1f9ce-1f3fd","🧎🏾":"1f9ce-1f3fe","🧎🏿":"1f9ce-1f3ff","🏃🏻":"1f3c3-1f3fb","🏃🏼":"1f3c3-1f3fc","🏃🏽":"1f3c3-1f3fd","🏃🏾":"1f3c3-1f3fe","🏃🏿":"1f3c3-1f3ff","💃🏻":"1f483-1f3fb","💃🏼":"1f483-1f3fc","💃🏽":"1f483-1f3fd","💃🏾":"1f483-1f3fe","💃🏿":"1f483-1f3ff","🕺🏻":"1f57a-1f3fb","🕺🏼":"1f57a-1f3fc","🕺🏽":"1f57a-1f3fd","🕺🏾":"1f57a-1f3fe","🕺🏿":"1f57a-1f3ff","🕴️":"1f574","🕴🏻":"1f574-1f3fb","🕴🏼":"1f574-1f3fc","🕴🏽":"1f574-1f3fd","🕴🏾":"1f574-1f3fe","🕴🏿":"1f574-1f3ff","🧖🏻":"1f9d6-1f3fb","🧖🏼":"1f9d6-1f3fc","🧖🏽":"1f9d6-1f3fd","🧖🏾":"1f9d6-1f3fe","🧖🏿":"1f9d6-1f3ff","🧗🏻":"1f9d7-1f3fb","🧗🏼":"1f9d7-1f3fc","🧗🏽":"1f9d7-1f3fd","🧗🏾":"1f9d7-1f3fe","🧗🏿":"1f9d7-1f3ff","🏇🏻":"1f3c7-1f3fb","🏇🏼":"1f3c7-1f3fc","🏇🏽":"1f3c7-1f3fd","🏇🏾":"1f3c7-1f3fe","🏇🏿":"1f3c7-1f3ff","⛷️":"26f7","🏂🏻":"1f3c2-1f3fb","🏂🏼":"1f3c2-1f3fc","🏂🏽":"1f3c2-1f3fd","🏂🏾":"1f3c2-1f3fe","🏂🏿":"1f3c2-1f3ff","🏌️":"1f3cc","🏌🏻":"1f3cc-1f3fb","🏌🏼":"1f3cc-1f3fc","🏌🏽":"1f3cc-1f3fd","🏌🏾":"1f3cc-1f3fe","🏌🏿":"1f3cc-1f3ff","🏄🏻":"1f3c4-1f3fb","🏄🏼":"1f3c4-1f3fc","🏄🏽":"1f3c4-1f3fd","🏄🏾":"1f3c4-1f3fe","🏄🏿":"1f3c4-1f3ff","🚣🏻":"1f6a3-1f3fb","🚣🏼":"1f6a3-1f3fc","🚣🏽":"1f6a3-1f3fd","🚣🏾":"1f6a3-1f3fe","🚣🏿":"1f6a3-1f3ff","🏊🏻":"1f3ca-1f3fb","🏊🏼":"1f3ca-1f3fc","🏊🏽":"1f3ca-1f3fd","🏊🏾":"1f3ca-1f3fe","🏊🏿":"1f3ca-1f3ff","⛹️":"26f9","⛹🏻":"26f9-1f3fb","⛹🏼":"26f9-1f3fc","⛹🏽":"26f9-1f3fd","⛹🏾":"26f9-1f3fe","⛹🏿":"26f9-1f3ff","🏋️":"1f3cb","🏋🏻":"1f3cb-1f3fb","🏋🏼":"1f3cb-1f3fc","🏋🏽":"1f3cb-1f3fd","🏋🏾":"1f3cb-1f3fe","🏋🏿":"1f3cb-1f3ff","🚴🏻":"1f6b4-1f3fb","🚴🏼":"1f6b4-1f3fc","🚴🏽":"1f6b4-1f3fd","🚴🏾":"1f6b4-1f3fe","🚴🏿":"1f6b4-1f3ff","🚵🏻":"1f6b5-1f3fb","🚵🏼":"1f6b5-1f3fc","🚵🏽":"1f6b5-1f3fd","🚵🏾":"1f6b5-1f3fe","🚵🏿":"1f6b5-1f3ff","🤸🏻":"1f938-1f3fb","🤸🏼":"1f938-1f3fc","🤸🏽":"1f938-1f3fd","🤸🏾":"1f938-1f3fe","🤸🏿":"1f938-1f3ff","🤽🏻":"1f93d-1f3fb","🤽🏼":"1f93d-1f3fc","🤽🏽":"1f93d-1f3fd","🤽🏾":"1f93d-1f3fe","🤽🏿":"1f93d-1f3ff","🤾🏻":"1f93e-1f3fb","🤾🏼":"1f93e-1f3fc","🤾🏽":"1f93e-1f3fd","🤾🏾":"1f93e-1f3fe","🤾🏿":"1f93e-1f3ff","🤹🏻":"1f939-1f3fb","🤹🏼":"1f939-1f3fc","🤹🏽":"1f939-1f3fd","🤹🏾":"1f939-1f3fe","🤹🏿":"1f939-1f3ff","🧘🏻":"1f9d8-1f3fb","🧘🏼":"1f9d8-1f3fc","🧘🏽":"1f9d8-1f3fd","🧘🏾":"1f9d8-1f3fe","🧘🏿":"1f9d8-1f3ff","🛀🏻":"1f6c0-1f3fb","🛀🏼":"1f6c0-1f3fc","🛀🏽":"1f6c0-1f3fd","🛀🏾":"1f6c0-1f3fe","🛀🏿":"1f6c0-1f3ff","🛌🏻":"1f6cc-1f3fb","🛌🏼":"1f6cc-1f3fc","🛌🏽":"1f6cc-1f3fd","🛌🏾":"1f6cc-1f3fe","🛌🏿":"1f6cc-1f3ff","👭🏻":"1f46d-1f3fb","👭🏼":"1f46d-1f3fc","👭🏽":"1f46d-1f3fd","👭🏾":"1f46d-1f3fe","👭🏿":"1f46d-1f3ff","👫🏻":"1f46b-1f3fb","👫🏼":"1f46b-1f3fc","👫🏽":"1f46b-1f3fd","👫🏾":"1f46b-1f3fe","👫🏿":"1f46b-1f3ff","👬🏻":"1f46c-1f3fb","👬🏼":"1f46c-1f3fc","👬🏽":"1f46c-1f3fd","👬🏾":"1f46c-1f3fe","👬🏿":"1f46c-1f3ff","💏🏻":"1f48f-1f3fb","💏🏼":"1f48f-1f3fc","💏🏽":"1f48f-1f3fd","💏🏾":"1f48f-1f3fe","💏🏿":"1f48f-1f3ff","💑🏻":"1f491-1f3fb","💑🏼":"1f491-1f3fc","💑🏽":"1f491-1f3fd","💑🏾":"1f491-1f3fe","💑🏿":"1f491-1f3ff","🗣️":"1f5e3","🐿️":"1f43f","🕊️":"1f54a","🕷️":"1f577","🕸️":"1f578","🏵️":"1f3f5","☘️":"2618","🌶️":"1f336","🍽️":"1f37d","🗺️":"1f5fa","🏔️":"1f3d4","⛰️":"26f0","🏕️":"1f3d5","🏖️":"1f3d6","🏜️":"1f3dc","🏝️":"1f3dd","🏞️":"1f3de","🏟️":"1f3df","🏛️":"1f3db","🏗️":"1f3d7","🏘️":"1f3d8","🏚️":"1f3da","⛩️":"26e9","🏙️":"1f3d9","♨️":"2668","🏎️":"1f3ce","🏍️":"1f3cd","🛣️":"1f6e3","🛤️":"1f6e4","🛢️":"1f6e2","🛳️":"1f6f3","⛴️":"26f4","🛥️":"1f6e5","✈️":"2708","🛩️":"1f6e9","🛰️":"1f6f0","🛎️":"1f6ce","⏱️":"23f1","⏲️":"23f2","🕰️":"1f570","🌡️":"1f321","☀️":"2600","☁️":"2601","⛈️":"26c8","🌤️":"1f324","🌥️":"1f325","🌦️":"1f326","🌧️":"1f327","🌨️":"1f328","🌩️":"1f329","🌪️":"1f32a","🌫️":"1f32b","🌬️":"1f32c","☂️":"2602","⛱️":"26f1","❄️":"2744","☃️":"2603","☄️":"2604","🎗️":"1f397","🎟️":"1f39f","🎖️":"1f396","⛸️":"26f8","🕹️":"1f579","♠️":"2660","♥️":"2665","♦️":"2666","♣️":"2663","♟️":"265f","🖼️":"1f5bc","🕶️":"1f576","🛍️":"1f6cd","⛑️":"26d1","🎙️":"1f399","🎚️":"1f39a","🎛️":"1f39b","☎️":"260e","🖥️":"1f5a5","🖨️":"1f5a8","⌨️":"2328","🖱️":"1f5b1","🖲️":"1f5b2","🎞️":"1f39e","📽️":"1f4fd","🕯️":"1f56f","🗞️":"1f5de","🏷️":"1f3f7","✉️":"2709","🗳️":"1f5f3","✏️":"270f","✒️":"2712","🖋️":"1f58b","🖊️":"1f58a","🖌️":"1f58c","🖍️":"1f58d","🗂️":"1f5c2","🗒️":"1f5d2","🗓️":"1f5d3","🖇️":"1f587","✂️":"2702","🗃️":"1f5c3","🗄️":"1f5c4","🗑️":"1f5d1","🗝️":"1f5dd","⛏️":"26cf","⚒️":"2692","🛠️":"1f6e0","🗡️":"1f5e1","⚔️":"2694","🛡️":"1f6e1","⚙️":"2699","🗜️":"1f5dc","⚖️":"2696","⛓️":"26d3","⚗️":"2697","🛏️":"1f6cf","🛋️":"1f6cb","⚰️":"26b0","⚱️":"26b1","⚠️":"26a0","☢️":"2622","☣️":"2623","⬆️":"2b06","↗️":"2197","➡️":"27a1","↘️":"2198","⬇️":"2b07","↙️":"2199","⬅️":"2b05","↖️":"2196","↕️":"2195","↔️":"2194","↩️":"21a9","↪️":"21aa","⤴️":"2934","⤵️":"2935","⚛️":"269b","🕉️":"1f549","✡️":"2721","☸️":"2638","☯️":"262f","✝️":"271d","☦️":"2626","☪️":"262a","☮️":"262e","▶️":"25b6","⏭️":"23ed","⏯️":"23ef","◀️":"25c0","⏮️":"23ee","⏸️":"23f8","⏹️":"23f9","⏺️":"23fa","⏏️":"23cf","♀️":"2640","♂️":"2642","⚧️":"26a7","✖️":"2716","♾️":"267e","‼️":"203c","⁉️":"2049","〰️":"3030","⚕️":"2695","♻️":"267b","⚜️":"269c","☑️":"2611","✔️":"2714","〽️":"303d","✳️":"2733","✴️":"2734","❇️":"2747","©️":"a9","®️":"ae","™️":"2122","#⃣":"23-20e3","*⃣":"2a-20e3","0⃣":"30-20e3","1⃣":"31-20e3","2⃣":"32-20e3","3⃣":"33-20e3","4⃣":"34-20e3","5⃣":"35-20e3","6⃣":"36-20e3","7⃣":"37-20e3","8⃣":"38-20e3","9⃣":"39-20e3","🅰️":"1f170","🅱️":"1f171","ℹ️":"2139","Ⓜ️":"24c2","🅾️":"1f17e","🅿️":"1f17f","🈂️":"1f202","🈷️":"1f237","㊗️":"3297","㊙️":"3299","◼️":"25fc","◻️":"25fb","▪️":"25aa","▫️":"25ab","🏳️":"1f3f3","🇦🇨":"1f1e6-1f1e8","🇦🇩":"1f1e6-1f1e9","🇦🇪":"1f1e6-1f1ea","🇦🇫":"1f1e6-1f1eb","🇦🇬":"1f1e6-1f1ec","🇦🇮":"1f1e6-1f1ee","🇦🇱":"1f1e6-1f1f1","🇦🇲":"1f1e6-1f1f2","🇦🇴":"1f1e6-1f1f4","🇦🇶":"1f1e6-1f1f6","🇦🇷":"1f1e6-1f1f7","🇦🇸":"1f1e6-1f1f8","🇦🇹":"1f1e6-1f1f9","🇦🇺":"1f1e6-1f1fa","🇦🇼":"1f1e6-1f1fc","🇦🇽":"1f1e6-1f1fd","🇦🇿":"1f1e6-1f1ff","🇧🇦":"1f1e7-1f1e6","🇧🇧":"1f1e7-1f1e7","🇧🇩":"1f1e7-1f1e9","🇧🇪":"1f1e7-1f1ea","🇧🇫":"1f1e7-1f1eb","🇧🇬":"1f1e7-1f1ec","🇧🇭":"1f1e7-1f1ed","🇧🇮":"1f1e7-1f1ee","🇧🇯":"1f1e7-1f1ef","🇧🇱":"1f1e7-1f1f1","🇧🇲":"1f1e7-1f1f2","🇧🇳":"1f1e7-1f1f3","🇧🇴":"1f1e7-1f1f4","🇧🇶":"1f1e7-1f1f6","🇧🇷":"1f1e7-1f1f7","🇧🇸":"1f1e7-1f1f8","🇧🇹":"1f1e7-1f1f9","🇧🇻":"1f1e7-1f1fb","🇧🇼":"1f1e7-1f1fc","🇧🇾":"1f1e7-1f1fe","🇧🇿":"1f1e7-1f1ff","🇨🇦":"1f1e8-1f1e6","🇨🇨":"1f1e8-1f1e8","🇨🇩":"1f1e8-1f1e9","🇨🇫":"1f1e8-1f1eb","🇨🇬":"1f1e8-1f1ec","🇨🇭":"1f1e8-1f1ed","🇨🇮":"1f1e8-1f1ee","🇨🇰":"1f1e8-1f1f0","🇨🇱":"1f1e8-1f1f1","🇨🇲":"1f1e8-1f1f2","🇨🇳":"1f1e8-1f1f3","🇨🇴":"1f1e8-1f1f4","🇨🇵":"1f1e8-1f1f5","🇨🇷":"1f1e8-1f1f7","🇨🇺":"1f1e8-1f1fa","🇨🇻":"1f1e8-1f1fb","🇨🇼":"1f1e8-1f1fc","🇨🇽":"1f1e8-1f1fd","🇨🇾":"1f1e8-1f1fe","🇨🇿":"1f1e8-1f1ff","🇩🇪":"1f1e9-1f1ea","🇩🇬":"1f1e9-1f1ec","🇩🇯":"1f1e9-1f1ef","🇩🇰":"1f1e9-1f1f0","🇩🇲":"1f1e9-1f1f2","🇩🇴":"1f1e9-1f1f4","🇩🇿":"1f1e9-1f1ff","🇪🇦":"1f1ea-1f1e6","🇪🇨":"1f1ea-1f1e8","🇪🇪":"1f1ea-1f1ea","🇪🇬":"1f1ea-1f1ec","🇪🇭":"1f1ea-1f1ed","🇪🇷":"1f1ea-1f1f7","🇪🇸":"1f1ea-1f1f8","🇪🇹":"1f1ea-1f1f9","🇪🇺":"1f1ea-1f1fa","🇫🇮":"1f1eb-1f1ee","🇫🇯":"1f1eb-1f1ef","🇫🇰":"1f1eb-1f1f0","🇫🇲":"1f1eb-1f1f2","🇫🇴":"1f1eb-1f1f4","🇫🇷":"1f1eb-1f1f7","🇬🇦":"1f1ec-1f1e6","🇬🇧":"1f1ec-1f1e7","🇬🇩":"1f1ec-1f1e9","🇬🇪":"1f1ec-1f1ea","🇬🇫":"1f1ec-1f1eb","🇬🇬":"1f1ec-1f1ec","🇬🇭":"1f1ec-1f1ed","🇬🇮":"1f1ec-1f1ee","🇬🇱":"1f1ec-1f1f1","🇬🇲":"1f1ec-1f1f2","🇬🇳":"1f1ec-1f1f3","🇬🇵":"1f1ec-1f1f5","🇬🇶":"1f1ec-1f1f6","🇬🇷":"1f1ec-1f1f7","🇬🇸":"1f1ec-1f1f8","🇬🇹":"1f1ec-1f1f9","🇬🇺":"1f1ec-1f1fa","🇬🇼":"1f1ec-1f1fc","🇬🇾":"1f1ec-1f1fe","🇭🇰":"1f1ed-1f1f0","🇭🇲":"1f1ed-1f1f2","🇭🇳":"1f1ed-1f1f3","🇭🇷":"1f1ed-1f1f7","🇭🇹":"1f1ed-1f1f9","🇭🇺":"1f1ed-1f1fa","🇮🇨":"1f1ee-1f1e8","🇮🇩":"1f1ee-1f1e9","🇮🇪":"1f1ee-1f1ea","🇮🇱":"1f1ee-1f1f1","🇮🇲":"1f1ee-1f1f2","🇮🇳":"1f1ee-1f1f3","🇮🇴":"1f1ee-1f1f4","🇮🇶":"1f1ee-1f1f6","🇮🇷":"1f1ee-1f1f7","🇮🇸":"1f1ee-1f1f8","🇮🇹":"1f1ee-1f1f9","🇯🇪":"1f1ef-1f1ea","🇯🇲":"1f1ef-1f1f2","🇯🇴":"1f1ef-1f1f4","🇯🇵":"1f1ef-1f1f5","🇰🇪":"1f1f0-1f1ea","🇰🇬":"1f1f0-1f1ec","🇰🇭":"1f1f0-1f1ed","🇰🇮":"1f1f0-1f1ee","🇰🇲":"1f1f0-1f1f2","🇰🇳":"1f1f0-1f1f3","🇰🇵":"1f1f0-1f1f5","🇰🇷":"1f1f0-1f1f7","🇰🇼":"1f1f0-1f1fc","🇰🇾":"1f1f0-1f1fe","🇰🇿":"1f1f0-1f1ff","🇱🇦":"1f1f1-1f1e6","🇱🇧":"1f1f1-1f1e7","🇱🇨":"1f1f1-1f1e8","🇱🇮":"1f1f1-1f1ee","🇱🇰":"1f1f1-1f1f0","🇱🇷":"1f1f1-1f1f7","🇱🇸":"1f1f1-1f1f8","🇱🇹":"1f1f1-1f1f9","🇱🇺":"1f1f1-1f1fa","🇱🇻":"1f1f1-1f1fb","🇱🇾":"1f1f1-1f1fe","🇲🇦":"1f1f2-1f1e6","🇲🇨":"1f1f2-1f1e8","🇲🇩":"1f1f2-1f1e9","🇲🇪":"1f1f2-1f1ea","🇲🇫":"1f1f2-1f1eb","🇲🇬":"1f1f2-1f1ec","🇲🇭":"1f1f2-1f1ed","🇲🇰":"1f1f2-1f1f0","🇲🇱":"1f1f2-1f1f1","🇲🇲":"1f1f2-1f1f2","🇲🇳":"1f1f2-1f1f3","🇲🇴":"1f1f2-1f1f4","🇲🇵":"1f1f2-1f1f5","🇲🇶":"1f1f2-1f1f6","🇲🇷":"1f1f2-1f1f7","🇲🇸":"1f1f2-1f1f8","🇲🇹":"1f1f2-1f1f9","🇲🇺":"1f1f2-1f1fa","🇲🇻":"1f1f2-1f1fb","🇲🇼":"1f1f2-1f1fc","🇲🇽":"1f1f2-1f1fd","🇲🇾":"1f1f2-1f1fe","🇲🇿":"1f1f2-1f1ff","🇳🇦":"1f1f3-1f1e6","🇳🇨":"1f1f3-1f1e8","🇳🇪":"1f1f3-1f1ea","🇳🇫":"1f1f3-1f1eb","🇳🇬":"1f1f3-1f1ec","🇳🇮":"1f1f3-1f1ee","🇳🇱":"1f1f3-1f1f1","🇳🇴":"1f1f3-1f1f4","🇳🇵":"1f1f3-1f1f5","🇳🇷":"1f1f3-1f1f7","🇳🇺":"1f1f3-1f1fa","🇳🇿":"1f1f3-1f1ff","🇴🇲":"1f1f4-1f1f2","🇵🇦":"1f1f5-1f1e6","🇵🇪":"1f1f5-1f1ea","🇵🇫":"1f1f5-1f1eb","🇵🇬":"1f1f5-1f1ec","🇵🇭":"1f1f5-1f1ed","🇵🇰":"1f1f5-1f1f0","🇵🇱":"1f1f5-1f1f1","🇵🇲":"1f1f5-1f1f2","🇵🇳":"1f1f5-1f1f3","🇵🇷":"1f1f5-1f1f7","🇵🇸":"1f1f5-1f1f8","🇵🇹":"1f1f5-1f1f9","🇵🇼":"1f1f5-1f1fc","🇵🇾":"1f1f5-1f1fe","🇶🇦":"1f1f6-1f1e6","🇷🇪":"1f1f7-1f1ea","🇷🇴":"1f1f7-1f1f4","🇷🇸":"1f1f7-1f1f8","🇷🇺":"1f1f7-1f1fa","🇷🇼":"1f1f7-1f1fc","🇸🇦":"1f1f8-1f1e6","🇸🇧":"1f1f8-1f1e7","🇸🇨":"1f1f8-1f1e8","🇸🇩":"1f1f8-1f1e9","🇸🇪":"1f1f8-1f1ea","🇸🇬":"1f1f8-1f1ec","🇸🇭":"1f1f8-1f1ed","🇸🇮":"1f1f8-1f1ee","🇸🇯":"1f1f8-1f1ef","🇸🇰":"1f1f8-1f1f0","🇸🇱":"1f1f8-1f1f1","🇸🇲":"1f1f8-1f1f2","🇸🇳":"1f1f8-1f1f3","🇸🇴":"1f1f8-1f1f4","🇸🇷":"1f1f8-1f1f7","🇸🇸":"1f1f8-1f1f8","🇸🇹":"1f1f8-1f1f9","🇸🇻":"1f1f8-1f1fb","🇸🇽":"1f1f8-1f1fd","🇸🇾":"1f1f8-1f1fe","🇸🇿":"1f1f8-1f1ff","🇹🇦":"1f1f9-1f1e6","🇹🇨":"1f1f9-1f1e8","🇹🇩":"1f1f9-1f1e9","🇹🇫":"1f1f9-1f1eb","🇹🇬":"1f1f9-1f1ec","🇹🇭":"1f1f9-1f1ed","🇹🇯":"1f1f9-1f1ef","🇹🇰":"1f1f9-1f1f0","🇹🇱":"1f1f9-1f1f1","🇹🇲":"1f1f9-1f1f2","🇹🇳":"1f1f9-1f1f3","🇹🇴":"1f1f9-1f1f4","🇹🇷":"1f1f9-1f1f7","🇹🇹":"1f1f9-1f1f9","🇹🇻":"1f1f9-1f1fb","🇹🇼":"1f1f9-1f1fc","🇹🇿":"1f1f9-1f1ff","🇺🇦":"1f1fa-1f1e6","🇺🇬":"1f1fa-1f1ec","🇺🇲":"1f1fa-1f1f2","🇺🇳":"1f1fa-1f1f3","🇺🇸":"1f1fa-1f1f8","🇺🇾":"1f1fa-1f1fe","🇺🇿":"1f1fa-1f1ff","🇻🇦":"1f1fb-1f1e6","🇻🇨":"1f1fb-1f1e8","🇻🇪":"1f1fb-1f1ea","🇻🇬":"1f1fb-1f1ec","🇻🇮":"1f1fb-1f1ee","🇻🇳":"1f1fb-1f1f3","🇻🇺":"1f1fb-1f1fa","🇼🇫":"1f1fc-1f1eb","🇼🇸":"1f1fc-1f1f8","🇽🇰":"1f1fd-1f1f0","🇾🇪":"1f1fe-1f1ea","🇾🇹":"1f1fe-1f1f9","🇿🇦":"1f1ff-1f1e6","🇿🇲":"1f1ff-1f1f2","🇿🇼":"1f1ff-1f1fc","😶‍🌫":"1f636-200d-1f32b-fe0f","😮‍💨":"1f62e-200d-1f4a8","😵‍💫":"1f635-200d-1f4ab","❤‍🔥":"2764-fe0f-200d-1f525","❤‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨":"1f441-200d-1f5e8","🧔‍♂":"1f9d4-200d-2642-fe0f","🧔‍♀":"1f9d4-200d-2640-fe0f","👨‍🦰":"1f468-200d-1f9b0","👨‍🦱":"1f468-200d-1f9b1","👨‍🦳":"1f468-200d-1f9b3","👨‍🦲":"1f468-200d-1f9b2","👩‍🦰":"1f469-200d-1f9b0","🧑‍🦰":"1f9d1-200d-1f9b0","👩‍🦱":"1f469-200d-1f9b1","🧑‍🦱":"1f9d1-200d-1f9b1","👩‍🦳":"1f469-200d-1f9b3","🧑‍🦳":"1f9d1-200d-1f9b3","👩‍🦲":"1f469-200d-1f9b2","🧑‍🦲":"1f9d1-200d-1f9b2","👱‍♀":"1f471-200d-2640-fe0f","👱‍♂":"1f471-200d-2642-fe0f","🙍‍♂":"1f64d-200d-2642-fe0f","🙍‍♀":"1f64d-200d-2640-fe0f","🙎‍♂":"1f64e-200d-2642-fe0f","🙎‍♀":"1f64e-200d-2640-fe0f","🙅‍♂":"1f645-200d-2642-fe0f","🙅‍♀":"1f645-200d-2640-fe0f","🙆‍♂":"1f646-200d-2642-fe0f","🙆‍♀":"1f646-200d-2640-fe0f","💁‍♂":"1f481-200d-2642-fe0f","💁‍♀":"1f481-200d-2640-fe0f","🙋‍♂":"1f64b-200d-2642-fe0f","🙋‍♀":"1f64b-200d-2640-fe0f","🧏‍♂":"1f9cf-200d-2642-fe0f","🧏‍♀":"1f9cf-200d-2640-fe0f","🙇‍♂":"1f647-200d-2642-fe0f","🙇‍♀":"1f647-200d-2640-fe0f","🤦‍♂":"1f926-200d-2642-fe0f","🤦‍♀":"1f926-200d-2640-fe0f","🤷‍♂":"1f937-200d-2642-fe0f","🤷‍♀":"1f937-200d-2640-fe0f","🧑‍⚕":"1f9d1-200d-2695-fe0f","👨‍⚕":"1f468-200d-2695-fe0f","👩‍⚕":"1f469-200d-2695-fe0f","🧑‍🎓":"1f9d1-200d-1f393","👨‍🎓":"1f468-200d-1f393","👩‍🎓":"1f469-200d-1f393","🧑‍🏫":"1f9d1-200d-1f3eb","👨‍🏫":"1f468-200d-1f3eb","👩‍🏫":"1f469-200d-1f3eb","🧑‍⚖":"1f9d1-200d-2696-fe0f","👨‍⚖":"1f468-200d-2696-fe0f","👩‍⚖":"1f469-200d-2696-fe0f","🧑‍🌾":"1f9d1-200d-1f33e","👨‍🌾":"1f468-200d-1f33e","👩‍🌾":"1f469-200d-1f33e","🧑‍🍳":"1f9d1-200d-1f373","👨‍🍳":"1f468-200d-1f373","👩‍🍳":"1f469-200d-1f373","🧑‍🔧":"1f9d1-200d-1f527","👨‍🔧":"1f468-200d-1f527","👩‍🔧":"1f469-200d-1f527","🧑‍🏭":"1f9d1-200d-1f3ed","👨‍🏭":"1f468-200d-1f3ed","👩‍🏭":"1f469-200d-1f3ed","🧑‍💼":"1f9d1-200d-1f4bc","👨‍💼":"1f468-200d-1f4bc","👩‍💼":"1f469-200d-1f4bc","🧑‍🔬":"1f9d1-200d-1f52c","👨‍🔬":"1f468-200d-1f52c","👩‍🔬":"1f469-200d-1f52c","🧑‍💻":"1f9d1-200d-1f4bb","👨‍💻":"1f468-200d-1f4bb","👩‍💻":"1f469-200d-1f4bb","🧑‍🎤":"1f9d1-200d-1f3a4","👨‍🎤":"1f468-200d-1f3a4","👩‍🎤":"1f469-200d-1f3a4","🧑‍🎨":"1f9d1-200d-1f3a8","👨‍🎨":"1f468-200d-1f3a8","👩‍🎨":"1f469-200d-1f3a8","🧑‍✈":"1f9d1-200d-2708-fe0f","👨‍✈":"1f468-200d-2708-fe0f","👩‍✈":"1f469-200d-2708-fe0f","🧑‍🚀":"1f9d1-200d-1f680","👨‍🚀":"1f468-200d-1f680","👩‍🚀":"1f469-200d-1f680","🧑‍🚒":"1f9d1-200d-1f692","👨‍🚒":"1f468-200d-1f692","👩‍🚒":"1f469-200d-1f692","👮‍♂":"1f46e-200d-2642-fe0f","👮‍♀":"1f46e-200d-2640-fe0f","🕵‍♂":"1f575-fe0f-200d-2642-fe0f","🕵‍♀":"1f575-fe0f-200d-2640-fe0f","💂‍♂":"1f482-200d-2642-fe0f","💂‍♀":"1f482-200d-2640-fe0f","👷‍♂":"1f477-200d-2642-fe0f","👷‍♀":"1f477-200d-2640-fe0f","👳‍♂":"1f473-200d-2642-fe0f","👳‍♀":"1f473-200d-2640-fe0f","🤵‍♂":"1f935-200d-2642-fe0f","🤵‍♀":"1f935-200d-2640-fe0f","👰‍♂":"1f470-200d-2642-fe0f","👰‍♀":"1f470-200d-2640-fe0f","👩‍🍼":"1f469-200d-1f37c","👨‍🍼":"1f468-200d-1f37c","🧑‍🍼":"1f9d1-200d-1f37c","🧑‍🎄":"1f9d1-200d-1f384","🦸‍♂":"1f9b8-200d-2642-fe0f","🦸‍♀":"1f9b8-200d-2640-fe0f","🦹‍♂":"1f9b9-200d-2642-fe0f","🦹‍♀":"1f9b9-200d-2640-fe0f","🧙‍♂":"1f9d9-200d-2642-fe0f","🧙‍♀":"1f9d9-200d-2640-fe0f","🧚‍♂":"1f9da-200d-2642-fe0f","🧚‍♀":"1f9da-200d-2640-fe0f","🧛‍♂":"1f9db-200d-2642-fe0f","🧛‍♀":"1f9db-200d-2640-fe0f","🧜‍♂":"1f9dc-200d-2642-fe0f","🧜‍♀":"1f9dc-200d-2640-fe0f","🧝‍♂":"1f9dd-200d-2642-fe0f","🧝‍♀":"1f9dd-200d-2640-fe0f","🧞‍♂":"1f9de-200d-2642-fe0f","🧞‍♀":"1f9de-200d-2640-fe0f","🧟‍♂":"1f9df-200d-2642-fe0f","🧟‍♀":"1f9df-200d-2640-fe0f","💆‍♂":"1f486-200d-2642-fe0f","💆‍♀":"1f486-200d-2640-fe0f","💇‍♂":"1f487-200d-2642-fe0f","💇‍♀":"1f487-200d-2640-fe0f","🚶‍♂":"1f6b6-200d-2642-fe0f","🚶‍♀":"1f6b6-200d-2640-fe0f","🧍‍♂":"1f9cd-200d-2642-fe0f","🧍‍♀":"1f9cd-200d-2640-fe0f","🧎‍♂":"1f9ce-200d-2642-fe0f","🧎‍♀":"1f9ce-200d-2640-fe0f","🧑‍🦯":"1f9d1-200d-1f9af","👨‍🦯":"1f468-200d-1f9af","👩‍🦯":"1f469-200d-1f9af","🧑‍🦼":"1f9d1-200d-1f9bc","👨‍🦼":"1f468-200d-1f9bc","👩‍🦼":"1f469-200d-1f9bc","🧑‍🦽":"1f9d1-200d-1f9bd","👨‍🦽":"1f468-200d-1f9bd","👩‍🦽":"1f469-200d-1f9bd","🏃‍♂":"1f3c3-200d-2642-fe0f","🏃‍♀":"1f3c3-200d-2640-fe0f","👯‍♂":"1f46f-200d-2642-fe0f","👯‍♀":"1f46f-200d-2640-fe0f","🧖‍♂":"1f9d6-200d-2642-fe0f","🧖‍♀":"1f9d6-200d-2640-fe0f","🧗‍♂":"1f9d7-200d-2642-fe0f","🧗‍♀":"1f9d7-200d-2640-fe0f","🏌‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏄‍♂":"1f3c4-200d-2642-fe0f","🏄‍♀":"1f3c4-200d-2640-fe0f","🚣‍♂":"1f6a3-200d-2642-fe0f","🚣‍♀":"1f6a3-200d-2640-fe0f","🏊‍♂":"1f3ca-200d-2642-fe0f","🏊‍♀":"1f3ca-200d-2640-fe0f","⛹‍♂":"26f9-fe0f-200d-2642-fe0f","⛹‍♀":"26f9-fe0f-200d-2640-fe0f","🏋‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋‍♀":"1f3cb-fe0f-200d-2640-fe0f","🚴‍♂":"1f6b4-200d-2642-fe0f","🚴‍♀":"1f6b4-200d-2640-fe0f","🚵‍♂":"1f6b5-200d-2642-fe0f","🚵‍♀":"1f6b5-200d-2640-fe0f","🤸‍♂":"1f938-200d-2642-fe0f","🤸‍♀":"1f938-200d-2640-fe0f","🤼‍♂":"1f93c-200d-2642-fe0f","🤼‍♀":"1f93c-200d-2640-fe0f","🤽‍♂":"1f93d-200d-2642-fe0f","🤽‍♀":"1f93d-200d-2640-fe0f","🤾‍♂":"1f93e-200d-2642-fe0f","🤾‍♀":"1f93e-200d-2640-fe0f","🤹‍♂":"1f939-200d-2642-fe0f","🤹‍♀":"1f939-200d-2640-fe0f","🧘‍♂":"1f9d8-200d-2642-fe0f","🧘‍♀":"1f9d8-200d-2640-fe0f","👨‍👦":"1f468-200d-1f466","👨‍👧":"1f468-200d-1f467","👩‍👦":"1f469-200d-1f466","👩‍👧":"1f469-200d-1f467","🐕‍🦺":"1f415-200d-1f9ba","🐈‍⬛":"1f408-200d-2b1b","🐻‍❄":"1f43b-200d-2744-fe0f","#️⃣":"23-20e3","*️⃣":"2a-20e3","0️⃣":"30-20e3","1️⃣":"31-20e3","2️⃣":"32-20e3","3️⃣":"33-20e3","4️⃣":"34-20e3","5️⃣":"35-20e3","6️⃣":"36-20e3","7️⃣":"37-20e3","8️⃣":"38-20e3","9️⃣":"39-20e3","🏳‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠":"1f3f4-200d-2620-fe0f","😶‍🌫️":"1f636-200d-1f32b-fe0f","❤️‍🔥":"2764-fe0f-200d-1f525","❤️‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨️":"1f441-200d-1f5e8","👁️‍🗨":"1f441-200d-1f5e8","🧔‍♂️":"1f9d4-200d-2642-fe0f","🧔🏻‍♂":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂":"1f9d4-1f3ff-200d-2642-fe0f","🧔‍♀️":"1f9d4-200d-2640-fe0f","🧔🏻‍♀":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀":"1f9d4-1f3ff-200d-2640-fe0f","👨🏻‍🦰":"1f468-1f3fb-200d-1f9b0","👨🏼‍🦰":"1f468-1f3fc-200d-1f9b0","👨🏽‍🦰":"1f468-1f3fd-200d-1f9b0","👨🏾‍🦰":"1f468-1f3fe-200d-1f9b0","👨🏿‍🦰":"1f468-1f3ff-200d-1f9b0","👨🏻‍🦱":"1f468-1f3fb-200d-1f9b1","👨🏼‍🦱":"1f468-1f3fc-200d-1f9b1","👨🏽‍🦱":"1f468-1f3fd-200d-1f9b1","👨🏾‍🦱":"1f468-1f3fe-200d-1f9b1","👨🏿‍🦱":"1f468-1f3ff-200d-1f9b1","👨🏻‍🦳":"1f468-1f3fb-200d-1f9b3","👨🏼‍🦳":"1f468-1f3fc-200d-1f9b3","👨🏽‍🦳":"1f468-1f3fd-200d-1f9b3","👨🏾‍🦳":"1f468-1f3fe-200d-1f9b3","👨🏿‍🦳":"1f468-1f3ff-200d-1f9b3","👨🏻‍🦲":"1f468-1f3fb-200d-1f9b2","👨🏼‍🦲":"1f468-1f3fc-200d-1f9b2","👨🏽‍🦲":"1f468-1f3fd-200d-1f9b2","👨🏾‍🦲":"1f468-1f3fe-200d-1f9b2","👨🏿‍🦲":"1f468-1f3ff-200d-1f9b2","👩🏻‍🦰":"1f469-1f3fb-200d-1f9b0","👩🏼‍🦰":"1f469-1f3fc-200d-1f9b0","👩🏽‍🦰":"1f469-1f3fd-200d-1f9b0","👩🏾‍🦰":"1f469-1f3fe-200d-1f9b0","👩🏿‍🦰":"1f469-1f3ff-200d-1f9b0","🧑🏻‍🦰":"1f9d1-1f3fb-200d-1f9b0","🧑🏼‍🦰":"1f9d1-1f3fc-200d-1f9b0","🧑🏽‍🦰":"1f9d1-1f3fd-200d-1f9b0","🧑🏾‍🦰":"1f9d1-1f3fe-200d-1f9b0","🧑🏿‍🦰":"1f9d1-1f3ff-200d-1f9b0","👩🏻‍🦱":"1f469-1f3fb-200d-1f9b1","👩🏼‍🦱":"1f469-1f3fc-200d-1f9b1","👩🏽‍🦱":"1f469-1f3fd-200d-1f9b1","👩🏾‍🦱":"1f469-1f3fe-200d-1f9b1","👩🏿‍🦱":"1f469-1f3ff-200d-1f9b1","🧑🏻‍🦱":"1f9d1-1f3fb-200d-1f9b1","🧑🏼‍🦱":"1f9d1-1f3fc-200d-1f9b1","🧑🏽‍🦱":"1f9d1-1f3fd-200d-1f9b1","🧑🏾‍🦱":"1f9d1-1f3fe-200d-1f9b1","🧑🏿‍🦱":"1f9d1-1f3ff-200d-1f9b1","👩🏻‍🦳":"1f469-1f3fb-200d-1f9b3","👩🏼‍🦳":"1f469-1f3fc-200d-1f9b3","👩🏽‍🦳":"1f469-1f3fd-200d-1f9b3","👩🏾‍🦳":"1f469-1f3fe-200d-1f9b3","👩🏿‍🦳":"1f469-1f3ff-200d-1f9b3","🧑🏻‍🦳":"1f9d1-1f3fb-200d-1f9b3","🧑🏼‍🦳":"1f9d1-1f3fc-200d-1f9b3","🧑🏽‍🦳":"1f9d1-1f3fd-200d-1f9b3","🧑🏾‍🦳":"1f9d1-1f3fe-200d-1f9b3","🧑🏿‍🦳":"1f9d1-1f3ff-200d-1f9b3","👩🏻‍🦲":"1f469-1f3fb-200d-1f9b2","👩🏼‍🦲":"1f469-1f3fc-200d-1f9b2","👩🏽‍🦲":"1f469-1f3fd-200d-1f9b2","👩🏾‍🦲":"1f469-1f3fe-200d-1f9b2","👩🏿‍🦲":"1f469-1f3ff-200d-1f9b2","🧑🏻‍🦲":"1f9d1-1f3fb-200d-1f9b2","🧑🏼‍🦲":"1f9d1-1f3fc-200d-1f9b2","🧑🏽‍🦲":"1f9d1-1f3fd-200d-1f9b2","🧑🏾‍🦲":"1f9d1-1f3fe-200d-1f9b2","🧑🏿‍🦲":"1f9d1-1f3ff-200d-1f9b2","👱‍♀️":"1f471-200d-2640-fe0f","👱🏻‍♀":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀":"1f471-1f3ff-200d-2640-fe0f","👱‍♂️":"1f471-200d-2642-fe0f","👱🏻‍♂":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂":"1f471-1f3ff-200d-2642-fe0f","🙍‍♂️":"1f64d-200d-2642-fe0f","🙍🏻‍♂":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂":"1f64d-1f3ff-200d-2642-fe0f","🙍‍♀️":"1f64d-200d-2640-fe0f","🙍🏻‍♀":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀":"1f64d-1f3ff-200d-2640-fe0f","🙎‍♂️":"1f64e-200d-2642-fe0f","🙎🏻‍♂":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂":"1f64e-1f3ff-200d-2642-fe0f","🙎‍♀️":"1f64e-200d-2640-fe0f","🙎🏻‍♀":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀":"1f64e-1f3ff-200d-2640-fe0f","🙅‍♂️":"1f645-200d-2642-fe0f","🙅🏻‍♂":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂":"1f645-1f3ff-200d-2642-fe0f","🙅‍♀️":"1f645-200d-2640-fe0f","🙅🏻‍♀":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀":"1f645-1f3ff-200d-2640-fe0f","🙆‍♂️":"1f646-200d-2642-fe0f","🙆🏻‍♂":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂":"1f646-1f3ff-200d-2642-fe0f","🙆‍♀️":"1f646-200d-2640-fe0f","🙆🏻‍♀":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀":"1f646-1f3ff-200d-2640-fe0f","💁‍♂️":"1f481-200d-2642-fe0f","💁🏻‍♂":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂":"1f481-1f3ff-200d-2642-fe0f","💁‍♀️":"1f481-200d-2640-fe0f","💁🏻‍♀":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀":"1f481-1f3ff-200d-2640-fe0f","🙋‍♂️":"1f64b-200d-2642-fe0f","🙋🏻‍♂":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂":"1f64b-1f3ff-200d-2642-fe0f","🙋‍♀️":"1f64b-200d-2640-fe0f","🙋🏻‍♀":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀":"1f64b-1f3ff-200d-2640-fe0f","🧏‍♂️":"1f9cf-200d-2642-fe0f","🧏🏻‍♂":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂":"1f9cf-1f3ff-200d-2642-fe0f","🧏‍♀️":"1f9cf-200d-2640-fe0f","🧏🏻‍♀":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀":"1f9cf-1f3ff-200d-2640-fe0f","🙇‍♂️":"1f647-200d-2642-fe0f","🙇🏻‍♂":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂":"1f647-1f3ff-200d-2642-fe0f","🙇‍♀️":"1f647-200d-2640-fe0f","🙇🏻‍♀":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀":"1f647-1f3ff-200d-2640-fe0f","🤦‍♂️":"1f926-200d-2642-fe0f","🤦🏻‍♂":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂":"1f926-1f3ff-200d-2642-fe0f","🤦‍♀️":"1f926-200d-2640-fe0f","🤦🏻‍♀":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀":"1f926-1f3ff-200d-2640-fe0f","🤷‍♂️":"1f937-200d-2642-fe0f","🤷🏻‍♂":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂":"1f937-1f3ff-200d-2642-fe0f","🤷‍♀️":"1f937-200d-2640-fe0f","🤷🏻‍♀":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀":"1f937-1f3ff-200d-2640-fe0f","🧑‍⚕️":"1f9d1-200d-2695-fe0f","🧑🏻‍⚕":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕":"1f9d1-1f3ff-200d-2695-fe0f","👨‍⚕️":"1f468-200d-2695-fe0f","👨🏻‍⚕":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕":"1f468-1f3ff-200d-2695-fe0f","👩‍⚕️":"1f469-200d-2695-fe0f","👩🏻‍⚕":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍🎓":"1f9d1-1f3fb-200d-1f393","🧑🏼‍🎓":"1f9d1-1f3fc-200d-1f393","🧑🏽‍🎓":"1f9d1-1f3fd-200d-1f393","🧑🏾‍🎓":"1f9d1-1f3fe-200d-1f393","🧑🏿‍🎓":"1f9d1-1f3ff-200d-1f393","👨🏻‍🎓":"1f468-1f3fb-200d-1f393","👨🏼‍🎓":"1f468-1f3fc-200d-1f393","👨🏽‍🎓":"1f468-1f3fd-200d-1f393","👨🏾‍🎓":"1f468-1f3fe-200d-1f393","👨🏿‍🎓":"1f468-1f3ff-200d-1f393","👩🏻‍🎓":"1f469-1f3fb-200d-1f393","👩🏼‍🎓":"1f469-1f3fc-200d-1f393","👩🏽‍🎓":"1f469-1f3fd-200d-1f393","👩🏾‍🎓":"1f469-1f3fe-200d-1f393","👩🏿‍🎓":"1f469-1f3ff-200d-1f393","🧑🏻‍🏫":"1f9d1-1f3fb-200d-1f3eb","🧑🏼‍🏫":"1f9d1-1f3fc-200d-1f3eb","🧑🏽‍🏫":"1f9d1-1f3fd-200d-1f3eb","🧑🏾‍🏫":"1f9d1-1f3fe-200d-1f3eb","🧑🏿‍🏫":"1f9d1-1f3ff-200d-1f3eb","👨🏻‍🏫":"1f468-1f3fb-200d-1f3eb","👨🏼‍🏫":"1f468-1f3fc-200d-1f3eb","👨🏽‍🏫":"1f468-1f3fd-200d-1f3eb","👨🏾‍🏫":"1f468-1f3fe-200d-1f3eb","👨🏿‍🏫":"1f468-1f3ff-200d-1f3eb","👩🏻‍🏫":"1f469-1f3fb-200d-1f3eb","👩🏼‍🏫":"1f469-1f3fc-200d-1f3eb","👩🏽‍🏫":"1f469-1f3fd-200d-1f3eb","👩🏾‍🏫":"1f469-1f3fe-200d-1f3eb","👩🏿‍🏫":"1f469-1f3ff-200d-1f3eb","🧑‍⚖️":"1f9d1-200d-2696-fe0f","🧑🏻‍⚖":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖":"1f9d1-1f3ff-200d-2696-fe0f","👨‍⚖️":"1f468-200d-2696-fe0f","👨🏻‍⚖":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖":"1f468-1f3ff-200d-2696-fe0f","👩‍⚖️":"1f469-200d-2696-fe0f","👩🏻‍⚖":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍🌾":"1f9d1-1f3fb-200d-1f33e","🧑🏼‍🌾":"1f9d1-1f3fc-200d-1f33e","🧑🏽‍🌾":"1f9d1-1f3fd-200d-1f33e","🧑🏾‍🌾":"1f9d1-1f3fe-200d-1f33e","🧑🏿‍🌾":"1f9d1-1f3ff-200d-1f33e","👨🏻‍🌾":"1f468-1f3fb-200d-1f33e","👨🏼‍🌾":"1f468-1f3fc-200d-1f33e","👨🏽‍🌾":"1f468-1f3fd-200d-1f33e","👨🏾‍🌾":"1f468-1f3fe-200d-1f33e","👨🏿‍🌾":"1f468-1f3ff-200d-1f33e","👩🏻‍🌾":"1f469-1f3fb-200d-1f33e","👩🏼‍🌾":"1f469-1f3fc-200d-1f33e","👩🏽‍🌾":"1f469-1f3fd-200d-1f33e","👩🏾‍🌾":"1f469-1f3fe-200d-1f33e","👩🏿‍🌾":"1f469-1f3ff-200d-1f33e","🧑🏻‍🍳":"1f9d1-1f3fb-200d-1f373","🧑🏼‍🍳":"1f9d1-1f3fc-200d-1f373","🧑🏽‍🍳":"1f9d1-1f3fd-200d-1f373","🧑🏾‍🍳":"1f9d1-1f3fe-200d-1f373","🧑🏿‍🍳":"1f9d1-1f3ff-200d-1f373","👨🏻‍🍳":"1f468-1f3fb-200d-1f373","👨🏼‍🍳":"1f468-1f3fc-200d-1f373","👨🏽‍🍳":"1f468-1f3fd-200d-1f373","👨🏾‍🍳":"1f468-1f3fe-200d-1f373","👨🏿‍🍳":"1f468-1f3ff-200d-1f373","👩🏻‍🍳":"1f469-1f3fb-200d-1f373","👩🏼‍🍳":"1f469-1f3fc-200d-1f373","👩🏽‍🍳":"1f469-1f3fd-200d-1f373","👩🏾‍🍳":"1f469-1f3fe-200d-1f373","👩🏿‍🍳":"1f469-1f3ff-200d-1f373","🧑🏻‍🔧":"1f9d1-1f3fb-200d-1f527","🧑🏼‍🔧":"1f9d1-1f3fc-200d-1f527","🧑🏽‍🔧":"1f9d1-1f3fd-200d-1f527","🧑🏾‍🔧":"1f9d1-1f3fe-200d-1f527","🧑🏿‍🔧":"1f9d1-1f3ff-200d-1f527","👨🏻‍🔧":"1f468-1f3fb-200d-1f527","👨🏼‍🔧":"1f468-1f3fc-200d-1f527","👨🏽‍🔧":"1f468-1f3fd-200d-1f527","👨🏾‍🔧":"1f468-1f3fe-200d-1f527","👨🏿‍🔧":"1f468-1f3ff-200d-1f527","👩🏻‍🔧":"1f469-1f3fb-200d-1f527","👩🏼‍🔧":"1f469-1f3fc-200d-1f527","👩🏽‍🔧":"1f469-1f3fd-200d-1f527","👩🏾‍🔧":"1f469-1f3fe-200d-1f527","👩🏿‍🔧":"1f469-1f3ff-200d-1f527","🧑🏻‍🏭":"1f9d1-1f3fb-200d-1f3ed","🧑🏼‍🏭":"1f9d1-1f3fc-200d-1f3ed","🧑🏽‍🏭":"1f9d1-1f3fd-200d-1f3ed","🧑🏾‍🏭":"1f9d1-1f3fe-200d-1f3ed","🧑🏿‍🏭":"1f9d1-1f3ff-200d-1f3ed","👨🏻‍🏭":"1f468-1f3fb-200d-1f3ed","👨🏼‍🏭":"1f468-1f3fc-200d-1f3ed","👨🏽‍🏭":"1f468-1f3fd-200d-1f3ed","👨🏾‍🏭":"1f468-1f3fe-200d-1f3ed","👨🏿‍🏭":"1f468-1f3ff-200d-1f3ed","👩🏻‍🏭":"1f469-1f3fb-200d-1f3ed","👩🏼‍🏭":"1f469-1f3fc-200d-1f3ed","👩🏽‍🏭":"1f469-1f3fd-200d-1f3ed","👩🏾‍🏭":"1f469-1f3fe-200d-1f3ed","👩🏿‍🏭":"1f469-1f3ff-200d-1f3ed","🧑🏻‍💼":"1f9d1-1f3fb-200d-1f4bc","🧑🏼‍💼":"1f9d1-1f3fc-200d-1f4bc","🧑🏽‍💼":"1f9d1-1f3fd-200d-1f4bc","🧑🏾‍💼":"1f9d1-1f3fe-200d-1f4bc","🧑🏿‍💼":"1f9d1-1f3ff-200d-1f4bc","👨🏻‍💼":"1f468-1f3fb-200d-1f4bc","👨🏼‍💼":"1f468-1f3fc-200d-1f4bc","👨🏽‍💼":"1f468-1f3fd-200d-1f4bc","👨🏾‍💼":"1f468-1f3fe-200d-1f4bc","👨🏿‍💼":"1f468-1f3ff-200d-1f4bc","👩🏻‍💼":"1f469-1f3fb-200d-1f4bc","👩🏼‍💼":"1f469-1f3fc-200d-1f4bc","👩🏽‍💼":"1f469-1f3fd-200d-1f4bc","👩🏾‍💼":"1f469-1f3fe-200d-1f4bc","👩🏿‍💼":"1f469-1f3ff-200d-1f4bc","🧑🏻‍🔬":"1f9d1-1f3fb-200d-1f52c","🧑🏼‍🔬":"1f9d1-1f3fc-200d-1f52c","🧑🏽‍🔬":"1f9d1-1f3fd-200d-1f52c","🧑🏾‍🔬":"1f9d1-1f3fe-200d-1f52c","🧑🏿‍🔬":"1f9d1-1f3ff-200d-1f52c","👨🏻‍🔬":"1f468-1f3fb-200d-1f52c","👨🏼‍🔬":"1f468-1f3fc-200d-1f52c","👨🏽‍🔬":"1f468-1f3fd-200d-1f52c","👨🏾‍🔬":"1f468-1f3fe-200d-1f52c","👨🏿‍🔬":"1f468-1f3ff-200d-1f52c","👩🏻‍🔬":"1f469-1f3fb-200d-1f52c","👩🏼‍🔬":"1f469-1f3fc-200d-1f52c","👩🏽‍🔬":"1f469-1f3fd-200d-1f52c","👩🏾‍🔬":"1f469-1f3fe-200d-1f52c","👩🏿‍🔬":"1f469-1f3ff-200d-1f52c","🧑🏻‍💻":"1f9d1-1f3fb-200d-1f4bb","🧑🏼‍💻":"1f9d1-1f3fc-200d-1f4bb","🧑🏽‍💻":"1f9d1-1f3fd-200d-1f4bb","🧑🏾‍💻":"1f9d1-1f3fe-200d-1f4bb","🧑🏿‍💻":"1f9d1-1f3ff-200d-1f4bb","👨🏻‍💻":"1f468-1f3fb-200d-1f4bb","👨🏼‍💻":"1f468-1f3fc-200d-1f4bb","👨🏽‍💻":"1f468-1f3fd-200d-1f4bb","👨🏾‍💻":"1f468-1f3fe-200d-1f4bb","👨🏿‍💻":"1f468-1f3ff-200d-1f4bb","👩🏻‍💻":"1f469-1f3fb-200d-1f4bb","👩🏼‍💻":"1f469-1f3fc-200d-1f4bb","👩🏽‍💻":"1f469-1f3fd-200d-1f4bb","👩🏾‍💻":"1f469-1f3fe-200d-1f4bb","👩🏿‍💻":"1f469-1f3ff-200d-1f4bb","🧑🏻‍🎤":"1f9d1-1f3fb-200d-1f3a4","🧑🏼‍🎤":"1f9d1-1f3fc-200d-1f3a4","🧑🏽‍🎤":"1f9d1-1f3fd-200d-1f3a4","🧑🏾‍🎤":"1f9d1-1f3fe-200d-1f3a4","🧑🏿‍🎤":"1f9d1-1f3ff-200d-1f3a4","👨🏻‍🎤":"1f468-1f3fb-200d-1f3a4","👨🏼‍🎤":"1f468-1f3fc-200d-1f3a4","👨🏽‍🎤":"1f468-1f3fd-200d-1f3a4","👨🏾‍🎤":"1f468-1f3fe-200d-1f3a4","👨🏿‍🎤":"1f468-1f3ff-200d-1f3a4","👩🏻‍🎤":"1f469-1f3fb-200d-1f3a4","👩🏼‍🎤":"1f469-1f3fc-200d-1f3a4","👩🏽‍🎤":"1f469-1f3fd-200d-1f3a4","👩🏾‍🎤":"1f469-1f3fe-200d-1f3a4","👩🏿‍🎤":"1f469-1f3ff-200d-1f3a4","🧑🏻‍🎨":"1f9d1-1f3fb-200d-1f3a8","🧑🏼‍🎨":"1f9d1-1f3fc-200d-1f3a8","🧑🏽‍🎨":"1f9d1-1f3fd-200d-1f3a8","🧑🏾‍🎨":"1f9d1-1f3fe-200d-1f3a8","🧑🏿‍🎨":"1f9d1-1f3ff-200d-1f3a8","👨🏻‍🎨":"1f468-1f3fb-200d-1f3a8","👨🏼‍🎨":"1f468-1f3fc-200d-1f3a8","👨🏽‍🎨":"1f468-1f3fd-200d-1f3a8","👨🏾‍🎨":"1f468-1f3fe-200d-1f3a8","👨🏿‍🎨":"1f468-1f3ff-200d-1f3a8","👩🏻‍🎨":"1f469-1f3fb-200d-1f3a8","👩🏼‍🎨":"1f469-1f3fc-200d-1f3a8","👩🏽‍🎨":"1f469-1f3fd-200d-1f3a8","👩🏾‍🎨":"1f469-1f3fe-200d-1f3a8","👩🏿‍🎨":"1f469-1f3ff-200d-1f3a8","🧑‍✈️":"1f9d1-200d-2708-fe0f","🧑🏻‍✈":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈":"1f9d1-1f3ff-200d-2708-fe0f","👨‍✈️":"1f468-200d-2708-fe0f","👨🏻‍✈":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈":"1f468-1f3ff-200d-2708-fe0f","👩‍✈️":"1f469-200d-2708-fe0f","👩🏻‍✈":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈":"1f469-1f3ff-200d-2708-fe0f","🧑🏻‍🚀":"1f9d1-1f3fb-200d-1f680","🧑🏼‍🚀":"1f9d1-1f3fc-200d-1f680","🧑🏽‍🚀":"1f9d1-1f3fd-200d-1f680","🧑🏾‍🚀":"1f9d1-1f3fe-200d-1f680","🧑🏿‍🚀":"1f9d1-1f3ff-200d-1f680","👨🏻‍🚀":"1f468-1f3fb-200d-1f680","👨🏼‍🚀":"1f468-1f3fc-200d-1f680","👨🏽‍🚀":"1f468-1f3fd-200d-1f680","👨🏾‍🚀":"1f468-1f3fe-200d-1f680","👨🏿‍🚀":"1f468-1f3ff-200d-1f680","👩🏻‍🚀":"1f469-1f3fb-200d-1f680","👩🏼‍🚀":"1f469-1f3fc-200d-1f680","👩🏽‍🚀":"1f469-1f3fd-200d-1f680","👩🏾‍🚀":"1f469-1f3fe-200d-1f680","👩🏿‍🚀":"1f469-1f3ff-200d-1f680","🧑🏻‍🚒":"1f9d1-1f3fb-200d-1f692","🧑🏼‍🚒":"1f9d1-1f3fc-200d-1f692","🧑🏽‍🚒":"1f9d1-1f3fd-200d-1f692","🧑🏾‍🚒":"1f9d1-1f3fe-200d-1f692","🧑🏿‍🚒":"1f9d1-1f3ff-200d-1f692","👨🏻‍🚒":"1f468-1f3fb-200d-1f692","👨🏼‍🚒":"1f468-1f3fc-200d-1f692","👨🏽‍🚒":"1f468-1f3fd-200d-1f692","👨🏾‍🚒":"1f468-1f3fe-200d-1f692","👨🏿‍🚒":"1f468-1f3ff-200d-1f692","👩🏻‍🚒":"1f469-1f3fb-200d-1f692","👩🏼‍🚒":"1f469-1f3fc-200d-1f692","👩🏽‍🚒":"1f469-1f3fd-200d-1f692","👩🏾‍🚒":"1f469-1f3fe-200d-1f692","👩🏿‍🚒":"1f469-1f3ff-200d-1f692","👮‍♂️":"1f46e-200d-2642-fe0f","👮🏻‍♂":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂":"1f46e-1f3ff-200d-2642-fe0f","👮‍♀️":"1f46e-200d-2640-fe0f","👮🏻‍♀":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀":"1f46e-1f3ff-200d-2640-fe0f","🕵‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵️‍♂":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂":"1f575-1f3ff-200d-2642-fe0f","🕵‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵️‍♀":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀":"1f575-1f3ff-200d-2640-fe0f","💂‍♂️":"1f482-200d-2642-fe0f","💂🏻‍♂":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂":"1f482-1f3ff-200d-2642-fe0f","💂‍♀️":"1f482-200d-2640-fe0f","💂🏻‍♀":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀":"1f482-1f3ff-200d-2640-fe0f","👷‍♂️":"1f477-200d-2642-fe0f","👷🏻‍♂":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂":"1f477-1f3ff-200d-2642-fe0f","👷‍♀️":"1f477-200d-2640-fe0f","👷🏻‍♀":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀":"1f477-1f3ff-200d-2640-fe0f","👳‍♂️":"1f473-200d-2642-fe0f","👳🏻‍♂":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂":"1f473-1f3ff-200d-2642-fe0f","👳‍♀️":"1f473-200d-2640-fe0f","👳🏻‍♀":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀":"1f473-1f3ff-200d-2640-fe0f","🤵‍♂️":"1f935-200d-2642-fe0f","🤵🏻‍♂":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂":"1f935-1f3ff-200d-2642-fe0f","🤵‍♀️":"1f935-200d-2640-fe0f","🤵🏻‍♀":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀":"1f935-1f3ff-200d-2640-fe0f","👰‍♂️":"1f470-200d-2642-fe0f","👰🏻‍♂":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂":"1f470-1f3ff-200d-2642-fe0f","👰‍♀️":"1f470-200d-2640-fe0f","👰🏻‍♀":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀":"1f470-1f3ff-200d-2640-fe0f","👩🏻‍🍼":"1f469-1f3fb-200d-1f37c","👩🏼‍🍼":"1f469-1f3fc-200d-1f37c","👩🏽‍🍼":"1f469-1f3fd-200d-1f37c","👩🏾‍🍼":"1f469-1f3fe-200d-1f37c","👩🏿‍🍼":"1f469-1f3ff-200d-1f37c","👨🏻‍🍼":"1f468-1f3fb-200d-1f37c","👨🏼‍🍼":"1f468-1f3fc-200d-1f37c","👨🏽‍🍼":"1f468-1f3fd-200d-1f37c","👨🏾‍🍼":"1f468-1f3fe-200d-1f37c","👨🏿‍🍼":"1f468-1f3ff-200d-1f37c","🧑🏻‍🍼":"1f9d1-1f3fb-200d-1f37c","🧑🏼‍🍼":"1f9d1-1f3fc-200d-1f37c","🧑🏽‍🍼":"1f9d1-1f3fd-200d-1f37c","🧑🏾‍🍼":"1f9d1-1f3fe-200d-1f37c","🧑🏿‍🍼":"1f9d1-1f3ff-200d-1f37c","🧑🏻‍🎄":"1f9d1-1f3fb-200d-1f384","🧑🏼‍🎄":"1f9d1-1f3fc-200d-1f384","🧑🏽‍🎄":"1f9d1-1f3fd-200d-1f384","🧑🏾‍🎄":"1f9d1-1f3fe-200d-1f384","🧑🏿‍🎄":"1f9d1-1f3ff-200d-1f384","🦸‍♂️":"1f9b8-200d-2642-fe0f","🦸🏻‍♂":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂":"1f9b8-1f3ff-200d-2642-fe0f","🦸‍♀️":"1f9b8-200d-2640-fe0f","🦸🏻‍♀":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀":"1f9b8-1f3ff-200d-2640-fe0f","🦹‍♂️":"1f9b9-200d-2642-fe0f","🦹🏻‍♂":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂":"1f9b9-1f3ff-200d-2642-fe0f","🦹‍♀️":"1f9b9-200d-2640-fe0f","🦹🏻‍♀":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀":"1f9b9-1f3ff-200d-2640-fe0f","🧙‍♂️":"1f9d9-200d-2642-fe0f","🧙🏻‍♂":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂":"1f9d9-1f3ff-200d-2642-fe0f","🧙‍♀️":"1f9d9-200d-2640-fe0f","🧙🏻‍♀":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀":"1f9d9-1f3ff-200d-2640-fe0f","🧚‍♂️":"1f9da-200d-2642-fe0f","🧚🏻‍♂":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂":"1f9da-1f3ff-200d-2642-fe0f","🧚‍♀️":"1f9da-200d-2640-fe0f","🧚🏻‍♀":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀":"1f9da-1f3ff-200d-2640-fe0f","🧛‍♂️":"1f9db-200d-2642-fe0f","🧛🏻‍♂":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂":"1f9db-1f3ff-200d-2642-fe0f","🧛‍♀️":"1f9db-200d-2640-fe0f","🧛🏻‍♀":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀":"1f9db-1f3ff-200d-2640-fe0f","🧜‍♂️":"1f9dc-200d-2642-fe0f","🧜🏻‍♂":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂":"1f9dc-1f3ff-200d-2642-fe0f","🧜‍♀️":"1f9dc-200d-2640-fe0f","🧜🏻‍♀":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀":"1f9dc-1f3ff-200d-2640-fe0f","🧝‍♂️":"1f9dd-200d-2642-fe0f","🧝🏻‍♂":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂":"1f9dd-1f3ff-200d-2642-fe0f","🧝‍♀️":"1f9dd-200d-2640-fe0f","🧝🏻‍♀":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀":"1f9dd-1f3ff-200d-2640-fe0f","🧞‍♂️":"1f9de-200d-2642-fe0f","🧞‍♀️":"1f9de-200d-2640-fe0f","🧟‍♂️":"1f9df-200d-2642-fe0f","🧟‍♀️":"1f9df-200d-2640-fe0f","💆‍♂️":"1f486-200d-2642-fe0f","💆🏻‍♂":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂":"1f486-1f3ff-200d-2642-fe0f","💆‍♀️":"1f486-200d-2640-fe0f","💆🏻‍♀":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀":"1f486-1f3ff-200d-2640-fe0f","💇‍♂️":"1f487-200d-2642-fe0f","💇🏻‍♂":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂":"1f487-1f3ff-200d-2642-fe0f","💇‍♀️":"1f487-200d-2640-fe0f","💇🏻‍♀":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀":"1f487-1f3ff-200d-2640-fe0f","🚶‍♂️":"1f6b6-200d-2642-fe0f","🚶🏻‍♂":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂":"1f6b6-1f3ff-200d-2642-fe0f","🚶‍♀️":"1f6b6-200d-2640-fe0f","🚶🏻‍♀":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀":"1f6b6-1f3ff-200d-2640-fe0f","🧍‍♂️":"1f9cd-200d-2642-fe0f","🧍🏻‍♂":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂":"1f9cd-1f3ff-200d-2642-fe0f","🧍‍♀️":"1f9cd-200d-2640-fe0f","🧍🏻‍♀":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀":"1f9cd-1f3ff-200d-2640-fe0f","🧎‍♂️":"1f9ce-200d-2642-fe0f","🧎🏻‍♂":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂":"1f9ce-1f3ff-200d-2642-fe0f","🧎‍♀️":"1f9ce-200d-2640-fe0f","🧎🏻‍♀":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀":"1f9ce-1f3ff-200d-2640-fe0f","🧑🏻‍🦯":"1f9d1-1f3fb-200d-1f9af","🧑🏼‍🦯":"1f9d1-1f3fc-200d-1f9af","🧑🏽‍🦯":"1f9d1-1f3fd-200d-1f9af","🧑🏾‍🦯":"1f9d1-1f3fe-200d-1f9af","🧑🏿‍🦯":"1f9d1-1f3ff-200d-1f9af","👨🏻‍🦯":"1f468-1f3fb-200d-1f9af","👨🏼‍🦯":"1f468-1f3fc-200d-1f9af","👨🏽‍🦯":"1f468-1f3fd-200d-1f9af","👨🏾‍🦯":"1f468-1f3fe-200d-1f9af","👨🏿‍🦯":"1f468-1f3ff-200d-1f9af","👩🏻‍🦯":"1f469-1f3fb-200d-1f9af","👩🏼‍🦯":"1f469-1f3fc-200d-1f9af","👩🏽‍🦯":"1f469-1f3fd-200d-1f9af","👩🏾‍🦯":"1f469-1f3fe-200d-1f9af","👩🏿‍🦯":"1f469-1f3ff-200d-1f9af","🧑🏻‍🦼":"1f9d1-1f3fb-200d-1f9bc","🧑🏼‍🦼":"1f9d1-1f3fc-200d-1f9bc","🧑🏽‍🦼":"1f9d1-1f3fd-200d-1f9bc","🧑🏾‍🦼":"1f9d1-1f3fe-200d-1f9bc","🧑🏿‍🦼":"1f9d1-1f3ff-200d-1f9bc","👨🏻‍🦼":"1f468-1f3fb-200d-1f9bc","👨🏼‍🦼":"1f468-1f3fc-200d-1f9bc","👨🏽‍🦼":"1f468-1f3fd-200d-1f9bc","👨🏾‍🦼":"1f468-1f3fe-200d-1f9bc","👨🏿‍🦼":"1f468-1f3ff-200d-1f9bc","👩🏻‍🦼":"1f469-1f3fb-200d-1f9bc","👩🏼‍🦼":"1f469-1f3fc-200d-1f9bc","👩🏽‍🦼":"1f469-1f3fd-200d-1f9bc","👩🏾‍🦼":"1f469-1f3fe-200d-1f9bc","👩🏿‍🦼":"1f469-1f3ff-200d-1f9bc","🧑🏻‍🦽":"1f9d1-1f3fb-200d-1f9bd","🧑🏼‍🦽":"1f9d1-1f3fc-200d-1f9bd","🧑🏽‍🦽":"1f9d1-1f3fd-200d-1f9bd","🧑🏾‍🦽":"1f9d1-1f3fe-200d-1f9bd","🧑🏿‍🦽":"1f9d1-1f3ff-200d-1f9bd","👨🏻‍🦽":"1f468-1f3fb-200d-1f9bd","👨🏼‍🦽":"1f468-1f3fc-200d-1f9bd","👨🏽‍🦽":"1f468-1f3fd-200d-1f9bd","👨🏾‍🦽":"1f468-1f3fe-200d-1f9bd","👨🏿‍🦽":"1f468-1f3ff-200d-1f9bd","👩🏻‍🦽":"1f469-1f3fb-200d-1f9bd","👩🏼‍🦽":"1f469-1f3fc-200d-1f9bd","👩🏽‍🦽":"1f469-1f3fd-200d-1f9bd","👩🏾‍🦽":"1f469-1f3fe-200d-1f9bd","👩🏿‍🦽":"1f469-1f3ff-200d-1f9bd","🏃‍♂️":"1f3c3-200d-2642-fe0f","🏃🏻‍♂":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂":"1f3c3-1f3ff-200d-2642-fe0f","🏃‍♀️":"1f3c3-200d-2640-fe0f","🏃🏻‍♀":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀":"1f3c3-1f3ff-200d-2640-fe0f","👯‍♂️":"1f46f-200d-2642-fe0f","👯‍♀️":"1f46f-200d-2640-fe0f","🧖‍♂️":"1f9d6-200d-2642-fe0f","🧖🏻‍♂":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂":"1f9d6-1f3ff-200d-2642-fe0f","🧖‍♀️":"1f9d6-200d-2640-fe0f","🧖🏻‍♀":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀":"1f9d6-1f3ff-200d-2640-fe0f","🧗‍♂️":"1f9d7-200d-2642-fe0f","🧗🏻‍♂":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂":"1f9d7-1f3ff-200d-2642-fe0f","🧗‍♀️":"1f9d7-200d-2640-fe0f","🧗🏻‍♀":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀":"1f9d7-1f3ff-200d-2640-fe0f","🏌‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌️‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂":"1f3cc-1f3ff-200d-2642-fe0f","🏌‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌️‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀":"1f3cc-1f3ff-200d-2640-fe0f","🏄‍♂️":"1f3c4-200d-2642-fe0f","🏄🏻‍♂":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂":"1f3c4-1f3ff-200d-2642-fe0f","🏄‍♀️":"1f3c4-200d-2640-fe0f","🏄🏻‍♀":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀":"1f3c4-1f3ff-200d-2640-fe0f","🚣‍♂️":"1f6a3-200d-2642-fe0f","🚣🏻‍♂":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂":"1f6a3-1f3ff-200d-2642-fe0f","🚣‍♀️":"1f6a3-200d-2640-fe0f","🚣🏻‍♀":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀":"1f6a3-1f3ff-200d-2640-fe0f","🏊‍♂️":"1f3ca-200d-2642-fe0f","🏊🏻‍♂":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂":"1f3ca-1f3ff-200d-2642-fe0f","🏊‍♀️":"1f3ca-200d-2640-fe0f","🏊🏻‍♀":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀":"1f3ca-1f3ff-200d-2640-fe0f","⛹‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹️‍♂":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂":"26f9-1f3ff-200d-2642-fe0f","⛹‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹️‍♀":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀":"26f9-1f3ff-200d-2640-fe0f","🏋‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋️‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂":"1f3cb-1f3ff-200d-2642-fe0f","🏋‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋️‍♀":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀":"1f3cb-1f3ff-200d-2640-fe0f","🚴‍♂️":"1f6b4-200d-2642-fe0f","🚴🏻‍♂":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂":"1f6b4-1f3ff-200d-2642-fe0f","🚴‍♀️":"1f6b4-200d-2640-fe0f","🚴🏻‍♀":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀":"1f6b4-1f3ff-200d-2640-fe0f","🚵‍♂️":"1f6b5-200d-2642-fe0f","🚵🏻‍♂":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂":"1f6b5-1f3ff-200d-2642-fe0f","🚵‍♀️":"1f6b5-200d-2640-fe0f","🚵🏻‍♀":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀":"1f6b5-1f3ff-200d-2640-fe0f","🤸‍♂️":"1f938-200d-2642-fe0f","🤸🏻‍♂":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂":"1f938-1f3ff-200d-2642-fe0f","🤸‍♀️":"1f938-200d-2640-fe0f","🤸🏻‍♀":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀":"1f938-1f3ff-200d-2640-fe0f","🤼‍♂️":"1f93c-200d-2642-fe0f","🤼‍♀️":"1f93c-200d-2640-fe0f","🤽‍♂️":"1f93d-200d-2642-fe0f","🤽🏻‍♂":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂":"1f93d-1f3ff-200d-2642-fe0f","🤽‍♀️":"1f93d-200d-2640-fe0f","🤽🏻‍♀":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀":"1f93d-1f3ff-200d-2640-fe0f","🤾‍♂️":"1f93e-200d-2642-fe0f","🤾🏻‍♂":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂":"1f93e-1f3ff-200d-2642-fe0f","🤾‍♀️":"1f93e-200d-2640-fe0f","🤾🏻‍♀":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀":"1f93e-1f3ff-200d-2640-fe0f","🤹‍♂️":"1f939-200d-2642-fe0f","🤹🏻‍♂":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂":"1f939-1f3ff-200d-2642-fe0f","🤹‍♀️":"1f939-200d-2640-fe0f","🤹🏻‍♀":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀":"1f939-1f3ff-200d-2640-fe0f","🧘‍♂️":"1f9d8-200d-2642-fe0f","🧘🏻‍♂":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂":"1f9d8-1f3ff-200d-2642-fe0f","🧘‍♀️":"1f9d8-200d-2640-fe0f","🧘🏻‍♀":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀":"1f9d8-1f3ff-200d-2640-fe0f","🐻‍❄️":"1f43b-200d-2744-fe0f","🏳️‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","🏳️‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠️":"1f3f4-200d-2620-fe0f","👁️‍🗨️":"1f441-200d-1f5e8","🫱🏻‍🫲🏼":"1faf1-1f3fb-200d-1faf2-1f3fc","🫱🏻‍🫲🏽":"1faf1-1f3fb-200d-1faf2-1f3fd","🫱🏻‍🫲🏾":"1faf1-1f3fb-200d-1faf2-1f3fe","🫱🏻‍🫲🏿":"1faf1-1f3fb-200d-1faf2-1f3ff","🫱🏼‍🫲🏻":"1faf1-1f3fc-200d-1faf2-1f3fb","🫱🏼‍🫲🏽":"1faf1-1f3fc-200d-1faf2-1f3fd","🫱🏼‍🫲🏾":"1faf1-1f3fc-200d-1faf2-1f3fe","🫱🏼‍🫲🏿":"1faf1-1f3fc-200d-1faf2-1f3ff","🫱🏽‍🫲🏻":"1faf1-1f3fd-200d-1faf2-1f3fb","🫱🏽‍🫲🏼":"1faf1-1f3fd-200d-1faf2-1f3fc","🫱🏽‍🫲🏾":"1faf1-1f3fd-200d-1faf2-1f3fe","🫱🏽‍🫲🏿":"1faf1-1f3fd-200d-1faf2-1f3ff","🫱🏾‍🫲🏻":"1faf1-1f3fe-200d-1faf2-1f3fb","🫱🏾‍🫲🏼":"1faf1-1f3fe-200d-1faf2-1f3fc","🫱🏾‍🫲🏽":"1faf1-1f3fe-200d-1faf2-1f3fd","🫱🏾‍🫲🏿":"1faf1-1f3fe-200d-1faf2-1f3ff","🫱🏿‍🫲🏻":"1faf1-1f3ff-200d-1faf2-1f3fb","🫱🏿‍🫲🏼":"1faf1-1f3ff-200d-1faf2-1f3fc","🫱🏿‍🫲🏽":"1faf1-1f3ff-200d-1faf2-1f3fd","🫱🏿‍🫲🏾":"1faf1-1f3ff-200d-1faf2-1f3fe","🧔🏻‍♂️":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂️":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂️":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂️":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂️":"1f9d4-1f3ff-200d-2642-fe0f","🧔🏻‍♀️":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀️":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀️":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀️":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀️":"1f9d4-1f3ff-200d-2640-fe0f","👱🏻‍♀️":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀️":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀️":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀️":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀️":"1f471-1f3ff-200d-2640-fe0f","👱🏻‍♂️":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂️":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂️":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂️":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂️":"1f471-1f3ff-200d-2642-fe0f","🙍🏻‍♂️":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂️":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂️":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂️":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂️":"1f64d-1f3ff-200d-2642-fe0f","🙍🏻‍♀️":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀️":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀️":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀️":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀️":"1f64d-1f3ff-200d-2640-fe0f","🙎🏻‍♂️":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂️":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂️":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂️":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂️":"1f64e-1f3ff-200d-2642-fe0f","🙎🏻‍♀️":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀️":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀️":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀️":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀️":"1f64e-1f3ff-200d-2640-fe0f","🙅🏻‍♂️":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂️":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂️":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂️":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂️":"1f645-1f3ff-200d-2642-fe0f","🙅🏻‍♀️":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀️":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀️":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀️":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀️":"1f645-1f3ff-200d-2640-fe0f","🙆🏻‍♂️":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂️":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂️":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂️":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂️":"1f646-1f3ff-200d-2642-fe0f","🙆🏻‍♀️":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀️":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀️":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀️":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀️":"1f646-1f3ff-200d-2640-fe0f","💁🏻‍♂️":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂️":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂️":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂️":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂️":"1f481-1f3ff-200d-2642-fe0f","💁🏻‍♀️":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀️":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀️":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀️":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀️":"1f481-1f3ff-200d-2640-fe0f","🙋🏻‍♂️":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂️":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂️":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂️":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂️":"1f64b-1f3ff-200d-2642-fe0f","🙋🏻‍♀️":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀️":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀️":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀️":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀️":"1f64b-1f3ff-200d-2640-fe0f","🧏🏻‍♂️":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂️":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂️":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂️":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂️":"1f9cf-1f3ff-200d-2642-fe0f","🧏🏻‍♀️":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀️":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀️":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀️":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀️":"1f9cf-1f3ff-200d-2640-fe0f","🙇🏻‍♂️":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂️":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂️":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂️":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂️":"1f647-1f3ff-200d-2642-fe0f","🙇🏻‍♀️":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀️":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀️":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀️":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀️":"1f647-1f3ff-200d-2640-fe0f","🤦🏻‍♂️":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂️":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂️":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂️":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂️":"1f926-1f3ff-200d-2642-fe0f","🤦🏻‍♀️":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀️":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀️":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀️":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀️":"1f926-1f3ff-200d-2640-fe0f","🤷🏻‍♂️":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂️":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂️":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂️":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂️":"1f937-1f3ff-200d-2642-fe0f","🤷🏻‍♀️":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀️":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀️":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀️":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀️":"1f937-1f3ff-200d-2640-fe0f","🧑🏻‍⚕️":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕️":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕️":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕️":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕️":"1f9d1-1f3ff-200d-2695-fe0f","👨🏻‍⚕️":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕️":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕️":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕️":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕️":"1f468-1f3ff-200d-2695-fe0f","👩🏻‍⚕️":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕️":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕️":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕️":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕️":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍⚖️":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖️":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖️":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖️":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖️":"1f9d1-1f3ff-200d-2696-fe0f","👨🏻‍⚖️":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖️":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖️":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖️":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖️":"1f468-1f3ff-200d-2696-fe0f","👩🏻‍⚖️":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖️":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖️":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖️":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖️":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍✈️":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈️":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈️":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈️":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈️":"1f9d1-1f3ff-200d-2708-fe0f","👨🏻‍✈️":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈️":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈️":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈️":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈️":"1f468-1f3ff-200d-2708-fe0f","👩🏻‍✈️":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈️":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈️":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈️":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈️":"1f469-1f3ff-200d-2708-fe0f","👮🏻‍♂️":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂️":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂️":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂️":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂️":"1f46e-1f3ff-200d-2642-fe0f","👮🏻‍♀️":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀️":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀️":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀️":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀️":"1f46e-1f3ff-200d-2640-fe0f","🕵️‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂️":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂️":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂️":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂️":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂️":"1f575-1f3ff-200d-2642-fe0f","🕵️‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀️":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀️":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀️":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀️":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀️":"1f575-1f3ff-200d-2640-fe0f","💂🏻‍♂️":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂️":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂️":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂️":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂️":"1f482-1f3ff-200d-2642-fe0f","💂🏻‍♀️":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀️":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀️":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀️":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀️":"1f482-1f3ff-200d-2640-fe0f","👷🏻‍♂️":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂️":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂️":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂️":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂️":"1f477-1f3ff-200d-2642-fe0f","👷🏻‍♀️":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀️":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀️":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀️":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀️":"1f477-1f3ff-200d-2640-fe0f","👳🏻‍♂️":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂️":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂️":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂️":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂️":"1f473-1f3ff-200d-2642-fe0f","👳🏻‍♀️":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀️":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀️":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀️":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀️":"1f473-1f3ff-200d-2640-fe0f","🤵🏻‍♂️":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂️":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂️":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂️":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂️":"1f935-1f3ff-200d-2642-fe0f","🤵🏻‍♀️":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀️":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀️":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀️":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀️":"1f935-1f3ff-200d-2640-fe0f","👰🏻‍♂️":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂️":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂️":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂️":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂️":"1f470-1f3ff-200d-2642-fe0f","👰🏻‍♀️":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀️":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀️":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀️":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀️":"1f470-1f3ff-200d-2640-fe0f","🦸🏻‍♂️":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂️":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂️":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂️":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂️":"1f9b8-1f3ff-200d-2642-fe0f","🦸🏻‍♀️":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀️":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀️":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀️":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀️":"1f9b8-1f3ff-200d-2640-fe0f","🦹🏻‍♂️":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂️":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂️":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂️":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂️":"1f9b9-1f3ff-200d-2642-fe0f","🦹🏻‍♀️":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀️":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀️":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀️":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀️":"1f9b9-1f3ff-200d-2640-fe0f","🧙🏻‍♂️":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂️":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂️":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂️":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂️":"1f9d9-1f3ff-200d-2642-fe0f","🧙🏻‍♀️":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀️":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀️":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀️":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀️":"1f9d9-1f3ff-200d-2640-fe0f","🧚🏻‍♂️":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂️":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂️":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂️":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂️":"1f9da-1f3ff-200d-2642-fe0f","🧚🏻‍♀️":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀️":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀️":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀️":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀️":"1f9da-1f3ff-200d-2640-fe0f","🧛🏻‍♂️":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂️":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂️":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂️":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂️":"1f9db-1f3ff-200d-2642-fe0f","🧛🏻‍♀️":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀️":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀️":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀️":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀️":"1f9db-1f3ff-200d-2640-fe0f","🧜🏻‍♂️":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂️":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂️":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂️":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂️":"1f9dc-1f3ff-200d-2642-fe0f","🧜🏻‍♀️":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀️":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀️":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀️":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀️":"1f9dc-1f3ff-200d-2640-fe0f","🧝🏻‍♂️":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂️":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂️":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂️":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂️":"1f9dd-1f3ff-200d-2642-fe0f","🧝🏻‍♀️":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀️":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀️":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀️":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀️":"1f9dd-1f3ff-200d-2640-fe0f","💆🏻‍♂️":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂️":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂️":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂️":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂️":"1f486-1f3ff-200d-2642-fe0f","💆🏻‍♀️":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀️":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀️":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀️":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀️":"1f486-1f3ff-200d-2640-fe0f","💇🏻‍♂️":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂️":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂️":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂️":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂️":"1f487-1f3ff-200d-2642-fe0f","💇🏻‍♀️":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀️":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀️":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀️":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀️":"1f487-1f3ff-200d-2640-fe0f","🚶🏻‍♂️":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂️":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂️":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂️":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂️":"1f6b6-1f3ff-200d-2642-fe0f","🚶🏻‍♀️":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀️":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀️":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀️":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀️":"1f6b6-1f3ff-200d-2640-fe0f","🧍🏻‍♂️":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂️":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂️":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂️":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂️":"1f9cd-1f3ff-200d-2642-fe0f","🧍🏻‍♀️":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀️":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀️":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀️":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀️":"1f9cd-1f3ff-200d-2640-fe0f","🧎🏻‍♂️":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂️":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂️":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂️":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂️":"1f9ce-1f3ff-200d-2642-fe0f","🧎🏻‍♀️":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀️":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀️":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀️":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀️":"1f9ce-1f3ff-200d-2640-fe0f","🏃🏻‍♂️":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂️":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂️":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂️":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂️":"1f3c3-1f3ff-200d-2642-fe0f","🏃🏻‍♀️":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀️":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀️":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀️":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀️":"1f3c3-1f3ff-200d-2640-fe0f","🧖🏻‍♂️":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂️":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂️":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂️":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂️":"1f9d6-1f3ff-200d-2642-fe0f","🧖🏻‍♀️":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀️":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀️":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀️":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀️":"1f9d6-1f3ff-200d-2640-fe0f","🧗🏻‍♂️":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂️":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂️":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂️":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂️":"1f9d7-1f3ff-200d-2642-fe0f","🧗🏻‍♀️":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀️":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀️":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀️":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀️":"1f9d7-1f3ff-200d-2640-fe0f","🏌️‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂️":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂️":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂️":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂️":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂️":"1f3cc-1f3ff-200d-2642-fe0f","🏌️‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀️":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀️":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀️":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀️":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀️":"1f3cc-1f3ff-200d-2640-fe0f","🏄🏻‍♂️":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂️":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂️":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂️":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂️":"1f3c4-1f3ff-200d-2642-fe0f","🏄🏻‍♀️":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀️":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀️":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀️":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀️":"1f3c4-1f3ff-200d-2640-fe0f","🚣🏻‍♂️":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂️":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂️":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂️":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂️":"1f6a3-1f3ff-200d-2642-fe0f","🚣🏻‍♀️":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀️":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀️":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀️":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀️":"1f6a3-1f3ff-200d-2640-fe0f","🏊🏻‍♂️":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂️":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂️":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂️":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂️":"1f3ca-1f3ff-200d-2642-fe0f","🏊🏻‍♀️":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀️":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀️":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀️":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀️":"1f3ca-1f3ff-200d-2640-fe0f","⛹️‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂️":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂️":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂️":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂️":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂️":"26f9-1f3ff-200d-2642-fe0f","⛹️‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀️":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀️":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀️":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀️":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀️":"26f9-1f3ff-200d-2640-fe0f","🏋️‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂️":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂️":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂️":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂️":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂️":"1f3cb-1f3ff-200d-2642-fe0f","🏋️‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀️":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀️":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀️":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀️":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀️":"1f3cb-1f3ff-200d-2640-fe0f","🚴🏻‍♂️":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂️":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂️":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂️":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂️":"1f6b4-1f3ff-200d-2642-fe0f","🚴🏻‍♀️":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀️":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀️":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀️":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀️":"1f6b4-1f3ff-200d-2640-fe0f","🚵🏻‍♂️":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂️":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂️":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂️":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂️":"1f6b5-1f3ff-200d-2642-fe0f","🚵🏻‍♀️":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀️":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀️":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀️":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀️":"1f6b5-1f3ff-200d-2640-fe0f","🤸🏻‍♂️":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂️":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂️":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂️":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂️":"1f938-1f3ff-200d-2642-fe0f","🤸🏻‍♀️":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀️":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀️":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀️":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀️":"1f938-1f3ff-200d-2640-fe0f","🤽🏻‍♂️":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂️":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂️":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂️":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂️":"1f93d-1f3ff-200d-2642-fe0f","🤽🏻‍♀️":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀️":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀️":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀️":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀️":"1f93d-1f3ff-200d-2640-fe0f","🤾🏻‍♂️":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂️":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂️":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂️":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂️":"1f93e-1f3ff-200d-2642-fe0f","🤾🏻‍♀️":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀️":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀️":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀️":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀️":"1f93e-1f3ff-200d-2640-fe0f","🤹🏻‍♂️":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂️":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂️":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂️":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂️":"1f939-1f3ff-200d-2642-fe0f","🤹🏻‍♀️":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀️":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀️":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀️":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀️":"1f939-1f3ff-200d-2640-fe0f","🧘🏻‍♂️":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂️":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂️":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂️":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂️":"1f9d8-1f3ff-200d-2642-fe0f","🧘🏻‍♀️":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀️":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀️":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀️":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀️":"1f9d8-1f3ff-200d-2640-fe0f","🧑‍🤝‍🧑":"1f9d1-200d-1f91d-200d-1f9d1","👩‍❤‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤‍👩":"1f469-200d-2764-fe0f-200d-1f469","👨‍👩‍👦":"1f468-200d-1f469-200d-1f466","👨‍👩‍👧":"1f468-200d-1f469-200d-1f467","👨‍👨‍👦":"1f468-200d-1f468-200d-1f466","👨‍👨‍👧":"1f468-200d-1f468-200d-1f467","👩‍👩‍👦":"1f469-200d-1f469-200d-1f466","👩‍👩‍👧":"1f469-200d-1f469-200d-1f467","👨‍👦‍👦":"1f468-200d-1f466-200d-1f466","👨‍👧‍👦":"1f468-200d-1f467-200d-1f466","👨‍👧‍👧":"1f468-200d-1f467-200d-1f467","👩‍👦‍👦":"1f469-200d-1f466-200d-1f466","👩‍👧‍👦":"1f469-200d-1f467-200d-1f466","👩‍👧‍👧":"1f469-200d-1f467-200d-1f467","🏳️‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","👩‍❤️‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤️‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤️‍👩":"1f469-200d-2764-fe0f-200d-1f469","🧑🏻‍🤝‍🧑🏻":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb","🧑🏻‍🤝‍🧑🏼":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc","🧑🏻‍🤝‍🧑🏽":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd","🧑🏻‍🤝‍🧑🏾":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe","🧑🏻‍🤝‍🧑🏿":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff","🧑🏼‍🤝‍🧑🏻":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb","🧑🏼‍🤝‍🧑🏼":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc","🧑🏼‍🤝‍🧑🏽":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd","🧑🏼‍🤝‍🧑🏾":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe","🧑🏼‍🤝‍🧑🏿":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff","🧑🏽‍🤝‍🧑🏻":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb","🧑🏽‍🤝‍🧑🏼":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc","🧑🏽‍🤝‍🧑🏽":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd","🧑🏽‍🤝‍🧑🏾":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe","🧑🏽‍🤝‍🧑🏿":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff","🧑🏾‍🤝‍🧑🏻":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb","🧑🏾‍🤝‍🧑🏼":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc","🧑🏾‍🤝‍🧑🏽":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd","🧑🏾‍🤝‍🧑🏾":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe","🧑🏾‍🤝‍🧑🏿":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff","🧑🏿‍🤝‍🧑🏻":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb","🧑🏿‍🤝‍🧑🏼":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc","🧑🏿‍🤝‍🧑🏽":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd","🧑🏿‍🤝‍🧑🏾":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe","🧑🏿‍🤝‍🧑🏿":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff","👩🏻‍🤝‍👩🏼":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc","👩🏻‍🤝‍👩🏽":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd","👩🏻‍🤝‍👩🏾":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👩🏿":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff","👩🏼‍🤝‍👩🏻":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb","👩🏼‍🤝‍👩🏽":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd","👩🏼‍🤝‍👩🏾":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe","👩🏼‍🤝‍👩🏿":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff","👩🏽‍🤝‍👩🏻":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb","👩🏽‍🤝‍👩🏼":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc","👩🏽‍🤝‍👩🏾":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe","👩🏽‍🤝‍👩🏿":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff","👩🏾‍🤝‍👩🏻":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb","👩🏾‍🤝‍👩🏼":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc","👩🏾‍🤝‍👩🏽":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd","👩🏾‍🤝‍👩🏿":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff","👩🏿‍🤝‍👩🏻":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb","👩🏿‍🤝‍👩🏼":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc","👩🏿‍🤝‍👩🏽":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd","👩🏿‍🤝‍👩🏾":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👨🏼":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc","👩🏻‍🤝‍👨🏽":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd","👩🏻‍🤝‍👨🏾":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe","👩🏻‍🤝‍👨🏿":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff","👩🏼‍🤝‍👨🏻":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb","👩🏼‍🤝‍👨🏽":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd","👩🏼‍🤝‍👨🏾":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe","👩🏼‍🤝‍👨🏿":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff","👩🏽‍🤝‍👨🏻":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb","👩🏽‍🤝‍👨🏼":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc","👩🏽‍🤝‍👨🏾":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe","👩🏽‍🤝‍👨🏿":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff","👩🏾‍🤝‍👨🏻":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb","👩🏾‍🤝‍👨🏼":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc","👩🏾‍🤝‍👨🏽":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd","👩🏾‍🤝‍👨🏿":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff","👩🏿‍🤝‍👨🏻":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb","👩🏿‍🤝‍👨🏼":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc","👩🏿‍🤝‍👨🏽":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd","👩🏿‍🤝‍👨🏾":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏼":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc","👨🏻‍🤝‍👨🏽":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd","👨🏻‍🤝‍👨🏾":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏿":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff","👨🏼‍🤝‍👨🏻":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb","👨🏼‍🤝‍👨🏽":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd","👨🏼‍🤝‍👨🏾":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe","👨🏼‍🤝‍👨🏿":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff","👨🏽‍🤝‍👨🏻":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb","👨🏽‍🤝‍👨🏼":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc","👨🏽‍🤝‍👨🏾":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe","👨🏽‍🤝‍👨🏿":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff","👨🏾‍🤝‍👨🏻":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb","👨🏾‍🤝‍👨🏼":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc","👨🏾‍🤝‍👨🏽":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd","👨🏾‍🤝‍👨🏿":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff","👨🏿‍🤝‍👨🏻":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb","👨🏿‍🤝‍👨🏼":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc","👨🏿‍🤝‍👨🏽":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd","👨🏿‍🤝‍👨🏾":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe","👩‍❤‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","👨‍👩‍👧‍👦":"1f468-200d-1f469-200d-1f467-200d-1f466","👨‍👩‍👦‍👦":"1f468-200d-1f469-200d-1f466-200d-1f466","👨‍👩‍👧‍👧":"1f468-200d-1f469-200d-1f467-200d-1f467","👨‍👨‍👧‍👦":"1f468-200d-1f468-200d-1f467-200d-1f466","👨‍👨‍👦‍👦":"1f468-200d-1f468-200d-1f466-200d-1f466","👨‍👨‍👧‍👧":"1f468-200d-1f468-200d-1f467-200d-1f467","👩‍👩‍👧‍👦":"1f469-200d-1f469-200d-1f467-200d-1f466","👩‍👩‍👦‍👦":"1f469-200d-1f469-200d-1f466-200d-1f466","👩‍👩‍👧‍👧":"1f469-200d-1f469-200d-1f467-200d-1f467","🏴󠁧󠁢󠁥󠁮󠁧󠁿":"1f3f4-e0067-e0062-e0065-e006e-e0067-e007f","🏴󠁧󠁢󠁳󠁣󠁴󠁿":"1f3f4-e0067-e0062-e0073-e0063-e0074-e007f","🏴󠁧󠁢󠁷󠁬󠁳󠁿":"1f3f4-e0067-e0062-e0077-e006c-e0073-e007f","👩‍❤️‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤️‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤️‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤️‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤️‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤️‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤️‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤️‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤️‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤️‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤️‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤️‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤️‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤️‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤️‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤️‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤️‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤️‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤️‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤️‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤️‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤️‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤️‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤️‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤️‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤️‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤️‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤️‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤️‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤️‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤️‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤️‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤️‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤️‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤️‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤️‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤️‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤️‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤️‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤️‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤️‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤️‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤️‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤️‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤️‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤️‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤️‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤️‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤️‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤️‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤️‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤️‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤️‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤️‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤️‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤️‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤️‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤️‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤️‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤️‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤️‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤️‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤️‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤️‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤️‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤️‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤️‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤️‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤️‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤️‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤️‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤️‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤️‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤️‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤️‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤️‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤️‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤️‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤️‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤️‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤️‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤️‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤️‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤️‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤️‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤️‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤️‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤️‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤️‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤️‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤️‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤️‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤️‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤️‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤️‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤️‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤️‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤️‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","🧑🏻‍❤‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","🧑🏻‍❤️‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤️‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤️‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤️‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤️‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤️‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤️‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤️‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤️‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤️‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤️‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤️‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤️‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤️‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤️‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤️‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤️‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤️‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤️‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤️‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤️‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤️‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤️‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤️‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤️‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤️‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤️‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤️‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤️‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤️‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤️‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤️‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤️‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤️‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤️‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤️‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤️‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤️‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤️‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤️‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤️‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤️‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤️‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤️‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤️‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤️‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤️‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤️‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤️‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤️‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤️‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤️‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤️‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤️‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤️‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤️‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤️‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤️‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤️‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤️‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤️‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤️‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤️‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤️‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤️‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤️‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤️‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤️‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤️‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤️‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤️‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤️‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤️‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤️‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤️‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤️‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤️‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤️‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤️‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤️‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤️‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤️‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤️‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤️‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤️‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤️‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤️‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤️‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤️‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤️‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤️‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤️‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤️‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤️‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤️‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff"}
\ No newline at end of file
+{"😀":"1f600","😃":"1f603","😄":"1f604","😁":"1f601","😆":"1f606","😅":"1f605","🤣":"1f923","😂":"1f602","🙂":"1f642","🙃":"1f643","🫠":"1fae0","😉":"1f609","😊":"1f60a","😇":"1f607","🥰":"1f970","😍":"1f60d","🤩":"1f929","😘":"1f618","😗":"1f617","☺":"263a","😚":"1f61a","😙":"1f619","🥲":"1f972","😋":"1f60b","😛":"1f61b","😜":"1f61c","🤪":"1f92a","😝":"1f61d","🤑":"1f911","🤗":"1f917","🤭":"1f92d","🫢":"1fae2","🫣":"1fae3","🤫":"1f92b","🤔":"1f914","🫡":"1fae1","🤐":"1f910","🤨":"1f928","😐":"1f610","😑":"1f611","😶":"1f636","🫥":"1fae5","😏":"1f60f","😒":"1f612","🙄":"1f644","😬":"1f62c","🤥":"1f925","🫨":"1fae8","😌":"1f60c","😔":"1f614","😪":"1f62a","🤤":"1f924","😴":"1f634","😷":"1f637","🤒":"1f912","🤕":"1f915","🤢":"1f922","🤮":"1f92e","🤧":"1f927","🥵":"1f975","🥶":"1f976","🥴":"1f974","😵":"1f635","🤯":"1f92f","🤠":"1f920","🥳":"1f973","🥸":"1f978","😎":"1f60e","🤓":"1f913","🧐":"1f9d0","😕":"1f615","🫤":"1fae4","😟":"1f61f","🙁":"1f641","☹":"2639","😮":"1f62e","😯":"1f62f","😲":"1f632","😳":"1f633","🥺":"1f97a","🥹":"1f979","😦":"1f626","😧":"1f627","😨":"1f628","😰":"1f630","😥":"1f625","😢":"1f622","😭":"1f62d","😱":"1f631","😖":"1f616","😣":"1f623","😞":"1f61e","😓":"1f613","😩":"1f629","😫":"1f62b","🥱":"1f971","😤":"1f624","😡":"1f621","😠":"1f620","🤬":"1f92c","😈":"1f608","👿":"1f47f","💀":"1f480","☠":"2620","💩":"1f4a9","🤡":"1f921","👹":"1f479","👺":"1f47a","👻":"1f47b","👽":"1f47d","👾":"1f47e","🤖":"1f916","😺":"1f63a","😸":"1f638","😹":"1f639","😻":"1f63b","😼":"1f63c","😽":"1f63d","🙀":"1f640","😿":"1f63f","😾":"1f63e","🙈":"1f648","🙉":"1f649","🙊":"1f64a","💌":"1f48c","💘":"1f498","💝":"1f49d","💖":"1f496","💗":"1f497","💓":"1f493","💞":"1f49e","💕":"1f495","💟":"1f49f","❣":"2763","💔":"1f494","❤":"2764","🩷":"1fa77","🧡":"1f9e1","💛":"1f49b","💚":"1f49a","💙":"1f499","🩵":"1fa75","💜":"1f49c","🤎":"1f90e","🖤":"1f5a4","🩶":"1fa76","🤍":"1f90d","💋":"1f48b","💯":"1f4af","💢":"1f4a2","💥":"1f4a5","💫":"1f4ab","💦":"1f4a6","💨":"1f4a8","🕳":"1f573","💬":"1f4ac","🗨":"1f5e8","🗯":"1f5ef","💭":"1f4ad","💤":"1f4a4","👋":"1f44b","🤚":"1f91a","🖐":"1f590","✋":"270b","🖖":"1f596","🫱":"1faf1","🫲":"1faf2","🫳":"1faf3","🫴":"1faf4","🫷":"1faf7","🫸":"1faf8","👌":"1f44c","🤌":"1f90c","🤏":"1f90f","✌":"270c","🤞":"1f91e","🫰":"1faf0","🤟":"1f91f","🤘":"1f918","🤙":"1f919","👈":"1f448","👉":"1f449","👆":"1f446","🖕":"1f595","👇":"1f447","☝":"261d","🫵":"1faf5","👍":"1f44d","👎":"1f44e","✊":"270a","👊":"1f44a","🤛":"1f91b","🤜":"1f91c","👏":"1f44f","🙌":"1f64c","🫶":"1faf6","👐":"1f450","🤲":"1f932","🤝":"1f91d","🙏":"1f64f","✍":"270d","💅":"1f485","🤳":"1f933","💪":"1f4aa","🦾":"1f9be","🦿":"1f9bf","🦵":"1f9b5","🦶":"1f9b6","👂":"1f442","🦻":"1f9bb","👃":"1f443","🧠":"1f9e0","🫀":"1fac0","🫁":"1fac1","🦷":"1f9b7","🦴":"1f9b4","👀":"1f440","👁":"1f441","👅":"1f445","👄":"1f444","🫦":"1fae6","👶":"1f476","🧒":"1f9d2","👦":"1f466","👧":"1f467","🧑":"1f9d1","👱":"1f471","👨":"1f468","🧔":"1f9d4","👩":"1f469","🧓":"1f9d3","👴":"1f474","👵":"1f475","🙍":"1f64d","🙎":"1f64e","🙅":"1f645","🙆":"1f646","💁":"1f481","🙋":"1f64b","🧏":"1f9cf","🙇":"1f647","🤦":"1f926","🤷":"1f937","👮":"1f46e","🕵":"1f575","💂":"1f482","🥷":"1f977","👷":"1f477","🫅":"1fac5","🤴":"1f934","👸":"1f478","👳":"1f473","👲":"1f472","🧕":"1f9d5","🤵":"1f935","👰":"1f470","🤰":"1f930","🫃":"1fac3","🫄":"1fac4","🤱":"1f931","👼":"1f47c","🎅":"1f385","🤶":"1f936","🦸":"1f9b8","🦹":"1f9b9","🧙":"1f9d9","🧚":"1f9da","🧛":"1f9db","🧜":"1f9dc","🧝":"1f9dd","🧞":"1f9de","🧟":"1f9df","🧌":"1f9cc","💆":"1f486","💇":"1f487","🚶":"1f6b6","🧍":"1f9cd","🧎":"1f9ce","🏃":"1f3c3","💃":"1f483","🕺":"1f57a","🕴":"1f574","👯":"1f46f","🧖":"1f9d6","🧗":"1f9d7","🤺":"1f93a","🏇":"1f3c7","⛷":"26f7","🏂":"1f3c2","🏌":"1f3cc","🏄":"1f3c4","🚣":"1f6a3","🏊":"1f3ca","⛹":"26f9","🏋":"1f3cb","🚴":"1f6b4","🚵":"1f6b5","🤸":"1f938","🤼":"1f93c","🤽":"1f93d","🤾":"1f93e","🤹":"1f939","🧘":"1f9d8","🛀":"1f6c0","🛌":"1f6cc","👭":"1f46d","👫":"1f46b","👬":"1f46c","💏":"1f48f","💑":"1f491","👪":"1f46a","🗣":"1f5e3","👤":"1f464","👥":"1f465","🫂":"1fac2","👣":"1f463","🏻":"1f463","🏼":"1f463","🏽":"1f463","🏾":"1f463","🏿":"1f463","🦰":"1f463","🦱":"1f463","🦳":"1f463","🦲":"1f463","🐵":"1f435","🐒":"1f412","🦍":"1f98d","🦧":"1f9a7","🐶":"1f436","🐕":"1f415","🦮":"1f9ae","🐩":"1f429","🐺":"1f43a","🦊":"1f98a","🦝":"1f99d","🐱":"1f431","🐈":"1f408","🦁":"1f981","🐯":"1f42f","🐅":"1f405","🐆":"1f406","🐴":"1f434","🫎":"1face","🫏":"1facf","🐎":"1f40e","🦄":"1f984","🦓":"1f993","🦌":"1f98c","🦬":"1f9ac","🐮":"1f42e","🐂":"1f402","🐃":"1f403","🐄":"1f404","🐷":"1f437","🐖":"1f416","🐗":"1f417","🐽":"1f43d","🐏":"1f40f","🐑":"1f411","🐐":"1f410","🐪":"1f42a","🐫":"1f42b","🦙":"1f999","🦒":"1f992","🐘":"1f418","🦣":"1f9a3","🦏":"1f98f","🦛":"1f99b","🐭":"1f42d","🐁":"1f401","🐀":"1f400","🐹":"1f439","🐰":"1f430","🐇":"1f407","🐿":"1f43f","🦫":"1f9ab","🦔":"1f994","🦇":"1f987","🐻":"1f43b","🐨":"1f428","🐼":"1f43c","🦥":"1f9a5","🦦":"1f9a6","🦨":"1f9a8","🦘":"1f998","🦡":"1f9a1","🐾":"1f43e","🦃":"1f983","🐔":"1f414","🐓":"1f413","🐣":"1f423","🐤":"1f424","🐥":"1f425","🐦":"1f426","🐧":"1f427","🕊":"1f54a","🦅":"1f985","🦆":"1f986","🦢":"1f9a2","🦉":"1f989","🦤":"1f9a4","🪶":"1fab6","🦩":"1f9a9","🦚":"1f99a","🦜":"1f99c","🪽":"1fabd","🪿":"1fabf","🐸":"1f438","🐊":"1f40a","🐢":"1f422","🦎":"1f98e","🐍":"1f40d","🐲":"1f432","🐉":"1f409","🦕":"1f995","🦖":"1f996","🐳":"1f433","🐋":"1f40b","🐬":"1f42c","🦭":"1f9ad","🐟":"1f41f","🐠":"1f420","🐡":"1f421","🦈":"1f988","🐙":"1f419","🐚":"1f41a","🪸":"1fab8","🪼":"1fabc","🐌":"1f40c","🦋":"1f98b","🐛":"1f41b","🐜":"1f41c","🐝":"1f41d","🪲":"1fab2","🐞":"1f41e","🦗":"1f997","🪳":"1fab3","🕷":"1f577","🕸":"1f578","🦂":"1f982","🦟":"1f99f","🪰":"1fab0","🪱":"1fab1","🦠":"1f9a0","💐":"1f490","🌸":"1f338","💮":"1f4ae","🪷":"1fab7","🏵":"1f3f5","🌹":"1f339","🥀":"1f940","🌺":"1f33a","🌻":"1f33b","🌼":"1f33c","🌷":"1f337","🪻":"1fabb","🌱":"1f331","🪴":"1fab4","🌲":"1f332","🌳":"1f333","🌴":"1f334","🌵":"1f335","🌾":"1f33e","🌿":"1f33f","☘":"2618","🍀":"1f340","🍁":"1f341","🍂":"1f342","🍃":"1f343","🪹":"1fab9","🪺":"1faba","🍄":"1f344","🍇":"1f347","🍈":"1f348","🍉":"1f349","🍊":"1f34a","🍋":"1f34b","🍌":"1f34c","🍍":"1f34d","🥭":"1f96d","🍎":"1f34e","🍏":"1f34f","🍐":"1f350","🍑":"1f351","🍒":"1f352","🍓":"1f353","🫐":"1fad0","🥝":"1f95d","🍅":"1f345","🫒":"1fad2","🥥":"1f965","🥑":"1f951","🍆":"1f346","🥔":"1f954","🥕":"1f955","🌽":"1f33d","🌶":"1f336","🫑":"1fad1","🥒":"1f952","🥬":"1f96c","🥦":"1f966","🧄":"1f9c4","🧅":"1f9c5","🥜":"1f95c","🫘":"1fad8","🌰":"1f330","🫚":"1fada","🫛":"1fadb","🍞":"1f35e","🥐":"1f950","🥖":"1f956","🫓":"1fad3","🥨":"1f968","🥯":"1f96f","🥞":"1f95e","🧇":"1f9c7","🧀":"1f9c0","🍖":"1f356","🍗":"1f357","🥩":"1f969","🥓":"1f953","🍔":"1f354","🍟":"1f35f","🍕":"1f355","🌭":"1f32d","🥪":"1f96a","🌮":"1f32e","🌯":"1f32f","🫔":"1fad4","🥙":"1f959","🧆":"1f9c6","🥚":"1f95a","🍳":"1f373","🥘":"1f958","🍲":"1f372","🫕":"1fad5","🥣":"1f963","🥗":"1f957","🍿":"1f37f","🧈":"1f9c8","🧂":"1f9c2","🥫":"1f96b","🍱":"1f371","🍘":"1f358","🍙":"1f359","🍚":"1f35a","🍛":"1f35b","🍜":"1f35c","🍝":"1f35d","🍠":"1f360","🍢":"1f362","🍣":"1f363","🍤":"1f364","🍥":"1f365","🥮":"1f96e","🍡":"1f361","🥟":"1f95f","🥠":"1f960","🥡":"1f961","🦀":"1f980","🦞":"1f99e","🦐":"1f990","🦑":"1f991","🦪":"1f9aa","🍦":"1f366","🍧":"1f367","🍨":"1f368","🍩":"1f369","🍪":"1f36a","🎂":"1f382","🍰":"1f370","🧁":"1f9c1","🥧":"1f967","🍫":"1f36b","🍬":"1f36c","🍭":"1f36d","🍮":"1f36e","🍯":"1f36f","🍼":"1f37c","🥛":"1f95b","☕":"2615","🫖":"1fad6","🍵":"1f375","🍶":"1f376","🍾":"1f37e","🍷":"1f377","🍸":"1f378","🍹":"1f379","🍺":"1f37a","🍻":"1f37b","🥂":"1f942","🥃":"1f943","🫗":"1fad7","🥤":"1f964","🧋":"1f9cb","🧃":"1f9c3","🧉":"1f9c9","🧊":"1f9ca","🥢":"1f962","🍽":"1f37d","🍴":"1f374","🥄":"1f944","🔪":"1f52a","🫙":"1fad9","🏺":"1f3fa","🌍":"1f30d","🌎":"1f30e","🌏":"1f30f","🌐":"1f310","🗺":"1f5fa","🗾":"1f5fe","🧭":"1f9ed","🏔":"1f3d4","⛰":"26f0","🌋":"1f30b","🗻":"1f5fb","🏕":"1f3d5","🏖":"1f3d6","🏜":"1f3dc","🏝":"1f3dd","🏞":"1f3de","🏟":"1f3df","🏛":"1f3db","🏗":"1f3d7","🧱":"1f9f1","🪨":"1faa8","🪵":"1fab5","🛖":"1f6d6","🏘":"1f3d8","🏚":"1f3da","🏠":"1f3e0","🏡":"1f3e1","🏢":"1f3e2","🏣":"1f3e3","🏤":"1f3e4","🏥":"1f3e5","🏦":"1f3e6","🏨":"1f3e8","🏩":"1f3e9","🏪":"1f3ea","🏫":"1f3eb","🏬":"1f3ec","🏭":"1f3ed","🏯":"1f3ef","🏰":"1f3f0","💒":"1f492","🗼":"1f5fc","🗽":"1f5fd","⛪":"26ea","🕌":"1f54c","🛕":"1f6d5","🕍":"1f54d","⛩":"26e9","🕋":"1f54b","⛲":"26f2","⛺":"26fa","🌁":"1f301","🌃":"1f303","🏙":"1f3d9","🌄":"1f304","🌅":"1f305","🌆":"1f306","🌇":"1f307","🌉":"1f309","♨":"2668","🎠":"1f3a0","🛝":"1f6dd","🎡":"1f3a1","🎢":"1f3a2","💈":"1f488","🎪":"1f3aa","🚂":"1f682","🚃":"1f683","🚄":"1f684","🚅":"1f685","🚆":"1f686","🚇":"1f687","🚈":"1f688","🚉":"1f689","🚊":"1f68a","🚝":"1f69d","🚞":"1f69e","🚋":"1f68b","🚌":"1f68c","🚍":"1f68d","🚎":"1f68e","🚐":"1f690","🚑":"1f691","🚒":"1f692","🚓":"1f693","🚔":"1f694","🚕":"1f695","🚖":"1f696","🚗":"1f697","🚘":"1f698","🚙":"1f699","🛻":"1f6fb","🚚":"1f69a","🚛":"1f69b","🚜":"1f69c","🏎":"1f3ce","🏍":"1f3cd","🛵":"1f6f5","🦽":"1f9bd","🦼":"1f9bc","🛺":"1f6fa","🚲":"1f6b2","🛴":"1f6f4","🛹":"1f6f9","🛼":"1f6fc","🚏":"1f68f","🛣":"1f6e3","🛤":"1f6e4","🛢":"1f6e2","⛽":"26fd","🛞":"1f6de","🚨":"1f6a8","🚥":"1f6a5","🚦":"1f6a6","🛑":"1f6d1","🚧":"1f6a7","⚓":"2693","🛟":"1f6df","⛵":"26f5","🛶":"1f6f6","🚤":"1f6a4","🛳":"1f6f3","⛴":"26f4","🛥":"1f6e5","🚢":"1f6a2","✈":"2708","🛩":"1f6e9","🛫":"1f6eb","🛬":"1f6ec","🪂":"1fa82","💺":"1f4ba","🚁":"1f681","🚟":"1f69f","🚠":"1f6a0","🚡":"1f6a1","🛰":"1f6f0","🚀":"1f680","🛸":"1f6f8","🛎":"1f6ce","🧳":"1f9f3","⌛":"231b","⏳":"23f3","⌚":"231a","⏰":"23f0","⏱":"23f1","⏲":"23f2","🕰":"1f570","🕛":"1f55b","🕧":"1f567","🕐":"1f550","🕜":"1f55c","🕑":"1f551","🕝":"1f55d","🕒":"1f552","🕞":"1f55e","🕓":"1f553","🕟":"1f55f","🕔":"1f554","🕠":"1f560","🕕":"1f555","🕡":"1f561","🕖":"1f556","🕢":"1f562","🕗":"1f557","🕣":"1f563","🕘":"1f558","🕤":"1f564","🕙":"1f559","🕥":"1f565","🕚":"1f55a","🕦":"1f566","🌑":"1f311","🌒":"1f312","🌓":"1f313","🌔":"1f314","🌕":"1f315","🌖":"1f316","🌗":"1f317","🌘":"1f318","🌙":"1f319","🌚":"1f31a","🌛":"1f31b","🌜":"1f31c","🌡":"1f321","☀":"2600","🌝":"1f31d","🌞":"1f31e","🪐":"1fa90","⭐":"2b50","🌟":"1f31f","🌠":"1f320","🌌":"1f30c","☁":"2601","⛅":"26c5","⛈":"26c8","🌤":"1f324","🌥":"1f325","🌦":"1f326","🌧":"1f327","🌨":"1f328","🌩":"1f329","🌪":"1f32a","🌫":"1f32b","🌬":"1f32c","🌀":"1f300","🌈":"1f308","🌂":"1f302","☂":"2602","☔":"2614","⛱":"26f1","⚡":"26a1","❄":"2744","☃":"2603","⛄":"26c4","☄":"2604","🔥":"1f525","💧":"1f4a7","🌊":"1f30a","🎃":"1f383","🎄":"1f384","🎆":"1f386","🎇":"1f387","🧨":"1f9e8","✨":"2728","🎈":"1f388","🎉":"1f389","🎊":"1f38a","🎋":"1f38b","🎍":"1f38d","🎎":"1f38e","🎏":"1f38f","🎐":"1f390","🎑":"1f391","🧧":"1f9e7","🎀":"1f380","🎁":"1f381","🎗":"1f397","🎟":"1f39f","🎫":"1f3ab","🎖":"1f396","🏆":"1f3c6","🏅":"1f3c5","🥇":"1f947","🥈":"1f948","🥉":"1f949","⚽":"26bd","⚾":"26be","🥎":"1f94e","🏀":"1f3c0","🏐":"1f3d0","🏈":"1f3c8","🏉":"1f3c9","🎾":"1f3be","🥏":"1f94f","🎳":"1f3b3","🏏":"1f3cf","🏑":"1f3d1","🏒":"1f3d2","🥍":"1f94d","🏓":"1f3d3","🏸":"1f3f8","🥊":"1f94a","🥋":"1f94b","🥅":"1f945","⛳":"26f3","⛸":"26f8","🎣":"1f3a3","🤿":"1f93f","🎽":"1f3bd","🎿":"1f3bf","🛷":"1f6f7","🥌":"1f94c","🎯":"1f3af","🪀":"1fa80","🪁":"1fa81","🔫":"1f52b","🎱":"1f3b1","🔮":"1f52e","🪄":"1fa84","🎮":"1f3ae","🕹":"1f579","🎰":"1f3b0","🎲":"1f3b2","🧩":"1f9e9","🧸":"1f9f8","🪅":"1fa85","🪩":"1faa9","🪆":"1fa86","♠":"2660","♥":"2665","♦":"2666","♣":"2663","♟":"265f","🃏":"1f0cf","🀄":"1f004","🎴":"1f3b4","🎭":"1f3ad","🖼":"1f5bc","🎨":"1f3a8","🧵":"1f9f5","🪡":"1faa1","🧶":"1f9f6","🪢":"1faa2","👓":"1f453","🕶":"1f576","🥽":"1f97d","🥼":"1f97c","🦺":"1f9ba","👔":"1f454","👕":"1f455","👖":"1f456","🧣":"1f9e3","🧤":"1f9e4","🧥":"1f9e5","🧦":"1f9e6","👗":"1f457","👘":"1f458","🥻":"1f97b","🩱":"1fa71","🩲":"1fa72","🩳":"1fa73","👙":"1f459","👚":"1f45a","🪭":"1faad","👛":"1f45b","👜":"1f45c","👝":"1f45d","🛍":"1f6cd","🎒":"1f392","🩴":"1fa74","👞":"1f45e","👟":"1f45f","🥾":"1f97e","🥿":"1f97f","👠":"1f460","👡":"1f461","🩰":"1fa70","👢":"1f462","🪮":"1faae","👑":"1f451","👒":"1f452","🎩":"1f3a9","🎓":"1f393","🧢":"1f9e2","🪖":"1fa96","⛑":"26d1","📿":"1f4ff","💄":"1f484","💍":"1f48d","💎":"1f48e","🔇":"1f507","🔈":"1f508","🔉":"1f509","🔊":"1f50a","📢":"1f4e2","📣":"1f4e3","📯":"1f4ef","🔔":"1f514","🔕":"1f515","🎼":"1f3bc","🎵":"1f3b5","🎶":"1f3b6","🎙":"1f399","🎚":"1f39a","🎛":"1f39b","🎤":"1f3a4","🎧":"1f3a7","📻":"1f4fb","🎷":"1f3b7","🪗":"1fa97","🎸":"1f3b8","🎹":"1f3b9","🎺":"1f3ba","🎻":"1f3bb","🪕":"1fa95","🥁":"1f941","🪘":"1fa98","🪇":"1fa87","🪈":"1fa88","📱":"1f4f1","📲":"1f4f2","☎":"260e","📞":"1f4de","📟":"1f4df","📠":"1f4e0","🔋":"1f50b","🪫":"1faab","🔌":"1f50c","💻":"1f4bb","🖥":"1f5a5","🖨":"1f5a8","⌨":"2328","🖱":"1f5b1","🖲":"1f5b2","💽":"1f4bd","💾":"1f4be","💿":"1f4bf","📀":"1f4c0","🧮":"1f9ee","🎥":"1f3a5","🎞":"1f39e","📽":"1f4fd","🎬":"1f3ac","📺":"1f4fa","📷":"1f4f7","📸":"1f4f8","📹":"1f4f9","📼":"1f4fc","🔍":"1f50d","🔎":"1f50e","🕯":"1f56f","💡":"1f4a1","🔦":"1f526","🏮":"1f3ee","🪔":"1fa94","📔":"1f4d4","📕":"1f4d5","📖":"1f4d6","📗":"1f4d7","📘":"1f4d8","📙":"1f4d9","📚":"1f4da","📓":"1f4d3","📒":"1f4d2","📃":"1f4c3","📜":"1f4dc","📄":"1f4c4","📰":"1f4f0","🗞":"1f5de","📑":"1f4d1","🔖":"1f516","🏷":"1f3f7","💰":"1f4b0","🪙":"1fa99","💴":"1f4b4","💵":"1f4b5","💶":"1f4b6","💷":"1f4b7","💸":"1f4b8","💳":"1f4b3","🧾":"1f9fe","💹":"1f4b9","✉":"2709","📧":"1f4e7","📨":"1f4e8","📩":"1f4e9","📤":"1f4e4","📥":"1f4e5","📦":"1f4e6","📫":"1f4eb","📪":"1f4ea","📬":"1f4ec","📭":"1f4ed","📮":"1f4ee","🗳":"1f5f3","✏":"270f","✒":"2712","🖋":"1f58b","🖊":"1f58a","🖌":"1f58c","🖍":"1f58d","📝":"1f4dd","💼":"1f4bc","📁":"1f4c1","📂":"1f4c2","🗂":"1f5c2","📅":"1f4c5","📆":"1f4c6","🗒":"1f5d2","🗓":"1f5d3","📇":"1f4c7","📈":"1f4c8","📉":"1f4c9","📊":"1f4ca","📋":"1f4cb","📌":"1f4cc","📍":"1f4cd","📎":"1f4ce","🖇":"1f587","📏":"1f4cf","📐":"1f4d0","✂":"2702","🗃":"1f5c3","🗄":"1f5c4","🗑":"1f5d1","🔒":"1f512","🔓":"1f513","🔏":"1f50f","🔐":"1f510","🔑":"1f511","🗝":"1f5dd","🔨":"1f528","🪓":"1fa93","⛏":"26cf","⚒":"2692","🛠":"1f6e0","🗡":"1f5e1","⚔":"2694","💣":"1f4a3","🪃":"1fa83","🏹":"1f3f9","🛡":"1f6e1","🪚":"1fa9a","🔧":"1f527","🪛":"1fa9b","🔩":"1f529","⚙":"2699","🗜":"1f5dc","⚖":"2696","🦯":"1f9af","🔗":"1f517","⛓":"26d3","🪝":"1fa9d","🧰":"1f9f0","🧲":"1f9f2","🪜":"1fa9c","⚗":"2697","🧪":"1f9ea","🧫":"1f9eb","🧬":"1f9ec","🔬":"1f52c","🔭":"1f52d","📡":"1f4e1","💉":"1f489","🩸":"1fa78","💊":"1f48a","🩹":"1fa79","🩼":"1fa7c","🩺":"1fa7a","🩻":"1fa7b","🚪":"1f6aa","🛗":"1f6d7","🪞":"1fa9e","🪟":"1fa9f","🛏":"1f6cf","🛋":"1f6cb","🪑":"1fa91","🚽":"1f6bd","🪠":"1faa0","🚿":"1f6bf","🛁":"1f6c1","🪤":"1faa4","🪒":"1fa92","🧴":"1f9f4","🧷":"1f9f7","🧹":"1f9f9","🧺":"1f9fa","🧻":"1f9fb","🪣":"1faa3","🧼":"1f9fc","🫧":"1fae7","🪥":"1faa5","🧽":"1f9fd","🧯":"1f9ef","🛒":"1f6d2","🚬":"1f6ac","⚰":"26b0","🪦":"1faa6","⚱":"26b1","🧿":"1f9ff","🪬":"1faac","🗿":"1f5ff","🪧":"1faa7","🪪":"1faaa","🏧":"1f3e7","🚮":"1f6ae","🚰":"1f6b0","♿":"267f","🚹":"1f6b9","🚺":"1f6ba","🚻":"1f6bb","🚼":"1f6bc","🚾":"1f6be","🛂":"1f6c2","🛃":"1f6c3","🛄":"1f6c4","🛅":"1f6c5","⚠":"26a0","🚸":"1f6b8","⛔":"26d4","🚫":"1f6ab","🚳":"1f6b3","🚭":"1f6ad","🚯":"1f6af","🚱":"1f6b1","🚷":"1f6b7","📵":"1f4f5","🔞":"1f51e","☢":"2622","☣":"2623","⬆":"2b06","↗":"2197","➡":"27a1","↘":"2198","⬇":"2b07","↙":"2199","⬅":"2b05","↖":"2196","↕":"2195","↔":"2194","↩":"21a9","↪":"21aa","⤴":"2934","⤵":"2935","🔃":"1f503","🔄":"1f504","🔙":"1f519","🔚":"1f51a","🔛":"1f51b","🔜":"1f51c","🔝":"1f51d","🛐":"1f6d0","⚛":"269b","🕉":"1f549","✡":"2721","☸":"2638","☯":"262f","✝":"271d","☦":"2626","☪":"262a","☮":"262e","🕎":"1f54e","🔯":"1f52f","🪯":"1faaf","♈":"2648","♉":"2649","♊":"264a","♋":"264b","♌":"264c","♍":"264d","♎":"264e","♏":"264f","♐":"2650","♑":"2651","♒":"2652","♓":"2653","⛎":"26ce","🔀":"1f500","🔁":"1f501","🔂":"1f502","▶":"25b6","⏩":"23e9","⏭":"23ed","⏯":"23ef","◀":"25c0","⏪":"23ea","⏮":"23ee","🔼":"1f53c","⏫":"23eb","🔽":"1f53d","⏬":"23ec","⏸":"23f8","⏹":"23f9","⏺":"23fa","⏏":"23cf","🎦":"1f3a6","🔅":"1f505","🔆":"1f506","📶":"1f4f6","🛜":"1f6dc","📳":"1f4f3","📴":"1f4f4","♀":"2640","♂":"2642","⚧":"26a7","✖":"2716","➕":"2795","➖":"2796","➗":"2797","🟰":"1f7f0","♾":"267e","‼":"203c","⁉":"2049","❓":"2753","❔":"2754","❕":"2755","❗":"2757","〰":"3030","💱":"1f4b1","💲":"1f4b2","⚕":"2695","♻":"267b","⚜":"269c","🔱":"1f531","📛":"1f4db","🔰":"1f530","⭕":"2b55","✅":"2705","☑":"2611","✔":"2714","❌":"274c","❎":"274e","➰":"27b0","➿":"27bf","〽":"303d","✳":"2733","✴":"2734","❇":"2747","©":"a9","®":"ae","™":"2122","🔟":"1f51f","🔠":"1f520","🔡":"1f521","🔢":"1f522","🔣":"1f523","🔤":"1f524","🅰":"1f170","🆎":"1f18e","🅱":"1f171","🆑":"1f191","🆒":"1f192","🆓":"1f193","ℹ":"2139","🆔":"1f194","Ⓜ":"24c2","🆕":"1f195","🆖":"1f196","🅾":"1f17e","🆗":"1f197","🅿":"1f17f","🆘":"1f198","🆙":"1f199","🆚":"1f19a","🈁":"1f201","🈂":"1f202","🈷":"1f237","🈶":"1f236","🈯":"1f22f","🉐":"1f250","🈹":"1f239","🈚":"1f21a","🈲":"1f232","🉑":"1f251","🈸":"1f238","🈴":"1f234","🈳":"1f233","㊗":"3297","㊙":"3299","🈺":"1f23a","🈵":"1f235","🔴":"1f534","🟠":"1f7e0","🟡":"1f7e1","🟢":"1f7e2","🔵":"1f535","🟣":"1f7e3","🟤":"1f7e4","⚫":"26ab","⚪":"26aa","🟥":"1f7e5","🟧":"1f7e7","🟨":"1f7e8","🟩":"1f7e9","🟦":"1f7e6","🟪":"1f7ea","🟫":"1f7eb","⬛":"2b1b","⬜":"2b1c","◼":"25fc","◻":"25fb","◾":"25fe","◽":"25fd","▪":"25aa","▫":"25ab","🔶":"1f536","🔷":"1f537","🔸":"1f538","🔹":"1f539","🔺":"1f53a","🔻":"1f53b","💠":"1f4a0","🔘":"1f518","🔳":"1f533","🔲":"1f532","🏁":"1f3c1","🚩":"1f6a9","🎌":"1f38c","🏴":"1f3f4","🏳":"1f3f3","☺️":"263a","☹️":"2639","☠️":"2620","❣️":"2763","❤️":"2764","🕳️":"1f573","🗨️":"1f5e8","🗯️":"1f5ef","👋🏻":"1f44b-1f3fb","👋🏼":"1f44b-1f3fc","👋🏽":"1f44b-1f3fd","👋🏾":"1f44b-1f3fe","👋🏿":"1f44b-1f3ff","🤚🏻":"1f91a-1f3fb","🤚🏼":"1f91a-1f3fc","🤚🏽":"1f91a-1f3fd","🤚🏾":"1f91a-1f3fe","🤚🏿":"1f91a-1f3ff","🖐️":"1f590","🖐🏻":"1f590-1f3fb","🖐🏼":"1f590-1f3fc","🖐🏽":"1f590-1f3fd","🖐🏾":"1f590-1f3fe","🖐🏿":"1f590-1f3ff","✋🏻":"270b-1f3fb","✋🏼":"270b-1f3fc","✋🏽":"270b-1f3fd","✋🏾":"270b-1f3fe","✋🏿":"270b-1f3ff","🖖🏻":"1f596-1f3fb","🖖🏼":"1f596-1f3fc","🖖🏽":"1f596-1f3fd","🖖🏾":"1f596-1f3fe","🖖🏿":"1f596-1f3ff","🫱🏻":"1faf1-1f3fb","🫱🏼":"1faf1-1f3fc","🫱🏽":"1faf1-1f3fd","🫱🏾":"1faf1-1f3fe","🫱🏿":"1faf1-1f3ff","🫲🏻":"1faf2-1f3fb","🫲🏼":"1faf2-1f3fc","🫲🏽":"1faf2-1f3fd","🫲🏾":"1faf2-1f3fe","🫲🏿":"1faf2-1f3ff","🫳🏻":"1faf3-1f3fb","🫳🏼":"1faf3-1f3fc","🫳🏽":"1faf3-1f3fd","🫳🏾":"1faf3-1f3fe","🫳🏿":"1faf3-1f3ff","🫴🏻":"1faf4-1f3fb","🫴🏼":"1faf4-1f3fc","🫴🏽":"1faf4-1f3fd","🫴🏾":"1faf4-1f3fe","🫴🏿":"1faf4-1f3ff","🫷🏻":"1faf7-1f3fb","🫷🏼":"1faf7-1f3fc","🫷🏽":"1faf7-1f3fd","🫷🏾":"1faf7-1f3fe","🫷🏿":"1faf7-1f3ff","🫸🏻":"1faf8-1f3fb","🫸🏼":"1faf8-1f3fc","🫸🏽":"1faf8-1f3fd","🫸🏾":"1faf8-1f3fe","🫸🏿":"1faf8-1f3ff","👌🏻":"1f44c-1f3fb","👌🏼":"1f44c-1f3fc","👌🏽":"1f44c-1f3fd","👌🏾":"1f44c-1f3fe","👌🏿":"1f44c-1f3ff","🤌🏻":"1f90c-1f3fb","🤌🏼":"1f90c-1f3fc","🤌🏽":"1f90c-1f3fd","🤌🏾":"1f90c-1f3fe","🤌🏿":"1f90c-1f3ff","🤏🏻":"1f90f-1f3fb","🤏🏼":"1f90f-1f3fc","🤏🏽":"1f90f-1f3fd","🤏🏾":"1f90f-1f3fe","🤏🏿":"1f90f-1f3ff","✌️":"270c","✌🏻":"270c-1f3fb","✌🏼":"270c-1f3fc","✌🏽":"270c-1f3fd","✌🏾":"270c-1f3fe","✌🏿":"270c-1f3ff","🤞🏻":"1f91e-1f3fb","🤞🏼":"1f91e-1f3fc","🤞🏽":"1f91e-1f3fd","🤞🏾":"1f91e-1f3fe","🤞🏿":"1f91e-1f3ff","🫰🏻":"1faf0-1f3fb","🫰🏼":"1faf0-1f3fc","🫰🏽":"1faf0-1f3fd","🫰🏾":"1faf0-1f3fe","🫰🏿":"1faf0-1f3ff","🤟🏻":"1f91f-1f3fb","🤟🏼":"1f91f-1f3fc","🤟🏽":"1f91f-1f3fd","🤟🏾":"1f91f-1f3fe","🤟🏿":"1f91f-1f3ff","🤘🏻":"1f918-1f3fb","🤘🏼":"1f918-1f3fc","🤘🏽":"1f918-1f3fd","🤘🏾":"1f918-1f3fe","🤘🏿":"1f918-1f3ff","🤙🏻":"1f919-1f3fb","🤙🏼":"1f919-1f3fc","🤙🏽":"1f919-1f3fd","🤙🏾":"1f919-1f3fe","🤙🏿":"1f919-1f3ff","👈🏻":"1f448-1f3fb","👈🏼":"1f448-1f3fc","👈🏽":"1f448-1f3fd","👈🏾":"1f448-1f3fe","👈🏿":"1f448-1f3ff","👉🏻":"1f449-1f3fb","👉🏼":"1f449-1f3fc","👉🏽":"1f449-1f3fd","👉🏾":"1f449-1f3fe","👉🏿":"1f449-1f3ff","👆🏻":"1f446-1f3fb","👆🏼":"1f446-1f3fc","👆🏽":"1f446-1f3fd","👆🏾":"1f446-1f3fe","👆🏿":"1f446-1f3ff","🖕🏻":"1f595-1f3fb","🖕🏼":"1f595-1f3fc","🖕🏽":"1f595-1f3fd","🖕🏾":"1f595-1f3fe","🖕🏿":"1f595-1f3ff","👇🏻":"1f447-1f3fb","👇🏼":"1f447-1f3fc","👇🏽":"1f447-1f3fd","👇🏾":"1f447-1f3fe","👇🏿":"1f447-1f3ff","☝️":"261d","☝🏻":"261d-1f3fb","☝🏼":"261d-1f3fc","☝🏽":"261d-1f3fd","☝🏾":"261d-1f3fe","☝🏿":"261d-1f3ff","🫵🏻":"1faf5-1f3fb","🫵🏼":"1faf5-1f3fc","🫵🏽":"1faf5-1f3fd","🫵🏾":"1faf5-1f3fe","🫵🏿":"1faf5-1f3ff","👍🏻":"1f44d-1f3fb","👍🏼":"1f44d-1f3fc","👍🏽":"1f44d-1f3fd","👍🏾":"1f44d-1f3fe","👍🏿":"1f44d-1f3ff","👎🏻":"1f44e-1f3fb","👎🏼":"1f44e-1f3fc","👎🏽":"1f44e-1f3fd","👎🏾":"1f44e-1f3fe","👎🏿":"1f44e-1f3ff","✊🏻":"270a-1f3fb","✊🏼":"270a-1f3fc","✊🏽":"270a-1f3fd","✊🏾":"270a-1f3fe","✊🏿":"270a-1f3ff","👊🏻":"1f44a-1f3fb","👊🏼":"1f44a-1f3fc","👊🏽":"1f44a-1f3fd","👊🏾":"1f44a-1f3fe","👊🏿":"1f44a-1f3ff","🤛🏻":"1f91b-1f3fb","🤛🏼":"1f91b-1f3fc","🤛🏽":"1f91b-1f3fd","🤛🏾":"1f91b-1f3fe","🤛🏿":"1f91b-1f3ff","🤜🏻":"1f91c-1f3fb","🤜🏼":"1f91c-1f3fc","🤜🏽":"1f91c-1f3fd","🤜🏾":"1f91c-1f3fe","🤜🏿":"1f91c-1f3ff","👏🏻":"1f44f-1f3fb","👏🏼":"1f44f-1f3fc","👏🏽":"1f44f-1f3fd","👏🏾":"1f44f-1f3fe","👏🏿":"1f44f-1f3ff","🙌🏻":"1f64c-1f3fb","🙌🏼":"1f64c-1f3fc","🙌🏽":"1f64c-1f3fd","🙌🏾":"1f64c-1f3fe","🙌🏿":"1f64c-1f3ff","🫶🏻":"1faf6-1f3fb","🫶🏼":"1faf6-1f3fc","🫶🏽":"1faf6-1f3fd","🫶🏾":"1faf6-1f3fe","🫶🏿":"1faf6-1f3ff","👐🏻":"1f450-1f3fb","👐🏼":"1f450-1f3fc","👐🏽":"1f450-1f3fd","👐🏾":"1f450-1f3fe","👐🏿":"1f450-1f3ff","🤲🏻":"1f932-1f3fb","🤲🏼":"1f932-1f3fc","🤲🏽":"1f932-1f3fd","🤲🏾":"1f932-1f3fe","🤲🏿":"1f932-1f3ff","🤝🏻":"1f91d-1f3fb","🤝🏼":"1f91d-1f3fc","🤝🏽":"1f91d-1f3fd","🤝🏾":"1f91d-1f3fe","🤝🏿":"1f91d-1f3ff","🙏🏻":"1f64f-1f3fb","🙏🏼":"1f64f-1f3fc","🙏🏽":"1f64f-1f3fd","🙏🏾":"1f64f-1f3fe","🙏🏿":"1f64f-1f3ff","✍️":"270d","✍🏻":"270d-1f3fb","✍🏼":"270d-1f3fc","✍🏽":"270d-1f3fd","✍🏾":"270d-1f3fe","✍🏿":"270d-1f3ff","💅🏻":"1f485-1f3fb","💅🏼":"1f485-1f3fc","💅🏽":"1f485-1f3fd","💅🏾":"1f485-1f3fe","💅🏿":"1f485-1f3ff","🤳🏻":"1f933-1f3fb","🤳🏼":"1f933-1f3fc","🤳🏽":"1f933-1f3fd","🤳🏾":"1f933-1f3fe","🤳🏿":"1f933-1f3ff","💪🏻":"1f4aa-1f3fb","💪🏼":"1f4aa-1f3fc","💪🏽":"1f4aa-1f3fd","💪🏾":"1f4aa-1f3fe","💪🏿":"1f4aa-1f3ff","🦵🏻":"1f9b5-1f3fb","🦵🏼":"1f9b5-1f3fc","🦵🏽":"1f9b5-1f3fd","🦵🏾":"1f9b5-1f3fe","🦵🏿":"1f9b5-1f3ff","🦶🏻":"1f9b6-1f3fb","🦶🏼":"1f9b6-1f3fc","🦶🏽":"1f9b6-1f3fd","🦶🏾":"1f9b6-1f3fe","🦶🏿":"1f9b6-1f3ff","👂🏻":"1f442-1f3fb","👂🏼":"1f442-1f3fc","👂🏽":"1f442-1f3fd","👂🏾":"1f442-1f3fe","👂🏿":"1f442-1f3ff","🦻🏻":"1f9bb-1f3fb","🦻🏼":"1f9bb-1f3fc","🦻🏽":"1f9bb-1f3fd","🦻🏾":"1f9bb-1f3fe","🦻🏿":"1f9bb-1f3ff","👃🏻":"1f443-1f3fb","👃🏼":"1f443-1f3fc","👃🏽":"1f443-1f3fd","👃🏾":"1f443-1f3fe","👃🏿":"1f443-1f3ff","👁️":"1f441","👶🏻":"1f476-1f3fb","👶🏼":"1f476-1f3fc","👶🏽":"1f476-1f3fd","👶🏾":"1f476-1f3fe","👶🏿":"1f476-1f3ff","🧒🏻":"1f9d2-1f3fb","🧒🏼":"1f9d2-1f3fc","🧒🏽":"1f9d2-1f3fd","🧒🏾":"1f9d2-1f3fe","🧒🏿":"1f9d2-1f3ff","👦🏻":"1f466-1f3fb","👦🏼":"1f466-1f3fc","👦🏽":"1f466-1f3fd","👦🏾":"1f466-1f3fe","👦🏿":"1f466-1f3ff","👧🏻":"1f467-1f3fb","👧🏼":"1f467-1f3fc","👧🏽":"1f467-1f3fd","👧🏾":"1f467-1f3fe","👧🏿":"1f467-1f3ff","🧑🏻":"1f9d1-1f3fb","🧑🏼":"1f9d1-1f3fc","🧑🏽":"1f9d1-1f3fd","🧑🏾":"1f9d1-1f3fe","🧑🏿":"1f9d1-1f3ff","👱🏻":"1f471-1f3fb","👱🏼":"1f471-1f3fc","👱🏽":"1f471-1f3fd","👱🏾":"1f471-1f3fe","👱🏿":"1f471-1f3ff","👨🏻":"1f468-1f3fb","👨🏼":"1f468-1f3fc","👨🏽":"1f468-1f3fd","👨🏾":"1f468-1f3fe","👨🏿":"1f468-1f3ff","🧔🏻":"1f9d4-1f3fb","🧔🏼":"1f9d4-1f3fc","🧔🏽":"1f9d4-1f3fd","🧔🏾":"1f9d4-1f3fe","🧔🏿":"1f9d4-1f3ff","👩🏻":"1f469-1f3fb","👩🏼":"1f469-1f3fc","👩🏽":"1f469-1f3fd","👩🏾":"1f469-1f3fe","👩🏿":"1f469-1f3ff","🧓🏻":"1f9d3-1f3fb","🧓🏼":"1f9d3-1f3fc","🧓🏽":"1f9d3-1f3fd","🧓🏾":"1f9d3-1f3fe","🧓🏿":"1f9d3-1f3ff","👴🏻":"1f474-1f3fb","👴🏼":"1f474-1f3fc","👴🏽":"1f474-1f3fd","👴🏾":"1f474-1f3fe","👴🏿":"1f474-1f3ff","👵🏻":"1f475-1f3fb","👵🏼":"1f475-1f3fc","👵🏽":"1f475-1f3fd","👵🏾":"1f475-1f3fe","👵🏿":"1f475-1f3ff","🙍🏻":"1f64d-1f3fb","🙍🏼":"1f64d-1f3fc","🙍🏽":"1f64d-1f3fd","🙍🏾":"1f64d-1f3fe","🙍🏿":"1f64d-1f3ff","🙎🏻":"1f64e-1f3fb","🙎🏼":"1f64e-1f3fc","🙎🏽":"1f64e-1f3fd","🙎🏾":"1f64e-1f3fe","🙎🏿":"1f64e-1f3ff","🙅🏻":"1f645-1f3fb","🙅🏼":"1f645-1f3fc","🙅🏽":"1f645-1f3fd","🙅🏾":"1f645-1f3fe","🙅🏿":"1f645-1f3ff","🙆🏻":"1f646-1f3fb","🙆🏼":"1f646-1f3fc","🙆🏽":"1f646-1f3fd","🙆🏾":"1f646-1f3fe","🙆🏿":"1f646-1f3ff","💁🏻":"1f481-1f3fb","💁🏼":"1f481-1f3fc","💁🏽":"1f481-1f3fd","💁🏾":"1f481-1f3fe","💁🏿":"1f481-1f3ff","🙋🏻":"1f64b-1f3fb","🙋🏼":"1f64b-1f3fc","🙋🏽":"1f64b-1f3fd","🙋🏾":"1f64b-1f3fe","🙋🏿":"1f64b-1f3ff","🧏🏻":"1f9cf-1f3fb","🧏🏼":"1f9cf-1f3fc","🧏🏽":"1f9cf-1f3fd","🧏🏾":"1f9cf-1f3fe","🧏🏿":"1f9cf-1f3ff","🙇🏻":"1f647-1f3fb","🙇🏼":"1f647-1f3fc","🙇🏽":"1f647-1f3fd","🙇🏾":"1f647-1f3fe","🙇🏿":"1f647-1f3ff","🤦🏻":"1f926-1f3fb","🤦🏼":"1f926-1f3fc","🤦🏽":"1f926-1f3fd","🤦🏾":"1f926-1f3fe","🤦🏿":"1f926-1f3ff","🤷🏻":"1f937-1f3fb","🤷🏼":"1f937-1f3fc","🤷🏽":"1f937-1f3fd","🤷🏾":"1f937-1f3fe","🤷🏿":"1f937-1f3ff","👮🏻":"1f46e-1f3fb","👮🏼":"1f46e-1f3fc","👮🏽":"1f46e-1f3fd","👮🏾":"1f46e-1f3fe","👮🏿":"1f46e-1f3ff","🕵️":"1f575","🕵🏻":"1f575-1f3fb","🕵🏼":"1f575-1f3fc","🕵🏽":"1f575-1f3fd","🕵🏾":"1f575-1f3fe","🕵🏿":"1f575-1f3ff","💂🏻":"1f482-1f3fb","💂🏼":"1f482-1f3fc","💂🏽":"1f482-1f3fd","💂🏾":"1f482-1f3fe","💂🏿":"1f482-1f3ff","🥷🏻":"1f977-1f3fb","🥷🏼":"1f977-1f3fc","🥷🏽":"1f977-1f3fd","🥷🏾":"1f977-1f3fe","🥷🏿":"1f977-1f3ff","👷🏻":"1f477-1f3fb","👷🏼":"1f477-1f3fc","👷🏽":"1f477-1f3fd","👷🏾":"1f477-1f3fe","👷🏿":"1f477-1f3ff","🫅🏻":"1fac5-1f3fb","🫅🏼":"1fac5-1f3fc","🫅🏽":"1fac5-1f3fd","🫅🏾":"1fac5-1f3fe","🫅🏿":"1fac5-1f3ff","🤴🏻":"1f934-1f3fb","🤴🏼":"1f934-1f3fc","🤴🏽":"1f934-1f3fd","🤴🏾":"1f934-1f3fe","🤴🏿":"1f934-1f3ff","👸🏻":"1f478-1f3fb","👸🏼":"1f478-1f3fc","👸🏽":"1f478-1f3fd","👸🏾":"1f478-1f3fe","👸🏿":"1f478-1f3ff","👳🏻":"1f473-1f3fb","👳🏼":"1f473-1f3fc","👳🏽":"1f473-1f3fd","👳🏾":"1f473-1f3fe","👳🏿":"1f473-1f3ff","👲🏻":"1f472-1f3fb","👲🏼":"1f472-1f3fc","👲🏽":"1f472-1f3fd","👲🏾":"1f472-1f3fe","👲🏿":"1f472-1f3ff","🧕🏻":"1f9d5-1f3fb","🧕🏼":"1f9d5-1f3fc","🧕🏽":"1f9d5-1f3fd","🧕🏾":"1f9d5-1f3fe","🧕🏿":"1f9d5-1f3ff","🤵🏻":"1f935-1f3fb","🤵🏼":"1f935-1f3fc","🤵🏽":"1f935-1f3fd","🤵🏾":"1f935-1f3fe","🤵🏿":"1f935-1f3ff","👰🏻":"1f470-1f3fb","👰🏼":"1f470-1f3fc","👰🏽":"1f470-1f3fd","👰🏾":"1f470-1f3fe","👰🏿":"1f470-1f3ff","🤰🏻":"1f930-1f3fb","🤰🏼":"1f930-1f3fc","🤰🏽":"1f930-1f3fd","🤰🏾":"1f930-1f3fe","🤰🏿":"1f930-1f3ff","🫃🏻":"1fac3-1f3fb","🫃🏼":"1fac3-1f3fc","🫃🏽":"1fac3-1f3fd","🫃🏾":"1fac3-1f3fe","🫃🏿":"1fac3-1f3ff","🫄🏻":"1fac4-1f3fb","🫄🏼":"1fac4-1f3fc","🫄🏽":"1fac4-1f3fd","🫄🏾":"1fac4-1f3fe","🫄🏿":"1fac4-1f3ff","🤱🏻":"1f931-1f3fb","🤱🏼":"1f931-1f3fc","🤱🏽":"1f931-1f3fd","🤱🏾":"1f931-1f3fe","🤱🏿":"1f931-1f3ff","👼🏻":"1f47c-1f3fb","👼🏼":"1f47c-1f3fc","👼🏽":"1f47c-1f3fd","👼🏾":"1f47c-1f3fe","👼🏿":"1f47c-1f3ff","🎅🏻":"1f385-1f3fb","🎅🏼":"1f385-1f3fc","🎅🏽":"1f385-1f3fd","🎅🏾":"1f385-1f3fe","🎅🏿":"1f385-1f3ff","🤶🏻":"1f936-1f3fb","🤶🏼":"1f936-1f3fc","🤶🏽":"1f936-1f3fd","🤶🏾":"1f936-1f3fe","🤶🏿":"1f936-1f3ff","🦸🏻":"1f9b8-1f3fb","🦸🏼":"1f9b8-1f3fc","🦸🏽":"1f9b8-1f3fd","🦸🏾":"1f9b8-1f3fe","🦸🏿":"1f9b8-1f3ff","🦹🏻":"1f9b9-1f3fb","🦹🏼":"1f9b9-1f3fc","🦹🏽":"1f9b9-1f3fd","🦹🏾":"1f9b9-1f3fe","🦹🏿":"1f9b9-1f3ff","🧙🏻":"1f9d9-1f3fb","🧙🏼":"1f9d9-1f3fc","🧙🏽":"1f9d9-1f3fd","🧙🏾":"1f9d9-1f3fe","🧙🏿":"1f9d9-1f3ff","🧚🏻":"1f9da-1f3fb","🧚🏼":"1f9da-1f3fc","🧚🏽":"1f9da-1f3fd","🧚🏾":"1f9da-1f3fe","🧚🏿":"1f9da-1f3ff","🧛🏻":"1f9db-1f3fb","🧛🏼":"1f9db-1f3fc","🧛🏽":"1f9db-1f3fd","🧛🏾":"1f9db-1f3fe","🧛🏿":"1f9db-1f3ff","🧜🏻":"1f9dc-1f3fb","🧜🏼":"1f9dc-1f3fc","🧜🏽":"1f9dc-1f3fd","🧜🏾":"1f9dc-1f3fe","🧜🏿":"1f9dc-1f3ff","🧝🏻":"1f9dd-1f3fb","🧝🏼":"1f9dd-1f3fc","🧝🏽":"1f9dd-1f3fd","🧝🏾":"1f9dd-1f3fe","🧝🏿":"1f9dd-1f3ff","💆🏻":"1f486-1f3fb","💆🏼":"1f486-1f3fc","💆🏽":"1f486-1f3fd","💆🏾":"1f486-1f3fe","💆🏿":"1f486-1f3ff","💇🏻":"1f487-1f3fb","💇🏼":"1f487-1f3fc","💇🏽":"1f487-1f3fd","💇🏾":"1f487-1f3fe","💇🏿":"1f487-1f3ff","🚶🏻":"1f6b6-1f3fb","🚶🏼":"1f6b6-1f3fc","🚶🏽":"1f6b6-1f3fd","🚶🏾":"1f6b6-1f3fe","🚶🏿":"1f6b6-1f3ff","🧍🏻":"1f9cd-1f3fb","🧍🏼":"1f9cd-1f3fc","🧍🏽":"1f9cd-1f3fd","🧍🏾":"1f9cd-1f3fe","🧍🏿":"1f9cd-1f3ff","🧎🏻":"1f9ce-1f3fb","🧎🏼":"1f9ce-1f3fc","🧎🏽":"1f9ce-1f3fd","🧎🏾":"1f9ce-1f3fe","🧎🏿":"1f9ce-1f3ff","🏃🏻":"1f3c3-1f3fb","🏃🏼":"1f3c3-1f3fc","🏃🏽":"1f3c3-1f3fd","🏃🏾":"1f3c3-1f3fe","🏃🏿":"1f3c3-1f3ff","💃🏻":"1f483-1f3fb","💃🏼":"1f483-1f3fc","💃🏽":"1f483-1f3fd","💃🏾":"1f483-1f3fe","💃🏿":"1f483-1f3ff","🕺🏻":"1f57a-1f3fb","🕺🏼":"1f57a-1f3fc","🕺🏽":"1f57a-1f3fd","🕺🏾":"1f57a-1f3fe","🕺🏿":"1f57a-1f3ff","🕴️":"1f574","🕴🏻":"1f574-1f3fb","🕴🏼":"1f574-1f3fc","🕴🏽":"1f574-1f3fd","🕴🏾":"1f574-1f3fe","🕴🏿":"1f574-1f3ff","🧖🏻":"1f9d6-1f3fb","🧖🏼":"1f9d6-1f3fc","🧖🏽":"1f9d6-1f3fd","🧖🏾":"1f9d6-1f3fe","🧖🏿":"1f9d6-1f3ff","🧗🏻":"1f9d7-1f3fb","🧗🏼":"1f9d7-1f3fc","🧗🏽":"1f9d7-1f3fd","🧗🏾":"1f9d7-1f3fe","🧗🏿":"1f9d7-1f3ff","🏇🏻":"1f3c7-1f3fb","🏇🏼":"1f3c7-1f3fc","🏇🏽":"1f3c7-1f3fd","🏇🏾":"1f3c7-1f3fe","🏇🏿":"1f3c7-1f3ff","⛷️":"26f7","🏂🏻":"1f3c2-1f3fb","🏂🏼":"1f3c2-1f3fc","🏂🏽":"1f3c2-1f3fd","🏂🏾":"1f3c2-1f3fe","🏂🏿":"1f3c2-1f3ff","🏌️":"1f3cc","🏌🏻":"1f3cc-1f3fb","🏌🏼":"1f3cc-1f3fc","🏌🏽":"1f3cc-1f3fd","🏌🏾":"1f3cc-1f3fe","🏌🏿":"1f3cc-1f3ff","🏄🏻":"1f3c4-1f3fb","🏄🏼":"1f3c4-1f3fc","🏄🏽":"1f3c4-1f3fd","🏄🏾":"1f3c4-1f3fe","🏄🏿":"1f3c4-1f3ff","🚣🏻":"1f6a3-1f3fb","🚣🏼":"1f6a3-1f3fc","🚣🏽":"1f6a3-1f3fd","🚣🏾":"1f6a3-1f3fe","🚣🏿":"1f6a3-1f3ff","🏊🏻":"1f3ca-1f3fb","🏊🏼":"1f3ca-1f3fc","🏊🏽":"1f3ca-1f3fd","🏊🏾":"1f3ca-1f3fe","🏊🏿":"1f3ca-1f3ff","⛹️":"26f9","⛹🏻":"26f9-1f3fb","⛹🏼":"26f9-1f3fc","⛹🏽":"26f9-1f3fd","⛹🏾":"26f9-1f3fe","⛹🏿":"26f9-1f3ff","🏋️":"1f3cb","🏋🏻":"1f3cb-1f3fb","🏋🏼":"1f3cb-1f3fc","🏋🏽":"1f3cb-1f3fd","🏋🏾":"1f3cb-1f3fe","🏋🏿":"1f3cb-1f3ff","🚴🏻":"1f6b4-1f3fb","🚴🏼":"1f6b4-1f3fc","🚴🏽":"1f6b4-1f3fd","🚴🏾":"1f6b4-1f3fe","🚴🏿":"1f6b4-1f3ff","🚵🏻":"1f6b5-1f3fb","🚵🏼":"1f6b5-1f3fc","🚵🏽":"1f6b5-1f3fd","🚵🏾":"1f6b5-1f3fe","🚵🏿":"1f6b5-1f3ff","🤸🏻":"1f938-1f3fb","🤸🏼":"1f938-1f3fc","🤸🏽":"1f938-1f3fd","🤸🏾":"1f938-1f3fe","🤸🏿":"1f938-1f3ff","🤽🏻":"1f93d-1f3fb","🤽🏼":"1f93d-1f3fc","🤽🏽":"1f93d-1f3fd","🤽🏾":"1f93d-1f3fe","🤽🏿":"1f93d-1f3ff","🤾🏻":"1f93e-1f3fb","🤾🏼":"1f93e-1f3fc","🤾🏽":"1f93e-1f3fd","🤾🏾":"1f93e-1f3fe","🤾🏿":"1f93e-1f3ff","🤹🏻":"1f939-1f3fb","🤹🏼":"1f939-1f3fc","🤹🏽":"1f939-1f3fd","🤹🏾":"1f939-1f3fe","🤹🏿":"1f939-1f3ff","🧘🏻":"1f9d8-1f3fb","🧘🏼":"1f9d8-1f3fc","🧘🏽":"1f9d8-1f3fd","🧘🏾":"1f9d8-1f3fe","🧘🏿":"1f9d8-1f3ff","🛀🏻":"1f6c0-1f3fb","🛀🏼":"1f6c0-1f3fc","🛀🏽":"1f6c0-1f3fd","🛀🏾":"1f6c0-1f3fe","🛀🏿":"1f6c0-1f3ff","🛌🏻":"1f6cc-1f3fb","🛌🏼":"1f6cc-1f3fc","🛌🏽":"1f6cc-1f3fd","🛌🏾":"1f6cc-1f3fe","🛌🏿":"1f6cc-1f3ff","👭🏻":"1f46d-1f3fb","👭🏼":"1f46d-1f3fc","👭🏽":"1f46d-1f3fd","👭🏾":"1f46d-1f3fe","👭🏿":"1f46d-1f3ff","👫🏻":"1f46b-1f3fb","👫🏼":"1f46b-1f3fc","👫🏽":"1f46b-1f3fd","👫🏾":"1f46b-1f3fe","👫🏿":"1f46b-1f3ff","👬🏻":"1f46c-1f3fb","👬🏼":"1f46c-1f3fc","👬🏽":"1f46c-1f3fd","👬🏾":"1f46c-1f3fe","👬🏿":"1f46c-1f3ff","💏🏻":"1f48f-1f3fb","💏🏼":"1f48f-1f3fc","💏🏽":"1f48f-1f3fd","💏🏾":"1f48f-1f3fe","💏🏿":"1f48f-1f3ff","💑🏻":"1f491-1f3fb","💑🏼":"1f491-1f3fc","💑🏽":"1f491-1f3fd","💑🏾":"1f491-1f3fe","💑🏿":"1f491-1f3ff","🗣️":"1f5e3","🐿️":"1f43f","🕊️":"1f54a","🕷️":"1f577","🕸️":"1f578","🏵️":"1f3f5","☘️":"2618","🌶️":"1f336","🍽️":"1f37d","🗺️":"1f5fa","🏔️":"1f3d4","⛰️":"26f0","🏕️":"1f3d5","🏖️":"1f3d6","🏜️":"1f3dc","🏝️":"1f3dd","🏞️":"1f3de","🏟️":"1f3df","🏛️":"1f3db","🏗️":"1f3d7","🏘️":"1f3d8","🏚️":"1f3da","⛩️":"26e9","🏙️":"1f3d9","♨️":"2668","🏎️":"1f3ce","🏍️":"1f3cd","🛣️":"1f6e3","🛤️":"1f6e4","🛢️":"1f6e2","🛳️":"1f6f3","⛴️":"26f4","🛥️":"1f6e5","✈️":"2708","🛩️":"1f6e9","🛰️":"1f6f0","🛎️":"1f6ce","⏱️":"23f1","⏲️":"23f2","🕰️":"1f570","🌡️":"1f321","☀️":"2600","☁️":"2601","⛈️":"26c8","🌤️":"1f324","🌥️":"1f325","🌦️":"1f326","🌧️":"1f327","🌨️":"1f328","🌩️":"1f329","🌪️":"1f32a","🌫️":"1f32b","🌬️":"1f32c","☂️":"2602","⛱️":"26f1","❄️":"2744","☃️":"2603","☄️":"2604","🎗️":"1f397","🎟️":"1f39f","🎖️":"1f396","⛸️":"26f8","🕹️":"1f579","♠️":"2660","♥️":"2665","♦️":"2666","♣️":"2663","♟️":"265f","🖼️":"1f5bc","🕶️":"1f576","🛍️":"1f6cd","⛑️":"26d1","🎙️":"1f399","🎚️":"1f39a","🎛️":"1f39b","☎️":"260e","🖥️":"1f5a5","🖨️":"1f5a8","⌨️":"2328","🖱️":"1f5b1","🖲️":"1f5b2","🎞️":"1f39e","📽️":"1f4fd","🕯️":"1f56f","🗞️":"1f5de","🏷️":"1f3f7","✉️":"2709","🗳️":"1f5f3","✏️":"270f","✒️":"2712","🖋️":"1f58b","🖊️":"1f58a","🖌️":"1f58c","🖍️":"1f58d","🗂️":"1f5c2","🗒️":"1f5d2","🗓️":"1f5d3","🖇️":"1f587","✂️":"2702","🗃️":"1f5c3","🗄️":"1f5c4","🗑️":"1f5d1","🗝️":"1f5dd","⛏️":"26cf","⚒️":"2692","🛠️":"1f6e0","🗡️":"1f5e1","⚔️":"2694","🛡️":"1f6e1","⚙️":"2699","🗜️":"1f5dc","⚖️":"2696","⛓️":"26d3","⚗️":"2697","🛏️":"1f6cf","🛋️":"1f6cb","⚰️":"26b0","⚱️":"26b1","⚠️":"26a0","☢️":"2622","☣️":"2623","⬆️":"2b06","↗️":"2197","➡️":"27a1","↘️":"2198","⬇️":"2b07","↙️":"2199","⬅️":"2b05","↖️":"2196","↕️":"2195","↔️":"2194","↩️":"21a9","↪️":"21aa","⤴️":"2934","⤵️":"2935","⚛️":"269b","🕉️":"1f549","✡️":"2721","☸️":"2638","☯️":"262f","✝️":"271d","☦️":"2626","☪️":"262a","☮️":"262e","▶️":"25b6","⏭️":"23ed","⏯️":"23ef","◀️":"25c0","⏮️":"23ee","⏸️":"23f8","⏹️":"23f9","⏺️":"23fa","⏏️":"23cf","♀️":"2640","♂️":"2642","⚧️":"26a7","✖️":"2716","♾️":"267e","‼️":"203c","⁉️":"2049","〰️":"3030","⚕️":"2695","♻️":"267b","⚜️":"269c","☑️":"2611","✔️":"2714","〽️":"303d","✳️":"2733","✴️":"2734","❇️":"2747","©️":"a9","®️":"ae","™️":"2122","#⃣":"23-20e3","*⃣":"2a-20e3","0⃣":"30-20e3","1⃣":"31-20e3","2⃣":"32-20e3","3⃣":"33-20e3","4⃣":"34-20e3","5⃣":"35-20e3","6⃣":"36-20e3","7⃣":"37-20e3","8⃣":"38-20e3","9⃣":"39-20e3","🅰️":"1f170","🅱️":"1f171","ℹ️":"2139","Ⓜ️":"24c2","🅾️":"1f17e","🅿️":"1f17f","🈂️":"1f202","🈷️":"1f237","㊗️":"3297","㊙️":"3299","◼️":"25fc","◻️":"25fb","▪️":"25aa","▫️":"25ab","🏳️":"1f3f3","🇦🇨":"1f1e6-1f1e8","🇦🇩":"1f1e6-1f1e9","🇦🇪":"1f1e6-1f1ea","🇦🇫":"1f1e6-1f1eb","🇦🇬":"1f1e6-1f1ec","🇦🇮":"1f1e6-1f1ee","🇦🇱":"1f1e6-1f1f1","🇦🇲":"1f1e6-1f1f2","🇦🇴":"1f1e6-1f1f4","🇦🇶":"1f1e6-1f1f6","🇦🇷":"1f1e6-1f1f7","🇦🇸":"1f1e6-1f1f8","🇦🇹":"1f1e6-1f1f9","🇦🇺":"1f1e6-1f1fa","🇦🇼":"1f1e6-1f1fc","🇦🇽":"1f1e6-1f1fd","🇦🇿":"1f1e6-1f1ff","🇧🇦":"1f1e7-1f1e6","🇧🇧":"1f1e7-1f1e7","🇧🇩":"1f1e7-1f1e9","🇧🇪":"1f1e7-1f1ea","🇧🇫":"1f1e7-1f1eb","🇧🇬":"1f1e7-1f1ec","🇧🇭":"1f1e7-1f1ed","🇧🇮":"1f1e7-1f1ee","🇧🇯":"1f1e7-1f1ef","🇧🇱":"1f1e7-1f1f1","🇧🇲":"1f1e7-1f1f2","🇧🇳":"1f1e7-1f1f3","🇧🇴":"1f1e7-1f1f4","🇧🇶":"1f1e7-1f1f6","🇧🇷":"1f1e7-1f1f7","🇧🇸":"1f1e7-1f1f8","🇧🇹":"1f1e7-1f1f9","🇧🇻":"1f1e7-1f1fb","🇧🇼":"1f1e7-1f1fc","🇧🇾":"1f1e7-1f1fe","🇧🇿":"1f1e7-1f1ff","🇨🇦":"1f1e8-1f1e6","🇨🇨":"1f1e8-1f1e8","🇨🇩":"1f1e8-1f1e9","🇨🇫":"1f1e8-1f1eb","🇨🇬":"1f1e8-1f1ec","🇨🇭":"1f1e8-1f1ed","🇨🇮":"1f1e8-1f1ee","🇨🇰":"1f1e8-1f1f0","🇨🇱":"1f1e8-1f1f1","🇨🇲":"1f1e8-1f1f2","🇨🇳":"1f1e8-1f1f3","🇨🇴":"1f1e8-1f1f4","🇨🇵":"1f1e8-1f1f5","🇨🇷":"1f1e8-1f1f7","🇨🇺":"1f1e8-1f1fa","🇨🇻":"1f1e8-1f1fb","🇨🇼":"1f1e8-1f1fc","🇨🇽":"1f1e8-1f1fd","🇨🇾":"1f1e8-1f1fe","🇨🇿":"1f1e8-1f1ff","🇩🇪":"1f1e9-1f1ea","🇩🇬":"1f1e9-1f1ec","🇩🇯":"1f1e9-1f1ef","🇩🇰":"1f1e9-1f1f0","🇩🇲":"1f1e9-1f1f2","🇩🇴":"1f1e9-1f1f4","🇩🇿":"1f1e9-1f1ff","🇪🇦":"1f1ea-1f1e6","🇪🇨":"1f1ea-1f1e8","🇪🇪":"1f1ea-1f1ea","🇪🇬":"1f1ea-1f1ec","🇪🇭":"1f1ea-1f1ed","🇪🇷":"1f1ea-1f1f7","🇪🇸":"1f1ea-1f1f8","🇪🇹":"1f1ea-1f1f9","🇪🇺":"1f1ea-1f1fa","🇫🇮":"1f1eb-1f1ee","🇫🇯":"1f1eb-1f1ef","🇫🇰":"1f1eb-1f1f0","🇫🇲":"1f1eb-1f1f2","🇫🇴":"1f1eb-1f1f4","🇫🇷":"1f1eb-1f1f7","🇬🇦":"1f1ec-1f1e6","🇬🇧":"1f1ec-1f1e7","🇬🇩":"1f1ec-1f1e9","🇬🇪":"1f1ec-1f1ea","🇬🇫":"1f1ec-1f1eb","🇬🇬":"1f1ec-1f1ec","🇬🇭":"1f1ec-1f1ed","🇬🇮":"1f1ec-1f1ee","🇬🇱":"1f1ec-1f1f1","🇬🇲":"1f1ec-1f1f2","🇬🇳":"1f1ec-1f1f3","🇬🇵":"1f1ec-1f1f5","🇬🇶":"1f1ec-1f1f6","🇬🇷":"1f1ec-1f1f7","🇬🇸":"1f1ec-1f1f8","🇬🇹":"1f1ec-1f1f9","🇬🇺":"1f1ec-1f1fa","🇬🇼":"1f1ec-1f1fc","🇬🇾":"1f1ec-1f1fe","🇭🇰":"1f1ed-1f1f0","🇭🇲":"1f1ed-1f1f2","🇭🇳":"1f1ed-1f1f3","🇭🇷":"1f1ed-1f1f7","🇭🇹":"1f1ed-1f1f9","🇭🇺":"1f1ed-1f1fa","🇮🇨":"1f1ee-1f1e8","🇮🇩":"1f1ee-1f1e9","🇮🇪":"1f1ee-1f1ea","🇮🇱":"1f1ee-1f1f1","🇮🇲":"1f1ee-1f1f2","🇮🇳":"1f1ee-1f1f3","🇮🇴":"1f1ee-1f1f4","🇮🇶":"1f1ee-1f1f6","🇮🇷":"1f1ee-1f1f7","🇮🇸":"1f1ee-1f1f8","🇮🇹":"1f1ee-1f1f9","🇯🇪":"1f1ef-1f1ea","🇯🇲":"1f1ef-1f1f2","🇯🇴":"1f1ef-1f1f4","🇯🇵":"1f1ef-1f1f5","🇰🇪":"1f1f0-1f1ea","🇰🇬":"1f1f0-1f1ec","🇰🇭":"1f1f0-1f1ed","🇰🇮":"1f1f0-1f1ee","🇰🇲":"1f1f0-1f1f2","🇰🇳":"1f1f0-1f1f3","🇰🇵":"1f1f0-1f1f5","🇰🇷":"1f1f0-1f1f7","🇰🇼":"1f1f0-1f1fc","🇰🇾":"1f1f0-1f1fe","🇰🇿":"1f1f0-1f1ff","🇱🇦":"1f1f1-1f1e6","🇱🇧":"1f1f1-1f1e7","🇱🇨":"1f1f1-1f1e8","🇱🇮":"1f1f1-1f1ee","🇱🇰":"1f1f1-1f1f0","🇱🇷":"1f1f1-1f1f7","🇱🇸":"1f1f1-1f1f8","🇱🇹":"1f1f1-1f1f9","🇱🇺":"1f1f1-1f1fa","🇱🇻":"1f1f1-1f1fb","🇱🇾":"1f1f1-1f1fe","🇲🇦":"1f1f2-1f1e6","🇲🇨":"1f1f2-1f1e8","🇲🇩":"1f1f2-1f1e9","🇲🇪":"1f1f2-1f1ea","🇲🇫":"1f1f2-1f1eb","🇲🇬":"1f1f2-1f1ec","🇲🇭":"1f1f2-1f1ed","🇲🇰":"1f1f2-1f1f0","🇲🇱":"1f1f2-1f1f1","🇲🇲":"1f1f2-1f1f2","🇲🇳":"1f1f2-1f1f3","🇲🇴":"1f1f2-1f1f4","🇲🇵":"1f1f2-1f1f5","🇲🇶":"1f1f2-1f1f6","🇲🇷":"1f1f2-1f1f7","🇲🇸":"1f1f2-1f1f8","🇲🇹":"1f1f2-1f1f9","🇲🇺":"1f1f2-1f1fa","🇲🇻":"1f1f2-1f1fb","🇲🇼":"1f1f2-1f1fc","🇲🇽":"1f1f2-1f1fd","🇲🇾":"1f1f2-1f1fe","🇲🇿":"1f1f2-1f1ff","🇳🇦":"1f1f3-1f1e6","🇳🇨":"1f1f3-1f1e8","🇳🇪":"1f1f3-1f1ea","🇳🇫":"1f1f3-1f1eb","🇳🇬":"1f1f3-1f1ec","🇳🇮":"1f1f3-1f1ee","🇳🇱":"1f1f3-1f1f1","🇳🇴":"1f1f3-1f1f4","🇳🇵":"1f1f3-1f1f5","🇳🇷":"1f1f3-1f1f7","🇳🇺":"1f1f3-1f1fa","🇳🇿":"1f1f3-1f1ff","🇴🇲":"1f1f4-1f1f2","🇵🇦":"1f1f5-1f1e6","🇵🇪":"1f1f5-1f1ea","🇵🇫":"1f1f5-1f1eb","🇵🇬":"1f1f5-1f1ec","🇵🇭":"1f1f5-1f1ed","🇵🇰":"1f1f5-1f1f0","🇵🇱":"1f1f5-1f1f1","🇵🇲":"1f1f5-1f1f2","🇵🇳":"1f1f5-1f1f3","🇵🇷":"1f1f5-1f1f7","🇵🇸":"1f1f5-1f1f8","🇵🇹":"1f1f5-1f1f9","🇵🇼":"1f1f5-1f1fc","🇵🇾":"1f1f5-1f1fe","🇶🇦":"1f1f6-1f1e6","🇷🇪":"1f1f7-1f1ea","🇷🇴":"1f1f7-1f1f4","🇷🇸":"1f1f7-1f1f8","🇷🇺":"1f1f7-1f1fa","🇷🇼":"1f1f7-1f1fc","🇸🇦":"1f1f8-1f1e6","🇸🇧":"1f1f8-1f1e7","🇸🇨":"1f1f8-1f1e8","🇸🇩":"1f1f8-1f1e9","🇸🇪":"1f1f8-1f1ea","🇸🇬":"1f1f8-1f1ec","🇸🇭":"1f1f8-1f1ed","🇸🇮":"1f1f8-1f1ee","🇸🇯":"1f1f8-1f1ef","🇸🇰":"1f1f8-1f1f0","🇸🇱":"1f1f8-1f1f1","🇸🇲":"1f1f8-1f1f2","🇸🇳":"1f1f8-1f1f3","🇸🇴":"1f1f8-1f1f4","🇸🇷":"1f1f8-1f1f7","🇸🇸":"1f1f8-1f1f8","🇸🇹":"1f1f8-1f1f9","🇸🇻":"1f1f8-1f1fb","🇸🇽":"1f1f8-1f1fd","🇸🇾":"1f1f8-1f1fe","🇸🇿":"1f1f8-1f1ff","🇹🇦":"1f1f9-1f1e6","🇹🇨":"1f1f9-1f1e8","🇹🇩":"1f1f9-1f1e9","🇹🇫":"1f1f9-1f1eb","🇹🇬":"1f1f9-1f1ec","🇹🇭":"1f1f9-1f1ed","🇹🇯":"1f1f9-1f1ef","🇹🇰":"1f1f9-1f1f0","🇹🇱":"1f1f9-1f1f1","🇹🇲":"1f1f9-1f1f2","🇹🇳":"1f1f9-1f1f3","🇹🇴":"1f1f9-1f1f4","🇹🇷":"1f1f9-1f1f7","🇹🇹":"1f1f9-1f1f9","🇹🇻":"1f1f9-1f1fb","🇹🇼":"1f1f9-1f1fc","🇹🇿":"1f1f9-1f1ff","🇺🇦":"1f1fa-1f1e6","🇺🇬":"1f1fa-1f1ec","🇺🇲":"1f1fa-1f1f2","🇺🇳":"1f1fa-1f1f3","🇺🇸":"1f1fa-1f1f8","🇺🇾":"1f1fa-1f1fe","🇺🇿":"1f1fa-1f1ff","🇻🇦":"1f1fb-1f1e6","🇻🇨":"1f1fb-1f1e8","🇻🇪":"1f1fb-1f1ea","🇻🇬":"1f1fb-1f1ec","🇻🇮":"1f1fb-1f1ee","🇻🇳":"1f1fb-1f1f3","🇻🇺":"1f1fb-1f1fa","🇼🇫":"1f1fc-1f1eb","🇼🇸":"1f1fc-1f1f8","🇽🇰":"1f1fd-1f1f0","🇾🇪":"1f1fe-1f1ea","🇾🇹":"1f1fe-1f1f9","🇿🇦":"1f1ff-1f1e6","🇿🇲":"1f1ff-1f1f2","🇿🇼":"1f1ff-1f1fc","😶‍🌫":"1f636-200d-1f32b-fe0f","😮‍💨":"1f62e-200d-1f4a8","😵‍💫":"1f635-200d-1f4ab","❤‍🔥":"2764-fe0f-200d-1f525","❤‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨":"1f441-200d-1f5e8","🧔‍♂":"1f9d4-200d-2642-fe0f","🧔‍♀":"1f9d4-200d-2640-fe0f","👨‍🦰":"1f468-200d-1f9b0","👨‍🦱":"1f468-200d-1f9b1","👨‍🦳":"1f468-200d-1f9b3","👨‍🦲":"1f468-200d-1f9b2","👩‍🦰":"1f469-200d-1f9b0","🧑‍🦰":"1f9d1-200d-1f9b0","👩‍🦱":"1f469-200d-1f9b1","🧑‍🦱":"1f9d1-200d-1f9b1","👩‍🦳":"1f469-200d-1f9b3","🧑‍🦳":"1f9d1-200d-1f9b3","👩‍🦲":"1f469-200d-1f9b2","🧑‍🦲":"1f9d1-200d-1f9b2","👱‍♀":"1f471-200d-2640-fe0f","👱‍♂":"1f471-200d-2642-fe0f","🙍‍♂":"1f64d-200d-2642-fe0f","🙍‍♀":"1f64d-200d-2640-fe0f","🙎‍♂":"1f64e-200d-2642-fe0f","🙎‍♀":"1f64e-200d-2640-fe0f","🙅‍♂":"1f645-200d-2642-fe0f","🙅‍♀":"1f645-200d-2640-fe0f","🙆‍♂":"1f646-200d-2642-fe0f","🙆‍♀":"1f646-200d-2640-fe0f","💁‍♂":"1f481-200d-2642-fe0f","💁‍♀":"1f481-200d-2640-fe0f","🙋‍♂":"1f64b-200d-2642-fe0f","🙋‍♀":"1f64b-200d-2640-fe0f","🧏‍♂":"1f9cf-200d-2642-fe0f","🧏‍♀":"1f9cf-200d-2640-fe0f","🙇‍♂":"1f647-200d-2642-fe0f","🙇‍♀":"1f647-200d-2640-fe0f","🤦‍♂":"1f926-200d-2642-fe0f","🤦‍♀":"1f926-200d-2640-fe0f","🤷‍♂":"1f937-200d-2642-fe0f","🤷‍♀":"1f937-200d-2640-fe0f","🧑‍⚕":"1f9d1-200d-2695-fe0f","👨‍⚕":"1f468-200d-2695-fe0f","👩‍⚕":"1f469-200d-2695-fe0f","🧑‍🎓":"1f9d1-200d-1f393","👨‍🎓":"1f468-200d-1f393","👩‍🎓":"1f469-200d-1f393","🧑‍🏫":"1f9d1-200d-1f3eb","👨‍🏫":"1f468-200d-1f3eb","👩‍🏫":"1f469-200d-1f3eb","🧑‍⚖":"1f9d1-200d-2696-fe0f","👨‍⚖":"1f468-200d-2696-fe0f","👩‍⚖":"1f469-200d-2696-fe0f","🧑‍🌾":"1f9d1-200d-1f33e","👨‍🌾":"1f468-200d-1f33e","👩‍🌾":"1f469-200d-1f33e","🧑‍🍳":"1f9d1-200d-1f373","👨‍🍳":"1f468-200d-1f373","👩‍🍳":"1f469-200d-1f373","🧑‍🔧":"1f9d1-200d-1f527","👨‍🔧":"1f468-200d-1f527","👩‍🔧":"1f469-200d-1f527","🧑‍🏭":"1f9d1-200d-1f3ed","👨‍🏭":"1f468-200d-1f3ed","👩‍🏭":"1f469-200d-1f3ed","🧑‍💼":"1f9d1-200d-1f4bc","👨‍💼":"1f468-200d-1f4bc","👩‍💼":"1f469-200d-1f4bc","🧑‍🔬":"1f9d1-200d-1f52c","👨‍🔬":"1f468-200d-1f52c","👩‍🔬":"1f469-200d-1f52c","🧑‍💻":"1f9d1-200d-1f4bb","👨‍💻":"1f468-200d-1f4bb","👩‍💻":"1f469-200d-1f4bb","🧑‍🎤":"1f9d1-200d-1f3a4","👨‍🎤":"1f468-200d-1f3a4","👩‍🎤":"1f469-200d-1f3a4","🧑‍🎨":"1f9d1-200d-1f3a8","👨‍🎨":"1f468-200d-1f3a8","👩‍🎨":"1f469-200d-1f3a8","🧑‍✈":"1f9d1-200d-2708-fe0f","👨‍✈":"1f468-200d-2708-fe0f","👩‍✈":"1f469-200d-2708-fe0f","🧑‍🚀":"1f9d1-200d-1f680","👨‍🚀":"1f468-200d-1f680","👩‍🚀":"1f469-200d-1f680","🧑‍🚒":"1f9d1-200d-1f692","👨‍🚒":"1f468-200d-1f692","👩‍🚒":"1f469-200d-1f692","👮‍♂":"1f46e-200d-2642-fe0f","👮‍♀":"1f46e-200d-2640-fe0f","🕵‍♂":"1f575-fe0f-200d-2642-fe0f","🕵‍♀":"1f575-fe0f-200d-2640-fe0f","💂‍♂":"1f482-200d-2642-fe0f","💂‍♀":"1f482-200d-2640-fe0f","👷‍♂":"1f477-200d-2642-fe0f","👷‍♀":"1f477-200d-2640-fe0f","👳‍♂":"1f473-200d-2642-fe0f","👳‍♀":"1f473-200d-2640-fe0f","🤵‍♂":"1f935-200d-2642-fe0f","🤵‍♀":"1f935-200d-2640-fe0f","👰‍♂":"1f470-200d-2642-fe0f","👰‍♀":"1f470-200d-2640-fe0f","👩‍🍼":"1f469-200d-1f37c","👨‍🍼":"1f468-200d-1f37c","🧑‍🍼":"1f9d1-200d-1f37c","🧑‍🎄":"1f9d1-200d-1f384","🦸‍♂":"1f9b8-200d-2642-fe0f","🦸‍♀":"1f9b8-200d-2640-fe0f","🦹‍♂":"1f9b9-200d-2642-fe0f","🦹‍♀":"1f9b9-200d-2640-fe0f","🧙‍♂":"1f9d9-200d-2642-fe0f","🧙‍♀":"1f9d9-200d-2640-fe0f","🧚‍♂":"1f9da-200d-2642-fe0f","🧚‍♀":"1f9da-200d-2640-fe0f","🧛‍♂":"1f9db-200d-2642-fe0f","🧛‍♀":"1f9db-200d-2640-fe0f","🧜‍♂":"1f9dc-200d-2642-fe0f","🧜‍♀":"1f9dc-200d-2640-fe0f","🧝‍♂":"1f9dd-200d-2642-fe0f","🧝‍♀":"1f9dd-200d-2640-fe0f","🧞‍♂":"1f9de-200d-2642-fe0f","🧞‍♀":"1f9de-200d-2640-fe0f","🧟‍♂":"1f9df-200d-2642-fe0f","🧟‍♀":"1f9df-200d-2640-fe0f","💆‍♂":"1f486-200d-2642-fe0f","💆‍♀":"1f486-200d-2640-fe0f","💇‍♂":"1f487-200d-2642-fe0f","💇‍♀":"1f487-200d-2640-fe0f","🚶‍♂":"1f6b6-200d-2642-fe0f","🚶‍♀":"1f6b6-200d-2640-fe0f","🧍‍♂":"1f9cd-200d-2642-fe0f","🧍‍♀":"1f9cd-200d-2640-fe0f","🧎‍♂":"1f9ce-200d-2642-fe0f","🧎‍♀":"1f9ce-200d-2640-fe0f","🧑‍🦯":"1f9d1-200d-1f9af","👨‍🦯":"1f468-200d-1f9af","👩‍🦯":"1f469-200d-1f9af","🧑‍🦼":"1f9d1-200d-1f9bc","👨‍🦼":"1f468-200d-1f9bc","👩‍🦼":"1f469-200d-1f9bc","🧑‍🦽":"1f9d1-200d-1f9bd","👨‍🦽":"1f468-200d-1f9bd","👩‍🦽":"1f469-200d-1f9bd","🏃‍♂":"1f3c3-200d-2642-fe0f","🏃‍♀":"1f3c3-200d-2640-fe0f","👯‍♂":"1f46f-200d-2642-fe0f","👯‍♀":"1f46f-200d-2640-fe0f","🧖‍♂":"1f9d6-200d-2642-fe0f","🧖‍♀":"1f9d6-200d-2640-fe0f","🧗‍♂":"1f9d7-200d-2642-fe0f","🧗‍♀":"1f9d7-200d-2640-fe0f","🏌‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏄‍♂":"1f3c4-200d-2642-fe0f","🏄‍♀":"1f3c4-200d-2640-fe0f","🚣‍♂":"1f6a3-200d-2642-fe0f","🚣‍♀":"1f6a3-200d-2640-fe0f","🏊‍♂":"1f3ca-200d-2642-fe0f","🏊‍♀":"1f3ca-200d-2640-fe0f","⛹‍♂":"26f9-fe0f-200d-2642-fe0f","⛹‍♀":"26f9-fe0f-200d-2640-fe0f","🏋‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋‍♀":"1f3cb-fe0f-200d-2640-fe0f","🚴‍♂":"1f6b4-200d-2642-fe0f","🚴‍♀":"1f6b4-200d-2640-fe0f","🚵‍♂":"1f6b5-200d-2642-fe0f","🚵‍♀":"1f6b5-200d-2640-fe0f","🤸‍♂":"1f938-200d-2642-fe0f","🤸‍♀":"1f938-200d-2640-fe0f","🤼‍♂":"1f93c-200d-2642-fe0f","🤼‍♀":"1f93c-200d-2640-fe0f","🤽‍♂":"1f93d-200d-2642-fe0f","🤽‍♀":"1f93d-200d-2640-fe0f","🤾‍♂":"1f93e-200d-2642-fe0f","🤾‍♀":"1f93e-200d-2640-fe0f","🤹‍♂":"1f939-200d-2642-fe0f","🤹‍♀":"1f939-200d-2640-fe0f","🧘‍♂":"1f9d8-200d-2642-fe0f","🧘‍♀":"1f9d8-200d-2640-fe0f","👨‍👦":"1f468-200d-1f466","👨‍👧":"1f468-200d-1f467","👩‍👦":"1f469-200d-1f466","👩‍👧":"1f469-200d-1f467","🐕‍🦺":"1f415-200d-1f9ba","🐈‍⬛":"1f408-200d-2b1b","🐻‍❄":"1f43b-200d-2744-fe0f","🐦‍⬛":"1f426-200d-2b1b","#️⃣":"23-20e3","*️⃣":"2a-20e3","0️⃣":"30-20e3","1️⃣":"31-20e3","2️⃣":"32-20e3","3️⃣":"33-20e3","4️⃣":"34-20e3","5️⃣":"35-20e3","6️⃣":"36-20e3","7️⃣":"37-20e3","8️⃣":"38-20e3","9️⃣":"39-20e3","🏳‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠":"1f3f4-200d-2620-fe0f","😶‍🌫️":"1f636-200d-1f32b-fe0f","❤️‍🔥":"2764-fe0f-200d-1f525","❤️‍🩹":"2764-fe0f-200d-1fa79","👁‍🗨️":"1f441-200d-1f5e8","👁️‍🗨":"1f441-200d-1f5e8","🧔‍♂️":"1f9d4-200d-2642-fe0f","🧔🏻‍♂":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂":"1f9d4-1f3ff-200d-2642-fe0f","🧔‍♀️":"1f9d4-200d-2640-fe0f","🧔🏻‍♀":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀":"1f9d4-1f3ff-200d-2640-fe0f","👨🏻‍🦰":"1f468-1f3fb-200d-1f9b0","👨🏼‍🦰":"1f468-1f3fc-200d-1f9b0","👨🏽‍🦰":"1f468-1f3fd-200d-1f9b0","👨🏾‍🦰":"1f468-1f3fe-200d-1f9b0","👨🏿‍🦰":"1f468-1f3ff-200d-1f9b0","👨🏻‍🦱":"1f468-1f3fb-200d-1f9b1","👨🏼‍🦱":"1f468-1f3fc-200d-1f9b1","👨🏽‍🦱":"1f468-1f3fd-200d-1f9b1","👨🏾‍🦱":"1f468-1f3fe-200d-1f9b1","👨🏿‍🦱":"1f468-1f3ff-200d-1f9b1","👨🏻‍🦳":"1f468-1f3fb-200d-1f9b3","👨🏼‍🦳":"1f468-1f3fc-200d-1f9b3","👨🏽‍🦳":"1f468-1f3fd-200d-1f9b3","👨🏾‍🦳":"1f468-1f3fe-200d-1f9b3","👨🏿‍🦳":"1f468-1f3ff-200d-1f9b3","👨🏻‍🦲":"1f468-1f3fb-200d-1f9b2","👨🏼‍🦲":"1f468-1f3fc-200d-1f9b2","👨🏽‍🦲":"1f468-1f3fd-200d-1f9b2","👨🏾‍🦲":"1f468-1f3fe-200d-1f9b2","👨🏿‍🦲":"1f468-1f3ff-200d-1f9b2","👩🏻‍🦰":"1f469-1f3fb-200d-1f9b0","👩🏼‍🦰":"1f469-1f3fc-200d-1f9b0","👩🏽‍🦰":"1f469-1f3fd-200d-1f9b0","👩🏾‍🦰":"1f469-1f3fe-200d-1f9b0","👩🏿‍🦰":"1f469-1f3ff-200d-1f9b0","🧑🏻‍🦰":"1f9d1-1f3fb-200d-1f9b0","🧑🏼‍🦰":"1f9d1-1f3fc-200d-1f9b0","🧑🏽‍🦰":"1f9d1-1f3fd-200d-1f9b0","🧑🏾‍🦰":"1f9d1-1f3fe-200d-1f9b0","🧑🏿‍🦰":"1f9d1-1f3ff-200d-1f9b0","👩🏻‍🦱":"1f469-1f3fb-200d-1f9b1","👩🏼‍🦱":"1f469-1f3fc-200d-1f9b1","👩🏽‍🦱":"1f469-1f3fd-200d-1f9b1","👩🏾‍🦱":"1f469-1f3fe-200d-1f9b1","👩🏿‍🦱":"1f469-1f3ff-200d-1f9b1","🧑🏻‍🦱":"1f9d1-1f3fb-200d-1f9b1","🧑🏼‍🦱":"1f9d1-1f3fc-200d-1f9b1","🧑🏽‍🦱":"1f9d1-1f3fd-200d-1f9b1","🧑🏾‍🦱":"1f9d1-1f3fe-200d-1f9b1","🧑🏿‍🦱":"1f9d1-1f3ff-200d-1f9b1","👩🏻‍🦳":"1f469-1f3fb-200d-1f9b3","👩🏼‍🦳":"1f469-1f3fc-200d-1f9b3","👩🏽‍🦳":"1f469-1f3fd-200d-1f9b3","👩🏾‍🦳":"1f469-1f3fe-200d-1f9b3","👩🏿‍🦳":"1f469-1f3ff-200d-1f9b3","🧑🏻‍🦳":"1f9d1-1f3fb-200d-1f9b3","🧑🏼‍🦳":"1f9d1-1f3fc-200d-1f9b3","🧑🏽‍🦳":"1f9d1-1f3fd-200d-1f9b3","🧑🏾‍🦳":"1f9d1-1f3fe-200d-1f9b3","🧑🏿‍🦳":"1f9d1-1f3ff-200d-1f9b3","👩🏻‍🦲":"1f469-1f3fb-200d-1f9b2","👩🏼‍🦲":"1f469-1f3fc-200d-1f9b2","👩🏽‍🦲":"1f469-1f3fd-200d-1f9b2","👩🏾‍🦲":"1f469-1f3fe-200d-1f9b2","👩🏿‍🦲":"1f469-1f3ff-200d-1f9b2","🧑🏻‍🦲":"1f9d1-1f3fb-200d-1f9b2","🧑🏼‍🦲":"1f9d1-1f3fc-200d-1f9b2","🧑🏽‍🦲":"1f9d1-1f3fd-200d-1f9b2","🧑🏾‍🦲":"1f9d1-1f3fe-200d-1f9b2","🧑🏿‍🦲":"1f9d1-1f3ff-200d-1f9b2","👱‍♀️":"1f471-200d-2640-fe0f","👱🏻‍♀":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀":"1f471-1f3ff-200d-2640-fe0f","👱‍♂️":"1f471-200d-2642-fe0f","👱🏻‍♂":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂":"1f471-1f3ff-200d-2642-fe0f","🙍‍♂️":"1f64d-200d-2642-fe0f","🙍🏻‍♂":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂":"1f64d-1f3ff-200d-2642-fe0f","🙍‍♀️":"1f64d-200d-2640-fe0f","🙍🏻‍♀":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀":"1f64d-1f3ff-200d-2640-fe0f","🙎‍♂️":"1f64e-200d-2642-fe0f","🙎🏻‍♂":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂":"1f64e-1f3ff-200d-2642-fe0f","🙎‍♀️":"1f64e-200d-2640-fe0f","🙎🏻‍♀":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀":"1f64e-1f3ff-200d-2640-fe0f","🙅‍♂️":"1f645-200d-2642-fe0f","🙅🏻‍♂":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂":"1f645-1f3ff-200d-2642-fe0f","🙅‍♀️":"1f645-200d-2640-fe0f","🙅🏻‍♀":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀":"1f645-1f3ff-200d-2640-fe0f","🙆‍♂️":"1f646-200d-2642-fe0f","🙆🏻‍♂":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂":"1f646-1f3ff-200d-2642-fe0f","🙆‍♀️":"1f646-200d-2640-fe0f","🙆🏻‍♀":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀":"1f646-1f3ff-200d-2640-fe0f","💁‍♂️":"1f481-200d-2642-fe0f","💁🏻‍♂":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂":"1f481-1f3ff-200d-2642-fe0f","💁‍♀️":"1f481-200d-2640-fe0f","💁🏻‍♀":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀":"1f481-1f3ff-200d-2640-fe0f","🙋‍♂️":"1f64b-200d-2642-fe0f","🙋🏻‍♂":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂":"1f64b-1f3ff-200d-2642-fe0f","🙋‍♀️":"1f64b-200d-2640-fe0f","🙋🏻‍♀":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀":"1f64b-1f3ff-200d-2640-fe0f","🧏‍♂️":"1f9cf-200d-2642-fe0f","🧏🏻‍♂":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂":"1f9cf-1f3ff-200d-2642-fe0f","🧏‍♀️":"1f9cf-200d-2640-fe0f","🧏🏻‍♀":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀":"1f9cf-1f3ff-200d-2640-fe0f","🙇‍♂️":"1f647-200d-2642-fe0f","🙇🏻‍♂":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂":"1f647-1f3ff-200d-2642-fe0f","🙇‍♀️":"1f647-200d-2640-fe0f","🙇🏻‍♀":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀":"1f647-1f3ff-200d-2640-fe0f","🤦‍♂️":"1f926-200d-2642-fe0f","🤦🏻‍♂":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂":"1f926-1f3ff-200d-2642-fe0f","🤦‍♀️":"1f926-200d-2640-fe0f","🤦🏻‍♀":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀":"1f926-1f3ff-200d-2640-fe0f","🤷‍♂️":"1f937-200d-2642-fe0f","🤷🏻‍♂":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂":"1f937-1f3ff-200d-2642-fe0f","🤷‍♀️":"1f937-200d-2640-fe0f","🤷🏻‍♀":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀":"1f937-1f3ff-200d-2640-fe0f","🧑‍⚕️":"1f9d1-200d-2695-fe0f","🧑🏻‍⚕":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕":"1f9d1-1f3ff-200d-2695-fe0f","👨‍⚕️":"1f468-200d-2695-fe0f","👨🏻‍⚕":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕":"1f468-1f3ff-200d-2695-fe0f","👩‍⚕️":"1f469-200d-2695-fe0f","👩🏻‍⚕":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍🎓":"1f9d1-1f3fb-200d-1f393","🧑🏼‍🎓":"1f9d1-1f3fc-200d-1f393","🧑🏽‍🎓":"1f9d1-1f3fd-200d-1f393","🧑🏾‍🎓":"1f9d1-1f3fe-200d-1f393","🧑🏿‍🎓":"1f9d1-1f3ff-200d-1f393","👨🏻‍🎓":"1f468-1f3fb-200d-1f393","👨🏼‍🎓":"1f468-1f3fc-200d-1f393","👨🏽‍🎓":"1f468-1f3fd-200d-1f393","👨🏾‍🎓":"1f468-1f3fe-200d-1f393","👨🏿‍🎓":"1f468-1f3ff-200d-1f393","👩🏻‍🎓":"1f469-1f3fb-200d-1f393","👩🏼‍🎓":"1f469-1f3fc-200d-1f393","👩🏽‍🎓":"1f469-1f3fd-200d-1f393","👩🏾‍🎓":"1f469-1f3fe-200d-1f393","👩🏿‍🎓":"1f469-1f3ff-200d-1f393","🧑🏻‍🏫":"1f9d1-1f3fb-200d-1f3eb","🧑🏼‍🏫":"1f9d1-1f3fc-200d-1f3eb","🧑🏽‍🏫":"1f9d1-1f3fd-200d-1f3eb","🧑🏾‍🏫":"1f9d1-1f3fe-200d-1f3eb","🧑🏿‍🏫":"1f9d1-1f3ff-200d-1f3eb","👨🏻‍🏫":"1f468-1f3fb-200d-1f3eb","👨🏼‍🏫":"1f468-1f3fc-200d-1f3eb","👨🏽‍🏫":"1f468-1f3fd-200d-1f3eb","👨🏾‍🏫":"1f468-1f3fe-200d-1f3eb","👨🏿‍🏫":"1f468-1f3ff-200d-1f3eb","👩🏻‍🏫":"1f469-1f3fb-200d-1f3eb","👩🏼‍🏫":"1f469-1f3fc-200d-1f3eb","👩🏽‍🏫":"1f469-1f3fd-200d-1f3eb","👩🏾‍🏫":"1f469-1f3fe-200d-1f3eb","👩🏿‍🏫":"1f469-1f3ff-200d-1f3eb","🧑‍⚖️":"1f9d1-200d-2696-fe0f","🧑🏻‍⚖":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖":"1f9d1-1f3ff-200d-2696-fe0f","👨‍⚖️":"1f468-200d-2696-fe0f","👨🏻‍⚖":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖":"1f468-1f3ff-200d-2696-fe0f","👩‍⚖️":"1f469-200d-2696-fe0f","👩🏻‍⚖":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍🌾":"1f9d1-1f3fb-200d-1f33e","🧑🏼‍🌾":"1f9d1-1f3fc-200d-1f33e","🧑🏽‍🌾":"1f9d1-1f3fd-200d-1f33e","🧑🏾‍🌾":"1f9d1-1f3fe-200d-1f33e","🧑🏿‍🌾":"1f9d1-1f3ff-200d-1f33e","👨🏻‍🌾":"1f468-1f3fb-200d-1f33e","👨🏼‍🌾":"1f468-1f3fc-200d-1f33e","👨🏽‍🌾":"1f468-1f3fd-200d-1f33e","👨🏾‍🌾":"1f468-1f3fe-200d-1f33e","👨🏿‍🌾":"1f468-1f3ff-200d-1f33e","👩🏻‍🌾":"1f469-1f3fb-200d-1f33e","👩🏼‍🌾":"1f469-1f3fc-200d-1f33e","👩🏽‍🌾":"1f469-1f3fd-200d-1f33e","👩🏾‍🌾":"1f469-1f3fe-200d-1f33e","👩🏿‍🌾":"1f469-1f3ff-200d-1f33e","🧑🏻‍🍳":"1f9d1-1f3fb-200d-1f373","🧑🏼‍🍳":"1f9d1-1f3fc-200d-1f373","🧑🏽‍🍳":"1f9d1-1f3fd-200d-1f373","🧑🏾‍🍳":"1f9d1-1f3fe-200d-1f373","🧑🏿‍🍳":"1f9d1-1f3ff-200d-1f373","👨🏻‍🍳":"1f468-1f3fb-200d-1f373","👨🏼‍🍳":"1f468-1f3fc-200d-1f373","👨🏽‍🍳":"1f468-1f3fd-200d-1f373","👨🏾‍🍳":"1f468-1f3fe-200d-1f373","👨🏿‍🍳":"1f468-1f3ff-200d-1f373","👩🏻‍🍳":"1f469-1f3fb-200d-1f373","👩🏼‍🍳":"1f469-1f3fc-200d-1f373","👩🏽‍🍳":"1f469-1f3fd-200d-1f373","👩🏾‍🍳":"1f469-1f3fe-200d-1f373","👩🏿‍🍳":"1f469-1f3ff-200d-1f373","🧑🏻‍🔧":"1f9d1-1f3fb-200d-1f527","🧑🏼‍🔧":"1f9d1-1f3fc-200d-1f527","🧑🏽‍🔧":"1f9d1-1f3fd-200d-1f527","🧑🏾‍🔧":"1f9d1-1f3fe-200d-1f527","🧑🏿‍🔧":"1f9d1-1f3ff-200d-1f527","👨🏻‍🔧":"1f468-1f3fb-200d-1f527","👨🏼‍🔧":"1f468-1f3fc-200d-1f527","👨🏽‍🔧":"1f468-1f3fd-200d-1f527","👨🏾‍🔧":"1f468-1f3fe-200d-1f527","👨🏿‍🔧":"1f468-1f3ff-200d-1f527","👩🏻‍🔧":"1f469-1f3fb-200d-1f527","👩🏼‍🔧":"1f469-1f3fc-200d-1f527","👩🏽‍🔧":"1f469-1f3fd-200d-1f527","👩🏾‍🔧":"1f469-1f3fe-200d-1f527","👩🏿‍🔧":"1f469-1f3ff-200d-1f527","🧑🏻‍🏭":"1f9d1-1f3fb-200d-1f3ed","🧑🏼‍🏭":"1f9d1-1f3fc-200d-1f3ed","🧑🏽‍🏭":"1f9d1-1f3fd-200d-1f3ed","🧑🏾‍🏭":"1f9d1-1f3fe-200d-1f3ed","🧑🏿‍🏭":"1f9d1-1f3ff-200d-1f3ed","👨🏻‍🏭":"1f468-1f3fb-200d-1f3ed","👨🏼‍🏭":"1f468-1f3fc-200d-1f3ed","👨🏽‍🏭":"1f468-1f3fd-200d-1f3ed","👨🏾‍🏭":"1f468-1f3fe-200d-1f3ed","👨🏿‍🏭":"1f468-1f3ff-200d-1f3ed","👩🏻‍🏭":"1f469-1f3fb-200d-1f3ed","👩🏼‍🏭":"1f469-1f3fc-200d-1f3ed","👩🏽‍🏭":"1f469-1f3fd-200d-1f3ed","👩🏾‍🏭":"1f469-1f3fe-200d-1f3ed","👩🏿‍🏭":"1f469-1f3ff-200d-1f3ed","🧑🏻‍💼":"1f9d1-1f3fb-200d-1f4bc","🧑🏼‍💼":"1f9d1-1f3fc-200d-1f4bc","🧑🏽‍💼":"1f9d1-1f3fd-200d-1f4bc","🧑🏾‍💼":"1f9d1-1f3fe-200d-1f4bc","🧑🏿‍💼":"1f9d1-1f3ff-200d-1f4bc","👨🏻‍💼":"1f468-1f3fb-200d-1f4bc","👨🏼‍💼":"1f468-1f3fc-200d-1f4bc","👨🏽‍💼":"1f468-1f3fd-200d-1f4bc","👨🏾‍💼":"1f468-1f3fe-200d-1f4bc","👨🏿‍💼":"1f468-1f3ff-200d-1f4bc","👩🏻‍💼":"1f469-1f3fb-200d-1f4bc","👩🏼‍💼":"1f469-1f3fc-200d-1f4bc","👩🏽‍💼":"1f469-1f3fd-200d-1f4bc","👩🏾‍💼":"1f469-1f3fe-200d-1f4bc","👩🏿‍💼":"1f469-1f3ff-200d-1f4bc","🧑🏻‍🔬":"1f9d1-1f3fb-200d-1f52c","🧑🏼‍🔬":"1f9d1-1f3fc-200d-1f52c","🧑🏽‍🔬":"1f9d1-1f3fd-200d-1f52c","🧑🏾‍🔬":"1f9d1-1f3fe-200d-1f52c","🧑🏿‍🔬":"1f9d1-1f3ff-200d-1f52c","👨🏻‍🔬":"1f468-1f3fb-200d-1f52c","👨🏼‍🔬":"1f468-1f3fc-200d-1f52c","👨🏽‍🔬":"1f468-1f3fd-200d-1f52c","👨🏾‍🔬":"1f468-1f3fe-200d-1f52c","👨🏿‍🔬":"1f468-1f3ff-200d-1f52c","👩🏻‍🔬":"1f469-1f3fb-200d-1f52c","👩🏼‍🔬":"1f469-1f3fc-200d-1f52c","👩🏽‍🔬":"1f469-1f3fd-200d-1f52c","👩🏾‍🔬":"1f469-1f3fe-200d-1f52c","👩🏿‍🔬":"1f469-1f3ff-200d-1f52c","🧑🏻‍💻":"1f9d1-1f3fb-200d-1f4bb","🧑🏼‍💻":"1f9d1-1f3fc-200d-1f4bb","🧑🏽‍💻":"1f9d1-1f3fd-200d-1f4bb","🧑🏾‍💻":"1f9d1-1f3fe-200d-1f4bb","🧑🏿‍💻":"1f9d1-1f3ff-200d-1f4bb","👨🏻‍💻":"1f468-1f3fb-200d-1f4bb","👨🏼‍💻":"1f468-1f3fc-200d-1f4bb","👨🏽‍💻":"1f468-1f3fd-200d-1f4bb","👨🏾‍💻":"1f468-1f3fe-200d-1f4bb","👨🏿‍💻":"1f468-1f3ff-200d-1f4bb","👩🏻‍💻":"1f469-1f3fb-200d-1f4bb","👩🏼‍💻":"1f469-1f3fc-200d-1f4bb","👩🏽‍💻":"1f469-1f3fd-200d-1f4bb","👩🏾‍💻":"1f469-1f3fe-200d-1f4bb","👩🏿‍💻":"1f469-1f3ff-200d-1f4bb","🧑🏻‍🎤":"1f9d1-1f3fb-200d-1f3a4","🧑🏼‍🎤":"1f9d1-1f3fc-200d-1f3a4","🧑🏽‍🎤":"1f9d1-1f3fd-200d-1f3a4","🧑🏾‍🎤":"1f9d1-1f3fe-200d-1f3a4","🧑🏿‍🎤":"1f9d1-1f3ff-200d-1f3a4","👨🏻‍🎤":"1f468-1f3fb-200d-1f3a4","👨🏼‍🎤":"1f468-1f3fc-200d-1f3a4","👨🏽‍🎤":"1f468-1f3fd-200d-1f3a4","👨🏾‍🎤":"1f468-1f3fe-200d-1f3a4","👨🏿‍🎤":"1f468-1f3ff-200d-1f3a4","👩🏻‍🎤":"1f469-1f3fb-200d-1f3a4","👩🏼‍🎤":"1f469-1f3fc-200d-1f3a4","👩🏽‍🎤":"1f469-1f3fd-200d-1f3a4","👩🏾‍🎤":"1f469-1f3fe-200d-1f3a4","👩🏿‍🎤":"1f469-1f3ff-200d-1f3a4","🧑🏻‍🎨":"1f9d1-1f3fb-200d-1f3a8","🧑🏼‍🎨":"1f9d1-1f3fc-200d-1f3a8","🧑🏽‍🎨":"1f9d1-1f3fd-200d-1f3a8","🧑🏾‍🎨":"1f9d1-1f3fe-200d-1f3a8","🧑🏿‍🎨":"1f9d1-1f3ff-200d-1f3a8","👨🏻‍🎨":"1f468-1f3fb-200d-1f3a8","👨🏼‍🎨":"1f468-1f3fc-200d-1f3a8","👨🏽‍🎨":"1f468-1f3fd-200d-1f3a8","👨🏾‍🎨":"1f468-1f3fe-200d-1f3a8","👨🏿‍🎨":"1f468-1f3ff-200d-1f3a8","👩🏻‍🎨":"1f469-1f3fb-200d-1f3a8","👩🏼‍🎨":"1f469-1f3fc-200d-1f3a8","👩🏽‍🎨":"1f469-1f3fd-200d-1f3a8","👩🏾‍🎨":"1f469-1f3fe-200d-1f3a8","👩🏿‍🎨":"1f469-1f3ff-200d-1f3a8","🧑‍✈️":"1f9d1-200d-2708-fe0f","🧑🏻‍✈":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈":"1f9d1-1f3ff-200d-2708-fe0f","👨‍✈️":"1f468-200d-2708-fe0f","👨🏻‍✈":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈":"1f468-1f3ff-200d-2708-fe0f","👩‍✈️":"1f469-200d-2708-fe0f","👩🏻‍✈":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈":"1f469-1f3ff-200d-2708-fe0f","🧑🏻‍🚀":"1f9d1-1f3fb-200d-1f680","🧑🏼‍🚀":"1f9d1-1f3fc-200d-1f680","🧑🏽‍🚀":"1f9d1-1f3fd-200d-1f680","🧑🏾‍🚀":"1f9d1-1f3fe-200d-1f680","🧑🏿‍🚀":"1f9d1-1f3ff-200d-1f680","👨🏻‍🚀":"1f468-1f3fb-200d-1f680","👨🏼‍🚀":"1f468-1f3fc-200d-1f680","👨🏽‍🚀":"1f468-1f3fd-200d-1f680","👨🏾‍🚀":"1f468-1f3fe-200d-1f680","👨🏿‍🚀":"1f468-1f3ff-200d-1f680","👩🏻‍🚀":"1f469-1f3fb-200d-1f680","👩🏼‍🚀":"1f469-1f3fc-200d-1f680","👩🏽‍🚀":"1f469-1f3fd-200d-1f680","👩🏾‍🚀":"1f469-1f3fe-200d-1f680","👩🏿‍🚀":"1f469-1f3ff-200d-1f680","🧑🏻‍🚒":"1f9d1-1f3fb-200d-1f692","🧑🏼‍🚒":"1f9d1-1f3fc-200d-1f692","🧑🏽‍🚒":"1f9d1-1f3fd-200d-1f692","🧑🏾‍🚒":"1f9d1-1f3fe-200d-1f692","🧑🏿‍🚒":"1f9d1-1f3ff-200d-1f692","👨🏻‍🚒":"1f468-1f3fb-200d-1f692","👨🏼‍🚒":"1f468-1f3fc-200d-1f692","👨🏽‍🚒":"1f468-1f3fd-200d-1f692","👨🏾‍🚒":"1f468-1f3fe-200d-1f692","👨🏿‍🚒":"1f468-1f3ff-200d-1f692","👩🏻‍🚒":"1f469-1f3fb-200d-1f692","👩🏼‍🚒":"1f469-1f3fc-200d-1f692","👩🏽‍🚒":"1f469-1f3fd-200d-1f692","👩🏾‍🚒":"1f469-1f3fe-200d-1f692","👩🏿‍🚒":"1f469-1f3ff-200d-1f692","👮‍♂️":"1f46e-200d-2642-fe0f","👮🏻‍♂":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂":"1f46e-1f3ff-200d-2642-fe0f","👮‍♀️":"1f46e-200d-2640-fe0f","👮🏻‍♀":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀":"1f46e-1f3ff-200d-2640-fe0f","🕵‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵️‍♂":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂":"1f575-1f3ff-200d-2642-fe0f","🕵‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵️‍♀":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀":"1f575-1f3ff-200d-2640-fe0f","💂‍♂️":"1f482-200d-2642-fe0f","💂🏻‍♂":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂":"1f482-1f3ff-200d-2642-fe0f","💂‍♀️":"1f482-200d-2640-fe0f","💂🏻‍♀":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀":"1f482-1f3ff-200d-2640-fe0f","👷‍♂️":"1f477-200d-2642-fe0f","👷🏻‍♂":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂":"1f477-1f3ff-200d-2642-fe0f","👷‍♀️":"1f477-200d-2640-fe0f","👷🏻‍♀":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀":"1f477-1f3ff-200d-2640-fe0f","👳‍♂️":"1f473-200d-2642-fe0f","👳🏻‍♂":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂":"1f473-1f3ff-200d-2642-fe0f","👳‍♀️":"1f473-200d-2640-fe0f","👳🏻‍♀":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀":"1f473-1f3ff-200d-2640-fe0f","🤵‍♂️":"1f935-200d-2642-fe0f","🤵🏻‍♂":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂":"1f935-1f3ff-200d-2642-fe0f","🤵‍♀️":"1f935-200d-2640-fe0f","🤵🏻‍♀":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀":"1f935-1f3ff-200d-2640-fe0f","👰‍♂️":"1f470-200d-2642-fe0f","👰🏻‍♂":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂":"1f470-1f3ff-200d-2642-fe0f","👰‍♀️":"1f470-200d-2640-fe0f","👰🏻‍♀":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀":"1f470-1f3ff-200d-2640-fe0f","👩🏻‍🍼":"1f469-1f3fb-200d-1f37c","👩🏼‍🍼":"1f469-1f3fc-200d-1f37c","👩🏽‍🍼":"1f469-1f3fd-200d-1f37c","👩🏾‍🍼":"1f469-1f3fe-200d-1f37c","👩🏿‍🍼":"1f469-1f3ff-200d-1f37c","👨🏻‍🍼":"1f468-1f3fb-200d-1f37c","👨🏼‍🍼":"1f468-1f3fc-200d-1f37c","👨🏽‍🍼":"1f468-1f3fd-200d-1f37c","👨🏾‍🍼":"1f468-1f3fe-200d-1f37c","👨🏿‍🍼":"1f468-1f3ff-200d-1f37c","🧑🏻‍🍼":"1f9d1-1f3fb-200d-1f37c","🧑🏼‍🍼":"1f9d1-1f3fc-200d-1f37c","🧑🏽‍🍼":"1f9d1-1f3fd-200d-1f37c","🧑🏾‍🍼":"1f9d1-1f3fe-200d-1f37c","🧑🏿‍🍼":"1f9d1-1f3ff-200d-1f37c","🧑🏻‍🎄":"1f9d1-1f3fb-200d-1f384","🧑🏼‍🎄":"1f9d1-1f3fc-200d-1f384","🧑🏽‍🎄":"1f9d1-1f3fd-200d-1f384","🧑🏾‍🎄":"1f9d1-1f3fe-200d-1f384","🧑🏿‍🎄":"1f9d1-1f3ff-200d-1f384","🦸‍♂️":"1f9b8-200d-2642-fe0f","🦸🏻‍♂":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂":"1f9b8-1f3ff-200d-2642-fe0f","🦸‍♀️":"1f9b8-200d-2640-fe0f","🦸🏻‍♀":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀":"1f9b8-1f3ff-200d-2640-fe0f","🦹‍♂️":"1f9b9-200d-2642-fe0f","🦹🏻‍♂":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂":"1f9b9-1f3ff-200d-2642-fe0f","🦹‍♀️":"1f9b9-200d-2640-fe0f","🦹🏻‍♀":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀":"1f9b9-1f3ff-200d-2640-fe0f","🧙‍♂️":"1f9d9-200d-2642-fe0f","🧙🏻‍♂":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂":"1f9d9-1f3ff-200d-2642-fe0f","🧙‍♀️":"1f9d9-200d-2640-fe0f","🧙🏻‍♀":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀":"1f9d9-1f3ff-200d-2640-fe0f","🧚‍♂️":"1f9da-200d-2642-fe0f","🧚🏻‍♂":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂":"1f9da-1f3ff-200d-2642-fe0f","🧚‍♀️":"1f9da-200d-2640-fe0f","🧚🏻‍♀":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀":"1f9da-1f3ff-200d-2640-fe0f","🧛‍♂️":"1f9db-200d-2642-fe0f","🧛🏻‍♂":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂":"1f9db-1f3ff-200d-2642-fe0f","🧛‍♀️":"1f9db-200d-2640-fe0f","🧛🏻‍♀":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀":"1f9db-1f3ff-200d-2640-fe0f","🧜‍♂️":"1f9dc-200d-2642-fe0f","🧜🏻‍♂":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂":"1f9dc-1f3ff-200d-2642-fe0f","🧜‍♀️":"1f9dc-200d-2640-fe0f","🧜🏻‍♀":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀":"1f9dc-1f3ff-200d-2640-fe0f","🧝‍♂️":"1f9dd-200d-2642-fe0f","🧝🏻‍♂":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂":"1f9dd-1f3ff-200d-2642-fe0f","🧝‍♀️":"1f9dd-200d-2640-fe0f","🧝🏻‍♀":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀":"1f9dd-1f3ff-200d-2640-fe0f","🧞‍♂️":"1f9de-200d-2642-fe0f","🧞‍♀️":"1f9de-200d-2640-fe0f","🧟‍♂️":"1f9df-200d-2642-fe0f","🧟‍♀️":"1f9df-200d-2640-fe0f","💆‍♂️":"1f486-200d-2642-fe0f","💆🏻‍♂":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂":"1f486-1f3ff-200d-2642-fe0f","💆‍♀️":"1f486-200d-2640-fe0f","💆🏻‍♀":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀":"1f486-1f3ff-200d-2640-fe0f","💇‍♂️":"1f487-200d-2642-fe0f","💇🏻‍♂":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂":"1f487-1f3ff-200d-2642-fe0f","💇‍♀️":"1f487-200d-2640-fe0f","💇🏻‍♀":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀":"1f487-1f3ff-200d-2640-fe0f","🚶‍♂️":"1f6b6-200d-2642-fe0f","🚶🏻‍♂":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂":"1f6b6-1f3ff-200d-2642-fe0f","🚶‍♀️":"1f6b6-200d-2640-fe0f","🚶🏻‍♀":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀":"1f6b6-1f3ff-200d-2640-fe0f","🧍‍♂️":"1f9cd-200d-2642-fe0f","🧍🏻‍♂":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂":"1f9cd-1f3ff-200d-2642-fe0f","🧍‍♀️":"1f9cd-200d-2640-fe0f","🧍🏻‍♀":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀":"1f9cd-1f3ff-200d-2640-fe0f","🧎‍♂️":"1f9ce-200d-2642-fe0f","🧎🏻‍♂":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂":"1f9ce-1f3ff-200d-2642-fe0f","🧎‍♀️":"1f9ce-200d-2640-fe0f","🧎🏻‍♀":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀":"1f9ce-1f3ff-200d-2640-fe0f","🧑🏻‍🦯":"1f9d1-1f3fb-200d-1f9af","🧑🏼‍🦯":"1f9d1-1f3fc-200d-1f9af","🧑🏽‍🦯":"1f9d1-1f3fd-200d-1f9af","🧑🏾‍🦯":"1f9d1-1f3fe-200d-1f9af","🧑🏿‍🦯":"1f9d1-1f3ff-200d-1f9af","👨🏻‍🦯":"1f468-1f3fb-200d-1f9af","👨🏼‍🦯":"1f468-1f3fc-200d-1f9af","👨🏽‍🦯":"1f468-1f3fd-200d-1f9af","👨🏾‍🦯":"1f468-1f3fe-200d-1f9af","👨🏿‍🦯":"1f468-1f3ff-200d-1f9af","👩🏻‍🦯":"1f469-1f3fb-200d-1f9af","👩🏼‍🦯":"1f469-1f3fc-200d-1f9af","👩🏽‍🦯":"1f469-1f3fd-200d-1f9af","👩🏾‍🦯":"1f469-1f3fe-200d-1f9af","👩🏿‍🦯":"1f469-1f3ff-200d-1f9af","🧑🏻‍🦼":"1f9d1-1f3fb-200d-1f9bc","🧑🏼‍🦼":"1f9d1-1f3fc-200d-1f9bc","🧑🏽‍🦼":"1f9d1-1f3fd-200d-1f9bc","🧑🏾‍🦼":"1f9d1-1f3fe-200d-1f9bc","🧑🏿‍🦼":"1f9d1-1f3ff-200d-1f9bc","👨🏻‍🦼":"1f468-1f3fb-200d-1f9bc","👨🏼‍🦼":"1f468-1f3fc-200d-1f9bc","👨🏽‍🦼":"1f468-1f3fd-200d-1f9bc","👨🏾‍🦼":"1f468-1f3fe-200d-1f9bc","👨🏿‍🦼":"1f468-1f3ff-200d-1f9bc","👩🏻‍🦼":"1f469-1f3fb-200d-1f9bc","👩🏼‍🦼":"1f469-1f3fc-200d-1f9bc","👩🏽‍🦼":"1f469-1f3fd-200d-1f9bc","👩🏾‍🦼":"1f469-1f3fe-200d-1f9bc","👩🏿‍🦼":"1f469-1f3ff-200d-1f9bc","🧑🏻‍🦽":"1f9d1-1f3fb-200d-1f9bd","🧑🏼‍🦽":"1f9d1-1f3fc-200d-1f9bd","🧑🏽‍🦽":"1f9d1-1f3fd-200d-1f9bd","🧑🏾‍🦽":"1f9d1-1f3fe-200d-1f9bd","🧑🏿‍🦽":"1f9d1-1f3ff-200d-1f9bd","👨🏻‍🦽":"1f468-1f3fb-200d-1f9bd","👨🏼‍🦽":"1f468-1f3fc-200d-1f9bd","👨🏽‍🦽":"1f468-1f3fd-200d-1f9bd","👨🏾‍🦽":"1f468-1f3fe-200d-1f9bd","👨🏿‍🦽":"1f468-1f3ff-200d-1f9bd","👩🏻‍🦽":"1f469-1f3fb-200d-1f9bd","👩🏼‍🦽":"1f469-1f3fc-200d-1f9bd","👩🏽‍🦽":"1f469-1f3fd-200d-1f9bd","👩🏾‍🦽":"1f469-1f3fe-200d-1f9bd","👩🏿‍🦽":"1f469-1f3ff-200d-1f9bd","🏃‍♂️":"1f3c3-200d-2642-fe0f","🏃🏻‍♂":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂":"1f3c3-1f3ff-200d-2642-fe0f","🏃‍♀️":"1f3c3-200d-2640-fe0f","🏃🏻‍♀":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀":"1f3c3-1f3ff-200d-2640-fe0f","👯‍♂️":"1f46f-200d-2642-fe0f","👯‍♀️":"1f46f-200d-2640-fe0f","🧖‍♂️":"1f9d6-200d-2642-fe0f","🧖🏻‍♂":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂":"1f9d6-1f3ff-200d-2642-fe0f","🧖‍♀️":"1f9d6-200d-2640-fe0f","🧖🏻‍♀":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀":"1f9d6-1f3ff-200d-2640-fe0f","🧗‍♂️":"1f9d7-200d-2642-fe0f","🧗🏻‍♂":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂":"1f9d7-1f3ff-200d-2642-fe0f","🧗‍♀️":"1f9d7-200d-2640-fe0f","🧗🏻‍♀":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀":"1f9d7-1f3ff-200d-2640-fe0f","🏌‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌️‍♂":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂":"1f3cc-1f3ff-200d-2642-fe0f","🏌‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌️‍♀":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀":"1f3cc-1f3ff-200d-2640-fe0f","🏄‍♂️":"1f3c4-200d-2642-fe0f","🏄🏻‍♂":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂":"1f3c4-1f3ff-200d-2642-fe0f","🏄‍♀️":"1f3c4-200d-2640-fe0f","🏄🏻‍♀":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀":"1f3c4-1f3ff-200d-2640-fe0f","🚣‍♂️":"1f6a3-200d-2642-fe0f","🚣🏻‍♂":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂":"1f6a3-1f3ff-200d-2642-fe0f","🚣‍♀️":"1f6a3-200d-2640-fe0f","🚣🏻‍♀":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀":"1f6a3-1f3ff-200d-2640-fe0f","🏊‍♂️":"1f3ca-200d-2642-fe0f","🏊🏻‍♂":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂":"1f3ca-1f3ff-200d-2642-fe0f","🏊‍♀️":"1f3ca-200d-2640-fe0f","🏊🏻‍♀":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀":"1f3ca-1f3ff-200d-2640-fe0f","⛹‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹️‍♂":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂":"26f9-1f3ff-200d-2642-fe0f","⛹‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹️‍♀":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀":"26f9-1f3ff-200d-2640-fe0f","🏋‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋️‍♂":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂":"1f3cb-1f3ff-200d-2642-fe0f","🏋‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋️‍♀":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀":"1f3cb-1f3ff-200d-2640-fe0f","🚴‍♂️":"1f6b4-200d-2642-fe0f","🚴🏻‍♂":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂":"1f6b4-1f3ff-200d-2642-fe0f","🚴‍♀️":"1f6b4-200d-2640-fe0f","🚴🏻‍♀":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀":"1f6b4-1f3ff-200d-2640-fe0f","🚵‍♂️":"1f6b5-200d-2642-fe0f","🚵🏻‍♂":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂":"1f6b5-1f3ff-200d-2642-fe0f","🚵‍♀️":"1f6b5-200d-2640-fe0f","🚵🏻‍♀":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀":"1f6b5-1f3ff-200d-2640-fe0f","🤸‍♂️":"1f938-200d-2642-fe0f","🤸🏻‍♂":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂":"1f938-1f3ff-200d-2642-fe0f","🤸‍♀️":"1f938-200d-2640-fe0f","🤸🏻‍♀":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀":"1f938-1f3ff-200d-2640-fe0f","🤼‍♂️":"1f93c-200d-2642-fe0f","🤼‍♀️":"1f93c-200d-2640-fe0f","🤽‍♂️":"1f93d-200d-2642-fe0f","🤽🏻‍♂":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂":"1f93d-1f3ff-200d-2642-fe0f","🤽‍♀️":"1f93d-200d-2640-fe0f","🤽🏻‍♀":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀":"1f93d-1f3ff-200d-2640-fe0f","🤾‍♂️":"1f93e-200d-2642-fe0f","🤾🏻‍♂":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂":"1f93e-1f3ff-200d-2642-fe0f","🤾‍♀️":"1f93e-200d-2640-fe0f","🤾🏻‍♀":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀":"1f93e-1f3ff-200d-2640-fe0f","🤹‍♂️":"1f939-200d-2642-fe0f","🤹🏻‍♂":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂":"1f939-1f3ff-200d-2642-fe0f","🤹‍♀️":"1f939-200d-2640-fe0f","🤹🏻‍♀":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀":"1f939-1f3ff-200d-2640-fe0f","🧘‍♂️":"1f9d8-200d-2642-fe0f","🧘🏻‍♂":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂":"1f9d8-1f3ff-200d-2642-fe0f","🧘‍♀️":"1f9d8-200d-2640-fe0f","🧘🏻‍♀":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀":"1f9d8-1f3ff-200d-2640-fe0f","🐻‍❄️":"1f43b-200d-2744-fe0f","🏳️‍🌈":"1f3f3-fe0f-200d-1f308","🏳‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","🏳️‍⚧":"1f3f3-fe0f-200d-26a7-fe0f","🏴‍☠️":"1f3f4-200d-2620-fe0f","👁️‍🗨️":"1f441-200d-1f5e8","🫱🏻‍🫲🏼":"1faf1-1f3fb-200d-1faf2-1f3fc","🫱🏻‍🫲🏽":"1faf1-1f3fb-200d-1faf2-1f3fd","🫱🏻‍🫲🏾":"1faf1-1f3fb-200d-1faf2-1f3fe","🫱🏻‍🫲🏿":"1faf1-1f3fb-200d-1faf2-1f3ff","🫱🏼‍🫲🏻":"1faf1-1f3fc-200d-1faf2-1f3fb","🫱🏼‍🫲🏽":"1faf1-1f3fc-200d-1faf2-1f3fd","🫱🏼‍🫲🏾":"1faf1-1f3fc-200d-1faf2-1f3fe","🫱🏼‍🫲🏿":"1faf1-1f3fc-200d-1faf2-1f3ff","🫱🏽‍🫲🏻":"1faf1-1f3fd-200d-1faf2-1f3fb","🫱🏽‍🫲🏼":"1faf1-1f3fd-200d-1faf2-1f3fc","🫱🏽‍🫲🏾":"1faf1-1f3fd-200d-1faf2-1f3fe","🫱🏽‍🫲🏿":"1faf1-1f3fd-200d-1faf2-1f3ff","🫱🏾‍🫲🏻":"1faf1-1f3fe-200d-1faf2-1f3fb","🫱🏾‍🫲🏼":"1faf1-1f3fe-200d-1faf2-1f3fc","🫱🏾‍🫲🏽":"1faf1-1f3fe-200d-1faf2-1f3fd","🫱🏾‍🫲🏿":"1faf1-1f3fe-200d-1faf2-1f3ff","🫱🏿‍🫲🏻":"1faf1-1f3ff-200d-1faf2-1f3fb","🫱🏿‍🫲🏼":"1faf1-1f3ff-200d-1faf2-1f3fc","🫱🏿‍🫲🏽":"1faf1-1f3ff-200d-1faf2-1f3fd","🫱🏿‍🫲🏾":"1faf1-1f3ff-200d-1faf2-1f3fe","🧔🏻‍♂️":"1f9d4-1f3fb-200d-2642-fe0f","🧔🏼‍♂️":"1f9d4-1f3fc-200d-2642-fe0f","🧔🏽‍♂️":"1f9d4-1f3fd-200d-2642-fe0f","🧔🏾‍♂️":"1f9d4-1f3fe-200d-2642-fe0f","🧔🏿‍♂️":"1f9d4-1f3ff-200d-2642-fe0f","🧔🏻‍♀️":"1f9d4-1f3fb-200d-2640-fe0f","🧔🏼‍♀️":"1f9d4-1f3fc-200d-2640-fe0f","🧔🏽‍♀️":"1f9d4-1f3fd-200d-2640-fe0f","🧔🏾‍♀️":"1f9d4-1f3fe-200d-2640-fe0f","🧔🏿‍♀️":"1f9d4-1f3ff-200d-2640-fe0f","👱🏻‍♀️":"1f471-1f3fb-200d-2640-fe0f","👱🏼‍♀️":"1f471-1f3fc-200d-2640-fe0f","👱🏽‍♀️":"1f471-1f3fd-200d-2640-fe0f","👱🏾‍♀️":"1f471-1f3fe-200d-2640-fe0f","👱🏿‍♀️":"1f471-1f3ff-200d-2640-fe0f","👱🏻‍♂️":"1f471-1f3fb-200d-2642-fe0f","👱🏼‍♂️":"1f471-1f3fc-200d-2642-fe0f","👱🏽‍♂️":"1f471-1f3fd-200d-2642-fe0f","👱🏾‍♂️":"1f471-1f3fe-200d-2642-fe0f","👱🏿‍♂️":"1f471-1f3ff-200d-2642-fe0f","🙍🏻‍♂️":"1f64d-1f3fb-200d-2642-fe0f","🙍🏼‍♂️":"1f64d-1f3fc-200d-2642-fe0f","🙍🏽‍♂️":"1f64d-1f3fd-200d-2642-fe0f","🙍🏾‍♂️":"1f64d-1f3fe-200d-2642-fe0f","🙍🏿‍♂️":"1f64d-1f3ff-200d-2642-fe0f","🙍🏻‍♀️":"1f64d-1f3fb-200d-2640-fe0f","🙍🏼‍♀️":"1f64d-1f3fc-200d-2640-fe0f","🙍🏽‍♀️":"1f64d-1f3fd-200d-2640-fe0f","🙍🏾‍♀️":"1f64d-1f3fe-200d-2640-fe0f","🙍🏿‍♀️":"1f64d-1f3ff-200d-2640-fe0f","🙎🏻‍♂️":"1f64e-1f3fb-200d-2642-fe0f","🙎🏼‍♂️":"1f64e-1f3fc-200d-2642-fe0f","🙎🏽‍♂️":"1f64e-1f3fd-200d-2642-fe0f","🙎🏾‍♂️":"1f64e-1f3fe-200d-2642-fe0f","🙎🏿‍♂️":"1f64e-1f3ff-200d-2642-fe0f","🙎🏻‍♀️":"1f64e-1f3fb-200d-2640-fe0f","🙎🏼‍♀️":"1f64e-1f3fc-200d-2640-fe0f","🙎🏽‍♀️":"1f64e-1f3fd-200d-2640-fe0f","🙎🏾‍♀️":"1f64e-1f3fe-200d-2640-fe0f","🙎🏿‍♀️":"1f64e-1f3ff-200d-2640-fe0f","🙅🏻‍♂️":"1f645-1f3fb-200d-2642-fe0f","🙅🏼‍♂️":"1f645-1f3fc-200d-2642-fe0f","🙅🏽‍♂️":"1f645-1f3fd-200d-2642-fe0f","🙅🏾‍♂️":"1f645-1f3fe-200d-2642-fe0f","🙅🏿‍♂️":"1f645-1f3ff-200d-2642-fe0f","🙅🏻‍♀️":"1f645-1f3fb-200d-2640-fe0f","🙅🏼‍♀️":"1f645-1f3fc-200d-2640-fe0f","🙅🏽‍♀️":"1f645-1f3fd-200d-2640-fe0f","🙅🏾‍♀️":"1f645-1f3fe-200d-2640-fe0f","🙅🏿‍♀️":"1f645-1f3ff-200d-2640-fe0f","🙆🏻‍♂️":"1f646-1f3fb-200d-2642-fe0f","🙆🏼‍♂️":"1f646-1f3fc-200d-2642-fe0f","🙆🏽‍♂️":"1f646-1f3fd-200d-2642-fe0f","🙆🏾‍♂️":"1f646-1f3fe-200d-2642-fe0f","🙆🏿‍♂️":"1f646-1f3ff-200d-2642-fe0f","🙆🏻‍♀️":"1f646-1f3fb-200d-2640-fe0f","🙆🏼‍♀️":"1f646-1f3fc-200d-2640-fe0f","🙆🏽‍♀️":"1f646-1f3fd-200d-2640-fe0f","🙆🏾‍♀️":"1f646-1f3fe-200d-2640-fe0f","🙆🏿‍♀️":"1f646-1f3ff-200d-2640-fe0f","💁🏻‍♂️":"1f481-1f3fb-200d-2642-fe0f","💁🏼‍♂️":"1f481-1f3fc-200d-2642-fe0f","💁🏽‍♂️":"1f481-1f3fd-200d-2642-fe0f","💁🏾‍♂️":"1f481-1f3fe-200d-2642-fe0f","💁🏿‍♂️":"1f481-1f3ff-200d-2642-fe0f","💁🏻‍♀️":"1f481-1f3fb-200d-2640-fe0f","💁🏼‍♀️":"1f481-1f3fc-200d-2640-fe0f","💁🏽‍♀️":"1f481-1f3fd-200d-2640-fe0f","💁🏾‍♀️":"1f481-1f3fe-200d-2640-fe0f","💁🏿‍♀️":"1f481-1f3ff-200d-2640-fe0f","🙋🏻‍♂️":"1f64b-1f3fb-200d-2642-fe0f","🙋🏼‍♂️":"1f64b-1f3fc-200d-2642-fe0f","🙋🏽‍♂️":"1f64b-1f3fd-200d-2642-fe0f","🙋🏾‍♂️":"1f64b-1f3fe-200d-2642-fe0f","🙋🏿‍♂️":"1f64b-1f3ff-200d-2642-fe0f","🙋🏻‍♀️":"1f64b-1f3fb-200d-2640-fe0f","🙋🏼‍♀️":"1f64b-1f3fc-200d-2640-fe0f","🙋🏽‍♀️":"1f64b-1f3fd-200d-2640-fe0f","🙋🏾‍♀️":"1f64b-1f3fe-200d-2640-fe0f","🙋🏿‍♀️":"1f64b-1f3ff-200d-2640-fe0f","🧏🏻‍♂️":"1f9cf-1f3fb-200d-2642-fe0f","🧏🏼‍♂️":"1f9cf-1f3fc-200d-2642-fe0f","🧏🏽‍♂️":"1f9cf-1f3fd-200d-2642-fe0f","🧏🏾‍♂️":"1f9cf-1f3fe-200d-2642-fe0f","🧏🏿‍♂️":"1f9cf-1f3ff-200d-2642-fe0f","🧏🏻‍♀️":"1f9cf-1f3fb-200d-2640-fe0f","🧏🏼‍♀️":"1f9cf-1f3fc-200d-2640-fe0f","🧏🏽‍♀️":"1f9cf-1f3fd-200d-2640-fe0f","🧏🏾‍♀️":"1f9cf-1f3fe-200d-2640-fe0f","🧏🏿‍♀️":"1f9cf-1f3ff-200d-2640-fe0f","🙇🏻‍♂️":"1f647-1f3fb-200d-2642-fe0f","🙇🏼‍♂️":"1f647-1f3fc-200d-2642-fe0f","🙇🏽‍♂️":"1f647-1f3fd-200d-2642-fe0f","🙇🏾‍♂️":"1f647-1f3fe-200d-2642-fe0f","🙇🏿‍♂️":"1f647-1f3ff-200d-2642-fe0f","🙇🏻‍♀️":"1f647-1f3fb-200d-2640-fe0f","🙇🏼‍♀️":"1f647-1f3fc-200d-2640-fe0f","🙇🏽‍♀️":"1f647-1f3fd-200d-2640-fe0f","🙇🏾‍♀️":"1f647-1f3fe-200d-2640-fe0f","🙇🏿‍♀️":"1f647-1f3ff-200d-2640-fe0f","🤦🏻‍♂️":"1f926-1f3fb-200d-2642-fe0f","🤦🏼‍♂️":"1f926-1f3fc-200d-2642-fe0f","🤦🏽‍♂️":"1f926-1f3fd-200d-2642-fe0f","🤦🏾‍♂️":"1f926-1f3fe-200d-2642-fe0f","🤦🏿‍♂️":"1f926-1f3ff-200d-2642-fe0f","🤦🏻‍♀️":"1f926-1f3fb-200d-2640-fe0f","🤦🏼‍♀️":"1f926-1f3fc-200d-2640-fe0f","🤦🏽‍♀️":"1f926-1f3fd-200d-2640-fe0f","🤦🏾‍♀️":"1f926-1f3fe-200d-2640-fe0f","🤦🏿‍♀️":"1f926-1f3ff-200d-2640-fe0f","🤷🏻‍♂️":"1f937-1f3fb-200d-2642-fe0f","🤷🏼‍♂️":"1f937-1f3fc-200d-2642-fe0f","🤷🏽‍♂️":"1f937-1f3fd-200d-2642-fe0f","🤷🏾‍♂️":"1f937-1f3fe-200d-2642-fe0f","🤷🏿‍♂️":"1f937-1f3ff-200d-2642-fe0f","🤷🏻‍♀️":"1f937-1f3fb-200d-2640-fe0f","🤷🏼‍♀️":"1f937-1f3fc-200d-2640-fe0f","🤷🏽‍♀️":"1f937-1f3fd-200d-2640-fe0f","🤷🏾‍♀️":"1f937-1f3fe-200d-2640-fe0f","🤷🏿‍♀️":"1f937-1f3ff-200d-2640-fe0f","🧑🏻‍⚕️":"1f9d1-1f3fb-200d-2695-fe0f","🧑🏼‍⚕️":"1f9d1-1f3fc-200d-2695-fe0f","🧑🏽‍⚕️":"1f9d1-1f3fd-200d-2695-fe0f","🧑🏾‍⚕️":"1f9d1-1f3fe-200d-2695-fe0f","🧑🏿‍⚕️":"1f9d1-1f3ff-200d-2695-fe0f","👨🏻‍⚕️":"1f468-1f3fb-200d-2695-fe0f","👨🏼‍⚕️":"1f468-1f3fc-200d-2695-fe0f","👨🏽‍⚕️":"1f468-1f3fd-200d-2695-fe0f","👨🏾‍⚕️":"1f468-1f3fe-200d-2695-fe0f","👨🏿‍⚕️":"1f468-1f3ff-200d-2695-fe0f","👩🏻‍⚕️":"1f469-1f3fb-200d-2695-fe0f","👩🏼‍⚕️":"1f469-1f3fc-200d-2695-fe0f","👩🏽‍⚕️":"1f469-1f3fd-200d-2695-fe0f","👩🏾‍⚕️":"1f469-1f3fe-200d-2695-fe0f","👩🏿‍⚕️":"1f469-1f3ff-200d-2695-fe0f","🧑🏻‍⚖️":"1f9d1-1f3fb-200d-2696-fe0f","🧑🏼‍⚖️":"1f9d1-1f3fc-200d-2696-fe0f","🧑🏽‍⚖️":"1f9d1-1f3fd-200d-2696-fe0f","🧑🏾‍⚖️":"1f9d1-1f3fe-200d-2696-fe0f","🧑🏿‍⚖️":"1f9d1-1f3ff-200d-2696-fe0f","👨🏻‍⚖️":"1f468-1f3fb-200d-2696-fe0f","👨🏼‍⚖️":"1f468-1f3fc-200d-2696-fe0f","👨🏽‍⚖️":"1f468-1f3fd-200d-2696-fe0f","👨🏾‍⚖️":"1f468-1f3fe-200d-2696-fe0f","👨🏿‍⚖️":"1f468-1f3ff-200d-2696-fe0f","👩🏻‍⚖️":"1f469-1f3fb-200d-2696-fe0f","👩🏼‍⚖️":"1f469-1f3fc-200d-2696-fe0f","👩🏽‍⚖️":"1f469-1f3fd-200d-2696-fe0f","👩🏾‍⚖️":"1f469-1f3fe-200d-2696-fe0f","👩🏿‍⚖️":"1f469-1f3ff-200d-2696-fe0f","🧑🏻‍✈️":"1f9d1-1f3fb-200d-2708-fe0f","🧑🏼‍✈️":"1f9d1-1f3fc-200d-2708-fe0f","🧑🏽‍✈️":"1f9d1-1f3fd-200d-2708-fe0f","🧑🏾‍✈️":"1f9d1-1f3fe-200d-2708-fe0f","🧑🏿‍✈️":"1f9d1-1f3ff-200d-2708-fe0f","👨🏻‍✈️":"1f468-1f3fb-200d-2708-fe0f","👨🏼‍✈️":"1f468-1f3fc-200d-2708-fe0f","👨🏽‍✈️":"1f468-1f3fd-200d-2708-fe0f","👨🏾‍✈️":"1f468-1f3fe-200d-2708-fe0f","👨🏿‍✈️":"1f468-1f3ff-200d-2708-fe0f","👩🏻‍✈️":"1f469-1f3fb-200d-2708-fe0f","👩🏼‍✈️":"1f469-1f3fc-200d-2708-fe0f","👩🏽‍✈️":"1f469-1f3fd-200d-2708-fe0f","👩🏾‍✈️":"1f469-1f3fe-200d-2708-fe0f","👩🏿‍✈️":"1f469-1f3ff-200d-2708-fe0f","👮🏻‍♂️":"1f46e-1f3fb-200d-2642-fe0f","👮🏼‍♂️":"1f46e-1f3fc-200d-2642-fe0f","👮🏽‍♂️":"1f46e-1f3fd-200d-2642-fe0f","👮🏾‍♂️":"1f46e-1f3fe-200d-2642-fe0f","👮🏿‍♂️":"1f46e-1f3ff-200d-2642-fe0f","👮🏻‍♀️":"1f46e-1f3fb-200d-2640-fe0f","👮🏼‍♀️":"1f46e-1f3fc-200d-2640-fe0f","👮🏽‍♀️":"1f46e-1f3fd-200d-2640-fe0f","👮🏾‍♀️":"1f46e-1f3fe-200d-2640-fe0f","👮🏿‍♀️":"1f46e-1f3ff-200d-2640-fe0f","🕵️‍♂️":"1f575-fe0f-200d-2642-fe0f","🕵🏻‍♂️":"1f575-1f3fb-200d-2642-fe0f","🕵🏼‍♂️":"1f575-1f3fc-200d-2642-fe0f","🕵🏽‍♂️":"1f575-1f3fd-200d-2642-fe0f","🕵🏾‍♂️":"1f575-1f3fe-200d-2642-fe0f","🕵🏿‍♂️":"1f575-1f3ff-200d-2642-fe0f","🕵️‍♀️":"1f575-fe0f-200d-2640-fe0f","🕵🏻‍♀️":"1f575-1f3fb-200d-2640-fe0f","🕵🏼‍♀️":"1f575-1f3fc-200d-2640-fe0f","🕵🏽‍♀️":"1f575-1f3fd-200d-2640-fe0f","🕵🏾‍♀️":"1f575-1f3fe-200d-2640-fe0f","🕵🏿‍♀️":"1f575-1f3ff-200d-2640-fe0f","💂🏻‍♂️":"1f482-1f3fb-200d-2642-fe0f","💂🏼‍♂️":"1f482-1f3fc-200d-2642-fe0f","💂🏽‍♂️":"1f482-1f3fd-200d-2642-fe0f","💂🏾‍♂️":"1f482-1f3fe-200d-2642-fe0f","💂🏿‍♂️":"1f482-1f3ff-200d-2642-fe0f","💂🏻‍♀️":"1f482-1f3fb-200d-2640-fe0f","💂🏼‍♀️":"1f482-1f3fc-200d-2640-fe0f","💂🏽‍♀️":"1f482-1f3fd-200d-2640-fe0f","💂🏾‍♀️":"1f482-1f3fe-200d-2640-fe0f","💂🏿‍♀️":"1f482-1f3ff-200d-2640-fe0f","👷🏻‍♂️":"1f477-1f3fb-200d-2642-fe0f","👷🏼‍♂️":"1f477-1f3fc-200d-2642-fe0f","👷🏽‍♂️":"1f477-1f3fd-200d-2642-fe0f","👷🏾‍♂️":"1f477-1f3fe-200d-2642-fe0f","👷🏿‍♂️":"1f477-1f3ff-200d-2642-fe0f","👷🏻‍♀️":"1f477-1f3fb-200d-2640-fe0f","👷🏼‍♀️":"1f477-1f3fc-200d-2640-fe0f","👷🏽‍♀️":"1f477-1f3fd-200d-2640-fe0f","👷🏾‍♀️":"1f477-1f3fe-200d-2640-fe0f","👷🏿‍♀️":"1f477-1f3ff-200d-2640-fe0f","👳🏻‍♂️":"1f473-1f3fb-200d-2642-fe0f","👳🏼‍♂️":"1f473-1f3fc-200d-2642-fe0f","👳🏽‍♂️":"1f473-1f3fd-200d-2642-fe0f","👳🏾‍♂️":"1f473-1f3fe-200d-2642-fe0f","👳🏿‍♂️":"1f473-1f3ff-200d-2642-fe0f","👳🏻‍♀️":"1f473-1f3fb-200d-2640-fe0f","👳🏼‍♀️":"1f473-1f3fc-200d-2640-fe0f","👳🏽‍♀️":"1f473-1f3fd-200d-2640-fe0f","👳🏾‍♀️":"1f473-1f3fe-200d-2640-fe0f","👳🏿‍♀️":"1f473-1f3ff-200d-2640-fe0f","🤵🏻‍♂️":"1f935-1f3fb-200d-2642-fe0f","🤵🏼‍♂️":"1f935-1f3fc-200d-2642-fe0f","🤵🏽‍♂️":"1f935-1f3fd-200d-2642-fe0f","🤵🏾‍♂️":"1f935-1f3fe-200d-2642-fe0f","🤵🏿‍♂️":"1f935-1f3ff-200d-2642-fe0f","🤵🏻‍♀️":"1f935-1f3fb-200d-2640-fe0f","🤵🏼‍♀️":"1f935-1f3fc-200d-2640-fe0f","🤵🏽‍♀️":"1f935-1f3fd-200d-2640-fe0f","🤵🏾‍♀️":"1f935-1f3fe-200d-2640-fe0f","🤵🏿‍♀️":"1f935-1f3ff-200d-2640-fe0f","👰🏻‍♂️":"1f470-1f3fb-200d-2642-fe0f","👰🏼‍♂️":"1f470-1f3fc-200d-2642-fe0f","👰🏽‍♂️":"1f470-1f3fd-200d-2642-fe0f","👰🏾‍♂️":"1f470-1f3fe-200d-2642-fe0f","👰🏿‍♂️":"1f470-1f3ff-200d-2642-fe0f","👰🏻‍♀️":"1f470-1f3fb-200d-2640-fe0f","👰🏼‍♀️":"1f470-1f3fc-200d-2640-fe0f","👰🏽‍♀️":"1f470-1f3fd-200d-2640-fe0f","👰🏾‍♀️":"1f470-1f3fe-200d-2640-fe0f","👰🏿‍♀️":"1f470-1f3ff-200d-2640-fe0f","🦸🏻‍♂️":"1f9b8-1f3fb-200d-2642-fe0f","🦸🏼‍♂️":"1f9b8-1f3fc-200d-2642-fe0f","🦸🏽‍♂️":"1f9b8-1f3fd-200d-2642-fe0f","🦸🏾‍♂️":"1f9b8-1f3fe-200d-2642-fe0f","🦸🏿‍♂️":"1f9b8-1f3ff-200d-2642-fe0f","🦸🏻‍♀️":"1f9b8-1f3fb-200d-2640-fe0f","🦸🏼‍♀️":"1f9b8-1f3fc-200d-2640-fe0f","🦸🏽‍♀️":"1f9b8-1f3fd-200d-2640-fe0f","🦸🏾‍♀️":"1f9b8-1f3fe-200d-2640-fe0f","🦸🏿‍♀️":"1f9b8-1f3ff-200d-2640-fe0f","🦹🏻‍♂️":"1f9b9-1f3fb-200d-2642-fe0f","🦹🏼‍♂️":"1f9b9-1f3fc-200d-2642-fe0f","🦹🏽‍♂️":"1f9b9-1f3fd-200d-2642-fe0f","🦹🏾‍♂️":"1f9b9-1f3fe-200d-2642-fe0f","🦹🏿‍♂️":"1f9b9-1f3ff-200d-2642-fe0f","🦹🏻‍♀️":"1f9b9-1f3fb-200d-2640-fe0f","🦹🏼‍♀️":"1f9b9-1f3fc-200d-2640-fe0f","🦹🏽‍♀️":"1f9b9-1f3fd-200d-2640-fe0f","🦹🏾‍♀️":"1f9b9-1f3fe-200d-2640-fe0f","🦹🏿‍♀️":"1f9b9-1f3ff-200d-2640-fe0f","🧙🏻‍♂️":"1f9d9-1f3fb-200d-2642-fe0f","🧙🏼‍♂️":"1f9d9-1f3fc-200d-2642-fe0f","🧙🏽‍♂️":"1f9d9-1f3fd-200d-2642-fe0f","🧙🏾‍♂️":"1f9d9-1f3fe-200d-2642-fe0f","🧙🏿‍♂️":"1f9d9-1f3ff-200d-2642-fe0f","🧙🏻‍♀️":"1f9d9-1f3fb-200d-2640-fe0f","🧙🏼‍♀️":"1f9d9-1f3fc-200d-2640-fe0f","🧙🏽‍♀️":"1f9d9-1f3fd-200d-2640-fe0f","🧙🏾‍♀️":"1f9d9-1f3fe-200d-2640-fe0f","🧙🏿‍♀️":"1f9d9-1f3ff-200d-2640-fe0f","🧚🏻‍♂️":"1f9da-1f3fb-200d-2642-fe0f","🧚🏼‍♂️":"1f9da-1f3fc-200d-2642-fe0f","🧚🏽‍♂️":"1f9da-1f3fd-200d-2642-fe0f","🧚🏾‍♂️":"1f9da-1f3fe-200d-2642-fe0f","🧚🏿‍♂️":"1f9da-1f3ff-200d-2642-fe0f","🧚🏻‍♀️":"1f9da-1f3fb-200d-2640-fe0f","🧚🏼‍♀️":"1f9da-1f3fc-200d-2640-fe0f","🧚🏽‍♀️":"1f9da-1f3fd-200d-2640-fe0f","🧚🏾‍♀️":"1f9da-1f3fe-200d-2640-fe0f","🧚🏿‍♀️":"1f9da-1f3ff-200d-2640-fe0f","🧛🏻‍♂️":"1f9db-1f3fb-200d-2642-fe0f","🧛🏼‍♂️":"1f9db-1f3fc-200d-2642-fe0f","🧛🏽‍♂️":"1f9db-1f3fd-200d-2642-fe0f","🧛🏾‍♂️":"1f9db-1f3fe-200d-2642-fe0f","🧛🏿‍♂️":"1f9db-1f3ff-200d-2642-fe0f","🧛🏻‍♀️":"1f9db-1f3fb-200d-2640-fe0f","🧛🏼‍♀️":"1f9db-1f3fc-200d-2640-fe0f","🧛🏽‍♀️":"1f9db-1f3fd-200d-2640-fe0f","🧛🏾‍♀️":"1f9db-1f3fe-200d-2640-fe0f","🧛🏿‍♀️":"1f9db-1f3ff-200d-2640-fe0f","🧜🏻‍♂️":"1f9dc-1f3fb-200d-2642-fe0f","🧜🏼‍♂️":"1f9dc-1f3fc-200d-2642-fe0f","🧜🏽‍♂️":"1f9dc-1f3fd-200d-2642-fe0f","🧜🏾‍♂️":"1f9dc-1f3fe-200d-2642-fe0f","🧜🏿‍♂️":"1f9dc-1f3ff-200d-2642-fe0f","🧜🏻‍♀️":"1f9dc-1f3fb-200d-2640-fe0f","🧜🏼‍♀️":"1f9dc-1f3fc-200d-2640-fe0f","🧜🏽‍♀️":"1f9dc-1f3fd-200d-2640-fe0f","🧜🏾‍♀️":"1f9dc-1f3fe-200d-2640-fe0f","🧜🏿‍♀️":"1f9dc-1f3ff-200d-2640-fe0f","🧝🏻‍♂️":"1f9dd-1f3fb-200d-2642-fe0f","🧝🏼‍♂️":"1f9dd-1f3fc-200d-2642-fe0f","🧝🏽‍♂️":"1f9dd-1f3fd-200d-2642-fe0f","🧝🏾‍♂️":"1f9dd-1f3fe-200d-2642-fe0f","🧝🏿‍♂️":"1f9dd-1f3ff-200d-2642-fe0f","🧝🏻‍♀️":"1f9dd-1f3fb-200d-2640-fe0f","🧝🏼‍♀️":"1f9dd-1f3fc-200d-2640-fe0f","🧝🏽‍♀️":"1f9dd-1f3fd-200d-2640-fe0f","🧝🏾‍♀️":"1f9dd-1f3fe-200d-2640-fe0f","🧝🏿‍♀️":"1f9dd-1f3ff-200d-2640-fe0f","💆🏻‍♂️":"1f486-1f3fb-200d-2642-fe0f","💆🏼‍♂️":"1f486-1f3fc-200d-2642-fe0f","💆🏽‍♂️":"1f486-1f3fd-200d-2642-fe0f","💆🏾‍♂️":"1f486-1f3fe-200d-2642-fe0f","💆🏿‍♂️":"1f486-1f3ff-200d-2642-fe0f","💆🏻‍♀️":"1f486-1f3fb-200d-2640-fe0f","💆🏼‍♀️":"1f486-1f3fc-200d-2640-fe0f","💆🏽‍♀️":"1f486-1f3fd-200d-2640-fe0f","💆🏾‍♀️":"1f486-1f3fe-200d-2640-fe0f","💆🏿‍♀️":"1f486-1f3ff-200d-2640-fe0f","💇🏻‍♂️":"1f487-1f3fb-200d-2642-fe0f","💇🏼‍♂️":"1f487-1f3fc-200d-2642-fe0f","💇🏽‍♂️":"1f487-1f3fd-200d-2642-fe0f","💇🏾‍♂️":"1f487-1f3fe-200d-2642-fe0f","💇🏿‍♂️":"1f487-1f3ff-200d-2642-fe0f","💇🏻‍♀️":"1f487-1f3fb-200d-2640-fe0f","💇🏼‍♀️":"1f487-1f3fc-200d-2640-fe0f","💇🏽‍♀️":"1f487-1f3fd-200d-2640-fe0f","💇🏾‍♀️":"1f487-1f3fe-200d-2640-fe0f","💇🏿‍♀️":"1f487-1f3ff-200d-2640-fe0f","🚶🏻‍♂️":"1f6b6-1f3fb-200d-2642-fe0f","🚶🏼‍♂️":"1f6b6-1f3fc-200d-2642-fe0f","🚶🏽‍♂️":"1f6b6-1f3fd-200d-2642-fe0f","🚶🏾‍♂️":"1f6b6-1f3fe-200d-2642-fe0f","🚶🏿‍♂️":"1f6b6-1f3ff-200d-2642-fe0f","🚶🏻‍♀️":"1f6b6-1f3fb-200d-2640-fe0f","🚶🏼‍♀️":"1f6b6-1f3fc-200d-2640-fe0f","🚶🏽‍♀️":"1f6b6-1f3fd-200d-2640-fe0f","🚶🏾‍♀️":"1f6b6-1f3fe-200d-2640-fe0f","🚶🏿‍♀️":"1f6b6-1f3ff-200d-2640-fe0f","🧍🏻‍♂️":"1f9cd-1f3fb-200d-2642-fe0f","🧍🏼‍♂️":"1f9cd-1f3fc-200d-2642-fe0f","🧍🏽‍♂️":"1f9cd-1f3fd-200d-2642-fe0f","🧍🏾‍♂️":"1f9cd-1f3fe-200d-2642-fe0f","🧍🏿‍♂️":"1f9cd-1f3ff-200d-2642-fe0f","🧍🏻‍♀️":"1f9cd-1f3fb-200d-2640-fe0f","🧍🏼‍♀️":"1f9cd-1f3fc-200d-2640-fe0f","🧍🏽‍♀️":"1f9cd-1f3fd-200d-2640-fe0f","🧍🏾‍♀️":"1f9cd-1f3fe-200d-2640-fe0f","🧍🏿‍♀️":"1f9cd-1f3ff-200d-2640-fe0f","🧎🏻‍♂️":"1f9ce-1f3fb-200d-2642-fe0f","🧎🏼‍♂️":"1f9ce-1f3fc-200d-2642-fe0f","🧎🏽‍♂️":"1f9ce-1f3fd-200d-2642-fe0f","🧎🏾‍♂️":"1f9ce-1f3fe-200d-2642-fe0f","🧎🏿‍♂️":"1f9ce-1f3ff-200d-2642-fe0f","🧎🏻‍♀️":"1f9ce-1f3fb-200d-2640-fe0f","🧎🏼‍♀️":"1f9ce-1f3fc-200d-2640-fe0f","🧎🏽‍♀️":"1f9ce-1f3fd-200d-2640-fe0f","🧎🏾‍♀️":"1f9ce-1f3fe-200d-2640-fe0f","🧎🏿‍♀️":"1f9ce-1f3ff-200d-2640-fe0f","🏃🏻‍♂️":"1f3c3-1f3fb-200d-2642-fe0f","🏃🏼‍♂️":"1f3c3-1f3fc-200d-2642-fe0f","🏃🏽‍♂️":"1f3c3-1f3fd-200d-2642-fe0f","🏃🏾‍♂️":"1f3c3-1f3fe-200d-2642-fe0f","🏃🏿‍♂️":"1f3c3-1f3ff-200d-2642-fe0f","🏃🏻‍♀️":"1f3c3-1f3fb-200d-2640-fe0f","🏃🏼‍♀️":"1f3c3-1f3fc-200d-2640-fe0f","🏃🏽‍♀️":"1f3c3-1f3fd-200d-2640-fe0f","🏃🏾‍♀️":"1f3c3-1f3fe-200d-2640-fe0f","🏃🏿‍♀️":"1f3c3-1f3ff-200d-2640-fe0f","🧖🏻‍♂️":"1f9d6-1f3fb-200d-2642-fe0f","🧖🏼‍♂️":"1f9d6-1f3fc-200d-2642-fe0f","🧖🏽‍♂️":"1f9d6-1f3fd-200d-2642-fe0f","🧖🏾‍♂️":"1f9d6-1f3fe-200d-2642-fe0f","🧖🏿‍♂️":"1f9d6-1f3ff-200d-2642-fe0f","🧖🏻‍♀️":"1f9d6-1f3fb-200d-2640-fe0f","🧖🏼‍♀️":"1f9d6-1f3fc-200d-2640-fe0f","🧖🏽‍♀️":"1f9d6-1f3fd-200d-2640-fe0f","🧖🏾‍♀️":"1f9d6-1f3fe-200d-2640-fe0f","🧖🏿‍♀️":"1f9d6-1f3ff-200d-2640-fe0f","🧗🏻‍♂️":"1f9d7-1f3fb-200d-2642-fe0f","🧗🏼‍♂️":"1f9d7-1f3fc-200d-2642-fe0f","🧗🏽‍♂️":"1f9d7-1f3fd-200d-2642-fe0f","🧗🏾‍♂️":"1f9d7-1f3fe-200d-2642-fe0f","🧗🏿‍♂️":"1f9d7-1f3ff-200d-2642-fe0f","🧗🏻‍♀️":"1f9d7-1f3fb-200d-2640-fe0f","🧗🏼‍♀️":"1f9d7-1f3fc-200d-2640-fe0f","🧗🏽‍♀️":"1f9d7-1f3fd-200d-2640-fe0f","🧗🏾‍♀️":"1f9d7-1f3fe-200d-2640-fe0f","🧗🏿‍♀️":"1f9d7-1f3ff-200d-2640-fe0f","🏌️‍♂️":"1f3cc-fe0f-200d-2642-fe0f","🏌🏻‍♂️":"1f3cc-1f3fb-200d-2642-fe0f","🏌🏼‍♂️":"1f3cc-1f3fc-200d-2642-fe0f","🏌🏽‍♂️":"1f3cc-1f3fd-200d-2642-fe0f","🏌🏾‍♂️":"1f3cc-1f3fe-200d-2642-fe0f","🏌🏿‍♂️":"1f3cc-1f3ff-200d-2642-fe0f","🏌️‍♀️":"1f3cc-fe0f-200d-2640-fe0f","🏌🏻‍♀️":"1f3cc-1f3fb-200d-2640-fe0f","🏌🏼‍♀️":"1f3cc-1f3fc-200d-2640-fe0f","🏌🏽‍♀️":"1f3cc-1f3fd-200d-2640-fe0f","🏌🏾‍♀️":"1f3cc-1f3fe-200d-2640-fe0f","🏌🏿‍♀️":"1f3cc-1f3ff-200d-2640-fe0f","🏄🏻‍♂️":"1f3c4-1f3fb-200d-2642-fe0f","🏄🏼‍♂️":"1f3c4-1f3fc-200d-2642-fe0f","🏄🏽‍♂️":"1f3c4-1f3fd-200d-2642-fe0f","🏄🏾‍♂️":"1f3c4-1f3fe-200d-2642-fe0f","🏄🏿‍♂️":"1f3c4-1f3ff-200d-2642-fe0f","🏄🏻‍♀️":"1f3c4-1f3fb-200d-2640-fe0f","🏄🏼‍♀️":"1f3c4-1f3fc-200d-2640-fe0f","🏄🏽‍♀️":"1f3c4-1f3fd-200d-2640-fe0f","🏄🏾‍♀️":"1f3c4-1f3fe-200d-2640-fe0f","🏄🏿‍♀️":"1f3c4-1f3ff-200d-2640-fe0f","🚣🏻‍♂️":"1f6a3-1f3fb-200d-2642-fe0f","🚣🏼‍♂️":"1f6a3-1f3fc-200d-2642-fe0f","🚣🏽‍♂️":"1f6a3-1f3fd-200d-2642-fe0f","🚣🏾‍♂️":"1f6a3-1f3fe-200d-2642-fe0f","🚣🏿‍♂️":"1f6a3-1f3ff-200d-2642-fe0f","🚣🏻‍♀️":"1f6a3-1f3fb-200d-2640-fe0f","🚣🏼‍♀️":"1f6a3-1f3fc-200d-2640-fe0f","🚣🏽‍♀️":"1f6a3-1f3fd-200d-2640-fe0f","🚣🏾‍♀️":"1f6a3-1f3fe-200d-2640-fe0f","🚣🏿‍♀️":"1f6a3-1f3ff-200d-2640-fe0f","🏊🏻‍♂️":"1f3ca-1f3fb-200d-2642-fe0f","🏊🏼‍♂️":"1f3ca-1f3fc-200d-2642-fe0f","🏊🏽‍♂️":"1f3ca-1f3fd-200d-2642-fe0f","🏊🏾‍♂️":"1f3ca-1f3fe-200d-2642-fe0f","🏊🏿‍♂️":"1f3ca-1f3ff-200d-2642-fe0f","🏊🏻‍♀️":"1f3ca-1f3fb-200d-2640-fe0f","🏊🏼‍♀️":"1f3ca-1f3fc-200d-2640-fe0f","🏊🏽‍♀️":"1f3ca-1f3fd-200d-2640-fe0f","🏊🏾‍♀️":"1f3ca-1f3fe-200d-2640-fe0f","🏊🏿‍♀️":"1f3ca-1f3ff-200d-2640-fe0f","⛹️‍♂️":"26f9-fe0f-200d-2642-fe0f","⛹🏻‍♂️":"26f9-1f3fb-200d-2642-fe0f","⛹🏼‍♂️":"26f9-1f3fc-200d-2642-fe0f","⛹🏽‍♂️":"26f9-1f3fd-200d-2642-fe0f","⛹🏾‍♂️":"26f9-1f3fe-200d-2642-fe0f","⛹🏿‍♂️":"26f9-1f3ff-200d-2642-fe0f","⛹️‍♀️":"26f9-fe0f-200d-2640-fe0f","⛹🏻‍♀️":"26f9-1f3fb-200d-2640-fe0f","⛹🏼‍♀️":"26f9-1f3fc-200d-2640-fe0f","⛹🏽‍♀️":"26f9-1f3fd-200d-2640-fe0f","⛹🏾‍♀️":"26f9-1f3fe-200d-2640-fe0f","⛹🏿‍♀️":"26f9-1f3ff-200d-2640-fe0f","🏋️‍♂️":"1f3cb-fe0f-200d-2642-fe0f","🏋🏻‍♂️":"1f3cb-1f3fb-200d-2642-fe0f","🏋🏼‍♂️":"1f3cb-1f3fc-200d-2642-fe0f","🏋🏽‍♂️":"1f3cb-1f3fd-200d-2642-fe0f","🏋🏾‍♂️":"1f3cb-1f3fe-200d-2642-fe0f","🏋🏿‍♂️":"1f3cb-1f3ff-200d-2642-fe0f","🏋️‍♀️":"1f3cb-fe0f-200d-2640-fe0f","🏋🏻‍♀️":"1f3cb-1f3fb-200d-2640-fe0f","🏋🏼‍♀️":"1f3cb-1f3fc-200d-2640-fe0f","🏋🏽‍♀️":"1f3cb-1f3fd-200d-2640-fe0f","🏋🏾‍♀️":"1f3cb-1f3fe-200d-2640-fe0f","🏋🏿‍♀️":"1f3cb-1f3ff-200d-2640-fe0f","🚴🏻‍♂️":"1f6b4-1f3fb-200d-2642-fe0f","🚴🏼‍♂️":"1f6b4-1f3fc-200d-2642-fe0f","🚴🏽‍♂️":"1f6b4-1f3fd-200d-2642-fe0f","🚴🏾‍♂️":"1f6b4-1f3fe-200d-2642-fe0f","🚴🏿‍♂️":"1f6b4-1f3ff-200d-2642-fe0f","🚴🏻‍♀️":"1f6b4-1f3fb-200d-2640-fe0f","🚴🏼‍♀️":"1f6b4-1f3fc-200d-2640-fe0f","🚴🏽‍♀️":"1f6b4-1f3fd-200d-2640-fe0f","🚴🏾‍♀️":"1f6b4-1f3fe-200d-2640-fe0f","🚴🏿‍♀️":"1f6b4-1f3ff-200d-2640-fe0f","🚵🏻‍♂️":"1f6b5-1f3fb-200d-2642-fe0f","🚵🏼‍♂️":"1f6b5-1f3fc-200d-2642-fe0f","🚵🏽‍♂️":"1f6b5-1f3fd-200d-2642-fe0f","🚵🏾‍♂️":"1f6b5-1f3fe-200d-2642-fe0f","🚵🏿‍♂️":"1f6b5-1f3ff-200d-2642-fe0f","🚵🏻‍♀️":"1f6b5-1f3fb-200d-2640-fe0f","🚵🏼‍♀️":"1f6b5-1f3fc-200d-2640-fe0f","🚵🏽‍♀️":"1f6b5-1f3fd-200d-2640-fe0f","🚵🏾‍♀️":"1f6b5-1f3fe-200d-2640-fe0f","🚵🏿‍♀️":"1f6b5-1f3ff-200d-2640-fe0f","🤸🏻‍♂️":"1f938-1f3fb-200d-2642-fe0f","🤸🏼‍♂️":"1f938-1f3fc-200d-2642-fe0f","🤸🏽‍♂️":"1f938-1f3fd-200d-2642-fe0f","🤸🏾‍♂️":"1f938-1f3fe-200d-2642-fe0f","🤸🏿‍♂️":"1f938-1f3ff-200d-2642-fe0f","🤸🏻‍♀️":"1f938-1f3fb-200d-2640-fe0f","🤸🏼‍♀️":"1f938-1f3fc-200d-2640-fe0f","🤸🏽‍♀️":"1f938-1f3fd-200d-2640-fe0f","🤸🏾‍♀️":"1f938-1f3fe-200d-2640-fe0f","🤸🏿‍♀️":"1f938-1f3ff-200d-2640-fe0f","🤽🏻‍♂️":"1f93d-1f3fb-200d-2642-fe0f","🤽🏼‍♂️":"1f93d-1f3fc-200d-2642-fe0f","🤽🏽‍♂️":"1f93d-1f3fd-200d-2642-fe0f","🤽🏾‍♂️":"1f93d-1f3fe-200d-2642-fe0f","🤽🏿‍♂️":"1f93d-1f3ff-200d-2642-fe0f","🤽🏻‍♀️":"1f93d-1f3fb-200d-2640-fe0f","🤽🏼‍♀️":"1f93d-1f3fc-200d-2640-fe0f","🤽🏽‍♀️":"1f93d-1f3fd-200d-2640-fe0f","🤽🏾‍♀️":"1f93d-1f3fe-200d-2640-fe0f","🤽🏿‍♀️":"1f93d-1f3ff-200d-2640-fe0f","🤾🏻‍♂️":"1f93e-1f3fb-200d-2642-fe0f","🤾🏼‍♂️":"1f93e-1f3fc-200d-2642-fe0f","🤾🏽‍♂️":"1f93e-1f3fd-200d-2642-fe0f","🤾🏾‍♂️":"1f93e-1f3fe-200d-2642-fe0f","🤾🏿‍♂️":"1f93e-1f3ff-200d-2642-fe0f","🤾🏻‍♀️":"1f93e-1f3fb-200d-2640-fe0f","🤾🏼‍♀️":"1f93e-1f3fc-200d-2640-fe0f","🤾🏽‍♀️":"1f93e-1f3fd-200d-2640-fe0f","🤾🏾‍♀️":"1f93e-1f3fe-200d-2640-fe0f","🤾🏿‍♀️":"1f93e-1f3ff-200d-2640-fe0f","🤹🏻‍♂️":"1f939-1f3fb-200d-2642-fe0f","🤹🏼‍♂️":"1f939-1f3fc-200d-2642-fe0f","🤹🏽‍♂️":"1f939-1f3fd-200d-2642-fe0f","🤹🏾‍♂️":"1f939-1f3fe-200d-2642-fe0f","🤹🏿‍♂️":"1f939-1f3ff-200d-2642-fe0f","🤹🏻‍♀️":"1f939-1f3fb-200d-2640-fe0f","🤹🏼‍♀️":"1f939-1f3fc-200d-2640-fe0f","🤹🏽‍♀️":"1f939-1f3fd-200d-2640-fe0f","🤹🏾‍♀️":"1f939-1f3fe-200d-2640-fe0f","🤹🏿‍♀️":"1f939-1f3ff-200d-2640-fe0f","🧘🏻‍♂️":"1f9d8-1f3fb-200d-2642-fe0f","🧘🏼‍♂️":"1f9d8-1f3fc-200d-2642-fe0f","🧘🏽‍♂️":"1f9d8-1f3fd-200d-2642-fe0f","🧘🏾‍♂️":"1f9d8-1f3fe-200d-2642-fe0f","🧘🏿‍♂️":"1f9d8-1f3ff-200d-2642-fe0f","🧘🏻‍♀️":"1f9d8-1f3fb-200d-2640-fe0f","🧘🏼‍♀️":"1f9d8-1f3fc-200d-2640-fe0f","🧘🏽‍♀️":"1f9d8-1f3fd-200d-2640-fe0f","🧘🏾‍♀️":"1f9d8-1f3fe-200d-2640-fe0f","🧘🏿‍♀️":"1f9d8-1f3ff-200d-2640-fe0f","🧑‍🤝‍🧑":"1f9d1-200d-1f91d-200d-1f9d1","👩‍❤‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤‍👩":"1f469-200d-2764-fe0f-200d-1f469","👨‍👩‍👦":"1f468-200d-1f469-200d-1f466","👨‍👩‍👧":"1f468-200d-1f469-200d-1f467","👨‍👨‍👦":"1f468-200d-1f468-200d-1f466","👨‍👨‍👧":"1f468-200d-1f468-200d-1f467","👩‍👩‍👦":"1f469-200d-1f469-200d-1f466","👩‍👩‍👧":"1f469-200d-1f469-200d-1f467","👨‍👦‍👦":"1f468-200d-1f466-200d-1f466","👨‍👧‍👦":"1f468-200d-1f467-200d-1f466","👨‍👧‍👧":"1f468-200d-1f467-200d-1f467","👩‍👦‍👦":"1f469-200d-1f466-200d-1f466","👩‍👧‍👦":"1f469-200d-1f467-200d-1f466","👩‍👧‍👧":"1f469-200d-1f467-200d-1f467","🏳️‍⚧️":"1f3f3-fe0f-200d-26a7-fe0f","👩‍❤️‍👨":"1f469-200d-2764-fe0f-200d-1f468","👨‍❤️‍👨":"1f468-200d-2764-fe0f-200d-1f468","👩‍❤️‍👩":"1f469-200d-2764-fe0f-200d-1f469","🧑🏻‍🤝‍🧑🏻":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb","🧑🏻‍🤝‍🧑🏼":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc","🧑🏻‍🤝‍🧑🏽":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd","🧑🏻‍🤝‍🧑🏾":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe","🧑🏻‍🤝‍🧑🏿":"1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff","🧑🏼‍🤝‍🧑🏻":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb","🧑🏼‍🤝‍🧑🏼":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc","🧑🏼‍🤝‍🧑🏽":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd","🧑🏼‍🤝‍🧑🏾":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe","🧑🏼‍🤝‍🧑🏿":"1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff","🧑🏽‍🤝‍🧑🏻":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb","🧑🏽‍🤝‍🧑🏼":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc","🧑🏽‍🤝‍🧑🏽":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd","🧑🏽‍🤝‍🧑🏾":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe","🧑🏽‍🤝‍🧑🏿":"1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff","🧑🏾‍🤝‍🧑🏻":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb","🧑🏾‍🤝‍🧑🏼":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc","🧑🏾‍🤝‍🧑🏽":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd","🧑🏾‍🤝‍🧑🏾":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe","🧑🏾‍🤝‍🧑🏿":"1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff","🧑🏿‍🤝‍🧑🏻":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb","🧑🏿‍🤝‍🧑🏼":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc","🧑🏿‍🤝‍🧑🏽":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd","🧑🏿‍🤝‍🧑🏾":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe","🧑🏿‍🤝‍🧑🏿":"1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff","👩🏻‍🤝‍👩🏼":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc","👩🏻‍🤝‍👩🏽":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd","👩🏻‍🤝‍👩🏾":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👩🏿":"1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff","👩🏼‍🤝‍👩🏻":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb","👩🏼‍🤝‍👩🏽":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd","👩🏼‍🤝‍👩🏾":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe","👩🏼‍🤝‍👩🏿":"1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff","👩🏽‍🤝‍👩🏻":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb","👩🏽‍🤝‍👩🏼":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc","👩🏽‍🤝‍👩🏾":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe","👩🏽‍🤝‍👩🏿":"1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff","👩🏾‍🤝‍👩🏻":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb","👩🏾‍🤝‍👩🏼":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc","👩🏾‍🤝‍👩🏽":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd","👩🏾‍🤝‍👩🏿":"1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff","👩🏿‍🤝‍👩🏻":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb","👩🏿‍🤝‍👩🏼":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc","👩🏿‍🤝‍👩🏽":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd","👩🏿‍🤝‍👩🏾":"1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe","👩🏻‍🤝‍👨🏼":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc","👩🏻‍🤝‍👨🏽":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd","👩🏻‍🤝‍👨🏾":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe","👩🏻‍🤝‍👨🏿":"1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff","👩🏼‍🤝‍👨🏻":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb","👩🏼‍🤝‍👨🏽":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd","👩🏼‍🤝‍👨🏾":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe","👩🏼‍🤝‍👨🏿":"1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff","👩🏽‍🤝‍👨🏻":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb","👩🏽‍🤝‍👨🏼":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc","👩🏽‍🤝‍👨🏾":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe","👩🏽‍🤝‍👨🏿":"1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff","👩🏾‍🤝‍👨🏻":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb","👩🏾‍🤝‍👨🏼":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc","👩🏾‍🤝‍👨🏽":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd","👩🏾‍🤝‍👨🏿":"1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff","👩🏿‍🤝‍👨🏻":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb","👩🏿‍🤝‍👨🏼":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc","👩🏿‍🤝‍👨🏽":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd","👩🏿‍🤝‍👨🏾":"1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏼":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc","👨🏻‍🤝‍👨🏽":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd","👨🏻‍🤝‍👨🏾":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe","👨🏻‍🤝‍👨🏿":"1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff","👨🏼‍🤝‍👨🏻":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb","👨🏼‍🤝‍👨🏽":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd","👨🏼‍🤝‍👨🏾":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe","👨🏼‍🤝‍👨🏿":"1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff","👨🏽‍🤝‍👨🏻":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb","👨🏽‍🤝‍👨🏼":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc","👨🏽‍🤝‍👨🏾":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe","👨🏽‍🤝‍👨🏿":"1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff","👨🏾‍🤝‍👨🏻":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb","👨🏾‍🤝‍👨🏼":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc","👨🏾‍🤝‍👨🏽":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd","👨🏾‍🤝‍👨🏿":"1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff","👨🏿‍🤝‍👨🏻":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb","👨🏿‍🤝‍👨🏼":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc","👨🏿‍🤝‍👨🏽":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd","👨🏿‍🤝‍👨🏾":"1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe","👩‍❤‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","👨‍👩‍👧‍👦":"1f468-200d-1f469-200d-1f467-200d-1f466","👨‍👩‍👦‍👦":"1f468-200d-1f469-200d-1f466-200d-1f466","👨‍👩‍👧‍👧":"1f468-200d-1f469-200d-1f467-200d-1f467","👨‍👨‍👧‍👦":"1f468-200d-1f468-200d-1f467-200d-1f466","👨‍👨‍👦‍👦":"1f468-200d-1f468-200d-1f466-200d-1f466","👨‍👨‍👧‍👧":"1f468-200d-1f468-200d-1f467-200d-1f467","👩‍👩‍👧‍👦":"1f469-200d-1f469-200d-1f467-200d-1f466","👩‍👩‍👦‍👦":"1f469-200d-1f469-200d-1f466-200d-1f466","👩‍👩‍👧‍👧":"1f469-200d-1f469-200d-1f467-200d-1f467","🏴󠁧󠁢󠁥󠁮󠁧󠁿":"1f3f4-e0067-e0062-e0065-e006e-e0067-e007f","🏴󠁧󠁢󠁳󠁣󠁴󠁿":"1f3f4-e0067-e0062-e0073-e0063-e0074-e007f","🏴󠁧󠁢󠁷󠁬󠁳󠁿":"1f3f4-e0067-e0062-e0077-e006c-e0073-e007f","👩‍❤️‍💋‍👨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","👨‍❤️‍💋‍👨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","👩‍❤️‍💋‍👩":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","🧑🏻‍❤️‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏻‍❤️‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏻‍❤️‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏻‍❤️‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏼‍❤️‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏼‍❤️‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏼‍❤️‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏼‍❤️‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏽‍❤️‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏽‍❤️‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏽‍❤️‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe","🧑🏽‍❤️‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏾‍❤️‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏾‍❤️‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏾‍❤️‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏾‍❤️‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff","🧑🏿‍❤️‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb","🧑🏿‍❤️‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc","🧑🏿‍❤️‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd","🧑🏿‍❤️‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe","👩🏻‍❤️‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👩🏻‍❤️‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👩🏻‍❤️‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👩🏻‍❤️‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👩🏻‍❤️‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👩🏼‍❤️‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👩🏼‍❤️‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👩🏼‍❤️‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👩🏼‍❤️‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👩🏼‍❤️‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👩🏽‍❤️‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👩🏽‍❤️‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👩🏽‍❤️‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👩🏽‍❤️‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👩🏽‍❤️‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👩🏾‍❤️‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👩🏾‍❤️‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👩🏾‍❤️‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👩🏾‍❤️‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👩🏾‍❤️‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👩🏿‍❤️‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👩🏿‍❤️‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👩🏿‍❤️‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👩🏿‍❤️‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👩🏿‍❤️‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👨🏻‍❤️‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb","👨🏻‍❤️‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc","👨🏻‍❤️‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd","👨🏻‍❤️‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe","👨🏻‍❤️‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff","👨🏼‍❤️‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb","👨🏼‍❤️‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc","👨🏼‍❤️‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd","👨🏼‍❤️‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe","👨🏼‍❤️‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff","👨🏽‍❤️‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb","👨🏽‍❤️‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc","👨🏽‍❤️‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd","👨🏽‍❤️‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe","👨🏽‍❤️‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff","👨🏾‍❤️‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb","👨🏾‍❤️‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc","👨🏾‍❤️‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd","👨🏾‍❤️‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe","👨🏾‍❤️‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff","👨🏿‍❤️‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb","👨🏿‍❤️‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc","👨🏿‍❤️‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd","👨🏿‍❤️‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe","👨🏿‍❤️‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff","👩🏻‍❤️‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb","👩🏻‍❤️‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc","👩🏻‍❤️‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd","👩🏻‍❤️‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe","👩🏻‍❤️‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff","👩🏼‍❤️‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb","👩🏼‍❤️‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc","👩🏼‍❤️‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd","👩🏼‍❤️‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe","👩🏼‍❤️‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff","👩🏽‍❤️‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb","👩🏽‍❤️‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc","👩🏽‍❤️‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd","👩🏽‍❤️‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe","👩🏽‍❤️‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff","👩🏾‍❤️‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb","👩🏾‍❤️‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc","👩🏾‍❤️‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd","👩🏾‍❤️‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe","👩🏾‍❤️‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff","👩🏿‍❤️‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb","👩🏿‍❤️‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc","👩🏿‍❤️‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd","👩🏿‍❤️‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe","👩🏿‍❤️‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff","🧑🏻‍❤‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","🧑🏻‍❤️‍💋‍🧑🏼":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏻‍❤️‍💋‍🧑🏽":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏻‍❤️‍💋‍🧑🏾":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏻‍❤️‍💋‍🧑🏿":"1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏼‍❤️‍💋‍🧑🏻":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏼‍❤️‍💋‍🧑🏽":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏼‍❤️‍💋‍🧑🏾":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏼‍❤️‍💋‍🧑🏿":"1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏽‍❤️‍💋‍🧑🏻":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏽‍❤️‍💋‍🧑🏼":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏽‍❤️‍💋‍🧑🏾":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","🧑🏽‍❤️‍💋‍🧑🏿":"1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏾‍❤️‍💋‍🧑🏻":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏾‍❤️‍💋‍🧑🏼":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏾‍❤️‍💋‍🧑🏽":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏾‍❤️‍💋‍🧑🏿":"1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff","🧑🏿‍❤️‍💋‍🧑🏻":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb","🧑🏿‍❤️‍💋‍🧑🏼":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc","🧑🏿‍❤️‍💋‍🧑🏽":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd","🧑🏿‍❤️‍💋‍🧑🏾":"1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe","👩🏻‍❤️‍💋‍👨🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏻‍❤️‍💋‍👨🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏻‍❤️‍💋‍👨🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏻‍❤️‍💋‍👨🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏻‍❤️‍💋‍👨🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏼‍❤️‍💋‍👨🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏼‍❤️‍💋‍👨🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏼‍❤️‍💋‍👨🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏼‍❤️‍💋‍👨🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏼‍❤️‍💋‍👨🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏽‍❤️‍💋‍👨🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏽‍❤️‍💋‍👨🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏽‍❤️‍💋‍👨🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏽‍❤️‍💋‍👨🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏽‍❤️‍💋‍👨🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏾‍❤️‍💋‍👨🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏾‍❤️‍💋‍👨🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏾‍❤️‍💋‍👨🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏾‍❤️‍💋‍👨🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏾‍❤️‍💋‍👨🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏿‍❤️‍💋‍👨🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👩🏿‍❤️‍💋‍👨🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👩🏿‍❤️‍💋‍👨🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👩🏿‍❤️‍💋‍👨🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👩🏿‍❤️‍💋‍👨🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏻‍❤️‍💋‍👨🏻":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏻‍❤️‍💋‍👨🏼":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏻‍❤️‍💋‍👨🏽":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏻‍❤️‍💋‍👨🏾":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏻‍❤️‍💋‍👨🏿":"1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏼‍❤️‍💋‍👨🏻":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏼‍❤️‍💋‍👨🏼":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏼‍❤️‍💋‍👨🏽":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏼‍❤️‍💋‍👨🏾":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏼‍❤️‍💋‍👨🏿":"1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏽‍❤️‍💋‍👨🏻":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏽‍❤️‍💋‍👨🏼":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏽‍❤️‍💋‍👨🏽":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏽‍❤️‍💋‍👨🏾":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏽‍❤️‍💋‍👨🏿":"1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏾‍❤️‍💋‍👨🏻":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏾‍❤️‍💋‍👨🏼":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏾‍❤️‍💋‍👨🏽":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏾‍❤️‍💋‍👨🏾":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏾‍❤️‍💋‍👨🏿":"1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👨🏿‍❤️‍💋‍👨🏻":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb","👨🏿‍❤️‍💋‍👨🏼":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc","👨🏿‍❤️‍💋‍👨🏽":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd","👨🏿‍❤️‍💋‍👨🏾":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe","👨🏿‍❤️‍💋‍👨🏿":"1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff","👩🏻‍❤️‍💋‍👩🏻":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏻‍❤️‍💋‍👩🏼":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏻‍❤️‍💋‍👩🏽":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏻‍❤️‍💋‍👩🏾":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏻‍❤️‍💋‍👩🏿":"1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏼‍❤️‍💋‍👩🏻":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏼‍❤️‍💋‍👩🏼":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏼‍❤️‍💋‍👩🏽":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏼‍❤️‍💋‍👩🏾":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏼‍❤️‍💋‍👩🏿":"1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏽‍❤️‍💋‍👩🏻":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏽‍❤️‍💋‍👩🏼":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏽‍❤️‍💋‍👩🏽":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏽‍❤️‍💋‍👩🏾":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏽‍❤️‍💋‍👩🏿":"1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏾‍❤️‍💋‍👩🏻":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏾‍❤️‍💋‍👩🏼":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏾‍❤️‍💋‍👩🏽":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏾‍❤️‍💋‍👩🏾":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏾‍❤️‍💋‍👩🏿":"1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff","👩🏿‍❤️‍💋‍👩🏻":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb","👩🏿‍❤️‍💋‍👩🏼":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc","👩🏿‍❤️‍💋‍👩🏽":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd","👩🏿‍❤️‍💋‍👩🏾":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe","👩🏿‍❤️‍💋‍👩🏿":"1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff"}
\ No newline at end of file
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index c24ea42e7d..e9fea2deea 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -45,7 +45,7 @@ end
 namespace :emojis do
   desc 'Generate a unicode to filename mapping'
   task :generate do
-    source = 'http://www.unicode.org/Public/emoji/14.0/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/15.0/emoji-test.txt'
     codes  = []
     dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
 
@@ -91,8 +91,8 @@ namespace :emojis do
   desc 'Generate emoji variants with white borders'
   task :generate_borders do
     src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
-    emojis_light = '👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️'
-    emojis_dark = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂‍♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂‍♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲'
+    emojis_light = '👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️🪽🪿'
+    emojis_dark = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂‍♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂‍♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲🪮🐦‍⬛'
 
     map = Oj.load(File.read(src))
 
diff --git a/public/emoji/1f1f2-1f1fe.svg b/public/emoji/1f1f2-1f1fe.svg
index 0480330cd0..29a3e3f794 100644
--- a/public/emoji/1f1f2-1f1fe.svg
+++ b/public/emoji/1f1f2-1f1fe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#DD2E44" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#EEE" d="M.555 29h34.891c.343-.591.554-1.268.554-2H0c0 .732.211 1.409.555 2zM0 23h36v2H0zm0-4h36v2H0zm0-4h36v2H0zm0-4h36v2H0zm.555-4C.211 7.59 0 8.268 0 9h36c0-.732-.211-1.41-.555-2H.555z"/><path fill="#010066" d="M18 5H4C1.791 5 0 6.791 0 9v10h18V5z"/><path fill="#FFCC4D" d="M9.534 17.233C6.644 17.233 4.3 14.89 4.3 12c0-2.89 2.343-5.233 5.233-5.233.715 0 1.397.146 2.018.405C10.556 6.438 9.331 6 8 6c-3.313 0-6 2.687-6 6 0 3.314 2.687 6 6 6 1.331 0 2.556-.438 3.551-1.172-.621.26-1.302.405-2.017.405z"/><path fill="#FFCC4D" d="M12.922 8.829l.334 1.62 1.003-1.315-.402 1.604 1.475-.749-1.059 1.271 1.654-.035-1.505.686 1.505.686-1.654-.035 1.059 1.271-1.475-.749.402 1.605-1.003-1.316-.334 1.621-.334-1.621-1.003 1.316.402-1.605-1.475.749 1.058-1.271-1.653.035 1.505-.686-1.505-.686 1.653.035-1.058-1.271 1.475.749-.402-1.604 1.003 1.315z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EEE" d="M36 27a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V9a4 4 0 0 1 4-4h28a4 4 0 0 1 4 4v18z"/><path fill="#DD2E44" d="M.646 29.18h34.708c.354-.544.58-1.18.634-1.863H.012c.054.684.28 1.32.634 1.863ZM36 23.597v1.863H0v-1.863h36Zm0-1.857v-1.863H0v1.863h36ZM0 16.157v1.863h36v-1.863H0ZM36 14.3v-1.863H0V14.3h36ZM0 9v1.58h36V9c0-.095-.003-.19-.01-.283H.01C.003 8.811 0 8.905 0 9Zm4-4C2.578 5 1.33 5.742.62 6.86h34.76A3.997 3.997 0 0 0 32 5H4Z"/><path fill="#010066" d="M18 5H4a4 4 0 0 0-4 4v10.88h18V5z"/><path fill="#FFCC4D" d="M9.534 17.673a5.234 5.234 0 0 1-.001-10.466c.715 0 1.397.146 2.018.405A5.958 5.958 0 0 0 8 6.44a6 6 0 0 0 0 12 5.958 5.958 0 0 0 3.551-1.172 5.21 5.21 0 0 1-2.017.405z"/><path fill="#FFCC4D" d="m12.922 9.269.334 1.62 1.003-1.315-.402 1.604 1.475-.749-1.059 1.271 1.654-.035-1.505.686 1.505.686-1.654-.035 1.059 1.271-1.475-.749.402 1.605-1.003-1.316-.334 1.621-.334-1.621-1.003 1.316.402-1.605-1.475.749 1.058-1.271-1.653.035 1.505-.686-1.505-.686 1.653.035-1.058-1.271 1.475.749-.402-1.604 1.003 1.315z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f301.svg b/public/emoji/1f301.svg
index d6298de42d..dfec948364 100644
--- a/public/emoji/1f301.svg
+++ b/public/emoji/1f301.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M32 0H4C1.791 0 0 1.791 0 4v6h36V4c0-2.209-1.791-4-4-4z"/><path fill="#E1E8ED" d="M36 16.368V9.257c-.638-.394-1.383-.632-2.188-.632-1.325 0-2.491.627-3.259 1.588C29.75 9.466 28.683 9 27.5 9c-.721 0-1.392.185-1.996.486C24.763 8.018 23.257 7 21.5 7c-.607 0-1.184.124-1.712.342C19.308 5.981 18.024 5 16.5 5c-1.207 0-2.273.611-2.901 1.542C12.97 6.207 12.263 6 11.5 6c-1.641 0-3.062.887-3.848 2.198C6.928 6.33 5.125 5 3 5c-1.131 0-2.162.389-3 1.022v7.955C.838 14.611 24.5 18 24.5 18s10.862-1.238 11.5-1.632z"/><path fill="#CCD6DD" d="M36 14.771C35.157 13.7 33.864 13 32.396 13c-1.997 0-3.681 1.279-4.318 3.059-.19-.033-.38-.059-.578-.059-.82 0-1.565.294-2.162.767C24.679 16.289 23.876 16 23 16c-.353 0-.689.06-1.015.146.002-.049.015-.096.015-.146 0-2.209-1.791-4-4-4-1.215 0-2.291.554-3.024 1.409C14.369 13.148 13.702 13 13 13c-.18 0-.35.034-.525.053C11.429 10.505 8.926 8.709 6 8.709c-2.551 0-4.777 1.369-6 3.408v13.544l32.396-1.452s2.761-1.343 3.604-2.966v-6.472z"/><path fill="#E1E8ED" d="M36 30.499V20.422c-.613-.268-1.288-.422-2-.422-2.125 0-3.928 1.33-4.652 3.198C28.562 21.887 27.141 21 25.5 21c-.763 0-1.47.207-2.099.542C22.773 20.611 21.707 20 20.5 20c-1.524 0-2.808.981-3.288 2.342-.528-.218-1.105-.342-1.712-.342-1.757 0-3.263 1.018-4.004 2.486C10.892 24.185 10.221 24 9.5 24c-1.183 0-2.25.466-3.054 1.213-.768-.961-1.934-1.588-3.259-1.588-1.284 0-2.419.591-3.188 1.501v5.373H36z"/><path fill="#FE5011" d="M36 24.059C32.465 22.229 25.013 17.594 20 9c0 0 0-2-2-2s-2 2-2 2C10.987 17.594 3.535 22.229 0 24.059v2.068c1.044-.495 2.422-1.204 4-2.169V24h2v-1.341c1.284-.88 2.637-1.908 4-3.094V27h2v-9.292c1.384-1.375 2.74-2.923 4-4.655V24h4V13.054c1.26 1.731 2.616 3.28 4 4.655V26h2v-6.435c1.362 1.186 2.716 2.214 4 3.095V25h2v-1.042c1.578.965 2.956 1.674 4 2.169v-2.068z"/><path fill="#F5F8FA" d="M25 25c-.821 0-1.582.249-2.217.673-.664-1.839-2.5-3.07-4.534-2.863-1.883.192-3.348 1.56-3.777 3.298-.181-.012-.363-.019-.55 0-.773.079-1.448.427-1.965.93-.667-.387-1.452-.582-2.278-.498-.333.034-.644.123-.942.236-.003-.047.004-.093 0-.139-.212-2.083-2.073-3.599-4.155-3.387-1.145.117-2.107.742-2.716 1.619-.586-.186-1.217-.258-1.866-.197V32c0 .773.23 1.489.61 2.101C.715 34.098 29 31.209 29 29s-1.791-4-4-4z"/><path fill="#CCD6DD" d="M32 36c2.209 0 4-1.791 4-4v-7.608c-.91-.433-1.925-.683-3-.683-2.926 0-5.429 1.796-6.475 4.344C26.35 28.034 26.18 28 26 28c-.702 0-1.369.147-1.976.409C23.291 27.554 22.215 27 21 27c-2.209 0-4 1.791-4 4 0 .05.013.097.015.146C16.689 31.06 16.353 31 16 31c-.876 0-1.679.289-2.338.767C13.065 31.294 12.32 31 11.5 31c-.198 0-.388.026-.577.059C10.286 29.279 8.602 28 6.604 28c-1.987 0-3.665 1.266-4.31 3.03C2.195 31.022 2.101 31 2 31c-.732 0-1.41.211-2 .555V32c0 2.209 1.791 4 4 4h28z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M32 0H4a4 4 0 0 0-4 4v7h36V4a4 4 0 0 0-4-4z"/><path fill="#E1E8ED" d="M36 16.368V9.257a4.148 4.148 0 0 0-2.188-.632c-1.325 0-2.491.627-3.259 1.588A4.466 4.466 0 0 0 27.5 9c-.721 0-1.392.185-1.996.486C24.763 8.018 23.257 7 21.5 7c-.607 0-1.184.124-1.712.342a3.49 3.49 0 0 0-6.189-.8A4.443 4.443 0 0 0 11.5 6c-1.641 0-3.062.887-3.848 2.198A4.99 4.99 0 0 0 3 5a4.955 4.955 0 0 0-3 1.022v7.955C.838 14.611 24.5 18 24.5 18s10.862-1.238 11.5-1.632z"/><path fill="#CCD6DD" d="M36 14.771C35.157 13.7 33.864 13 32.396 13c-1.997 0-3.681 1.279-4.318 3.059A3.35 3.35 0 0 0 27.5 16c-.82 0-1.565.294-2.162.767C22.146 14.452 22.265 12 18 12a3.974 3.974 0 0 0-3.024 1.409A4.989 4.989 0 0 0 13 13c-.18 0-.35.034-.525.053A6.998 6.998 0 0 0 6 8.709a6.989 6.989 0 0 0-6 3.408v13.544l32.396-1.452s2.761-1.343 3.604-2.966v-6.472z"/><path fill="#E1E8ED" d="M36 30.499V20.422A4.979 4.979 0 0 0 34 20a4.99 4.99 0 0 0-4.652 3.198C28.562 21.887 27.141 21 25.5 21c-.763 0-1.47.207-2.099.542a3.49 3.49 0 0 0-6.189.8A4.474 4.474 0 0 0 15.5 22c-1.757 0-3.263 1.018-4.004 2.486A4.453 4.453 0 0 0 9.5 24a4.47 4.47 0 0 0-3.054 1.213c-.768-.961-1.934-1.588-3.259-1.588-1.284 0-2.419.591-3.188 1.501v5.373H36z"/><path fill="#FE5011" d="M36 24.059C32.465 22.229 25.013 17.594 20 9c0 0 0-2-2-2s-2 2-2 2C10.987 17.594 3.535 22.229 0 24.059v2.068a42.972 42.972 0 0 0 4-2.169V24h2v-1.341a43.982 43.982 0 0 0 4-3.094V27h2v-9.292a38.473 38.473 0 0 0 4-4.655V24h4V13.054a38.55 38.55 0 0 0 4 4.655V26h2v-6.435a44.043 44.043 0 0 0 4 3.095V25h2v-1.042a42.972 42.972 0 0 0 4 2.169v-2.068z"/><path fill="#F5F8FA" d="M25 25c-.821 0-1.582.249-2.217.673a4.355 4.355 0 0 0-4.534-2.863 4.349 4.349 0 0 0-3.777 3.298 3.258 3.258 0 0 0-.55 0 3.289 3.289 0 0 0-1.965.93 3.76 3.76 0 0 0-2.278-.498 3.708 3.708 0 0 0-.942.236c-.003-.047.004-.093 0-.139a3.79 3.79 0 0 0-4.155-3.387 3.767 3.767 0 0 0-2.716 1.619A4.699 4.699 0 0 0 0 24.672V32c0 .773.23 1.489.61 2.101C.715 34.098 29 31.209 29 29s-1.791-4-4-4z"/><path fill="#CCD6DD" d="M32 36a4 4 0 0 0 4-4v-7.608a6.962 6.962 0 0 0-3-.683 6.998 6.998 0 0 0-6.475 4.344C26.35 28.034 26.18 28 26 28c-.702 0-1.369.147-1.976.409A3.974 3.974 0 0 0 21 27a4 4 0 0 0-4 4c0 .05.013.097.015.146A3.956 3.956 0 0 0 16 31c-.876 0-1.679.289-2.338.767A3.468 3.468 0 0 0 11.5 31a3.33 3.33 0 0 0-.577.059C10.286 29.279 8.602 28 6.604 28c-1.987 0-3.665 1.266-4.31 3.03C2.195 31.022 2.101 31 2 31c-.732 0-1.41.211-2 .555V32a4 4 0 0 0 4 4h28z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f3e5.svg b/public/emoji/1f3e5.svg
index 0b2748a523..33884c8ceb 100644
--- a/public/emoji/1f3e5.svg
+++ b/public/emoji/1f3e5.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M24 10c0 1.104-.896 2-2 2h-8c-1.104 0-2-.896-2-2V2c0-1.104.896-2 2-2h8c1.104 0 2 .896 2 2v8zM0 14v20c0 1.104.896 2 2 2h32c1.104 0 2-.896 2-2V14H0z"/><path fill="#99AAB5" d="M18 12H2c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/><path fill="#99AAB5" d="M34 12H18c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/><path fill="#55ACEE" d="M2 22h32v4H2zm0-6h32v4H2zm0 12h32v4H2z"/><path fill="#E1E8ED" d="M8 12h20v24H8z"/><path fill="#55ACEE" d="M10 20h16v4H10zm0-6h16v4H10zm0 12h16v4H10z"/><path fill="#3B88C3" d="M13 32h10v4H13z"/><path fill="#DD2E44" d="M22 4h-3V1h-2v3h-3v2h3v3h2V6h3z"/><path fill="#99AAB5" d="M26 10H10c-1.104 0-2 .896-2 2h20c0-1.104-.896-2-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M0 9v25a2 2 0 0 0 2 2h32a2 2 0 0 0 2-2V9H0Z"/><path fill="#99AAB5" d="M34 7H2a2 2 0 0 0-2 2h36a2 2 0 0 0-2-2Z"/><path fill="#55ACEE" d="M2 18h32v4H2v-4Zm0-6h32v4H2v-4Zm0 12h32v4H2v-4Z"/><path fill="#55ACEE" d="M34 24H2v4h32v-4Z"/><path fill="#E1E8ED" d="M8 2h20v34H8V2Z"/><path fill="#55ACEE" d="M10 20h16v4H10v-4Zm0-6h16v4H10v-4Zm0 12h16v4H10v-4Z"/><path fill="#3B88C3" d="M13 32h10v4H13v-4Z"/><path fill="#DD2E44" d="M22 6.5v3h-2.5V12h-3V9.5H14v-3h2.5V4h3v2.5H22Zm-4.5 1H15v1h2.5V11h1V8.5H21v-1h-2.5V5h-1v2.5Z"/><path fill="#99AAB5" d="M26 0H10a2 2 0 0 0-2 2h20a2 2 0 0 0-2-2Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f426-200d-2b1b.svg b/public/emoji/1f426-200d-2b1b.svg
new file mode 100755
index 0000000000..07908724aa
--- /dev/null
+++ b/public/emoji/1f426-200d-2b1b.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M8.916 12.88c-.111 1.652 1.768 3.126-.712 2.959-2.48-.167-7.836-2.533-7.768-3.53s3.708-2.757 6.188-2.59c2.48.166 2.404 1.508 2.292 3.161m20.122 16.049a.966.966 0 0 0-.564.095c-2.325.232-3.225-1.885-3.225-1.885-.439-.336-.981-2.009-1.589-1.215l.187 1.402c.187 1.402 2.57 3.224 2.57 3.224l-1.215 1.589a1 1 0 1 0 1.589 1.215l.673-.88-.039.249a1 1 0 1 0 1.976.314l.47-2.963a1.003 1.003 0 0 0-.833-1.145zm-6.278.623a.984.984 0 0 0-.572.018c-2.335-.082-2.944-2.3-2.944-2.3-.39-.392-.703-2.123-1.412-1.417l-.003 1.414c-.003 1.414 2.115 3.539 2.115 3.539l-1.417 1.412a.999.999 0 1 0 1.411 1.417l.785-.782-.073.242a1 1 0 0 0 1.916.576l.862-2.873a.996.996 0 0 0-.668-1.246z"/><path fill="#31373D" d="M35.009 6.729c-.383-.17-.758-.057-1.05.244-.054.056-4.225 6.306-14.532 4.944-.34-.045 3.139 11.968 3.199 11.962.124-.014 3.07-.368 6.14-2.553 2.818-2.005 6.284-5.991 6.797-13.598.028-.418-.171-.828-.554-.999z"/><path fill="#31373D" d="M34.477 21.108c-.204-.336-.59-.56-.979-.471-1.293.295-3.197.543-4.53.453-6.357-.428-9.361-4.129-9.392-4.16-.275-.282.466 11.552.816 11.576 9.194.62 13.862-6.027 14.057-6.31.222-.326.233-.751.028-1.088"/><path fill="#31373D" d="M24.586 19.016c-.371 5.51 1.316 9.861-4.194 9.489-5.51-.371-10.145-4.92-9.774-10.431s14.34-4.568 13.968.942"/><path fill="#31373D" d="M23.257 12.412c-.353 5.235-3.922 9.257-9.156 8.904-5.235-.353-9.193-4.882-8.84-10.117.353-5.235 4.832-8.444 10.067-8.091 4.001.269 8.24 4.683 7.929 9.304z"/><circle cx="10.67" cy="8.989" r="2"/><path d="M18.179 16.645s7.63 5.648 12.387-4.459c.396-.842 1.685.793.099 4.162s-8.175 6.44-12.04 1.536c-.815-1.035-.446-1.239-.446-1.239"/><path fill="#31373D" d="M15.327 3.107s6.246.254 7.798-.477.136 2.932-3.262 3.789-4.536-3.312-4.536-3.312z"/><path fill="#31373D" d="M17.428 5.788s4.501.136 6.054-.594.136 2.932-3.262 3.789c-3.399.857-2.792-3.195-2.792-3.195z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f426-200d-2b1b_border.svg b/public/emoji/1f426-200d-2b1b_border.svg
new file mode 100644
index 0000000000..f0be16a32b
--- /dev/null
+++ b/public/emoji/1f426-200d-2b1b_border.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M8.916 12.88c-.111 1.652 1.768 3.126-.712 2.959-2.48-.167-7.836-2.533-7.768-3.53s3.708-2.757 6.188-2.59c2.48.166 2.404 1.508 2.292 3.161m20.122 16.049a.966.966 0 0 0-.564.095c-2.325.232-3.225-1.885-3.225-1.885-.439-.336-.981-2.009-1.589-1.215l.187 1.402c.187 1.402 2.57 3.224 2.57 3.224l-1.215 1.589a1 1 0 1 0 1.589 1.215l.673-.88-.039.249a1 1 0 1 0 1.976.314l.47-2.963a1.003 1.003 0 0 0-.833-1.145zm-6.278.623a.984.984 0 0 0-.572.018c-2.335-.082-2.944-2.3-2.944-2.3-.39-.392-.703-2.123-1.412-1.417l-.003 1.414c-.003 1.414 2.115 3.539 2.115 3.539l-1.417 1.412a.999.999 0 1 0 1.411 1.417l.785-.782-.073.242a1 1 0 0 0 1.916.576l.862-2.873a.996.996 0 0 0-.668-1.246z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M35.009 6.729c-.383-.17-.758-.057-1.05.244-.054.056-4.225 6.306-14.532 4.944-.34-.045 3.139 11.968 3.199 11.962.124-.014 3.07-.368 6.14-2.553 2.818-2.005 6.284-5.991 6.797-13.598.028-.418-.171-.828-.554-.999z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M34.477 21.108c-.204-.336-.59-.56-.979-.471-1.293.295-3.197.543-4.53.453-6.357-.428-9.361-4.129-9.392-4.16-.275-.282.466 11.552.816 11.576 9.194.62 13.862-6.027 14.057-6.31.222-.326.233-.751.028-1.088" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24.586 19.016c-.371 5.51 1.316 9.861-4.194 9.489-5.51-.371-10.145-4.92-9.774-10.431s14.34-4.568 13.968.942" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M23.257 12.412c-.353 5.235-3.922 9.257-9.156 8.904-5.235-.353-9.193-4.882-8.84-10.117.353-5.235 4.832-8.444 10.067-8.091 4.001.269 8.24 4.683 7.929 9.304z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="10.67" cy="8.989" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M18.179 16.645s7.63 5.648 12.387-4.459c.396-.842 1.685.793.099 4.162s-8.175 6.44-12.04 1.536c-.815-1.035-.446-1.239-.446-1.239" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M15.327 3.107s6.246.254 7.798-.477.136 2.932-3.262 3.789-4.536-3.312-4.536-3.312z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M17.428 5.788s4.501.136 6.054-.594.136 2.932-3.262 3.789c-3.399.857-2.792-3.195-2.792-3.195z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#FFAC33" d="M8.916 12.88c-.111 1.652 1.768 3.126-.712 2.959-2.48-.167-7.836-2.533-7.768-3.53s3.708-2.757 6.188-2.59c2.48.166 2.404 1.508 2.292 3.161m20.122 16.049a.966.966 0 0 0-.564.095c-2.325.232-3.225-1.885-3.225-1.885-.439-.336-.981-2.009-1.589-1.215l.187 1.402c.187 1.402 2.57 3.224 2.57 3.224l-1.215 1.589a1 1 0 1 0 1.589 1.215l.673-.88-.039.249a1 1 0 1 0 1.976.314l.47-2.963a1.003 1.003 0 0 0-.833-1.145zm-6.278.623a.984.984 0 0 0-.572.018c-2.335-.082-2.944-2.3-2.944-2.3-.39-.392-.703-2.123-1.412-1.417l-.003 1.414c-.003 1.414 2.115 3.539 2.115 3.539l-1.417 1.412a.999.999 0 1 0 1.411 1.417l.785-.782-.073.242a1 1 0 0 0 1.916.576l.862-2.873a.996.996 0 0 0-.668-1.246z"/>
+  <path fill="#31373D" d="M35.009 6.729c-.383-.17-.758-.057-1.05.244-.054.056-4.225 6.306-14.532 4.944-.34-.045 3.139 11.968 3.199 11.962.124-.014 3.07-.368 6.14-2.553 2.818-2.005 6.284-5.991 6.797-13.598.028-.418-.171-.828-.554-.999z"/>
+  <path fill="#31373D" d="M34.477 21.108c-.204-.336-.59-.56-.979-.471-1.293.295-3.197.543-4.53.453-6.357-.428-9.361-4.129-9.392-4.16-.275-.282.466 11.552.816 11.576 9.194.62 13.862-6.027 14.057-6.31.222-.326.233-.751.028-1.088"/>
+  <path fill="#31373D" d="M24.586 19.016c-.371 5.51 1.316 9.861-4.194 9.489-5.51-.371-10.145-4.92-9.774-10.431s14.34-4.568 13.968.942"/>
+  <path fill="#31373D" d="M23.257 12.412c-.353 5.235-3.922 9.257-9.156 8.904-5.235-.353-9.193-4.882-8.84-10.117.353-5.235 4.832-8.444 10.067-8.091 4.001.269 8.24 4.683 7.929 9.304z"/>
+  <circle cx="10.67" cy="8.989" r="2"/>
+  <path d="M18.179 16.645s7.63 5.648 12.387-4.459c.396-.842 1.685.793.099 4.162s-8.175 6.44-12.04 1.536c-.815-1.035-.446-1.239-.446-1.239"/>
+  <path fill="#31373D" d="M15.327 3.107s6.246.254 7.798-.477.136 2.932-3.262 3.789-4.536-3.312-4.536-3.312z"/>
+  <path fill="#31373D" d="M17.428 5.788s4.501.136 6.054-.594.136 2.932-3.262 3.789c-3.399.857-2.792-3.195-2.792-3.195z"/>
+</svg>
diff --git a/public/emoji/1f50f.svg b/public/emoji/1f50f.svg
index d2ae4863c4..d4e864daae 100644
--- a/public/emoji/1f50f.svg
+++ b/public/emoji/1f50f.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M13 3C7.477 3 3 7.477 3 13v10h4V13c0-3.313 2.686-5.999 6-5.999S19 9.687 19 13v10h4V13c0-5.523-4.477-10-10-10z"/><path fill="#FFAC33" d="M26 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V20c0-2.209 1.791-4 4-4h18c2.209 0 4 1.791 4 4v12z"/><path fill="#66757F" d="M32 22l-16-4-11 7h12.184c.413-1.163 1.512-2 2.816-2 1.656 0 3 1.343 3 3s-1.344 3-3 3c-1.305 0-2.403-.837-2.816-2H5l11 7 16-4-1-4 1-4z"/><path fill="#292F33" d="M36 18h-3c-.55 0-1.201.402-1.447.894l-3.105 6.211c-.246.492-.246 1.297 0 1.789l3.105 6.211c.246.493.897.895 1.447.895h3V18z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M14 0C8.477 0 4 4.477 4 10v10h4V10a6 6 0 0 1 6-5.999A6 6 0 0 1 20 10v10h4V10c0-5.523-4.477-10-10-10Z"/><path fill="#FFAC33" d="M28 32a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V18a4 4 0 0 1 4-4h20a4 4 0 0 1 4 4v14Z"/><path fill="#66757F" d="m32 21-16-4-11 7h12.184A2.99 2.99 0 0 1 20 22a3 3 0 0 1 0 6 2.99 2.99 0 0 1-2.816-2H5l11 7 16-4-1-4 1-4Z"/><path fill="#292F33" d="M36 17h-3c-.55 0-1.201.402-1.447.894l-3.105 6.211c-.246.492-.246 1.297 0 1.789l3.105 6.211c.246.493.897.895 1.447.895h3V17Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f510.svg b/public/emoji/1f510.svg
index 014079e8b1..45f288f106 100644
--- a/public/emoji/1f510.svg
+++ b/public/emoji/1f510.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M13 3C7.477 3 3 7.477 3 13v10h4V13c0-3.313 2.687-6 6-6s6 2.687 6 6v10h4V13c0-5.523-4.477-10-10-10z"/><path fill="#FFAC33" d="M26 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V20c0-2.209 1.791-4 4-4h18c2.209 0 4 1.791 4 4v12z"/><path fill="#C1694F" d="M35 9c0-4.971-4.029-9-9-9s-9 4.029-9 9c0 3.917 2.507 7.24 6 8.477V33.5c0 1.381 1.119 2.5 2.5 2.5 1.213 0 2.223-.864 2.45-2.01.018.001.032.01.05.01.553 0 1-.447 1-1v-1c0-.553-.447-1-1-1v-1c.553 0 1-.447 1-1v-2c0-.553-.447-1-1-1v-2.277c.596-.347 1-.984 1-1.723v-4.523c3.493-1.236 6-4.559 6-8.477zm-9-7c1.104 0 2 .896 2 2s-.896 2-2 2-2-.896-2-2 .896-2 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M14 0C8.477 0 4 4.477 4 10v10h4V10a6 6 0 0 1 12 0v10h4V10c0-5.523-4.477-10-10-10Z"/><path fill="#FFAC33" d="M28 32a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V18a4 4 0 0 1 4-4h20a4 4 0 0 1 4 4v14Z"/><path fill="#C1694F" d="M35 9a9 9 0 0 0-9-9 9 9 0 0 0-9 9c0 3.917 2.507 7.24 6 8.477V33.5a2.5 2.5 0 0 0 4.95.49c.018.001.032.01.05.01a1 1 0 0 0 1-1v-1a1 1 0 0 0-1-1v-1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1v-2.277A1.99 1.99 0 0 0 29 22v-4.523c3.493-1.236 6-4.559 6-8.477Zm-9-7a2 2 0 1 1-.001 4.001A2 2 0 0 1 26 2Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f512.svg b/public/emoji/1f512.svg
index 378fabf403..4cd1facae8 100644
--- a/public/emoji/1f512.svg
+++ b/public/emoji/1f512.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M18 3C12.477 3 8 7.477 8 13v10h4V13c0-3.313 2.686-6 6-6s6 2.687 6 6v10h4V13c0-5.523-4.477-10-10-10z"/><path fill="#FFAC33" d="M31 32c0 2.209-1.791 4-4 4H9c-2.209 0-4-1.791-4-4V20c0-2.209 1.791-4 4-4h18c2.209 0 4 1.791 4 4v12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M18 0C12.477 0 8 4.477 8 10v10h4V10a6 6 0 0 1 12 0v10h4V10c0-5.523-4.477-10-10-10Z"/><path fill="#FFAC33" d="M32 32a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4V18a4 4 0 0 1 4-4h20a4 4 0 0 1 4 4v14Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f513.svg b/public/emoji/1f513.svg
index cd82ec8e3f..b9ffd7b936 100644
--- a/public/emoji/1f513.svg
+++ b/public/emoji/1f513.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M18 0c-4.612 0-8.483 3.126-9.639 7.371l3.855 1.052C12.91 5.876 15.233 4 18 4c3.313 0 6 2.687 6 6v10h4V10c0-5.522-4.477-10-10-10z"/><path fill="#FFAC33" d="M31 32c0 2.209-1.791 4-4 4H9c-2.209 0-4-1.791-4-4V20c0-2.209 1.791-4 4-4h18c2.209 0 4 1.791 4 4v12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AAB8C2" d="M18 0c-4.612 0-8.483 3.126-9.639 7.371l3.855 1.052A5.999 5.999 0 0 1 18 4a6 6 0 0 1 6 6v10h4V10c0-5.522-4.477-10-10-10Z"/><path fill="#FFAC33" d="M32 32a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4V18a4 4 0 0 1 4-4h20a4 4 0 0 1 4 4v14Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f691.svg b/public/emoji/1f691.svg
index 844dd40f0b..e6b1cc7bae 100644
--- a/public/emoji/1f691.svg
+++ b/public/emoji/1f691.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M35 12c0-1-1-4-4-4H9.401c-1.377 0-3.29 1.791-4.302 4L2 17c-1.453.599-2 2.331-2 4v6c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-8c0-1.027-1-7-1-7z"/><path fill="#E1E8ED" d="M9 25c-3.267 0-5.918 2.612-5.993 5.861.32.081.648.139.993.139h11c0-3.313-2.686-6-6-6zm23.993 5.86C32.918 27.612 30.268 25 27 25c-3.312 0-6 2.687-6 6h11c.345 0 .674-.058.993-.14z"/><circle fill="#292F33" cx="9" cy="31" r="4"/><circle fill="#99AAB5" cx="9" cy="31" r="2"/><circle fill="#292F33" cx="27" cy="31" r="4"/><circle fill="#99AAB5" cx="27" cy="31" r="2"/><path fill="#DD2E44" d="M0 21h36v3H0zm31-8h-3v-3h-2v3h-3v2h3v3h2v-3h3z"/><path fill="#55ACEE" d="M8 10h5v7H4z"/><path fill="#DD2E44" d="M15 6.5c0 .829-.671 1.5-1.5 1.5h-2c-.829 0-1.5-.671-1.5-1.5S10.671 5 11.5 5h2c.829 0 1.5.671 1.5 1.5z"/><path fill="#55ACEE" d="M18 6.5c0 .829-.671 1.5-1.5 1.5h-2c-.829 0-1.5-.671-1.5-1.5S13.671 5 14.5 5h2c.829 0 1.5.671 1.5 1.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M35 12c0-1-1-4-4-4H9.401c-1.377 0-3.29 1.791-4.302 4L2 17c-1.453.599-2 2.331-2 4v6a4 4 0 0 0 4 4h28a4 4 0 0 0 4-4v-8c0-1.027-1-7-1-7z"/><path fill="#E1E8ED" d="M9 25a5.997 5.997 0 0 0-5.993 5.861c.32.081.648.139.993.139h11a6 6 0 0 0-6-6zm23.993 5.86A5.996 5.996 0 0 0 27 25c-3.312 0-6 2.687-6 6h11c.345 0 .674-.058.993-.14z"/><circle cx="9" cy="31" r="4" fill="#292F33"/><circle cx="9" cy="31" r="2" fill="#99AAB5"/><circle cx="27" cy="31" r="4" fill="#292F33"/><circle cx="27" cy="31" r="2" fill="#99AAB5"/><path fill="#DD2E44" d="M0 21h36v3H0v-3Z"/><path fill="#55ACEE" d="M8 10h5v7H4z"/><path fill="#DD2E44" d="M17 6.5A1.5 1.5 0 0 1 15.5 8h-4a1.5 1.5 0 1 1 0-3h4A1.5 1.5 0 0 1 17 6.5Z"/><path fill="#BE1931" d="M18 6.5A1.5 1.5 0 0 1 16.5 8h-1a1.5 1.5 0 1 1 0-3h1A1.5 1.5 0 0 1 18 6.5Z"/><path fill="#3B88C3" d="M26 10v2.27l-1.965-1.135-1 1.73L25.002 14l-1.967 1.135 1 1.73L26 15.731V18h2v-2.27l1.965 1.135 1-1.73L28.998 14l1.967-1.135-1-1.73L28 12.27V10h-2Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f6dc.svg b/public/emoji/1f6dc.svg
new file mode 100644
index 0000000000..364a68e74e
--- /dev/null
+++ b/public/emoji/1f6dc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><defs><clipPath id="a"><path fill="none" d="M0 0h36v36H0z"/></clipPath></defs><g clip-path="url(#a)"><path fill="#2b87c7" d="M36 32c0 4-4 4-4 4H4c-4 0-4-4-4-4V4c0-4 4-4 4-4h28s4 0 4 4z"/></g><path fill="#fff" d="m5.1 13.01 1.46 1.65c.15.16.39.19.57.07 3.01-1.98 6.77-3.17 10.83-3.17s7.88 1.2 10.9 3.21c.18.12.42.09.57-.07l1.47-1.64c.17-.2.14-.5-.07-.65-3.56-2.45-8.02-3.91-12.87-3.91S8.72 9.94 5.17 12.36c-.22.15-.25.45-.08.65Z"/><path fill="#fff" d="m9.43 17.9 1.45 1.64c.15.16.39.2.58.08 1.8-1.2 4.06-1.92 6.51-1.92s4.74.73 6.54 1.95c.18.12.42.1.57-.07l1.47-1.64c.18-.2.14-.5-.08-.65-2.34-1.66-5.29-2.65-8.5-2.65s-6.12.98-8.45 2.61a.43.43 0 0 0-.08.65Zm4.22 4.77 1.46 1.64c.14.16.39.19.57.07.63-.41 1.42-.65 2.28-.65s1.67.25 2.3.66c.18.12.42.09.57-.07l1.46-1.64a.44.44 0 0 0-.06-.64c-1.17-.86-2.65-1.37-4.27-1.37s-3.08.51-4.24 1.35c-.21.15-.24.45-.07.64Z"/><circle cx="17.91" cy="27.64" r="1.86" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f979.svg b/public/emoji/1f979.svg
old mode 100755
new mode 100644
index 1944a5463a..fff9243190
--- a/public/emoji/1f979.svg
+++ b/public/emoji/1f979.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" xml:space="preserve"><path fill="#FFCC4D" d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"/><path fill="#65471B" d="M18 31c-5.629 0-6.896-3.527-6.947-3.678a1 1 0 0 1 1.889-.658C12.987 26.782 13.895 29 18 29c4.128 0 5.022-2.242 5.059-2.337.193-.51.763-.78 1.276-.596s.788.739.612 1.255C24.896 27.473 23.629 31 18 31zM28.994 8.011A1.005 1.005 0 0 0 28.011 7c-.067-.001-1.653-.056-3.304-1.707a.999.999 0 1 0-1.414 1.414C25.56 8.974 27.901 9 28 9a.995.995 0 0 0 .994-.989zM12.707 6.707a.999.999 0 1 0-1.414-1.414C9.652 6.934 8.075 6.998 7.99 7A1 1 0 0 0 8 9c.099 0 2.44-.026 4.707-2.293z"/><path fill="#FFF" d="M29.895 15.058c-2.186-3.426-6.094-4.536-8.157-3.659-1.14.483-1.711 2.022-1.737 4.647-.006.616.018 1.294.072 2.032.032.435.067.876.119 1.353.134 1.219.777 2.181 1.859 2.779.72.399 1.581.604 2.471.661 1.523.096 3.137-.246 4.281-.799 1.21-.584 1.996-1.636 2.158-2.886.162-1.243-.187-2.749-1.066-4.128z"/><path fill="#F4900C" d="M30.962 19.186c.161-1.243-.188-2.75-1.067-4.128a8.85 8.85 0 0 0-1.631-1.878 5.958 5.958 0 0 0-2.764-.68 6.005 6.005 0 0 0-5.498 3.606c-.004.601.018 1.257.071 1.973.032.435.067.876.12 1.353.134 1.219.777 2.181 1.859 2.779.72.399 1.581.604 2.471.661 1.523.096 3.137-.246 4.281-.799 1.21-.585 1.996-1.636 2.158-2.887z"/><circle fill="#65471B" cx="25.5" cy="18" r="4"/><ellipse transform="rotate(-45.028 24.498 14.999)" fill="#FFF" cx="24.5" cy="15" rx="1.674" ry="1.303"/><path fill="#5DADEC" d="M21.81 22.648c.747.414 1.649.657 2.682.722.182.011.365.017.549.017 1.392 0 2.843-.315 3.981-.864.973-.47 1.698-1.214 2.102-2.117a.585.585 0 0 0-.254-.753c-1.421-.771-2.921 1.362-4.872 1.362-1.952 0-4.074-.936-5.256 0a.506.506 0 0 0-.065.728c.309.353.686.658 1.133.905z"/><path fill="#FFF" d="M6.105 15.058c2.186-3.426 6.094-4.536 8.157-3.659 1.14.483 1.711 2.022 1.737 4.647.006.616-.018 1.294-.072 2.032-.032.435-.067.876-.119 1.353-.134 1.219-.777 2.181-1.859 2.779-.72.399-1.581.604-2.471.661-1.523.096-3.137-.246-4.281-.799-1.21-.584-1.996-1.636-2.158-2.886-.162-1.243.187-2.749 1.066-4.128z"/><path fill="#F4900C" d="M15.808 19.432c-.134 1.219-.777 2.181-1.859 2.779-.72.399-1.581.604-2.471.661-1.523.096-3.137-.246-4.281-.799-1.21-.584-1.996-1.636-2.158-2.886-.161-1.243.188-2.75 1.067-4.128a8.85 8.85 0 0 1 1.631-1.878 5.958 5.958 0 0 1 2.764-.68 6.005 6.005 0 0 1 5.498 3.606c.004.601-.018 1.257-.071 1.973a41.06 41.06 0 0 1-.12 1.352z"/><circle fill="#65471B" cx="10.5" cy="18" r="4"/><path fill="#FFF" d="M10.954 15c-.203.828-1.019 1.5-1.822 1.5-.803 0-1.289-.672-1.086-1.5s1.019-1.5 1.822-1.5c.803 0 1.289.672 1.086 1.5z"/><path fill="#5DADEC" d="M14.19 22.648c-.747.414-1.649.657-2.682.722a9.097 9.097 0 0 1-.549.017c-1.392 0-2.843-.315-3.981-.864-.973-.47-1.698-1.214-2.102-2.117a.585.585 0 0 1 .254-.753c1.421-.771 2.921 1.362 4.872 1.362 1.952 0 4.074-.936 5.256 0a.506.506 0 0 1 .065.728 4.178 4.178 0 0 1-1.133.905z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle cx="18" cy="18" r="18" fill="#FFCC4D"/><path fill="#664500" d="M22.657 25.637a.513.513 0 0 1 .597-.06.497.497 0 0 1 .231.544C23.474 26.165 22.34 30.5 18 30.5s-5.474-4.335-5.484-4.38a.5.5 0 0 1 .838-.474s1.005.854 4.646.854c3.644 0 4.647-.855 4.657-.863Z"/><path fill="#65471B" d="M28.994 10.011A1.005 1.005 0 0 0 28.011 9c-.067-.001-1.653-.056-3.304-1.707a1 1 0 1 0-1.414 1.414C25.56 10.974 27.901 11 28 11a.995.995 0 0 0 .994-.989ZM12.707 8.707a.998.998 0 0 0-.324-1.63 1 1 0 0 0-1.09.216C9.652 8.934 8.075 8.998 7.99 9A1 1 0 0 0 8 11c.099 0 2.44-.026 4.707-2.293Z"/><path fill="#FFF" d="M24.5 23a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11Z"/><path fill="#292F33" d="M24.5 22a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z"/><path fill="#FFF" d="M24.337 16.836c1.044-1.046 1.23-2.552.417-3.364-.813-.813-2.32-.625-3.363.42-1.045 1.046-1.231 2.552-.418 3.364.814.813 2.32.625 3.364-.42Zm3.288 2.845c.458-.459.54-1.12.183-1.477-.357-.357-1.019-.274-1.478.185-.458.459-.54 1.12-.183 1.477.357.357 1.019.275 1.478-.184ZM11.5 23a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11Z"/><path fill="#292F33" d="M11.5 22a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z"/><path fill="#FFF" d="M11.337 16.836c1.044-1.046 1.23-2.552.417-3.364-.813-.813-2.32-.625-3.363.42-1.045 1.046-1.231 2.552-.418 3.364.814.813 2.32.625 3.364-.42Zm3.287 2.845c.46-.459.541-1.12.184-1.477-.357-.357-1.019-.274-1.478.185-.458.459-.54 1.12-.183 1.477.357.357 1.019.275 1.477-.184Z"/><path fill="#5DADEC" d="M29 21c0 .105-1.015 2-4.5 2-3.485 0-4.5-1.895-4.5-2-2-3.105 2.015 0 4.5 0s6.5-3.105 4.5 0Zm-13 0c0 .105-1.015 2-4.5 2C8.015 23 7 21.105 7 21c-2-3.105 2.015 0 4.5 0s6.5-3.105 4.5 0Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1f97a.svg b/public/emoji/1f97a.svg
index fe9336084a..3240471fbd 100644
--- a/public/emoji/1f97a.svg
+++ b/public/emoji/1f97a.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#FFCC4D" cx="18" cy="18" r="18"/><path fill="#65471B" d="M20.996 27c-.103 0-.206-.016-.309-.049-1.76-.571-3.615-.571-5.375 0-.524.169-1.089-.117-1.26-.642-.171-.525.117-1.089.643-1.26 2.162-.702 4.447-.702 6.609 0 .525.171.813.735.643 1.26-.137.421-.529.691-.951.691z"/><path fill="#FFF" d="M30.335 12.068c-.903 2.745-3.485 4.715-6.494 4.715-.144 0-.289-.005-.435-.014-1.477-.093-2.842-.655-3.95-1.584.036.495.076.997.136 1.54.152 1.388.884 2.482 2.116 3.163.82.454 1.8.688 2.813.752 1.734.109 3.57-.28 4.873-.909 1.377-.665 2.272-1.862 2.456-3.285.183-1.415-.354-2.924-1.515-4.378z"/><path fill="#65471B" d="M21.351 7.583c-1.297.55-1.947 2.301-1.977 5.289l.039.068c.897 1.319 2.373 2.224 4.088 2.332.114.007.228.011.341.011 2.634 0 4.849-1.937 5.253-4.524-.115-.105-.221-.212-.343-.316-3.715-3.17-6.467-3.257-7.401-2.86z"/><path fill="#F4900C" d="M23.841 16.783c3.009 0 5.591-1.97 6.494-4.715-.354-.443-.771-.88-1.241-1.309-.404 2.587-2.619 4.524-5.253 4.524-.113 0-.227-.004-.341-.011-1.715-.108-3.191-1.013-4.088-2.332l-.039-.068c-.007.701.021 1.473.083 2.313 1.108.929 2.473 1.491 3.95 1.584.146.01.291.014.435.014z"/><circle fill="#FFF" cx="21.413" cy="10.705" r="1.107"/><path fill="#FFF" d="M12.159 16.783c-3.009 0-5.591-1.97-6.494-4.715-1.161 1.454-1.697 2.963-1.515 4.377.185 1.423 1.079 2.621 2.456 3.285 1.303.629 3.138 1.018 4.873.909 1.013-.064 1.993-.297 2.813-.752 1.231-.681 1.963-1.775 2.116-3.163.06-.542.1-1.042.136-1.536-1.103.923-2.47 1.487-3.95 1.58-.146.011-.291.015-.435.015z"/><path fill="#65471B" d="M12.159 15.283c.113 0 .227-.004.341-.011 1.715-.108 3.191-1.013 4.088-2.332l.039-.068c-.031-2.988-.68-4.739-1.977-5.289-.934-.397-3.687-.31-7.401 2.859-.122.104-.227.211-.343.316.404 2.588 2.619 4.525 5.253 4.525z"/><path fill="#F4900C" d="M16.626 12.872l-.039.068c-.897 1.319-2.373 2.224-4.088 2.332-.114.007-.228.011-.341.011-2.634 0-4.849-1.937-5.253-4.524-.47.429-.887.866-1.241 1.309.903 2.745 3.485 4.715 6.494 4.715.144 0 .289-.005.435-.014 1.48-.093 2.847-.657 3.95-1.58.062-.841.091-1.614.083-2.317z"/><path fill="#FFF" d="M9.781 11.81c.61-.038 1.074-.564 1.035-1.174-.038-.61-.564-1.074-1.174-1.036-.61.038-1.074.564-1.036 1.174.039.61.565 1.074 1.175 1.036z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle cx="18" cy="18" r="18" fill="#FFCC4D"/><path fill="#65471B" d="M20.996 28.477a.978.978 0 0 1-.309-.049 8.647 8.647 0 0 0-5.375 0 1 1 0 1 1-.617-1.902 10.633 10.633 0 0 1 6.609 0c.525.172.813.736.643 1.26a1.002 1.002 0 0 1-.951.691Zm7.998-18.466A1.005 1.005 0 0 0 28.011 9c-.067-.001-1.653-.056-3.304-1.707a1 1 0 1 0-1.414 1.414C25.56 10.974 27.901 11 28 11a.995.995 0 0 0 .994-.989ZM12.707 8.707a.998.998 0 0 0-.324-1.63 1 1 0 0 0-1.09.216C9.652 8.934 8.075 8.998 7.99 9A1 1 0 0 0 8 11c.099 0 2.44-.026 4.707-2.293Z"/><path fill="#FFF" d="M24.5 23a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11Z"/><path fill="#292F33" d="M24.5 22a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z"/><path fill="#FFF" d="M24.337 16.836c1.044-1.046 1.23-2.552.417-3.364-.813-.813-2.32-.625-3.363.42-1.045 1.046-1.231 2.552-.418 3.364.814.813 2.32.625 3.364-.42Zm3.288 2.845c.458-.459.54-1.12.183-1.477-.357-.357-1.019-.274-1.478.185-.458.459-.54 1.12-.183 1.477.357.357 1.019.275 1.478-.184ZM11.5 23a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11Z"/><path fill="#292F33" d="M11.5 22a5 5 0 1 0 0-10 5 5 0 0 0 0 10Z"/><path fill="#FFF" d="M11.337 16.836c1.044-1.046 1.23-2.552.417-3.364-.813-.813-2.32-.625-3.363.42-1.045 1.046-1.231 2.552-.418 3.364.814.813 2.32.625 3.364-.42Zm3.287 2.845c.46-.459.541-1.12.184-1.477-.357-.357-1.019-.274-1.478.185-.458.459-.54 1.12-.183 1.477.357.357 1.019.275 1.477-.184Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa75.svg b/public/emoji/1fa75.svg
new file mode 100755
index 0000000000..5a72101acb
--- /dev/null
+++ b/public/emoji/1fa75.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M35.885 11.833c0-5.45-4.418-9.868-9.867-9.868-3.308 0-6.227 1.633-8.018 4.129-1.791-2.496-4.71-4.129-8.017-4.129-5.45 0-9.868 4.417-9.868 9.868 0 .772.098 1.52.266 2.241C1.751 22.587 11.216 31.568 18 34.034c6.783-2.466 16.249-11.447 17.617-19.959.17-.721.268-1.469.268-2.242z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa76.svg b/public/emoji/1fa76.svg
new file mode 100755
index 0000000000..56e3ef1ae9
--- /dev/null
+++ b/public/emoji/1fa76.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M35.885 11.833c0-5.45-4.418-9.868-9.867-9.868-3.308 0-6.227 1.633-8.018 4.129-1.791-2.496-4.71-4.129-8.017-4.129-5.45 0-9.868 4.417-9.868 9.868 0 .772.098 1.52.266 2.241C1.751 22.587 11.216 31.568 18 34.034c6.783-2.466 16.249-11.447 17.617-19.959.17-.721.268-1.469.268-2.242z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa77.svg b/public/emoji/1fa77.svg
new file mode 100755
index 0000000000..a372dcce63
--- /dev/null
+++ b/public/emoji/1fa77.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4ABBA" d="M35.885 11.833c0-5.45-4.418-9.868-9.867-9.868-3.308 0-6.227 1.633-8.018 4.129-1.791-2.496-4.71-4.129-8.017-4.129-5.45 0-9.868 4.417-9.868 9.868 0 .772.098 1.52.266 2.241C1.751 22.587 11.216 31.568 18 34.034c6.783-2.466 16.249-11.447 17.617-19.959.17-.721.268-1.469.268-2.242z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa87.svg b/public/emoji/1fa87.svg
new file mode 100644
index 0000000000..fd8c53a663
--- /dev/null
+++ b/public/emoji/1fa87.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M-35.367 13.848h36v-36h-36Z"/></clipPath><clipPath id="b" clipPathUnits="userSpaceOnUse"><path d="M-24.343 34.246h36v-36h-36Z"/></clipPath><clipPath id="c" clipPathUnits="userSpaceOnUse"><path d="M-36 10.269H0v-36h-36Z"/></clipPath><clipPath id="d" clipPathUnits="userSpaceOnUse"><path d="M-34.38 15.907h36v-36h-36Z"/></clipPath><clipPath id="e" clipPathUnits="userSpaceOnUse"><path d="M-31.406 19.303h36v-36h-36Z"/></clipPath><clipPath id="f" clipPathUnits="userSpaceOnUse"><path d="M-28.11 21.53h36v-36h-36Z"/></clipPath><clipPath id="g" clipPathUnits="userSpaceOnUse"><path d="M-12.71 6.294h36v-36h-36Z"/></clipPath><clipPath id="h" clipPathUnits="userSpaceOnUse"><path d="M-16.316 29.198h36v-36h-36Z"/></clipPath><clipPath id="i" clipPathUnits="userSpaceOnUse"><path d="M-11.042 3.065h36v-36h-36Z"/></clipPath><clipPath id="j" clipPathUnits="userSpaceOnUse"><path d="M-13.173 8.53h36v-36h-36Z"/></clipPath><clipPath id="k" clipPathUnits="userSpaceOnUse"><path d="M-12.869 13.034h36v-36h-36Z"/></clipPath><clipPath id="l" clipPathUnits="userSpaceOnUse"><path d="M-11.599 16.805h36v-36h-36Z"/></clipPath></defs><path fill="#fcd646" d="M0 0a10.926 10.926 0 0 0-.987-2.058l-.001-.001c-1.379-1.093-5.157-1.888-7.379-1.093-2.222.794-4 3-4.227 5.246.098.732.276 1.477.54 2.217a10.562 10.562 0 0 0 1.783 3.168c1.904-.631 3.847.105 5.904-.631 2.058-.736 3-2 5-3.269A10.622 10.622 0 0 0 0 0" clip-path="url(#a)" transform="matrix(1 0 0 -1 35.367 13.848)"/><path fill="#d4a086" d="M0 0c-.55-1.538-2.122-2.092-3.626-1.554-1.502.537-2.368 1.963-1.818 3.501.348.972.898 1.811 1.275 2.334 1.491 2.067 2.65 4.354 3.508 6.755l.036.101c.045.125.086.251.123.378 1.159.731 1.691.898 2.159.731.468-.168 0 0 .592-1.715a6.6 6.6 0 0 1-.145-.37l-.036-.101C1.209 7.659.654 5.156.496 2.612.456 1.969.394 1.102 0 0" clip-path="url(#b)" transform="matrix(1 0 0 -1 24.343 34.246)"/><path fill="#d24248" d="M0 0c-1.778-.237-3.836-.021-5.895.715-2.056.736-3.785 1.875-5.009 3.185 1.922 2.334 4.664 3.444 7.073 2.583C-1.422 5.621-.007 3.024 0 0" clip-path="url(#c)" transform="matrix(1 0 0 -1 36 10.269)"/><path fill="#82ae63" d="M0 0a10.36 10.36 0 0 0-.431-.64 12.303 12.303 0 0 0-2.543-2.757c-1.406-.696-3.867-.247-5.406.304-1.538.55-2 1-3.082 2.732a12.312 12.312 0 0 0-.217 3.745c.015.255.039.511.073.769C-10.373 2.709-8.535 1.445-6.314.65-4.091-.145-1.869-.333 0 0" clip-path="url(#d)" transform="matrix(1 0 0 -1 34.38 15.907)"/><path fill="#d24248" d="M0 0a10.735 10.735 0 0 0-1.724-1.11 6.727 6.727 0 0 1-1.573-1.117c-2.109 0-1.41-.72-2.109-.47-.697.25-1.013.987-1.946 1.92a6.698 6.698 0 0 1-.507 1.861 10.78 10.78 0 0 0-.629 1.952c1.096-.904 2.45-1.679 3.989-2.229C-2.961.256-1.422-.003 0 0" clip-path="url(#e)" transform="matrix(1 0 0 -1 31.406 19.303)"/><path fill="#ba6e54" d="M0 0a6.63 6.63 0 0 1-1.517-2.184 14.314 14.314 0 0 0-2.751.984c.252.865.32 1.766.213 2.651.614-.334 1.274-.63 1.971-.88C-1.385.321-.688.132 0 0" clip-path="url(#f)" transform="matrix(1 0 0 -1 28.11 21.53)"/><path fill="#fcd646" d="M0 0c.239-.75.391-1.499.463-2.235v-.001C.029-3.942-2.492-6.865-4.741-7.581c-2.248-.716-5-.041-6.542 1.608a10.935 10.935 0 0 0-.916 2.091 10.586 10.586 0 0 0-.504 3.599c1.897.653 2.996 2.416 5.077 3.079 2.083.663 3.599.229 5.958.433A10.592 10.592 0 0 0 0 0" clip-path="url(#g)" transform="matrix(1 0 0 -1 12.71 6.294)"/><path fill="#d4a086" d="M0 0c.496-1.557-.419-2.95-1.94-3.434s-3.074.124-3.569 1.681C-5.822-.77-5.893.23-5.911.875c-.068 2.548-.534 5.069-1.307 7.499l-.033.102c-.04.127-.084.252-.132.375.478 1.284.8 1.739 1.273 1.89.474.151 0 0 1.511-1.003.033-.129.069-.256.109-.383l.033-.103c.773-2.429 1.85-4.756 3.267-6.875C-.832 1.841-.355 1.115 0 0" clip-path="url(#h)" transform="matrix(1 0 0 -1 16.316 29.198)"/><path fill="#d24248" d="M0 0c-1.27-1.267-3.037-2.343-5.12-3.006-2.082-.663-4.147-.806-5.915-.506.113 3.022 1.62 5.567 4.057 6.343C-4.54 3.607-1.84 2.4 0 0" clip-path="url(#i)" transform="matrix(1 0 0 -1 11.042 3.065)"/><path fill="#ec9435" d="M0 0c.024-.258.04-.516.046-.77.059-1.085 0-2.378-.35-3.734C-1-5.911-3.229-7.046-4.786-7.542c-1.557-.495-2.197-.417-4.109.304a12.287 12.287 0 0 0-2.443 2.845c-.143.212-.279.43-.409.656 1.857-.4 4.084-.291 6.332.425C-3.165-2.596-1.284-1.398 0 0" clip-path="url(#j)" transform="matrix(1 0 0 -1 13.173 8.53)"/><path fill="#d24248" d="M0 0a10.72 10.72 0 0 0-.698-1.928A6.694 6.694 0 0 1-1.27-3.77c-1.677-1.279-.686-1.428-1.393-1.653-.705-.224-1.404.171-2.712.347a6.693 6.693 0 0 1-1.531 1.172c-.624.35-1.184.747-1.684 1.17 1.42-.054 2.966.151 4.523.647C-2.51-1.592-1.129-.865 0 0" clip-path="url(#k)" transform="matrix(1 0 0 -1 12.869 13.035)"/><path fill="#ba6e54" d="M0 0a6.594 6.594 0 0 1 .119-2.656 13.854 13.854 0 0 0-1.371-.514 14.2 14.2 0 0 0-1.414-.373 6.617 6.617 0 0 1-1.438 2.237c.691.107 1.395.272 2.101.497C-1.296-.584-.627-.312 0 0" clip-path="url(#l)" transform="matrix(1 0 0 -1 11.599 16.805)"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fa88.svg b/public/emoji/1fa88.svg
new file mode 100755
index 0000000000..633fa4c62c
--- /dev/null
+++ b/public/emoji/1fa88.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="m29.346.937 4.95 4.95L6.012 34.17l-4.95-4.95z"/><circle cx="4.5" cy="30.75" r="3.5" fill="#C1694F"/><circle cx="3.5" cy="31.75" r="3.5" fill="#FFCC4D"/><circle cx="3.5" cy="31.75" r="2" fill="#292F33"/><circle cx="31.75" cy="3.5" r="3.5" fill="#FFCC4D"/><circle cx="25.75" cy="9.5" r="3.5" fill="#C1694F"/><circle cx="24.75" cy="10.5" r="3.5" fill="#FFCC4D"/><circle cx="7.95" cy="26.15" r="1.25" fill="#C1694F"/><circle cx="8.2" cy="26.4" r="1" fill="#292F33"/><circle cx="10.95" cy="23.15" r="1.25" fill="#C1694F"/><circle cx="11.2" cy="23.4" r="1" fill="#292F33"/><circle cx="13.95" cy="20.15" r="1.25" fill="#C1694F"/><circle cx="14.2" cy="20.4" r="1" fill="#292F33"/><circle cx="16.95" cy="17.15" r="1.25" fill="#C1694F"/><circle cx="17.2" cy="17.4" r="1" fill="#292F33"/><circle cx="19.95" cy="14.15" r="1.25" fill="#C1694F"/><circle cx="20.2" cy="14.4" r="1" fill="#292F33"/><circle cx="22.95" cy="11.15" r="1.25" fill="#C1694F"/><circle cx="23.2" cy="11.4" r="1" fill="#292F33"/><circle cx="29.95" cy="4.15" r="1.25" fill="#C1694F"/><circle cx="30.2" cy="4.4" r="1" fill="#292F33"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faad.svg b/public/emoji/1faad.svg
new file mode 100644
index 0000000000..503632391d
--- /dev/null
+++ b/public/emoji/1faad.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#e80040" d="m18 28 17.08-10.2c.42-.25.52-.84.19-1.2C30.98 11.94 24.84 9.01 18 9.01S5.02 11.93.73 16.59c-.33.36-.24.95.19 1.2L18 27.99Z"/><path fill="#a80018" d="m18 25.79.03-.05.47-1.71V9.01c-.17 0-.33-.01-.5-.01s-.33 0-.5.01v15.02l.47 1.71zm-.81 1.26-.06.1.23.15-.03-.1zm2.99-2.79 8.25-12.81c-.3-.15-.6-.3-.91-.43l-7.68 11.93-.58 2.12.92-.81Z"/><path fill="#a80018" d="m18.01 25.81.02-.07-.03.05zm.76 1.01 14.15-12.45c-.26-.22-.53-.43-.8-.63L20.17 24.25l-.92.81-.48 1.75Zm-1.54.03-.12.11.08.09.14.15zm1.21.62.06.23.04-.02.1-.38-.13.08z"/><path fill="#a80018" d="m19.25 25.07.58-2.12 3.63-13.3c-.32-.08-.65-.15-.98-.21L18.5 24.03l-.47 1.71-.02.07.55.86.2.18v-.03zm-3.08-2.12L8.49 11.02c-.31.14-.61.28-.91.43l8.25 12.81.92.81-.58-2.12Z"/><path fill="#a80018" d="m17.97 25.74.14.53.46.4-.56-.86-.01-.02zm.54 1.64.13-.08.23-.15-.06-.1z"/><path fill="#a80018" d="m18.57 26.67-.46-.4.33 1.2.07-.09.3-.33.08-.09-.12-.11zm-1.82-1.6-.92-.81L3.87 13.75c-.27.2-.54.41-.8.63l14.15 12.45-.48-1.75Z"/><path fill="#a80018" d="m18.44 27.47-.33-1.19-.14-.53-.47-1.71-3.98-14.59c-.33.06-.66.13-.98.21l3.63 13.3.58 2.12.48 1.75v.03l.1.35.03.09.1.38.54.32.5-.3-.06-.23Z"/><path fill="#de9a7e" d="m18 28 6.59-3.94a8.628 8.628 0 0 0-13.18 0z"/><path fill="#fff" d="M12.19 23.95c1.53-1.56 3.62-2.45 5.81-2.45s4.28.88 5.81 2.45L18 27.42l-5.81-3.47Z"/><path fill="#de9a7e" d="m19.52 27.09 5.07-3.03a8.628 8.628 0 0 0-13.18 0l5.07 3.03-2.08 1.49a.38.38 0 0 0-.08.55c.93 1.15 2.24 1.87 3.69 1.87s2.75-.72 3.69-1.87c.14-.17.09-.42-.08-.55l-2.08-1.49Zm3.47-3.23-3.4 2.03c-.1-.15-.22-.28-.35-.4l1.83-2.84c.69.3 1.34.71 1.92 1.21Zm-4.61-1.84c.68.03 1.34.16 1.97.36l-1.76 2.73c-.07-.02-.14-.04-.22-.06v-3.03Zm-.75 0v3.03c-.07.02-.15.03-.22.06l-1.76-2.73c.63-.21 1.3-.33 1.97-.36Zm-4.61 1.84c.58-.5 1.23-.9 1.92-1.21l1.83 2.84c-.13.12-.25.25-.35.4l-3.4-2.03Z"/><circle cx="18" cy="27" r="1" fill="#a80018"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faae.svg b/public/emoji/1faae.svg
new file mode 100644
index 0000000000..e8ad033fb1
--- /dev/null
+++ b/public/emoji/1faae.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#31373d" d="M35.9 12.22c-.13-.13-.37-.13-.51 0-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.29-11.67 11.52-11.92.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61C12.94 11.63 23.51.82 23.74.57c.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.31 10.98-12.15 11.73-4.62 4.17-2.53 6.17-2.3 8.58.37 3.97-2.44 6.21-4.38 6.41-2.52.26-4.45 2.06-4.45 4.59 0 1.27.51 2.42 1.35 3.25.83.83 1.98 1.35 3.25 1.35 2.54 0 4.33-1.93 4.59-4.45.2-1.94 2.44-4.75 6.41-4.38 2.41.22 4.41 2.32 8.58-2.3.75-.83 11.5-11.9 11.73-12.15.13-.14.13-.38 0-.51zM4.56 32.69c-.35 0-.66-.14-.88-.37a1.24 1.24 0 0 1-.37-.88c0-.69.56-1.25 1.25-1.25.35 0 .66.14.88.37s.37.54.37.88c0 .69-.56 1.25-1.25 1.25"/><path fill="none" stroke="#7a8891" stroke-linecap="round" stroke-miterlimit="10" d="M3.88 28.12c-1.46.3-2.58 1.55-2.67 3.08m9.28-17.1c-1.61 2.13-1.3 2.91-.65 5.23.55 1.97.06 3.81-.65 5.23"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faae_border.svg b/public/emoji/1faae_border.svg
new file mode 100644
index 0000000000..6b59fee57b
--- /dev/null
+++ b/public/emoji/1faae_border.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M35.9 12.22c-.13-.13-.37-.13-.51 0-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.29-11.67 11.52-11.92.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61C12.94 11.63 23.51.82 23.74.57c.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.31 10.98-12.15 11.73-4.62 4.17-2.53 6.17-2.3 8.58.37 3.97-2.44 6.21-4.38 6.41-2.52.26-4.45 2.06-4.45 4.59 0 1.27.51 2.42 1.35 3.25.83.83 1.98 1.35 3.25 1.35 2.54 0 4.33-1.93 4.59-4.45.2-1.94 2.44-4.75 6.41-4.38 2.41.22 4.41 2.32 8.58-2.3.75-.83 11.5-11.9 11.73-12.15.13-.14.13-.38 0-.51zM4.56 32.69c-.35 0-.66-.14-.88-.37a1.24 1.24 0 0 1-.37-.88c0-.69.56-1.25 1.25-1.25.35 0 .66.14.88.37s.37.54.37.88c0 .69-.56 1.25-1.25 1.25" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path stroke="white" stroke-linecap="round" stroke-miterlimit="10" d="M3.88 28.12c-1.46.3-2.58 1.55-2.67 3.08m9.28-17.1c-1.61 2.13-1.3 2.91-.65 5.23.55 1.97.06 3.81-.65 5.23" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#31373d" d="M35.9 12.22c-.13-.13-.37-.13-.51 0-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.29-11.67 11.52-11.92.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.92 11.67-12.78 12.38-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.15-12.54 12.38-12.78.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.77 11.52-12.64 12.24-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 12.01-12.39 12.24-12.64.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.49 11.24-12.35 11.95-.19.16-.45.16-.61 0s-.16-.42 0-.61c.72-.86 11.72-12.11 11.95-12.35.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.05 10.8-11.92 11.52-.19.16-.45.16-.61 0s-.16-.42 0-.61C12.94 11.63 23.51.82 23.74.57c.13-.14.13-.38 0-.51s-.37-.13-.51 0c-.24.23-11.31 10.98-12.15 11.73-4.62 4.17-2.53 6.17-2.3 8.58.37 3.97-2.44 6.21-4.38 6.41-2.52.26-4.45 2.06-4.45 4.59 0 1.27.51 2.42 1.35 3.25.83.83 1.98 1.35 3.25 1.35 2.54 0 4.33-1.93 4.59-4.45.2-1.94 2.44-4.75 6.41-4.38 2.41.22 4.41 2.32 8.58-2.3.75-.83 11.5-11.9 11.73-12.15.13-.14.13-.38 0-.51zM4.56 32.69c-.35 0-.66-.14-.88-.37a1.24 1.24 0 0 1-.37-.88c0-.69.56-1.25 1.25-1.25.35 0 .66.14.88.37s.37.54.37.88c0 .69-.56 1.25-1.25 1.25"/>
+  <path fill="none" stroke="#7a8891" stroke-linecap="round" stroke-miterlimit="10" d="M3.88 28.12c-1.46.3-2.58 1.55-2.67 3.08m9.28-17.1c-1.61 2.13-1.3 2.91-.65 5.23.55 1.97.06 3.81-.65 5.23"/>
+</svg>
diff --git a/public/emoji/1faaf.svg b/public/emoji/1faaf.svg
new file mode 100644
index 0000000000..bfaceb5395
--- /dev/null
+++ b/public/emoji/1faaf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 36 36"><path fill="#9266cc" d="M36 32c0 2.2-1.8 4-4 4H4c-2.2 0-4-1.8-4-4V4c0-2.2 1.8-4 4-4h28c2.2 0 4 1.8 4 4z"/><path fill="#fff" d="M23.5 6.9s4 2.3 3.6 7.5c-.4 5.1-8.3 10.1-8.3 10.1v-1.6l2.1-1.5c-.1-.5-.2-.9-.3-1.4 2.8-1.1 4.9-3.8 4.9-7s-2-5.9-4.8-7c.1-.7.2-1 .2-1L18 2l-2.9 3s.1.3.2.9c-2.8 1.1-4.8 3.8-4.8 7s2 5.9 4.8 7c-.1.5-.2.9-.3 1.4l2.1 1.5v1.6s-7.9-4.9-8.3-10.1c-.4-5.1 3.6-7.5 3.6-7.5s-6.1 1-6.5 7.5c-.4 6.3 5.8 11 5.8 11s1.1.9 1.2 1.9l2.7-2 1 .7-3.4 2.6c-.3.2-.5.6-.5 1 0 .8.6 1.4 1.4 1.4s1.4-.6 1.4-1.4c0-.3-.1-.6-.3-.8l1.9-1.3v3c-.6.3-1 .9-1 1.6 0 1 .8 1.9 1.9 1.9s1.9-.8 1.9-1.9c0-.7-.4-1.3-1-1.6v-3l1.9 1.3c-.2.2-.3.5-.3.8 0 .8.6 1.4 1.4 1.4s1.4-.6 1.4-1.4c0-.4-.2-.8-.5-1l-3.4-2.6 1-.7 2.7 2c.1-1 1.2-1.9 1.2-1.9s6.2-4.7 5.8-11c-.5-6.4-6.6-7.4-6.6-7.4m.5 6c0 2.5-1.5 4.6-3.6 5.5-.7-4.6-.3-8.6.1-11 2 1 3.5 3.1 3.5 5.5m-12 0c0-2.4 1.5-4.5 3.6-5.5.4 2.4.7 6.4.1 11-2.2-.9-3.7-3-3.7-5.5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fabb.svg b/public/emoji/1fabb.svg
new file mode 100644
index 0000000000..3cae81a662
--- /dev/null
+++ b/public/emoji/1fabb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#69b546" d="M31.71 28.26c-1.78-.49-4.33.36-6.77 1.57 1.9-2.33 3.91-4.76 6.1-6.08 1.82-1.09 2.07-2.09 1.86-2.82-.24-.86-1.17-1.32-2.05-1.18-4.49.7-9.71 8.85-11.86 12.52v-5.53h-2v5.53c-2.14-3.68-7.36-11.82-11.86-12.52-.88-.14-1.81.32-2.05 1.18-.2.73.05 1.73 1.86 2.82 2.19 1.32 4.2 3.75 6.1 6.08-2.44-1.21-5-2.07-6.77-1.57-.68.19-1.2.83-1.09 1.53.09.59.6 1.24 2.28 1.43 4.21.49 9.43 4.74 12.53 4.52 3.1.23 8.32-4.03 12.53-4.52 1.68-.19 2.18-.84 2.28-1.43.11-.7-.41-1.34-1.09-1.53Z"/><path fill="#894fc4" d="M23.68 6.26c1.93-4-1.93-3-1.93-3C21-.24 18 2.32 18 2.32s-3-2.56-3.75.94c0 0-3.86-1-1.93 3 0 0-3.07 1-2.07 4l.82 3.68S8.75 21.85 13 19.56c0 0-1.75 3.7 2.25 2.7 0 0-.46 3.38 1.02 5.32a2.145 2.145 0 0 0 3.45 0c1.48-1.94 1.02-5.32 1.02-5.32 4 1 2.25-2.7 2.25-2.7 4.25 2.3 1.93-5.62 1.93-5.62l.82-3.68c1-3-2.07-4-2.07-4Z"/><path fill="#ae6dee" d="M19.17 2.98c0 1.93-.52 4.28-1.17 4.28s-1.17-2.34-1.17-4.28S17.35.26 18 .26s1.17.79 1.17 2.72"/><path fill="#ae6dee" d="M19.17 10.54c0-1.93-.52-4.28-1.17-4.28s-1.17 2.34-1.17 4.28.52 2.72 1.17 2.72 1.17-.79 1.17-2.72"/><path fill="#ae6dee" d="M21.62 5.05c-1.17 1.17-2.9 2.27-3.29 1.88s.71-2.12 1.88-3.29 1.96-1.33 2.35-.94.23 1.18-.94 2.35"/><path fill="#ae6dee" d="M21.62 8.47c-1.17-1.17-2.9-2.27-3.29-1.88s.71 2.12 1.88 3.29 1.96 1.33 2.35.94.23-1.18-.94-2.35m-7.24-3.42c1.17 1.17 2.9 2.27 3.29 1.88s-.71-2.12-1.88-3.29-1.96-1.33-2.35-.94-.23 1.18.94 2.35Z"/><path fill="#ae6dee" d="M14.38 8.47c1.17-1.17 2.9-2.27 3.29-1.88s-.71 2.12-1.88 3.29-1.96 1.33-2.35.94-.23-1.18.94-2.35Z"/><circle cx="18" cy="6.76" r=".8" fill="#cd95ff"/><path fill="#ae6dee" d="M19.17 16.98c0 1.93-.52 4.28-1.17 4.28s-1.17-2.34-1.17-4.28.52-2.72 1.17-2.72 1.17.79 1.17 2.72"/><path fill="#ae6dee" d="M19.17 24.54c0-1.93-.52-4.28-1.17-4.28s-1.17 2.34-1.17 4.28.52 2.72 1.17 2.72 1.17-.79 1.17-2.72"/><path fill="#ae6dee" d="M21.62 19.05c-1.17 1.17-2.9 2.27-3.29 1.88s.71-2.12 1.88-3.29 1.96-1.33 2.35-.94.23 1.18-.94 2.35"/><path fill="#ae6dee" d="M21.62 22.47c-1.17-1.17-2.9-2.27-3.29-1.88s.71 2.12 1.88 3.29 1.96 1.33 2.35.94.23-1.18-.94-2.35m-7.24-3.42c1.17 1.17 2.9 2.27 3.29 1.88s-.71-2.12-1.88-3.29-1.96-1.33-2.35-.94-.23 1.18.94 2.35Z"/><path fill="#ae6dee" d="M14.38 22.47c1.17-1.17 2.9-2.27 3.29-1.88s-.71 2.12-1.88 3.29-1.96 1.33-2.35.94-.23-1.18.94-2.35Z"/><circle cx="18" cy="20.76" r=".8" fill="#cd95ff"/><path fill="#ae6dee" d="M22.17 13.3c1.19.62 2.8 1.04 3.01.65s-1.07-1.47-2.26-2.08-1.84-.55-2.05-.15.11.97 1.31 1.59Z"/><path fill="#ae6dee" d="M22.17 14.21c1.19-.62 2.8-1.04 3.01-.65s-1.07 1.47-2.26 2.08-1.84.55-2.05.15.11-.97 1.31-1.59Z"/><path fill="#ae6dee" d="M27.83 13.3c-1.19.62-2.8 1.04-3.01.65s1.07-1.47 2.26-2.08 1.84-.55 2.05-.15-.11.97-1.31 1.59Z"/><path fill="#ae6dee" d="M27.83 14.21c-1.19-.62-2.8-1.04-3.01-.65s1.07 1.47 2.26 2.08 1.84.55 2.05.15-.11-.97-1.31-1.59Z"/><path fill="#ae6dee" d="M26.84 11.03c-.58 1.47-1.67 3.1-2.16 2.91s-.19-2.13.39-3.61 1.21-1.92 1.7-1.73.65.95.08 2.42Z"/><path fill="#ae6dee" d="M26.84 16.49c-.58-1.47-1.67-3.1-2.16-2.91s-.19 2.13.39 3.61 1.21 1.92 1.7 1.73.65-.95.08-2.42Z"/><ellipse cx="25.35" cy="13.76" fill="#cd95ff" rx=".4" ry=".8"/><path fill="#ae6dee" d="M13.83 13.3c-1.19.62-2.8 1.04-3.01.65s1.07-1.47 2.26-2.08 1.84-.55 2.05-.15-.11.97-1.31 1.59Z"/><path fill="#ae6dee" d="M13.83 14.21c-1.19-.62-2.8-1.04-3.01-.65s1.07 1.47 2.26 2.08 1.84.55 2.05.15-.11-.97-1.31-1.59Z"/><path fill="#ae6dee" d="M8.17 13.3c1.19.62 2.8 1.04 3.01.65s-1.07-1.47-2.26-2.08-1.84-.55-2.05-.15.11.97 1.31 1.59Z"/><path fill="#ae6dee" d="M8.17 14.21c1.19-.62 2.8-1.04 3.01-.65s-1.07 1.47-2.26 2.08-1.84.55-2.05.15.11-.97 1.31-1.59Z"/><path fill="#ae6dee" d="M9.16 11.03c.58 1.47 1.67 3.1 2.16 2.91s.19-2.13-.39-3.61-1.21-1.92-1.7-1.73-.65.95-.08 2.42Z"/><path fill="#ae6dee" d="M9.16 16.49c.58-1.47 1.67-3.1 2.16-2.91s.19 2.13-.39 3.61-1.21 1.92-1.7 1.73-.65-.95-.08-2.42Z"/><ellipse cx="10.65" cy="13.76" fill="#cd95ff" rx=".4" ry=".8"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fabc.svg b/public/emoji/1fabc.svg
new file mode 100644
index 0000000000..cb8c4eef40
--- /dev/null
+++ b/public/emoji/1fabc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#44abf3" d="M13.5 35c-.26 0-.53-.07-.77-.21-.71-.43-.94-1.35-.51-2.06l1.59-2.65c.45-.75.3-1.71-.34-2.29a4.804 4.804 0 0 1-.84-6.19l2.2-3.44c.45-.7 1.37-.9 2.07-.45.7.45.9 1.37.45 2.07l-2.2 3.44c-.48.75-.35 1.73.32 2.33 1.72 1.54 2.1 4.09.92 6.06l-1.59 2.65a1.5 1.5 0 0 1-1.29.73Zm-6-2c-.26 0-.53-.07-.77-.21-.71-.43-.94-1.35-.51-2.06l1.59-2.65c.45-.75.3-1.71-.34-2.29a4.804 4.804 0 0 1-.84-6.19l2.2-3.44c.45-.7 1.37-.9 2.07-.45.7.45.9 1.38.45 2.07l-2.2 3.44c-.48.75-.35 1.73.32 2.33 1.72 1.54 2.1 4.09.92 6.06L8.8 32.26a1.5 1.5 0 0 1-1.29.73Zm14.44 2a1.5 1.5 0 0 1-1.29-.73l-1.59-2.65c-1.19-1.98-.8-4.53.92-6.06.67-.6.8-1.58.32-2.33l-2.2-3.44a1.499 1.499 0 0 1 2.52-1.62l2.2 3.44c1.28 2 .93 4.6-.84 6.19-.65.58-.79 1.54-.34 2.29l1.59 2.65c.43.71.2 1.63-.51 2.06-.24.15-.51.21-.77.21Zm6-2a1.5 1.5 0 0 1-1.29-.73l-1.59-2.65c-1.19-1.98-.8-4.53.92-6.06.67-.6.8-1.58.32-2.33l-2.2-3.44a1.499 1.499 0 0 1 2.52-1.62l2.2 3.44c1.28 2 .93 4.6-.84 6.19-.65.58-.79 1.54-.34 2.29l1.59 2.65c.43.71.2 1.63-.51 2.06-.24.15-.51.21-.77.21Z"/><path fill="#44abf3" d="M18 22.27c-1.17 0-2.3-.29-3.36-.85-.71-.38-1.28-.82-1.68-1.31-.61-.75-1.5-1.17-2.42-1.17-.11 0-.21 0-.32.02-.33.04-.72.06-1.15.06-3.21 0-5.26-1.36-6.1-4.04C1.6 10.6 4.73 7.51 7.59 5.7c1.13-.72 5.7-2.68 10.42-2.68S27.3 4.99 28.43 5.7c2.87 1.82 6 4.9 4.62 9.28-.84 2.68-2.89 4.04-6.1 4.04-.43 0-.82-.03-1.15-.06-.11-.01-.21-.02-.32-.02-.92 0-1.81.43-2.42 1.17-.41.5-.97.94-1.68 1.32-1.06.57-2.2.85-3.36.85Z"/><path fill="#2b87c7" d="M18 4c4.44 0 8.86 1.88 9.89 2.53 2.57 1.63 5.39 4.36 4.21 8.14-.26.83-1.05 3.34-5.15 3.34-.34 0-.7-.02-1.05-.06-.14-.02-.28-.02-.43-.02-1.23 0-2.39.56-3.19 1.54-.32.39-.79.75-1.38 1.07-.92.49-1.89.74-2.9.74s-1.98-.25-2.9-.74c-.59-.32-1.06-.67-1.38-1.07-.8-.98-1.97-1.54-3.19-1.54-.14 0-.28 0-.43.02-.35.04-.7.06-1.05.06-4.1 0-4.89-2.51-5.15-3.34-1.18-3.78 1.63-6.51 4.21-8.14C9.13 5.88 13.55 4 18 4m0-2C13 2 8.24 4.08 7.04 4.84 4.44 6.48.36 10.02 2 15.26 3.25 19.25 6.67 20 9.06 20c.47 0 .89-.03 1.26-.07.07 0 .14-.01.22-.01.61 0 1.21.27 1.65.81.54.66 1.25 1.17 1.99 1.56 1.22.65 2.53.97 3.83.97s2.62-.32 3.83-.97c.73-.39 1.44-.9 1.99-1.56.44-.54 1.04-.81 1.65-.81.07 0 .14 0 .22.01.36.04.79.07 1.26.07 2.39 0 5.81-.75 7.06-4.74 1.64-5.25-2.44-8.78-5.04-10.43-1.19-.76-5.96-2.84-10.96-2.84Z"/><path fill="#fff" d="M8.12 12.67c-.57 1.67-.98 2.83-1.99 2.49s-1.36-1.97-.79-3.64 1.84-2.75 2.84-2.41.5 1.89-.06 3.57Z"/><path fill="#2b87c7" d="M23.12 6.98c-.61-.48-1.76-1.72-5.12-1.72s-4.51 1.25-5.12 1.72c-.78.61-.86 1.53-.19 2.06.67.53 1.85.46 2.62-.15.11-.08.24-.21.39-.35-.11.37-.18.7-.18.9 0 .86 1.11 1.56 2.48 1.56s2.48-.7 2.48-1.56c0-.21-.06-.53-.18-.9.15.15.28.27.39.35.78.61 1.95.68 2.62.15.67-.53.59-1.45-.19-2.06"/><ellipse cx="10" cy="7.5" fill="#fff" rx="1.5" ry="1" transform="rotate(-42.63 9.993 7.502)"/><path fill="#fff" d="M30.24 15.68c-.77 1.03-1.9 1.49-2.52 1.03s-.5-1.68.28-2.71 1.9-1.49 2.52-1.03.5 1.67-.27 2.71Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fabd.svg b/public/emoji/1fabd.svg
new file mode 100644
index 0000000000..9effe33338
--- /dev/null
+++ b/public/emoji/1fabd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CAD4DB" d="M33.86 3.06c.03-.8-.92-1.26-1.53-.75-6.2 5.13-13.64 8.46-18.68 9.1-4.06.52-5.34 2.11-6.26 5.18-.29.97-.69 1.9-1.22 2.75l-3.19 5.12-.117.252c-.428.923-.873 1.881-.873 2.898 0 2.47 3.16 3.67 4.89 4.14.39.11.74-.15.82-.51l-.044-.063.078.022-1.515-4.012.563.241.026.072c.038.107.075.213.122.32v.01c.2.48.44.96.71 1.44 2.03 3.27 5.56 3.85 7.66 3.88.73.01 1.14-.83.69-1.41l-.68-.88-.036.073-2.524-2.495.763.108.067.054-.04-.05.052.007c4.516 2.8 8.073 3.373 10.298 3.333.97-.01 1.34-1.27.54-1.82l-.17-.12a23.27 23.27 0 0 1-.243-.065l-3.11-1.666.62-.19c6.053 1.66 9.432-.137 10.953-1.439.49-.42.27-1.21-.37-1.3l-1.17-.18-.137.024-5.49-.743.189-.099.208.018-.19-.027.007-.004c3.684-.136 5.926-1.552 7.103-2.609.35-.31.26-.82-.06-1.06l-.18.045-6.015-.093.102-.106.113-.006c3.99-1.03 5.97-2.54 6.95-3.79.65-.82-.07-2.01-1.11-1.87l-.73.1.008.02-4.599 1.012.32-.353c.117-.035.234-.072.351-.109l-.28.04c4.44-1.27 6.06-3.74 6.66-5.38a.795.795 0 0 0-.81-1.07l-.029.021.023-.024-4.512 2.012c-.562.18-.857.3-1.16.392a4.781 4.781 0 0 1-.234.066l.015-.025c5.22-2.61 6.277-6.232 6.377-8.442z"/><path fill="#97A8B3" d="M24.8 21.53c3.37 0 6.05-.49 7.77-.92a.69.69 0 0 0-.41-.13h-5.68l.11-.03c-3.13.17-7.02-.05-11.37-1.25.31-.41.61-.86.9-1.33.58.03 1.19.04 1.82.04 4.11 0 9.13-.64 13.78-2.96l-.02-.05-3.92.56c-3.9 1.24-7.86 1.5-11.09 1.4.27-.52.52-1.08.75-1.66h.24c2.98 0 8.64-.88 15.67-6.16a.76.76 0 0 0-.25.06l-5.29 2.27c-4.39 2.28-7.9 2.77-10 2.8.06-.18.13-.35.19-.53a.5.5 0 0 0-.33-.62c-.04-.01-.08 0-.12-.01-.22 0-.43.12-.5.35-2.41 8.04-8.32 10.1-12 10.58-.19.03-.39.05-.57.07-.28.03-.48.27-.45.54.02.26.24.45.5.45h.05c.2-.02.41-.04.64-.07.19 2.07 1.04 4.19 2.52 6.32.02-.1.03-.21 0-.32L6.69 27.1c-.27-.79-.43-1.57-.49-2.34.78-.16 1.66-.39 2.59-.75 1.92 4.58 6.46 6.91 6.52 6.94l.04-.08-1.74-2.26c-1.33-1.07-2.96-2.73-3.9-4.98.36-.16.72-.35 1.08-.55 4.17 4.34 12.35 6.58 13.49 6.88l-2.8-1.93c-2.93-1.03-7.2-2.87-9.82-5.49.4-.26.79-.55 1.19-.87 4.01 1.96 9.68 3.72 14.83 3.72 1.13 0 2.24-.09 3.3-.28l-5.25-.8c-4.31-.35-8.75-1.81-12.05-3.37.3-.28.59-.58.87-.91 3.83 1.11 7.32 1.5 10.27 1.5z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fabd_border.svg b/public/emoji/1fabd_border.svg
new file mode 100644
index 0000000000..30184ea09a
--- /dev/null
+++ b/public/emoji/1fabd_border.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M33.86 3.06c.03-.8-.92-1.26-1.53-.75-6.2 5.13-13.64 8.46-18.68 9.1-4.06.52-5.34 2.11-6.26 5.18-.29.97-.69 1.9-1.22 2.75l-3.19 5.12-.117.252c-.428.923-.873 1.881-.873 2.898 0 2.47 3.16 3.67 4.89 4.14.39.11.74-.15.82-.51l-.044-.063.078.022-1.515-4.012.563.241.026.072c.038.107.075.213.122.32v.01c.2.48.44.96.71 1.44 2.03 3.27 5.56 3.85 7.66 3.88.73.01 1.14-.83.69-1.41l-.68-.88-.036.073-2.524-2.495.763.108.067.054-.04-.05.052.007c4.516 2.8 8.073 3.373 10.298 3.333.97-.01 1.34-1.27.54-1.82l-.17-.12a23.27 23.27 0 0 1-.243-.065l-3.11-1.666.62-.19c6.053 1.66 9.432-.137 10.953-1.439.49-.42.27-1.21-.37-1.3l-1.17-.18-.137.024-5.49-.743.189-.099.208.018-.19-.027.007-.004c3.684-.136 5.926-1.552 7.103-2.609.35-.31.26-.82-.06-1.06l-.18.045-6.015-.093.102-.106.113-.006c3.99-1.03 5.97-2.54 6.95-3.79.65-.82-.07-2.01-1.11-1.87l-.73.1.008.02-4.599 1.012.32-.353c.117-.035.234-.072.351-.109l-.28.04c4.44-1.27 6.06-3.74 6.66-5.38a.795.795 0 0 0-.81-1.07l-.029.021.023-.024-4.512 2.012c-.562.18-.857.3-1.16.392a4.781 4.781 0 0 1-.234.066l.015-.025c5.22-2.61 6.277-6.232 6.377-8.442z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M24.8 21.53c3.37 0 6.05-.49 7.77-.92a.69.69 0 0 0-.41-.13h-5.68l.11-.03c-3.13.17-7.02-.05-11.37-1.25.31-.41.61-.86.9-1.33.58.03 1.19.04 1.82.04 4.11 0 9.13-.64 13.78-2.96l-.02-.05-3.92.56c-3.9 1.24-7.86 1.5-11.09 1.4.27-.52.52-1.08.75-1.66h.24c2.98 0 8.64-.88 15.67-6.16a.76.76 0 0 0-.25.06l-5.29 2.27c-4.39 2.28-7.9 2.77-10 2.8.06-.18.13-.35.19-.53a.5.5 0 0 0-.33-.62c-.04-.01-.08 0-.12-.01-.22 0-.43.12-.5.35-2.41 8.04-8.32 10.1-12 10.58-.19.03-.39.05-.57.07-.28.03-.48.27-.45.54.02.26.24.45.5.45h.05c.2-.02.41-.04.64-.07.19 2.07 1.04 4.19 2.52 6.32.02-.1.03-.21 0-.32L6.69 27.1c-.27-.79-.43-1.57-.49-2.34.78-.16 1.66-.39 2.59-.75 1.92 4.58 6.46 6.91 6.52 6.94l.04-.08-1.74-2.26c-1.33-1.07-2.96-2.73-3.9-4.98.36-.16.72-.35 1.08-.55 4.17 4.34 12.35 6.58 13.49 6.88l-2.8-1.93c-2.93-1.03-7.2-2.87-9.82-5.49.4-.26.79-.55 1.19-.87 4.01 1.96 9.68 3.72 14.83 3.72 1.13 0 2.24-.09 3.3-.28l-5.25-.8c-4.31-.35-8.75-1.81-12.05-3.37.3-.28.59-.58.87-.91 3.83 1.11 7.32 1.5 10.27 1.5z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#CAD4DB" d="M33.86 3.06c.03-.8-.92-1.26-1.53-.75-6.2 5.13-13.64 8.46-18.68 9.1-4.06.52-5.34 2.11-6.26 5.18-.29.97-.69 1.9-1.22 2.75l-3.19 5.12-.117.252c-.428.923-.873 1.881-.873 2.898 0 2.47 3.16 3.67 4.89 4.14.39.11.74-.15.82-.51l-.044-.063.078.022-1.515-4.012.563.241.026.072c.038.107.075.213.122.32v.01c.2.48.44.96.71 1.44 2.03 3.27 5.56 3.85 7.66 3.88.73.01 1.14-.83.69-1.41l-.68-.88-.036.073-2.524-2.495.763.108.067.054-.04-.05.052.007c4.516 2.8 8.073 3.373 10.298 3.333.97-.01 1.34-1.27.54-1.82l-.17-.12a23.27 23.27 0 0 1-.243-.065l-3.11-1.666.62-.19c6.053 1.66 9.432-.137 10.953-1.439.49-.42.27-1.21-.37-1.3l-1.17-.18-.137.024-5.49-.743.189-.099.208.018-.19-.027.007-.004c3.684-.136 5.926-1.552 7.103-2.609.35-.31.26-.82-.06-1.06l-.18.045-6.015-.093.102-.106.113-.006c3.99-1.03 5.97-2.54 6.95-3.79.65-.82-.07-2.01-1.11-1.87l-.73.1.008.02-4.599 1.012.32-.353c.117-.035.234-.072.351-.109l-.28.04c4.44-1.27 6.06-3.74 6.66-5.38a.795.795 0 0 0-.81-1.07l-.029.021.023-.024-4.512 2.012c-.562.18-.857.3-1.16.392a4.781 4.781 0 0 1-.234.066l.015-.025c5.22-2.61 6.277-6.232 6.377-8.442z"/>
+  <path fill="#97A8B3" d="M24.8 21.53c3.37 0 6.05-.49 7.77-.92a.69.69 0 0 0-.41-.13h-5.68l.11-.03c-3.13.17-7.02-.05-11.37-1.25.31-.41.61-.86.9-1.33.58.03 1.19.04 1.82.04 4.11 0 9.13-.64 13.78-2.96l-.02-.05-3.92.56c-3.9 1.24-7.86 1.5-11.09 1.4.27-.52.52-1.08.75-1.66h.24c2.98 0 8.64-.88 15.67-6.16a.76.76 0 0 0-.25.06l-5.29 2.27c-4.39 2.28-7.9 2.77-10 2.8.06-.18.13-.35.19-.53a.5.5 0 0 0-.33-.62c-.04-.01-.08 0-.12-.01-.22 0-.43.12-.5.35-2.41 8.04-8.32 10.1-12 10.58-.19.03-.39.05-.57.07-.28.03-.48.27-.45.54.02.26.24.45.5.45h.05c.2-.02.41-.04.64-.07.19 2.07 1.04 4.19 2.52 6.32.02-.1.03-.21 0-.32L6.69 27.1c-.27-.79-.43-1.57-.49-2.34.78-.16 1.66-.39 2.59-.75 1.92 4.58 6.46 6.91 6.52 6.94l.04-.08-1.74-2.26c-1.33-1.07-2.96-2.73-3.9-4.98.36-.16.72-.35 1.08-.55 4.17 4.34 12.35 6.58 13.49 6.88l-2.8-1.93c-2.93-1.03-7.2-2.87-9.82-5.49.4-.26.79-.55 1.19-.87 4.01 1.96 9.68 3.72 14.83 3.72 1.13 0 2.24-.09 3.3-.28l-5.25-.8c-4.31-.35-8.75-1.81-12.05-3.37.3-.28.59-.58.87-.91 3.83 1.11 7.32 1.5 10.27 1.5z"/>
+</svg>
diff --git a/public/emoji/1fabf.svg b/public/emoji/1fabf.svg
new file mode 100644
index 0000000000..7c0f6a6b8b
--- /dev/null
+++ b/public/emoji/1fabf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#ffa800" d="M20.43 33.26a.736.736 0 0 0-.32-.31s-.36-.08-.42-.17c-.67-1.12 1.29-5.33 1.29-5.33h-2l-1.21 4.9-1.11-.03a.773.773 0 0 0-.79.76c-.01.43.33.78.76.79l.86.02-.17.09c-.38.19-.53.66-.34 1.04s.66.53 1.04.34l2.07-1.06c.38-.19.53-.66.34-1.04Z"/><path fill="#ffa800" d="M25.12 31.7a.743.743 0 0 0-.44-.06s-.33.15-.44.11c-1.21-.49-2.15-5.05-2.15-5.05l-1.6 1.19 1.96 4.65-.91.64c-.35.25-.43.73-.19 1.08.25.35.73.43 1.08.19l.7-.5-.09.18c-.19.38-.03.85.35 1.04s.85.03 1.04-.35l1.03-2.08a.78.78 0 0 0-.35-1.04Z"/><path fill="#dfe7ed" d="M9.23 11.39c-1.03 1.43-1.74 3.08-1.77 4.84-.08 5.16 4.11 7.45 6.01 8.71 1.33.88 2.85 2.35 4.13 3.72 1.47 1.56 3.98 1.41 5.24-.32 1.5-2.07 3.54-4.48 5.57-5.62 2.41-1.37 3.27-3.3 3.57-4.59.16-.66-.4-1.26-1.08-1.23-3.54.17-5.43-1.96-5.43-1.96-5.02-5.02-10.04-2.38-11.55-1.38-.25.17-.6.04-.68-.25-.38-1.35-.12-3.35.77-5.42.57-1.32.76-2.79.47-4.19-.12-.61-.34-1.22-.69-1.76-1.31-2-5.31-2-6.32 1.17-1.21 3.77 1.02 2.83 1.02 2.83s3.12 2.16.75 5.45Z"/><path fill="#fc8a00" d="M4.47 4.8c.91-.22 2.04-.55 2.94-.97.31-.14.66-.02.85.27.23.35.63.73 1.34.81.42.04.52.63.17.86-1.16.74-3.06 1.42-5.44.24-.53-.26-.43-1.07.14-1.21Z"/><circle cx="10.98" cy="3.44" r="1" fill="#282f33"/><path fill="#cad4db" d="M21.43 23.72c-1.02 0-1.99-.18-2.91-.55-4.06-1.62-5.47-6.22-5.52-6.41-.08-.26.07-.54.34-.62.27-.08.54.07.62.34.01.04 1.33 4.34 4.94 5.77 2.38.95 5.25.46 8.54-1.43a.35.35 0 0 0 .17-.3c0-.06-.02-.22-.19-.3l-2.65-1.33a.488.488 0 0 1-.22-.67c.12-.25.42-.34.67-.22l2.65 1.33c.44.22.73.67.74 1.16.01.49-.24.95-.67 1.2-2.35 1.36-4.53 2.04-6.51 2.04Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fabf_border.svg b/public/emoji/1fabf_border.svg
new file mode 100644
index 0000000000..42b1f98013
--- /dev/null
+++ b/public/emoji/1fabf_border.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M20.43 33.26a.736.736 0 0 0-.32-.31s-.36-.08-.42-.17c-.67-1.12 1.29-5.33 1.29-5.33h-2l-1.21 4.9-1.11-.03a.773.773 0 0 0-.79.76c-.01.43.33.78.76.79l.86.02-.17.09c-.38.19-.53.66-.34 1.04s.66.53 1.04.34l2.07-1.06c.38-.19.53-.66.34-1.04Z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M25.12 31.7a.743.743 0 0 0-.44-.06s-.33.15-.44.11c-1.21-.49-2.15-5.05-2.15-5.05l-1.6 1.19 1.96 4.65-.91.64c-.35.25-.43.73-.19 1.08.25.35.73.43 1.08.19l.7-.5-.09.18c-.19.38-.03.85.35 1.04s.85.03 1.04-.35l1.03-2.08a.78.78 0 0 0-.35-1.04Z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M9.23 11.39c-1.03 1.43-1.74 3.08-1.77 4.84-.08 5.16 4.11 7.45 6.01 8.71 1.33.88 2.85 2.35 4.13 3.72 1.47 1.56 3.98 1.41 5.24-.32 1.5-2.07 3.54-4.48 5.57-5.62 2.41-1.37 3.27-3.3 3.57-4.59.16-.66-.4-1.26-1.08-1.23-3.54.17-5.43-1.96-5.43-1.96-5.02-5.02-10.04-2.38-11.55-1.38-.25.17-.6.04-.68-.25-.38-1.35-.12-3.35.77-5.42.57-1.32.76-2.79.47-4.19-.12-.61-.34-1.22-.69-1.76-1.31-2-5.31-2-6.32 1.17-1.21 3.77 1.02 2.83 1.02 2.83s3.12 2.16.75 5.45Z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M4.47 4.8c.91-.22 2.04-.55 2.94-.97.31-.14.66-.02.85.27.23.35.63.73 1.34.81.42.04.52.63.17.86-1.16.74-3.06 1.42-5.44.24-.53-.26-.43-1.07.14-1.21Z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="10.98" cy="3.44" r="1" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M21.43 23.72c-1.02 0-1.99-.18-2.91-.55-4.06-1.62-5.47-6.22-5.52-6.41-.08-.26.07-.54.34-.62.27-.08.54.07.62.34.01.04 1.33 4.34 4.94 5.77 2.38.95 5.25.46 8.54-1.43a.35.35 0 0 0 .17-.3c0-.06-.02-.22-.19-.3l-2.65-1.33a.488.488 0 0 1-.22-.67c.12-.25.42-.34.67-.22l2.65 1.33c.44.22.73.67.74 1.16.01.49-.24.95-.67 1.2-2.35 1.36-4.53 2.04-6.51 2.04Z" stroke="black" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#ffa800" d="M20.43 33.26a.736.736 0 0 0-.32-.31s-.36-.08-.42-.17c-.67-1.12 1.29-5.33 1.29-5.33h-2l-1.21 4.9-1.11-.03a.773.773 0 0 0-.79.76c-.01.43.33.78.76.79l.86.02-.17.09c-.38.19-.53.66-.34 1.04s.66.53 1.04.34l2.07-1.06c.38-.19.53-.66.34-1.04Z"/>
+  <path fill="#ffa800" d="M25.12 31.7a.743.743 0 0 0-.44-.06s-.33.15-.44.11c-1.21-.49-2.15-5.05-2.15-5.05l-1.6 1.19 1.96 4.65-.91.64c-.35.25-.43.73-.19 1.08.25.35.73.43 1.08.19l.7-.5-.09.18c-.19.38-.03.85.35 1.04s.85.03 1.04-.35l1.03-2.08a.78.78 0 0 0-.35-1.04Z"/>
+  <path fill="#dfe7ed" d="M9.23 11.39c-1.03 1.43-1.74 3.08-1.77 4.84-.08 5.16 4.11 7.45 6.01 8.71 1.33.88 2.85 2.35 4.13 3.72 1.47 1.56 3.98 1.41 5.24-.32 1.5-2.07 3.54-4.48 5.57-5.62 2.41-1.37 3.27-3.3 3.57-4.59.16-.66-.4-1.26-1.08-1.23-3.54.17-5.43-1.96-5.43-1.96-5.02-5.02-10.04-2.38-11.55-1.38-.25.17-.6.04-.68-.25-.38-1.35-.12-3.35.77-5.42.57-1.32.76-2.79.47-4.19-.12-.61-.34-1.22-.69-1.76-1.31-2-5.31-2-6.32 1.17-1.21 3.77 1.02 2.83 1.02 2.83s3.12 2.16.75 5.45Z"/>
+  <path fill="#fc8a00" d="M4.47 4.8c.91-.22 2.04-.55 2.94-.97.31-.14.66-.02.85.27.23.35.63.73 1.34.81.42.04.52.63.17.86-1.16.74-3.06 1.42-5.44.24-.53-.26-.43-1.07.14-1.21Z"/>
+  <circle cx="10.98" cy="3.44" r="1" fill="#282f33"/>
+  <path fill="#cad4db" d="M21.43 23.72c-1.02 0-1.99-.18-2.91-.55-4.06-1.62-5.47-6.22-5.52-6.41-.08-.26.07-.54.34-.62.27-.08.54.07.62.34.01.04 1.33 4.34 4.94 5.77 2.38.95 5.25.46 8.54-1.43a.35.35 0 0 0 .17-.3c0-.06-.02-.22-.19-.3l-2.65-1.33a.488.488 0 0 1-.22-.67c.12-.25.42-.34.67-.22l2.65 1.33c.44.22.73.67.74 1.16.01.49-.24.95-.67 1.2-2.35 1.36-4.53 2.04-6.51 2.04Z"/>
+</svg>
diff --git a/public/emoji/1face.svg b/public/emoji/1face.svg
new file mode 100644
index 0000000000..f419d66350
--- /dev/null
+++ b/public/emoji/1face.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#6c1a0d" d="M.75 8.93s.24-3.25 3.01-5.01c.67-.43 1.46.33 1.08 1.03-.82 1.47-1.64 3.51-1.12 5.2.1.32.54.34.65.03.25-.73.67-1.83 1.28-2.75.37-.56 1.26-.23 1.18.44-.12.96-.21 2.12-.11 2.99.07.64.84.93 1.31.49.3-.28.62-.66.83-1.13.23-.5.96-.44 1.13.08.12.37.19.84.15 1.41-.05.85.36 1.66 1.08 2.1l2.05 1.26-1.15.94-1.92-1.28c-.63-.42-1.42-.52-2.12-.23-2.31.93-7.59 2.22-7.31-5.56Zm34.5 0s-.24-3.25-3.01-5.01c-.67-.43-1.46.33-1.08 1.03.82 1.47 1.64 3.51 1.12 5.2-.1.32-.54.34-.65.03-.25-.73-.67-1.83-1.28-2.75-.37-.56-1.26-.23-1.18.44.12.96.21 2.12.11 2.99-.07.64-.84.93-1.31.49-.3-.28-.62-.66-.83-1.13-.23-.5-.96-.44-1.13.08-.12.37-.19.84-.15 1.41.05.85-.36 1.66-1.08 2.1l-2.05 1.26 1.15.94 1.92-1.28c.63-.42 1.42-.52 2.12-.23 2.31.93 7.59 2.22 7.31-5.56Zm-15.73.53-.7.63-.49-.87c-.16-.29-.49-.29-.65 0l-.49.87-.7-.63c-.22-.2-.52-.07-.61.27L15.01 13h6l-.87-3.27c-.09-.34-.39-.47-.61-.27Z"/><path fill="#282f33" d="M13.15 15.06s-2.37-3.81-.72-4.76 3.73 3.06 3.73 3.06z"/><path fill="#c86349" d="m12.97 15.73-.25-.41c-.18-.28-1.71-2.82-1.31-4.42.11-.46.38-.81.76-1.04.39-.22.83-.27 1.27-.14 1.58.46 3 3.1 3.15 3.4l.22.43-3.85 2.18Zm-.01-5.08c-.1 0-.2.03-.29.08-.15.09-.25.22-.3.42-.21.84.49 2.38.95 3.23l2.15-1.21c-.58-.98-1.54-2.26-2.31-2.48a.761.761 0 0 0-.21-.03Z"/><path fill="#282f33" d="M22.85 15.06s2.37-3.81.72-4.76-3.73 3.06-3.73 3.06z"/><path fill="#c86349" d="m23.03 15.73-3.85-2.18.22-.43c.16-.3 1.57-2.94 3.15-3.4.45-.13.89-.08 1.28.14s.65.58.76 1.04c.4 1.6-1.14 4.14-1.31 4.42l-.25.41Zm-2.5-2.56 2.15 1.21c.47-.86 1.16-2.39.95-3.23-.05-.19-.14-.33-.29-.41-.15-.09-.31-.1-.5-.05-.83.24-1.81 1.64-2.31 2.48Z"/><circle cx="18" cy="30" r="2.5" fill="#282f33"/><path fill="#c86349" d="M18 33c-1.65 0-3-1.35-3-3s1.35-3 3-3 3 1.35 3 3-1.35 3-3 3m0-5c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"/><path fill="#c86349" d="M25 17.5c0-3.31-3.13-6-7-6s-7 2.69-7 6c0 1.2.41 2.32 1.13 3.26.78 1.02 1 2.37.76 3.64-.25 1.33-.39 2.46-.39 3.11 0 2.76 2.46 3 5.5 3s5.5-.24 5.5-3c0-.65-.14-1.77-.39-3.11-.24-1.26-.02-2.61.76-3.64.71-.94 1.13-2.05 1.13-3.26"/><path fill="#262b2b" d="M14.4 20.01s0-1.03 1.03-1.03 1.03 1.03 1.03 1.03v1.03s0 1.03-1.03 1.03-1.03-1.03-1.03-1.03v-1.03Zm5.15 0s0-1.03 1.03-1.03 1.03 1.03 1.03 1.03v1.03s0 1.03-1.03 1.03-1.03-1.03-1.03-1.03z"/><path fill="#6c1a0d" d="M16.06 28.03c.36-.09.51-.76.33-1.49s-.63-1.25-1-1.15-.51.76-.33 1.49.63 1.25 1 1.15Zm4.86-1.16c.19-.73.04-1.4-.33-1.49s-.81.42-1 1.15-.04 1.4.33 1.49.81-.42 1-1.15"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1facf.svg b/public/emoji/1facf.svg
new file mode 100644
index 0000000000..030b0bd8d2
--- /dev/null
+++ b/public/emoji/1facf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#738695" d="m16.07 26.09 3.23 6.04c.1.18.35.22.49.07l1.49-1.49c.12-.12.12-.31 0-.43l-2.24-2.43a1.03 1.03 0 0 1-.27-.69v-3.72l-3.28-1.94-1 3 1.57 1.59Zm5.7-2.88S23 26 25 27l-1.33 4.07c-.08.2.07.43.29.43h1.52c.14 0 .26-.09.3-.22l1.72-5.78-3-5.38-3 2z"/><path fill="#bfccd5" d="M6.97 5s-1.86 3.92-.18 5.5h1.14S9.02 8.48 6.97 5"/><path fill="#738695" d="M7.02 8.82s.38-1.7 3.48-2.32c1.36-.27 2.42.05 3.11.39.48.24.57.89.16 1.25l-.76.67s1.72-.24 1.99.18c.22.33-.5 1.5-.5 1.5s1.08.02 1.5.5c.11.13.52.54.94.96.69.68 1.54 1.16 2.48 1.4l2.57.64-6.5-.5-4.04-2.91-4.44-1.77Z"/><path fill="#bfccd5" d="M31.4 12.92c-1.91-2.01-5.4-2.75-8.9-.42-4.85 3.23-10-2-10-2-3.36-2.69-5.37-2.21-6.32-1.61-.38.24-.67.59-.87.99l-2.2 4.36c-.84 1.66.82 3.47 2.55 2.79L9.01 16c.71 2.83 2.17 4.41 2.96 5.09.35.3.58.72.64 1.18l.9 7.23-.75 4.05c-.05.27.15.51.42.51h1.89c.24 0 .43-.19.43-.43V29.5s.63-3.81.89-5.36c.06-.34.4-.53.72-.42 3.39 1.12 5.78-.06 6.81-.77.28-.19.67-.08.78.25 1.15 3.42 3.79 4.3 3.79 4.3l-1.34 6.04c-.06.27.15.53.42.53h1.58c.2 0 .37-.13.42-.32l1.81-6.86c.06-.24.03-.51-.1-.73l-.78-1.36a.788.788 0 0 1-.06-.67l2.03-5.63c.06-.16.1-.32.15-.48.22 1.19.35 2.66.35 4.48 0 .28.22.5.5.5s.5-.22.5-.5c0-5.84-1.37-8.43-2.6-9.58Z"/><path fill="#dfe7ed" d="M5.82 15.37S6.5 11.5 2.5 13.5c-2 1-1.06 2.92.36 3.98 1.04.77 2.53.6 3.33-.41.5-.63.67-1.31-.38-1.7Z"/><path fill="#bfccd5" d="M10.38 4.3s-2.86 3.97-1.32 6.06l1.26.23s1.62-2.02.06-6.3Z"/><path fill="#738695" d="M9.76 8.82c.25.1.52.23.79.38.11-.74.08-1.78-.43-3.18 0 0-.88 1.26-1.08 2.59.24.04.48.11.71.2Zm-6 6.12c.13-.52.06-.98-.15-1.04s-.5.32-.63.84-.06.98.15 1.04.5-.32.63-.84"/><path d="M7.2 12.82c.44 0 .8-.36.8-.8s-.36-.8-.8-.8-.8.36-.8.8.36.8.8.8"/><path fill="#738695" d="M13.18 34.06h1.89c.24 0 .43-.19.43-.43V33h-2.65l-.1.55c-.05.27.15.51.42.51ZM27.28 33l-.12.54c-.06.27.15.53.42.53h1.58c.2 0 .37-.13.42-.32l.2-.74h-2.5Zm6.21-11.18c-.98 0-1.93 1.45 0 3.91 0 0 2.44-3.92 0-3.91"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fada.svg b/public/emoji/1fada.svg
new file mode 100644
index 0000000000..2094a77023
--- /dev/null
+++ b/public/emoji/1fada.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#f1b777" d="M16.4 26.75c.52.82 1.17 2 1.81 3.58.69 1.71 2.05 3.05 3.8 3.64.05.02.09.03.14.05 3.88 1.31 8.02-1.13 8.75-5.15.22-1.19-.05-2.42-.74-3.42l-1.32-1.9c-.3-.43-.25-1.01.13-1.37 1.35-1.29 4.18-4.55 3.34-8.56-.08-.4-2.81-4.11-6.72-1.05a1.77 1.77 0 0 0-.4 1.96c.36.84.71 2.15.48 3.73-.04.27-.41.32-.51.07-.42-.99-1.31-2.54-2.93-3.14-.42-.16-.71-.55-.71-1v-.98c0-.41.25-.78.63-.91 1.17-.42 3.61-1.55 4.37-3.8 0 0 .49-1.47-.59-2.35-.9-.74-2.29-.51-3.01.4-.38.48-.96.95-1.75.95 0 0 .08-.78.06-1.73a3.497 3.497 0 0 0-2.92-3.37h-.08c-2.49-.42-5.71.1-7.88 2.44-.51.55-1.01 1.1-1.2 1.83-.6 2.35-1.33 8.02 2.85 14.83 0 0-3.43-.77-4.95-4.31a2.197 2.197 0 0 0-2.46-1.3c-1.4.28-2.51 1.36-2.81 2.76-.41 1.87.14 3.82 1.47 5.2 1.9 1.96 5.27 3.9 10.54 2.02.98-.35 2.07 0 2.63.88Z"/><path fill="#ffd875" d="M29.06 27.58c-.69-1.6-3.11-2.09-5.41-1.1-2.3.99-3.6 3.09-2.91 4.69.69 1.6 3.11 2.09 5.41 1.1s3.6-3.09 2.91-4.69Z"/><path fill="#ea9e48" d="M20.21 24.17c-1.56 1.01-2.54 2.4-3.17 3.69.19.35.39.74.59 1.17.52-1.35 1.46-2.96 3.12-4.03 2.16-1.39 5.07-1.59 8.66-.63l-.58-.84c-.08-.11-.13-.24-.16-.36-3.43-.74-6.27-.42-8.46 1m-16.99-.32c.14.14.29.29.45.43-.14-1.9.23-3.4 1.09-4.48.83-1.04 1.96-1.47 2.77-1.65-.17-.28-.34-.59-.48-.92-.93.25-2.13.79-3.06 1.94-.83 1.03-1.27 2.37-1.33 3.98.17.25.36.48.57.7Zm6.8-3.21c-.51-.32-1.07-.74-1.59-1.3-.78.65-1.84 1.79-2.25 3.48-.24 1-.23 2.04.04 3.11.7.3 1.47.52 2.34.63-.53-1.17-.68-2.26-.44-3.24.34-1.42 1.4-2.32 1.9-2.68m6.88-1.34c1.98-2.42 5.18-3.07 6.72-3.24a4.27 4.27 0 0 0-1.27-.82c-1.83.36-4.42 1.23-6.21 3.42-1.49 1.82-2.12 4.2-1.92 7.1.34-.05.69-.02 1.01.08-.22-2.7.33-4.9 1.68-6.54Zm4.6-5.24v-.85c0-.41.25-.78.63-.91.06-.02.13-.05.2-.08-2.73-1.63-5.39-2.16-7.93-1.55-2.46.59-4.27 2.13-5.4 3.39.15.78.35 1.59.63 2.44.64-.94 2.46-3.22 5.25-3.89 2.06-.49 4.29 0 6.62 1.45ZM8.94 7.5c-.08.43-.16.91-.21 1.46 2.43-2.11 7.03-5.05 12.46-3.32-.02-.39-.1-.77-.25-1.12-5.04-1.36-9.34.91-12 2.98Zm14.98-1.67c-.36.13-.69.35-.95.65.76.34 1.62.87 2.09 1.71.35.62.43 1.34.27 2.16a5.2 5.2 0 0 0 1.02-1.48c-.08-.41-.21-.8-.42-1.17-.48-.86-1.25-1.45-2.01-1.86Zm8.51 8.7c-1.28-1.21-2.63-1.88-4.03-1.98-1.4-.09-2.54.41-3.3.87-.09.36-.07.74.08 1.09 0 .01.01.03.02.05.54-.41 1.7-1.12 3.14-1.01 1.39.1 2.76.91 4.06 2.39.05-.45.07-.92.03-1.41m-3.98.82c-.97-.3-1.96-.25-2.96.12.08.31.14.65.18 1.02.85-.36 1.68-.43 2.48-.18 1.46.44 2.56 1.77 3.21 2.75.18-.33.34-.68.49-1.05-.76-1.03-1.91-2.21-3.41-2.66Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fadb.svg b/public/emoji/1fadb.svg
new file mode 100644
index 0000000000..e68a96d9f1
--- /dev/null
+++ b/public/emoji/1fadb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4e932b" d="M28 5C12 5 2.03 33.73 2.03 33.73c.01.24.21.42.45.4l8.78-5.46s.36-.61.83-1.4c.75.3 1.57.45 2.43.4a5.789 5.789 0 0 0 5.44-5.08 6.373 6.373 0 0 0 4.31-6.19c3.64-.44 6.18-4.23 4.61-8.08-.62-1.52.75-3.33-.89-3.33Z"/><circle cx="7.7" cy="30.6" r="3.3" fill="#9bd57f"/><path fill="#4e932b" d="M7 25s-2 4 1.7 6c.26.14 2.46-1.81 2.38-1.4S7.4 25.11 7.4 25.11z"/><circle cx="12.16" cy="26.74" r="5.16" fill="#9bd57f"/><path fill="#4e932b" d="M11 20s-4 2 1 8l4 1z"/><circle cx="15.5" cy="21.5" r="5.5" fill="#9bd57f"/><path fill="#4e932b" d="M13.8 15.12S12.48 21.99 19 24l1.42-1.14-6.63-7.74Z"/><circle cx="19.75" cy="16.33" r="5.58" fill="#9bd57f"/><path fill="#4e932b" d="M19.27 9.73s-1.49 5.78 2.9 8.38l5.69-2.55-8.6-5.83Z"/><circle cx="24.44" cy="11.46" r="4.96" fill="#9bd57f"/><path fill="#69b546" d="M2.35 34.03C4.2 33.16 19 22 29.25 8.47l1.71 1S21 38 2.39 34.23c-.1-.02-.13-.15-.04-.2Z"/><path fill="#4e932b" d="M32.64 3.18c2.46.88 2.24-1.04 1.69-1.62-.81-.84-2.22-.94-3.3-.07-.35.28-.83.89-1.32 1.59-.2.29-.57.38-.89.25-2.85-1.16-5.8-1.23-9.4.4 0 0 2.41 3.35 7.37 3.46 0 0-3.37 3.24-.99 8.24 0 0 3.35-2.41 3.42-5.71 0 0 1.6 2.51 4.91 2.58 0 0-.61-5.8-3.37-7.95-.18-.14-.16-.43.04-.56.74-.47 1.43-.77 1.87-.61Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1fae8.svg b/public/emoji/1fae8.svg
new file mode 100644
index 0000000000..02ab52d88e
--- /dev/null
+++ b/public/emoji/1fae8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><defs><clipPath id="a"><path fill="none" d="M.997 18 17.996 1.001l16.999 17-17 16.998z"/></clipPath></defs><g clip-path="url(#a)"><path fill="#ffcb26" d="M26.5 26.5c-4.69 4.69-12.31 4.69-17 0-4.69-4.69-4.69-12.31 0-17s12.31-4.69 17 0c4.69 4.69 4.69 12.31 0 17"/><path fill="#b68600" d="M14.93 13.99c.65.65 1.92.44 2.83-.47.91-.91 1.12-2.18.47-2.83s-1.92-.44-2.83.47-1.12 2.18-.47 2.83Z"/><path fill="#b68600" d="M16.35 15.4c.65.65 1.92.44 2.83-.47.91-.91 1.12-2.18.47-2.83s-1.92-.44-2.83.47-1.12 2.18-.47 2.83m5.66 5.67c.65.65 1.92.44 2.83-.47s1.12-2.18.47-2.83-1.92-.44-2.83.47-1.12 2.18-.47 2.83Z"/><path fill="#b68600" d="M20.6 19.65c.65.65 1.92.44 2.83-.47s1.12-2.18.47-2.83-1.92-.44-2.83.47-1.12 2.18-.47 2.83"/><path fill="#694400" d="M12.33 23.67c1.04 1.04 2.95.83 4.25-.47s1.52-3.21.47-4.25-2.95-.83-4.25.47-1.52 3.21-.47 4.25Z"/></g><path fill="#4facf0" d="M21.89 33.66c-.46 0-.88-.32-.98-.79-.11-.54.23-1.07.77-1.19 8.4-1.78 9.92-9.63 9.99-9.96.1-.54.62-.9 1.16-.81s.9.62.81 1.16c-.02.09-1.79 9.5-11.54 11.57-.07.01-.14.02-.21.02Zm5.31 2.33c-.46 0-.88-.32-.98-.79-.11-.54.23-1.07.77-1.19 5.89-1.25 6.97-6.75 7.01-6.99.1-.54.62-.9 1.16-.8.54.1.9.61.81 1.16-.05.29-1.33 7.06-8.57 8.59-.07.01-.14.02-.21.02ZM3.34 15.1c-.07 0-.14 0-.21-.02a.998.998 0 0 1-.77-1.19C4.43 4.15 13.83 2.37 13.93 2.36a1 1 0 1 1 .35 1.97c-.35.06-8.18 1.6-9.96 9.99-.1.47-.52.79-.98.79ZM1.01 9.8c-.07 0-.14 0-.21-.02a.998.998 0 0 1-.77-1.19C1.56 1.36 8.34.08 8.62.03A1 1 0 1 1 8.97 2c-.26.05-5.74 1.14-6.99 7.01-.1.47-.51.79-.98.79Z"/><path fill="#694400" d="M15.64 14.69c.65.65 1.92.44 2.83-.47.91-.91 1.12-2.18.47-2.83s-1.92-.44-2.83.47-1.12 2.18-.47 2.83Zm5.67 5.67c.65.65 1.92.44 2.83-.47s1.12-2.18.47-2.83-1.92-.44-2.83.47-1.12 2.18-.47 2.83"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7-1f3fb.svg b/public/emoji/1faf7-1f3fb.svg
new file mode 100644
index 0000000000..5df3bd18c4
--- /dev/null
+++ b/public/emoji/1faf7-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E0AA94" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#F7DECE" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path fill="#E0AA94" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7-1f3fc.svg b/public/emoji/1faf7-1f3fc.svg
new file mode 100644
index 0000000000..6633504ee3
--- /dev/null
+++ b/public/emoji/1faf7-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D2A077" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#F3D2A2" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path fill="#D2A077" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7-1f3fd.svg b/public/emoji/1faf7-1f3fd.svg
new file mode 100644
index 0000000000..752c49b4f1
--- /dev/null
+++ b/public/emoji/1faf7-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#D5AB88" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path fill="#B78B60" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7-1f3fe.svg b/public/emoji/1faf7-1f3fe.svg
new file mode 100644
index 0000000000..d4aaefc739
--- /dev/null
+++ b/public/emoji/1faf7-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path xmlns="http://www.w3.org/2000/svg" fill="#90603E" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#AF7E57" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path xmlns="http://www.w3.org/2000/svg" fill="#90603E" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7-1f3ff.svg b/public/emoji/1faf7-1f3ff.svg
new file mode 100644
index 0000000000..6735ce300a
--- /dev/null
+++ b/public/emoji/1faf7-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#583529" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#7C533E" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path fill="#583529" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf7.svg b/public/emoji/1faf7.svg
new file mode 100644
index 0000000000..1237887922
--- /dev/null
+++ b/public/emoji/1faf7.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M16.5 31c-.64 0-1.28-.24-1.77-.73C9.28 24.82 6.79 5.49 6.52 3.3 6.35 1.93 7.33.68 8.7.52c1.38-.17 2.62.81 2.78 2.18.93 7.6 3.59 20.84 6.79 24.04a2.499 2.499 0 0 1-1.77 4.27Z"/><path fill="#FFDC5D" d="m28.9 25.33-8.75 1.15c-2.15.51-3.94-1.06-5.01-2.8l-.17-.38c-1.3-2.86-2.22-5.87-2.73-8.97L10.32 2.64a2.392 2.392 0 0 0-4.77.31l.22 12.21c0 .07-.02.14-.05.21-.78 1.3-1.35 3.72.04 7.88-.15.77-.44 1.48-.92 2.69-1.28 4.82 2.35 9.55 7.34 9.55h16.51a2.76 2.76 0 0 0 2.76-2.76v-5.16c0-1.35-1.19-2.4-2.54-2.22Z"/><path fill="#EF9645" d="M12.21 26.47c-.77-1.68-1.11-3.93-1.47-5.82-.22-1.26-.42-2.55-.6-3.81-.05-1.6-1.43-2.97-3.04-2.74-.47.01-.92.11-1.35.26l.02.86c1.24-.57 2.76-.43 3.19 1.06.44 3.71.43 7.3 1.67 10.9.47 1.09 2.09.36 1.59-.71ZM26.55 34H13.33c-1.55 0-3.09-.15-4.61-.46l-2.04-.41a7.564 7.564 0 0 0 5.49 2.35h16.51c1.25 0 2.3-.84 2.64-1.98-1.57.32-3.16.5-4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8-1f3fb.svg b/public/emoji/1faf8-1f3fb.svg
new file mode 100644
index 0000000000..3a28a11716
--- /dev/null
+++ b/public/emoji/1faf8-1f3fb.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E0AA94" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#F7DECE" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#E0AA94" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8-1f3fc.svg b/public/emoji/1faf8-1f3fc.svg
new file mode 100644
index 0000000000..544719ebc8
--- /dev/null
+++ b/public/emoji/1faf8-1f3fc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D2A077" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#F3D2A2" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#D2A077" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5Z"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8-1f3fd.svg b/public/emoji/1faf8-1f3fd.svg
new file mode 100644
index 0000000000..607bcf2037
--- /dev/null
+++ b/public/emoji/1faf8-1f3fd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#B78B60" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#D5AB88" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#B78B60" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8-1f3fe.svg b/public/emoji/1faf8-1f3fe.svg
new file mode 100644
index 0000000000..378fa2e3c5
--- /dev/null
+++ b/public/emoji/1faf8-1f3fe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#90603E" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#AF7E57" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#90603E" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8-1f3ff.svg b/public/emoji/1faf8-1f3ff.svg
new file mode 100644
index 0000000000..b3cccfc6a0
--- /dev/null
+++ b/public/emoji/1faf8-1f3ff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#583529" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#7C533E" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#583529" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5"/></svg>
\ No newline at end of file
diff --git a/public/emoji/1faf8.svg b/public/emoji/1faf8.svg
new file mode 100644
index 0000000000..fadecd83f0
--- /dev/null
+++ b/public/emoji/1faf8.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M19.5 31c.64 0 1.28-.24 1.77-.73 5.45-5.45 7.95-24.78 8.21-26.96.17-1.37-.81-2.62-2.18-2.78-1.38-.17-2.62.81-2.78 2.18-.93 7.6-3.59 20.84-6.79 24.04a2.499 2.499 0 0 0 1.77 4.27Z"/><path fill="#FFDC5D" d="m7.1 25.33 8.75 1.15c2.15.51 3.94-1.06 5.01-2.8l.17-.38c1.3-2.86 2.22-5.87 2.73-8.97l1.92-11.69a2.392 2.392 0 0 1 4.77.31l-.22 12.21c0 .07.02.14.05.21.78 1.3 1.35 3.72-.04 7.88.15.77.44 1.48.92 2.69 1.28 4.82-2.35 9.55-7.34 9.55H7.33a2.76 2.76 0 0 1-2.76-2.76v-5.16c0-1.35 1.19-2.4 2.54-2.22Z"/><path fill="#EF9645" d="M23.79 26.47c.77-1.68 1.11-3.93 1.47-5.82.22-1.26.42-2.55.6-3.81.05-1.6 1.43-2.97 3.04-2.74.47.01.92.11 1.35.26l-.02.86c-1.24-.57-2.76-.43-3.19 1.06-.44 3.71-.43 7.3-1.67 10.9-.47 1.09-2.09.36-1.59-.71ZM9.45 34h13.22c1.55 0 3.09-.15 4.61-.46l2.04-.41a7.564 7.564 0 0 1-5.49 2.35H7.33c-1.25 0-2.3-.84-2.64-1.98 1.57.32 3.16.5 4.76.5"/></svg>
\ No newline at end of file

From 185c806d69efef28b8ec6b1431e53d01effed192 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 11:17:21 -0500
Subject: [PATCH 285/436] Extract spec helper for verifing to/from public AP
 collection namespace (#28472)

---
 .../activitypub/outboxes_controller_spec.rb   | 22 ++++++++++++++++---
 .../activitypub/replies_controller_spec.rb    | 15 ++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index 53c4f0c09c..ead231f29f 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -79,7 +79,7 @@ RSpec.describe ActivityPub::OutboxesController do
         it 'returns orderedItems with public or unlisted statuses' do
           expect(body[:orderedItems]).to be_an Array
           expect(body[:orderedItems].size).to eq 2
-          expect(body[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+          expect(body[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
 
         it_behaves_like 'cacheable response'
@@ -132,7 +132,7 @@ RSpec.describe ActivityPub::OutboxesController do
           json = body_as_json
           expect(json[:orderedItems]).to be_an Array
           expect(json[:orderedItems].size).to eq 2
-          expect(json[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+          expect(json[:orderedItems].all? { |item| targets_public_collection?(item) }).to be true
         end
 
         it 'returns private Cache-Control header' do
@@ -158,7 +158,7 @@ RSpec.describe ActivityPub::OutboxesController do
           json = body_as_json
           expect(json[:orderedItems]).to be_an Array
           expect(json[:orderedItems].size).to eq 3
-          expect(json[:orderedItems].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:to].include?(account_followers_url(account, ActionMailer::Base.default_url_options)) }).to be true
+          expect(json[:orderedItems].all? { |item| targets_public_collection?(item) || targets_followers_collection?(item, account) }).to be true
         end
 
         it 'returns private Cache-Control header' do
@@ -217,4 +217,20 @@ RSpec.describe ActivityPub::OutboxesController do
       end
     end
   end
+
+  private
+
+  def ap_public_collection
+    ActivityPub::TagManager::COLLECTIONS[:public]
+  end
+
+  def targets_public_collection?(item)
+    item[:to].include?(ap_public_collection) || item[:cc].include?(ap_public_collection)
+  end
+
+  def targets_followers_collection?(item, account)
+    item[:to].include?(
+      account_followers_url(account, ActionMailer::Base.default_url_options)
+    )
+  end
 end
diff --git a/spec/controllers/activitypub/replies_controller_spec.rb b/spec/controllers/activitypub/replies_controller_spec.rb
index 5fc9698a32..6b5a69d42a 100644
--- a/spec/controllers/activitypub/replies_controller_spec.rb
+++ b/spec/controllers/activitypub/replies_controller_spec.rb
@@ -84,7 +84,7 @@ RSpec.describe ActivityPub::RepliesController do
           expect(page_json).to be_a Hash
           expect(page_json[:items]).to be_an Array
           expect(page_json[:items].size).to eq 1
-          expect(page_json[:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
+          expect(page_json[:items].all? { |item| targets_public_collection?(item) }).to be true
         end
 
         context 'when there are few self-replies' do
@@ -117,8 +117,7 @@ RSpec.describe ActivityPub::RepliesController do
 
         it 'only inlines items that are local and public or unlisted replies' do
           inlined_replies = page_json[:items].select { |x| x.is_a?(Hash) }
-          public_collection = ActivityPub::TagManager::COLLECTIONS[:public]
-          expect(inlined_replies.all? { |item| item[:to].include?(public_collection) || item[:cc].include?(public_collection) }).to be true
+          expect(inlined_replies.all? { |item| targets_public_collection?(item) }).to be true
           expect(inlined_replies.all? { |item| ActivityPub::TagManager.instance.local_uri?(item[:id]) }).to be true
         end
 
@@ -194,4 +193,14 @@ RSpec.describe ActivityPub::RepliesController do
       end
     end
   end
+
+  private
+
+  def ap_public_collection
+    ActivityPub::TagManager::COLLECTIONS[:public]
+  end
+
+  def targets_public_collection?(item)
+    item[:to].include?(ap_public_collection) || item[:cc].include?(ap_public_collection)
+  end
 end

From 8b26614fa7fce5db7c9e4402679df0c8a833dfcf Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 11 Jan 2024 11:17:45 -0500
Subject: [PATCH 286/436] Combine results include check in spec/models/account
 (#28471)

---
 spec/models/account_spec.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index b4fcb805a6..1a4c14c45c 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -339,9 +339,11 @@ RSpec.describe Account do
 
       results = account.excluded_from_timeline_account_ids
       expect(results.size).to eq 3
-      expect(results).to include(block.target_account.id)
-      expect(results).to include(mute.target_account.id)
-      expect(results).to include(block_by.account.id)
+      expect(results).to include(
+        block.target_account.id,
+        mute.target_account.id,
+        block_by.account.id
+      )
     end
   end
 

From 383be173afacae35130855fb7d625ff7565ac804 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 12 Jan 2024 04:39:11 +0100
Subject: [PATCH 287/436] Add a version comment to the emoji preval-ed file so
 it is regenerated (#28700)

---
 app/javascript/mastodon/features/emoji/emoji_compressed.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.js b/app/javascript/mastodon/features/emoji/emoji_compressed.js
index 883bf21a4a..a4863566da 100644
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -7,6 +7,10 @@
 // It's designed to be emitted in an array format to take up less space
 // over the wire.
 
+// This version comment should be bumped each time the emoji data is changed
+// to ensure that the prevaled file is regenerated by Babel
+// version: 2
+
 const { emojiIndex } = require('emoji-mart');
 let data = require('emoji-mart/data/all.json');
 const { uncompress: emojiMartUncompress } = require('emoji-mart/dist/utils/data');
@@ -15,7 +19,6 @@ const emojiMap = require('./emoji_map.json');
 const { unicodeToFilename } = require('./unicode_to_filename');
 const { unicodeToUnifiedName } = require('./unicode_to_unified_name');
 
-
 if(data.compressed) {
   data = emojiMartUncompress(data);
 }

From 575ab085bec5730835330970e771db69a4758a7c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:08:17 -0500
Subject: [PATCH 288/436] Disable `Rails/ApplicationController` for
 `HealthController` (#28705)

---
 .rubocop_todo.yml                    | 5 -----
 app/controllers/health_controller.rb | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6ab8957055..bf4a9a09fe 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -56,11 +56,6 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Max: 6
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/ApplicationController:
-  Exclude:
-    - 'app/controllers/health_controller.rb'
-
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb
index 2a22a05570..7bc424d0a4 100644
--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class HealthController < ActionController::Base
+class HealthController < ActionController::Base # rubocop:disable Rails/ApplicationController
   def show
     render plain: 'OK'
   end

From 923fc831903c11ae5cc885c9454403007c77d734 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 12 Jan 2024 10:09:57 +0100
Subject: [PATCH 289/436] Improve `lint-staged` config (#28704)

---
 .prettierignore         |  2 ++
 lint-staged.config.js   | 11 +++++++++++
 package.json            |  6 ------
 streaming/package.json  |  2 +-
 streaming/tsconfig.json |  1 +
 tsconfig.json           |  2 ++
 6 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 lint-staged.config.js

diff --git a/.prettierignore b/.prettierignore
index 305f0fd753..51850b2b28 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -73,3 +73,5 @@ app/javascript/styles/mastodon/reset.scss
 
 # Ignore the generated AUTHORS.md
 AUTHORS.md
+
+!lint-staged.config.js
diff --git a/lint-staged.config.js b/lint-staged.config.js
new file mode 100644
index 0000000000..06fe66d11e
--- /dev/null
+++ b/lint-staged.config.js
@@ -0,0 +1,11 @@
+const config = {
+  '*': 'prettier --ignore-unknown --write',
+  'Capfile|Gemfile|*.{rb,ruby,ru,rake}':
+    'bundle exec rubocop --force-exclusion -a',
+  '*.{js,jsx,ts,tsx}': 'eslint --fix',
+  '*.{css,scss}': 'stylelint --fix',
+  '*.haml': 'bundle exec haml-lint -a',
+  '**/*.ts?(x)': () => 'tsc -p tsconfig.json --noEmit',
+};
+
+module.exports = config;
diff --git a/package.json b/package.json
index 16ed4decaa..e3ba91f45c 100644
--- a/package.json
+++ b/package.json
@@ -218,11 +218,5 @@
     "react-router-dom": {
       "optional": true
     }
-  },
-  "lint-staged": {
-    "*": "prettier --ignore-unknown --write",
-    "Capfile|Gemfile|*.{rb,ruby,ru,rake}": "bundle exec rubocop --force-exclusion -a",
-    "*.{js,jsx,ts,tsx}": "eslint --fix",
-    "*.{css,scss}": "stylelint --fix"
   }
 }
diff --git a/streaming/package.json b/streaming/package.json
index 2d70acb829..149055ca1b 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -13,7 +13,7 @@
   },
   "scripts": {
     "start": "node ./index.js",
-    "check:types": "tsc --noEmit"
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "cors": "^2.8.5",
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index 032274d856..f7bb711b9b 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -5,6 +5,7 @@
     "module": "CommonJS",
     "moduleResolution": "node",
     "noUnusedParameters": false,
+    "tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
     "paths": {}
   },
   "include": ["./*.js", "./.eslintrc.js"]
diff --git a/tsconfig.json b/tsconfig.json
index ff9da29497..d1a77e5493 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,6 +10,8 @@
     "esModuleInterop": true,
     "skipLibCheck": true,
     "baseUrl": "./",
+    "incremental": true,
+    "tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
     "paths": {
       "mastodon": ["app/javascript/mastodon"],
       "mastodon/*": ["app/javascript/mastodon/*"]

From 32eeca9c7b59c156425c6b16c0014dcdcd7fb739 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:10:37 -0500
Subject: [PATCH 290/436] Refresh instance counts in spec (fixes intermittent
 failure) (#28698)

---
 spec/controllers/admin/instances_controller_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index 74d69d1aaa..e6fa0b9def 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -12,6 +12,8 @@ RSpec.describe Admin::InstancesController do
   before do
     _account_less_popular = Fabricate(:account, domain: 'less.popular')
     _account_popular_other = Fabricate(:account, domain: 'popular')
+    Instance.refresh
+
     sign_in current_user, scope: :user
   end
 

From cd37048439f9b324f48e6af1f426a7894c54b4da Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:11:34 -0500
Subject: [PATCH 291/436] Move followable_by coverage to suggestions (#28697)

---
 .../follow_recommendation_mute_fabricator.rb  |  6 ++
 spec/models/account_spec.rb                   | 23 --------
 .../models/account_suggestions/source_spec.rb | 57 +++++++++++++++++++
 3 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 spec/fabricators/follow_recommendation_mute_fabricator.rb
 create mode 100644 spec/models/account_suggestions/source_spec.rb

diff --git a/spec/fabricators/follow_recommendation_mute_fabricator.rb b/spec/fabricators/follow_recommendation_mute_fabricator.rb
new file mode 100644
index 0000000000..0f924386e9
--- /dev/null
+++ b/spec/fabricators/follow_recommendation_mute_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:follow_recommendation_mute) do
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
+end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 1a4c14c45c..ab74579624 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1011,27 +1011,4 @@ RSpec.describe Account do
       expect(subject.reload.followers_count).to eq 15
     end
   end
-
-  describe '.followable_by' do
-    context 'with follows and follow requests' do
-      let!(:account) { Fabricate(:account) }
-      let!(:eligible_account) { Fabricate(:account) }
-      let!(:following_account) { Fabricate(:account) }
-      let!(:follow_requested_account) { Fabricate(:account) }
-
-      before do
-        Fabricate :follow, account: account, target_account: following_account
-        Fabricate :follow_request, account: account, target_account: follow_requested_account
-      end
-
-      it 'returns accounts not already following or requested to follow' do
-        results = described_class.followable_by(account)
-
-        expect(results)
-          .to include(eligible_account)
-          .and not_include(following_account)
-          .and not_include(follow_requested_account)
-      end
-    end
-  end
 end
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
new file mode 100644
index 0000000000..d8227e01bc
--- /dev/null
+++ b/spec/models/account_suggestions/source_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountSuggestions::Source do
+  describe '#base_account_scope' do
+    subject { FakeSource.new }
+
+    before do
+      stub_const 'FakeSource', fake_source_class
+    end
+
+    context 'with follows and follow requests' do
+      let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host') }
+      let!(:account) { Fabricate(:account) }
+      let!(:blocked_account) { Fabricate(:account) }
+      let!(:eligible_account) { Fabricate(:account) }
+      let!(:follow_recommendation_muted_account) { Fabricate(:account) }
+      let!(:follow_requested_account) { Fabricate(:account) }
+      let!(:following_account) { Fabricate(:account) }
+      let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account)) }
+
+      before do
+        Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
+        Fabricate :block, account: account, target_account: blocked_account
+        Fabricate :follow_recommendation_mute, account: account, target_account: follow_recommendation_muted_account
+        Fabricate :follow_request, account: account, target_account: follow_requested_account
+        Fabricate :follow, account: account, target_account: following_account
+      end
+
+      it 'returns eligible accounts' do
+        results = subject.get(account)
+
+        expect(results)
+          .to include(eligible_account)
+          .and not_include(account_domain_blocked_account)
+          .and not_include(account)
+          .and not_include(blocked_account)
+          .and not_include(follow_recommendation_muted_account)
+          .and not_include(follow_requested_account)
+          .and not_include(following_account)
+          .and not_include(moved_account)
+      end
+    end
+  end
+
+  private
+
+  def fake_source_class
+    Class.new described_class do
+      def get(account, limit: 10)
+        base_account_scope(account)
+          .limit(limit)
+      end
+    end
+  end
+end

From df9e220364484acccdb3f51b71a7081dfa0bec2f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:12:31 -0500
Subject: [PATCH 292/436] Add JS console errors check (#28682)

---
 lib/tasks/spec.rake               |  2 ++
 spec/support/javascript_errors.rb | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 spec/support/javascript_errors.rb

diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index 8f2cbeea35..d505a47195 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -3,6 +3,8 @@
 if Rake::Task.task_defined?('spec:system')
   namespace :spec do
     task :enable_system_specs do # rubocop:disable Rails/RakeEnvironment
+      ENV['LOCAL_DOMAIN'] = 'localhost:3000'
+      ENV['LOCAL_HTTPS'] = 'false'
       ENV['RUN_SYSTEM_SPECS'] = 'true'
     end
   end
diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
new file mode 100644
index 0000000000..bdce1cc76d
--- /dev/null
+++ b/spec/support/javascript_errors.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.after(:each, type: :system) do
+    errors = page.driver.browser.logs.get(:browser)
+    if errors.present?
+      aggregate_failures 'javascript errrors' do
+        errors.each do |error|
+          expect(error.level).to_not eq('SEVERE'), error.message
+          next unless error.level == 'WARNING'
+
+          $stderr.warn 'WARN: javascript warning'
+          $stderr.warn error.message
+        end
+      end
+    end
+  end
+end

From b86083f0dc22e68451aaee5b2a01a8c69de60334 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 10:17:10 +0100
Subject: [PATCH 293/436] New Crowdin Translations (automated) (#28708)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/de.json | 2 +-
 config/locales/eu.yml                   | 2 +-
 config/locales/ro.yml                   | 1 +
 config/locales/sk.yml                   | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 2608b91563..462352750c 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -489,7 +489,7 @@
   "onboarding.profile.lead": "Du kannst das später in den Einstellungen vervollständigen, wo noch mehr Anpassungsmöglichkeiten zur Verfügung stehen.",
   "onboarding.profile.note": "Über mich",
   "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
-  "onboarding.profile.save_and_continue": "Speichern und fortsetzen",
+  "onboarding.profile.save_and_continue": "Speichern und fortfahren",
   "onboarding.profile.title": "Profil einrichten",
   "onboarding.profile.upload_avatar": "Profilbild hochladen",
   "onboarding.profile.upload_header": "Titelbild hochladen",
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 0d253e9b3b..9174b83b43 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1445,7 +1445,7 @@ eu:
       cooldown: Migratu eta gero egonaldi tarte bat egongo da eta bitartean ezin izango duzu berriro migratu
       disabled_account: Zure uneko kontua ezin izango da gero erabili. Hala ere, datua exporatu ahal izango dituzu, eta berriro aktibatu.
       followers: Ekintza honek jarraitzaile guztiak eramango ditu uneko kontutik kontu berrira
-      only_redirect_html: Bestela, <a href="%{path}">zure profilean birbideratze soil bat jarri</a> dezakezu.
+      only_redirect_html: Bestela, <a href="%{path}">zure profilean birbideratze bat jar</a> dezakezu.
       other_data: Ez da beste daturik migratuko automatikoki
       redirect: Zure uneko kontuaren profila eguneratuko da birbideratze ohar batekin eta bilaketetatik kenduko da
   moderation:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index a0f20d57dc..12c06505b8 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -93,6 +93,7 @@ ro:
       moderation:
         active: Activ
         all: Toate
+        disabled: Dezactivat
         pending: În așteptare
         silenced: Limitat
         suspended: Suspendate
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 89d41b4616..a91f1d620e 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -184,6 +184,7 @@ sk:
         create_domain_block: Vytvor zákaz domény
         create_email_domain_block: Vytvor zákaz emailovej domény
         create_ip_block: Vytvor IP pravidlo
+        create_unavailable_domain: Vytvor nedostupnú doménu
         create_user_role: Vytvoriť rolu
         demote_user: Zniž užívateľskú rolu
         destroy_announcement: Vymaž oboznámenie
@@ -245,6 +246,7 @@ sk:
         destroy_email_domain_block_html: "%{name} odblokoval/a e-mailovú doménu %{target}"
         destroy_ip_block_html: "%{name} vymazal/a pravidlo pre IP %{target}"
         destroy_status_html: "%{name} zmazal/a príspevok od %{target}"
+        destroy_unavailable_domain_html: "%{name} znova spustil/a doručovanie pre doménu %{target}"
         destroy_user_role_html: "%{name} vymazal/a rolu pre %{target}"
         enable_user_html: "%{name} povolil/a prihlásenie pre používateľa %{target}"
         memorialize_account_html: "%{name} zmenil/a účet %{target} na pamätnú stránku"

From 7801db7ba463a71b8a11a2867486b012a2ec3972 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:19:25 -0500
Subject: [PATCH 294/436] Spec coverage for custom css endpoint (#28706)

---
 app/controllers/custom_css_controller.rb | 13 +++++
 app/views/custom_css/show.css.erb        |  6 +--
 spec/requests/custom_css_spec.rb         | 60 ++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 spec/requests/custom_css_spec.rb

diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
index e7a02ea89c..62f8e0d772 100644
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@@ -1,8 +1,21 @@
 # frozen_string_literal: true
 
 class CustomCssController < ActionController::Base # rubocop:disable Rails/ApplicationController
+  before_action :set_user_roles
+
   def show
     expires_in 3.minutes, public: true
     render content_type: 'text/css'
   end
+
+  private
+
+  def custom_css_styles
+    Setting.custom_css
+  end
+  helper_method :custom_css_styles
+
+  def set_user_roles
+    @user_roles = UserRole.where(highlighted: true).where.not(color: [nil, ''])
+  end
 end
diff --git a/app/views/custom_css/show.css.erb b/app/views/custom_css/show.css.erb
index 9cd38fb371..78da809ed6 100644
--- a/app/views/custom_css/show.css.erb
+++ b/app/views/custom_css/show.css.erb
@@ -1,8 +1,8 @@
-<%- if Setting.custom_css.present? %>
-<%= raw Setting.custom_css %>
+<%- if custom_css_styles.present? %>
+<%= raw custom_css_styles %>
 
 <%- end %>
-<%- UserRole.where(highlighted: true).select { |role| role.color.present? }.each do |role| %>
+<%- @user_roles.each do |role| %>
 .user-role-<%= role.id %> {
   --user-role-accent: <%= role.color %>;
 }
diff --git a/spec/requests/custom_css_spec.rb b/spec/requests/custom_css_spec.rb
new file mode 100644
index 0000000000..5271ed4a5a
--- /dev/null
+++ b/spec/requests/custom_css_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Custom CSS' do
+  include RoutingHelper
+
+  describe 'GET /custom.css' do
+    context 'without any CSS or User Roles' do
+      it 'returns empty stylesheet' do
+        get '/custom.css'
+
+        expect(response.content_type).to include('text/css')
+        expect(response.body.presence).to be_nil
+      end
+    end
+
+    context 'with CSS settings' do
+      before do
+        Setting.custom_css = expected_css
+      end
+
+      it 'returns stylesheet from settings' do
+        get '/custom.css'
+
+        expect(response.content_type).to include('text/css')
+        expect(response.body.strip).to eq(expected_css)
+      end
+
+      def expected_css
+        <<~CSS.strip
+          body { background-color: red; }
+        CSS
+      end
+    end
+
+    context 'with highlighted colored UserRole records' do
+      before do
+        _highlighted_colored = Fabricate :user_role, highlighted: true, color: '#336699', id: '123_123_123'
+        _highlighted_no_color = Fabricate :user_role, highlighted: true, color: ''
+        _no_highlight_with_color = Fabricate :user_role, highlighted: false, color: ''
+      end
+
+      it 'returns stylesheet from settings' do
+        get '/custom.css'
+
+        expect(response.content_type).to include('text/css')
+        expect(response.body.strip).to eq(expected_css)
+      end
+
+      def expected_css
+        <<~CSS.strip
+          .user-role-123123123 {
+            --user-role-accent: #336699;
+          }
+        CSS
+      end
+    end
+  end
+end

From a90696011e563e62100cba56e2d52f6babbaff00 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:21:00 -0500
Subject: [PATCH 295/436] Add coverage/bugfix for invalid appeal submission
 (#28703)

---
 app/views/disputes/strikes/show.html.haml     |  2 +-
 .../disputes/appeals_controller_spec.rb       | 37 ++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
index 62695b155e..5f72138821 100644
--- a/app/views/disputes/strikes/show.html.haml
+++ b/app/views/disputes/strikes/show.html.haml
@@ -21,7 +21,7 @@
 
 .report-header
   .report-header__card
-    = render 'card', strike: @strike
+    = render 'disputes/strikes/card', strike: @strike
 
   .report-header__details
     .report-header__details__item
diff --git a/spec/controllers/disputes/appeals_controller_spec.rb b/spec/controllers/disputes/appeals_controller_spec.rb
index 452bd60dc5..da2f86ade5 100644
--- a/spec/controllers/disputes/appeals_controller_spec.rb
+++ b/spec/controllers/disputes/appeals_controller_spec.rb
@@ -10,19 +10,38 @@ RSpec.describe Disputes::AppealsController do
   let!(:admin) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
   describe '#create' do
-    let(:current_user) { Fabricate(:user) }
-    let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
+    context 'with valid params' do
+      let(:current_user) { Fabricate(:user) }
+      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
 
-    before do
-      post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
+      before do
+        post :create, params: { strike_id: strike.id, appeal: { text: 'Foo' } }
+      end
+
+      it 'notifies staff about new appeal', :sidekiq_inline do
+        expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
+      end
+
+      it 'redirects back to the strike page' do
+        expect(response).to redirect_to(disputes_strike_path(strike.id))
+      end
     end
 
-    it 'notifies staff about new appeal', :sidekiq_inline do
-      expect(ActionMailer::Base.deliveries.first.to).to eq([admin.email])
-    end
+    context 'with invalid params' do
+      let(:current_user) { Fabricate(:user) }
+      let(:strike) { Fabricate(:account_warning, target_account: current_user.account) }
 
-    it 'redirects back to the strike page' do
-      expect(response).to redirect_to(disputes_strike_path(strike.id))
+      before do
+        post :create, params: { strike_id: strike.id, appeal: { text: '' } }
+      end
+
+      it 'does not send email', :sidekiq_inline do
+        expect(ActionMailer::Base.deliveries.size).to eq(0)
+      end
+
+      it 'renders the strike show page' do
+        expect(response).to render_template('disputes/strikes/show')
+      end
     end
   end
 end

From c6684aa1e392f2dd86af4362b4259809549abaad Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 12 Jan 2024 10:32:45 +0100
Subject: [PATCH 296/436] Use the assets pipeline to load `inert.css` (#28701)

---
 app/javascript/packs/inert.js                        | 4 ++++
 public/inert.css => app/javascript/styles/inert.scss | 2 ++
 app/views/layouts/application.html.haml              | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 app/javascript/packs/inert.js
 rename public/inert.css => app/javascript/styles/inert.scss (78%)

diff --git a/app/javascript/packs/inert.js b/app/javascript/packs/inert.js
new file mode 100644
index 0000000000..7c04a97faf
--- /dev/null
+++ b/app/javascript/packs/inert.js
@@ -0,0 +1,4 @@
+/* Placeholder file to have `inert.scss` compiled by Webpack
+   This is used by the `wicg-inert` polyfill */
+
+import '../styles/inert.scss';
diff --git a/public/inert.css b/app/javascript/styles/inert.scss
similarity index 78%
rename from public/inert.css
rename to app/javascript/styles/inert.scss
index 54e10616d2..a60045d7be 100644
--- a/public/inert.css
+++ b/app/javascript/styles/inert.scss
@@ -1,3 +1,5 @@
+/* This is needed for the wicg-inert polyfill */
+
 [inert] {
   pointer-events: none;
   cursor: default;
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 1244fd5eb3..6f6b1825f6 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,12 +28,14 @@
 
     = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
     = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
+    = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
+
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
-    = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style'
     = stylesheet_link_tag custom_css_path, skip_pipeline: true, host: root_url, media: 'all'
 
     = yield :header_tags

From 608f66f978e02e583f1c42c912b1daa22fbc0bad Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Fri, 12 Jan 2024 11:31:24 +0100
Subject: [PATCH 297/436] Change icon SVG imports to use a default import
 (#28709)

---
 app/javascript/__mocks__/svg.js               |  6 ++---
 .../mastodon/components/attachment_list.jsx   |  2 +-
 app/javascript/mastodon/components/badge.jsx  |  8 +++----
 .../components/column_back_button.tsx         |  2 +-
 .../mastodon/components/column_header.jsx     | 12 +++++-----
 .../mastodon/components/copy_icon_button.jsx  |  2 +-
 .../components/dismissable_banner.tsx         |  2 +-
 app/javascript/mastodon/components/domain.tsx |  2 +-
 .../mastodon/components/dropdown_menu.jsx     |  2 +-
 .../components/edited_timestamp/index.jsx     |  2 +-
 app/javascript/mastodon/components/icon.tsx   |  2 +-
 .../mastodon/components/load_gap.tsx          |  2 +-
 .../mastodon/components/media_gallery.jsx     |  2 +-
 .../picture_in_picture_placeholder.jsx        |  2 +-
 app/javascript/mastodon/components/poll.jsx   |  2 +-
 app/javascript/mastodon/components/status.jsx |  8 +++----
 .../mastodon/components/status_action_bar.jsx | 22 +++++++++----------
 .../mastodon/components/status_content.jsx    |  2 +-
 .../mastodon/components/verified_badge.tsx    |  2 +-
 .../mastodon/components/visibility_icon.tsx   |  8 +++----
 .../mastodon/features/about/index.jsx         |  4 ++--
 .../components/follow_request_note.jsx        |  4 ++--
 .../features/account/components/header.jsx    | 12 +++++-----
 .../account_gallery/components/media_item.jsx |  6 ++---
 .../mastodon/features/audio/index.jsx         | 12 +++++-----
 .../mastodon/features/blocks/index.jsx        |  2 +-
 .../features/bookmarked_statuses/index.jsx    |  2 +-
 .../features/community_timeline/index.jsx     |  2 +-
 .../compose/components/action_bar.jsx         |  2 +-
 .../compose/components/compose_form.jsx       |  2 +-
 .../compose/components/poll_button.jsx        |  2 +-
 .../features/compose/components/poll_form.jsx |  4 ++--
 .../compose/components/privacy_dropdown.jsx   |  8 +++----
 .../compose/components/reply_indicator.jsx    |  2 +-
 .../features/compose/components/search.jsx    |  6 ++---
 .../compose/components/search_results.jsx     |  8 +++----
 .../features/compose/components/upload.jsx    |  6 ++---
 .../compose/components/upload_button.jsx      |  2 +-
 .../compose/components/upload_progress.jsx    |  2 +-
 .../mastodon/features/compose/index.jsx       | 14 ++++++------
 .../components/conversation.jsx               |  4 ++--
 .../features/direct_timeline/index.jsx        |  2 +-
 .../mastodon/features/directory/index.jsx     |  2 +-
 .../mastodon/features/domain_blocks/index.jsx |  2 +-
 .../mastodon/features/explore/index.jsx       |  4 ++--
 .../mastodon/features/explore/results.jsx     |  6 ++---
 .../features/favourited_statuses/index.jsx    |  2 +-
 .../mastodon/features/favourites/index.jsx    |  2 +-
 .../features/filters/select_filter.jsx        |  2 +-
 .../mastodon/features/firehose/index.jsx      |  2 +-
 .../components/account_authorize.jsx          |  4 ++--
 .../features/follow_requests/index.jsx        |  2 +-
 .../mastodon/features/followed_tags/index.jsx |  2 +-
 .../components/announcements.jsx              |  6 ++---
 .../features/getting_started/index.jsx        | 22 +++++++++----------
 .../features/hashtag_timeline/index.jsx       |  2 +-
 .../mastodon/features/home_timeline/index.jsx |  4 ++--
 .../features/interaction_modal/index.jsx      |  8 +++----
 .../features/keyboard_shortcuts/index.jsx     |  2 +-
 .../features/list_adder/components/list.jsx   |  6 ++---
 .../list_editor/components/account.jsx        |  4 ++--
 .../list_editor/components/edit_list_form.jsx |  2 +-
 .../list_editor/components/search.jsx         |  4 ++--
 .../mastodon/features/list_timeline/index.jsx |  6 ++---
 .../mastodon/features/lists/index.jsx         |  2 +-
 .../mastodon/features/mutes/index.jsx         |  2 +-
 .../components/clear_column_button.jsx        |  2 +-
 .../notifications/components/filter_bar.jsx   | 12 +++++-----
 .../components/follow_request.jsx             |  4 ++--
 .../notifications/components/notification.jsx | 16 +++++++-------
 .../notifications_permission_banner.jsx       |  4 ++--
 .../mastodon/features/notifications/index.jsx |  4 ++--
 .../features/onboarding/components/step.jsx   |  4 ++--
 .../mastodon/features/onboarding/index.jsx    | 10 ++++-----
 .../mastodon/features/onboarding/profile.jsx  |  4 ++--
 .../mastodon/features/onboarding/share.jsx    |  4 ++--
 .../picture_in_picture/components/footer.jsx  | 10 ++++-----
 .../picture_in_picture/components/header.jsx  |  2 +-
 .../features/pinned_statuses/index.jsx        |  2 +-
 .../features/public_timeline/index.jsx        |  2 +-
 .../mastodon/features/reblogs/index.jsx       |  2 +-
 .../features/report/components/option.jsx     |  2 +-
 .../features/status/components/action_bar.jsx | 20 ++++++++---------
 .../features/status/components/card.jsx       |  6 ++---
 .../status/components/detailed_status.jsx     |  6 ++---
 .../mastodon/features/status/index.jsx        |  4 ++--
 .../subscribed_languages_modal/index.jsx      |  2 +-
 .../features/ui/components/boost_modal.jsx    |  2 +-
 .../ui/components/bundle_modal_error.jsx      |  2 +-
 .../ui/components/compare_history_modal.jsx   |  2 +-
 .../features/ui/components/embed_modal.jsx    |  2 +-
 .../features/ui/components/filter_modal.jsx   |  2 +-
 .../ui/components/focal_point_modal.jsx       |  2 +-
 .../follow_requests_column_link.jsx           |  2 +-
 .../features/ui/components/header.jsx         |  2 +-
 .../features/ui/components/image_modal.jsx    |  2 +-
 .../features/ui/components/list_panel.jsx     |  2 +-
 .../features/ui/components/media_modal.jsx    |  6 ++---
 .../ui/components/navigation_panel.jsx        | 20 ++++++++---------
 .../components/notifications_counter_icon.js  |  2 +-
 .../features/ui/components/report_modal.jsx   |  2 +-
 .../features/ui/components/zoomable_image.jsx |  4 ++--
 .../mastodon/features/video/index.jsx         | 16 +++++++-------
 app/javascript/types/image.d.ts               | 10 ++++++---
 config/webpack/rules/file.js                  |  1 +
 jest.config.js                                |  2 +-
 106 files changed, 255 insertions(+), 250 deletions(-)

diff --git a/app/javascript/__mocks__/svg.js b/app/javascript/__mocks__/svg.js
index e725dc2da6..762bc165d0 100644
--- a/app/javascript/__mocks__/svg.js
+++ b/app/javascript/__mocks__/svg.js
@@ -1,3 +1,3 @@
-// eslint-disable-next-line import/no-anonymous-default-export
-export default 'SvgrURL';
-export const ReactComponent = 'div';
+const ReactComponent = 'div';
+
+export default ReactComponent;
diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx
index ebf092b83d..e912d515cd 100644
--- a/app/javascript/mastodon/components/attachment_list.jsx
+++ b/app/javascript/mastodon/components/attachment_list.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as LinkIcon } from '@material-symbols/svg-600/outlined/link.svg';
+import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index 2f762fed5f..e716421710 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import { ReactComponent as GroupsIcon } from '@material-symbols/svg-600/outlined/group.svg';
-import { ReactComponent as PersonIcon } from '@material-symbols/svg-600/outlined/person.svg';
-import { ReactComponent as SmartToyIcon } from '@material-symbols/svg-600/outlined/smart_toy.svg';
+import GroupsIcon from '@material-symbols/svg-600/outlined/group.svg?react';
+import PersonIcon from '@material-symbols/svg-600/outlined/person.svg?react';
+import SmartToyIcon from '@material-symbols/svg-600/outlined/smart_toy.svg?react';
 
 
 export const Badge = ({ icon, label, domain }) => (
@@ -31,4 +31,4 @@ export const GroupBadge = () => (
 
 export const AutomatedBadge = () => (
   <Badge icon={<SmartToyIcon />} label={<FormattedMessage id='account.badges.bot' defaultMessage='Automated' />} />
-);
\ No newline at end of file
+);
diff --git a/app/javascript/mastodon/components/column_back_button.tsx b/app/javascript/mastodon/components/column_back_button.tsx
index b835e9e6ad..7a23c4e108 100644
--- a/app/javascript/mastodon/components/column_back_button.tsx
+++ b/app/javascript/mastodon/components/column_back_button.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { ReactComponent as ArrowBackIcon } from '@material-symbols/svg-600/outlined/arrow_back.svg';
+import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
 
 import { Icon } from 'mastodon/components/icon';
 import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index b78bd9a8ef..a0ce10bf17 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -6,12 +6,12 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
-import { ReactComponent as ArrowBackIcon } from '@material-symbols/svg-600/outlined/arrow_back.svg';
-import { ReactComponent as ChevronLeftIcon } from '@material-symbols/svg-600/outlined/chevron_left.svg';
-import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
-import { ReactComponent as TuneIcon } from '@material-symbols/svg-600/outlined/tune.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
+import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
+import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
+import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx
index 9b1a36d83a..0c250a7632 100644
--- a/app/javascript/mastodon/components/copy_icon_button.jsx
+++ b/app/javascript/mastodon/components/copy_icon_button.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 
 import { useDispatch } from 'react-redux';
 
-import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
+import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
 
 import { showAlert } from 'mastodon/actions/alerts';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx
index 4e6d3bb9a7..c35fec983d 100644
--- a/app/javascript/mastodon/components/dismissable_banner.tsx
+++ b/app/javascript/mastodon/components/dismissable_banner.tsx
@@ -8,7 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { changeSetting } from 'mastodon/actions/settings';
 import { bannerSettings } from 'mastodon/settings';
diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index 34c376f530..26cc77604e 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import { ReactComponent as LockOpenIcon } from '@material-symbols/svg-600/outlined/lock_open.svg';
+import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
 
 import { IconButton } from './icon_button';
 
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index d9cbcc32e5..1cb5c03150 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -6,7 +6,7 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 4375166bcd..de4c641cfb 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as ArrowDropDownIcon } from '@material-symbols/svg-600/outlined/arrow_drop_down.svg';
+import ArrowDropDownIcon from '@material-symbols/svg-600/outlined/arrow_drop_down.svg?react';
 
 import { openModal } from 'mastodon/actions/modal';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx
index f0af11f7f6..4b17f063b9 100644
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 
-import { ReactComponent as CheckBoxOutlineBlankIcon } from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg';
+import CheckBoxOutlineBlankIcon from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg?react';
 
 import { isProduction } from 'mastodon/utils/environment';
 
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 27ca6648c3..ea97c3eb57 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
 
 import { Icon } from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 668c2a2a8a..72daeea5a0 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -8,7 +8,7 @@ import classNames from 'classnames';
 import { is } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
+import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
 import { debounce } from 'lodash';
 
 import { Blurhash } from 'mastodon/components/blurhash';
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
index 08a599cd42..3ce5ea5a74 100644
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as CancelPresentationIcon } from '@material-symbols/svg-600/outlined/cancel_presentation.svg';
+import CancelPresentationIcon from '@material-symbols/svg-600/outlined/cancel_presentation.svg?react';
 
 import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index 7cf2c57b78..b8f6446409 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
 import escapeTextContentForBrowser from 'escape-html';
 import spring from 'react-motion/lib/spring';
 
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index c141ee2da3..f1ea369610 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -7,10 +7,10 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as PushPinIcon } from '@material-symbols/svg-600/outlined/push_pin.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 25eab91fe3..536ea350ae 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -9,18 +9,18 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as BookmarkIcon } from '@material-symbols/svg-600/outlined/bookmark-fill.svg';
-import { ReactComponent as BookmarkBorderIcon } from '@material-symbols/svg-600/outlined/bookmark.svg';
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
-import { ReactComponent as ReplyAllIcon } from '@material-symbols/svg-600/outlined/reply_all.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
-import { ReactComponent as StarBorderIcon } from '@material-symbols/svg-600/outlined/star.svg';
-import { ReactComponent as VisibilityIcon } from '@material-symbols/svg-600/outlined/visibility.svg';
+import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg';
+import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
+import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
+import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
+import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
 
-import { ReactComponent as RepeatDisabledIcon } from 'mastodon/../svg-icons/repeat_disabled.svg';
-import { ReactComponent as RepeatPrivateIcon } from 'mastodon/../svg-icons/repeat_private.svg';
+import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index d1f50fc8d7..f8ca0b3043 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -9,7 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
+import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 import PollContainer from 'mastodon/containers/poll_container';
diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx
index e96bf82563..add7c7acdf 100644
--- a/app/javascript/mastodon/components/verified_badge.tsx
+++ b/app/javascript/mastodon/components/verified_badge.tsx
@@ -1,4 +1,4 @@
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index 3e9f36dc70..e0ef1372f1 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -1,9 +1,9 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as LockIcon } from '@material-symbols/svg-600/outlined/lock.svg';
-import { ReactComponent as LockOpenIcon } from '@material-symbols/svg-600/outlined/lock_open.svg';
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
+import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index 380942b8ee..1e43aaea7b 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -10,8 +10,8 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
-import { ReactComponent as ExpandMoreIcon } from '@material-symbols/svg-600/outlined/expand_more.svg';
+import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
+import ExpandMoreIcon from '@material-symbols/svg-600/outlined/expand_more.svg?react';
 
 import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'mastodon/actions/server';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
index 685c282df2..da775248ce 100644
--- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
@@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 97f68c2217..e8b5e72145 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -9,12 +9,12 @@ import { NavLink, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
-import { ReactComponent as LockIcon } from '@material-symbols/svg-600/outlined/lock.svg';
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
-import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications.svg';
-import { ReactComponent as NotificationsActiveIcon } from '@material-symbols/svg-600/outlined/notifications_active-fill.svg';
-import { ReactComponent as ShareIcon } from '@material-symbols/svg-600/outlined/share.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
+import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications.svg?react';
+import NotificationsActiveIcon from '@material-symbols/svg-600/outlined/notifications_active-fill.svg?react';
+import ShareIcon from '@material-symbols/svg-600/outlined/share.svg?react';
 
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
index 657b17d43d..e4495601f5 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
@@ -5,9 +5,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as AudiotrackIcon } from '@material-symbols/svg-600/outlined/music_note.svg';
-import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow.svg';
-import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
+import AudiotrackIcon from '@material-symbols/svg-600/outlined/music_note.svg?react';
+import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow.svg?react';
+import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
 
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index 7a7d0910fa..881e5cef1b 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -7,12 +7,12 @@ import classNames from 'classnames';
 
 import { is } from 'immutable';
 
-import { ReactComponent as DownloadIcon } from '@material-symbols/svg-600/outlined/download.svg';
-import { ReactComponent as PauseIcon } from '@material-symbols/svg-600/outlined/pause.svg';
-import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow-fill.svg';
-import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
-import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outlined/volume_off-fill.svg';
-import { ReactComponent as VolumeUpIcon } from '@material-symbols/svg-600/outlined/volume_up-fill.svg';
+import DownloadIcon from '@material-symbols/svg-600/outlined/download.svg?react';
+import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react';
+import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
+import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
+import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react';
+import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react';
 import { throttle, debounce } from 'lodash';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/blocks/index.jsx b/app/javascript/mastodon/features/blocks/index.jsx
index 615e4c8be2..7e1eda8aca 100644
--- a/app/javascript/mastodon/features/blocks/index.jsx
+++ b/app/javascript/mastodon/features/blocks/index.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as BlockIcon } from '@material-symbols/svg-600/outlined/block-fill.svg';
+import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
index be6110b0da..767707755b 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as BookmarksIcon } from '@material-symbols/svg-600/outlined/bookmarks-fill.svg';
+import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx
index 60f036a628..1862cdf902 100644
--- a/app/javascript/mastodon/features/community_timeline/index.jsx
+++ b/app/javascript/mastodon/features/community_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
 
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index 3e21090925..42ed78578a 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { ReactComponent as MenuIcon } from '@material-symbols/svg-600/outlined/menu.svg';
+import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
 
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index b15fe2909b..1570bd4d06 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -8,7 +8,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as LockIcon } from '@material-symbols/svg-600/outlined/lock.svg';
+import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
 import { length } from 'stringz';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index f722815b51..a5025a0f40 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { ReactComponent as InsertChartIcon } from '@material-symbols/svg-600/outlined/insert_chart.svg';
+import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index d909a22a09..89596815ec 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -8,8 +8,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 060eb6767c..0dbbcbc256 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -6,10 +6,10 @@ import { injectIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as LockIcon } from '@material-symbols/svg-600/outlined/lock.svg';
-import { ReactComponent as LockOpenIcon } from '@material-symbols/svg-600/outlined/lock_open.svg';
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
+import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index af7a9b6be5..40e79cafaa 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import AttachmentList from 'mastodon/components/attachment_list';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 5d55330dcb..8dbbb0383d 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -8,9 +8,9 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { ReactComponent as CancelIcon } from '@material-symbols/svg-600/outlined/cancel-fill.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
+import CancelIcon from '@material-symbols/svg-600/outlined/cancel-fill.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 import { domain, searchEnabled } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 2667ed5437..00d4dc5329 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -5,10 +5,10 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as FindInPageIcon } from '@material-symbols/svg-600/outlined/find_in_page.svg';
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index a443741d5c..88d6f68b54 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -5,9 +5,9 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
-import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
-import { ReactComponent as InfoIcon } from '@material-symbols/svg-600/outlined/info.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
+import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
 import spring from 'react-motion/lib/spring';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index dda8a42ab0..201b1b8983 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as AddPhotoAlternateIcon } from '@material-symbols/svg-600/outlined/add_photo_alternate.svg';
+import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index 90c5142e24..2c44ac6364 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { ReactComponent as UploadFileIcon } from '@material-symbols/svg-600/outlined/upload_file.svg';
+import UploadFileIcon from '@material-symbols/svg-600/outlined/upload_file.svg?react';
 import spring from 'react-motion/lib/spring';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index 65650ffe02..0b9fa65fe1 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -9,13 +9,13 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
-import { ReactComponent as LogoutIcon } from '@material-symbols/svg-600/outlined/logout.svg';
-import { ReactComponent as MenuIcon } from '@material-symbols/svg-600/outlined/menu.svg';
-import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications-fill.svg';
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
-import { ReactComponent as SettingsIcon } from '@material-symbols/svg-600/outlined/settings-fill.svg';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
+import LogoutIcon from '@material-symbols/svg-600/outlined/logout.svg?react';
+import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
+import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
+import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
 import spring from 'react-motion/lib/spring';
 
 import { openModal } from 'mastodon/actions/modal';
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 005edc5c2b..0aeec1e3b0 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -8,8 +8,8 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
 import AttachmentList from 'mastodon/components/attachment_list';
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index 4e6d0c3e72..1a11520c3b 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
 
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
index 20c84d4df0..0de77164f5 100644
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ b/app/javascript/mastodon/features/directory/index.jsx
@@ -9,7 +9,7 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
 
 import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
diff --git a/app/javascript/mastodon/features/domain_blocks/index.jsx b/app/javascript/mastodon/features/domain_blocks/index.jsx
index 142f14bf71..7a57ea1262 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.jsx
+++ b/app/javascript/mastodon/features/domain_blocks/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as BlockIcon } from '@material-symbols/svg-600/outlined/block-fill.svg';
+import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index 80825e4563..a59830fb82 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -8,8 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 8c172c134a..665f97f8ff 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -9,9 +9,9 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as FindInPageIcon } from '@material-symbols/svg-600/outlined/find_in_page.svg';
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 
 import { submitSearch, expandSearch } from 'mastodon/actions/search';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.jsx b/app/javascript/mastodon/features/favourited_statuses/index.jsx
index d3c3cc9f09..d4716580d8 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.jsx
+++ b/app/javascript/mastodon/features/favourited_statuses/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
 import { debounce } from 'lodash';
 
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
diff --git a/app/javascript/mastodon/features/favourites/index.jsx b/app/javascript/mastodon/features/favourites/index.jsx
index 637a9d6994..a26afda892 100644
--- a/app/javascript/mastodon/features/favourites/index.jsx
+++ b/app/javascript/mastodon/features/favourites/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
+import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
diff --git a/app/javascript/mastodon/features/filters/select_filter.jsx b/app/javascript/mastodon/features/filters/select_filter.jsx
index 9e8f87e005..55f2a8c09f 100644
--- a/app/javascript/mastodon/features/filters/select_filter.jsx
+++ b/app/javascript/mastodon/features/filters/select_filter.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
 import fuzzysort from 'fuzzysort';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 0ed8aa11aa..337b9a65b2 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -6,7 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
 
 import { addColumn } from 'mastodon/actions/columns';
 import { changeSetting } from 'mastodon/actions/settings';
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
index ca2b454143..ed61f2d841 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx
index 3b98791926..9f73d09252 100644
--- a/app/javascript/mastodon/features/follow_requests/index.jsx
+++ b/app/javascript/mastodon/features/follow_requests/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
diff --git a/app/javascript/mastodon/features/followed_tags/index.jsx b/app/javascript/mastodon/features/followed_tags/index.jsx
index dec53f0121..d4b26356b3 100644
--- a/app/javascript/mastodon/features/followed_tags/index.jsx
+++ b/app/javascript/mastodon/features/followed_tags/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 import { debounce } from 'lodash';
 
 import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index 1999316a8e..0818da5519 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -9,9 +9,9 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
-import { ReactComponent as ChevronLeftIcon } from '@material-symbols/svg-600/outlined/chevron_left.svg';
-import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
+import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
+import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import ReactSwipeableViews from 'react-swipeable-views';
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 5994e88edf..29bbfd35f6 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -9,17 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as BookmarksIcon } from '@material-symbols/svg-600/outlined/bookmarks-fill.svg';
-import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
-import { ReactComponent as MenuIcon } from '@material-symbols/svg-600/outlined/menu.svg';
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
-import { ReactComponent as SettingsIcon } from '@material-symbols/svg-600/outlined/settings-fill.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star.svg';
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
+import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
+import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
+import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index d39d550a1b..bdb8da00a5 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -8,7 +8,7 @@ import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 import { isEqual } from 'lodash';
 
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 613eb4b896..6fc986393e 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -10,8 +10,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CampaignIcon } from '@material-symbols/svg-600/outlined/campaign.svg';
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
+import CampaignIcon from '@material-symbols/svg-600/outlined/campaign.svg?react';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
 
 import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 216c63a7e6..527cba5d97 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -7,10 +7,10 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star.svg';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
 import { throttle, escapeRegExp } from 'lodash';
 
 import { openModal, closeModal } from 'mastodon/actions/modal';
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 7552e1799b..054797d18f 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as InfoIcon } from '@material-symbols/svg-600/outlined/info.svg';
+import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
 
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/list_adder/components/list.jsx b/app/javascript/mastodon/features/list_adder/components/list.jsx
index 6c5aab85da..14e320e00b 100644
--- a/app/javascript/mastodon/features/list_adder/components/list.jsx
+++ b/app/javascript/mastodon/features/list_adder/components/list.jsx
@@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/list_editor/components/account.jsx b/app/javascript/mastodon/features/list_editor/components/account.jsx
index 18d5e905cb..30595ebc8b 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/account.jsx
@@ -6,8 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as AddIcon } from '@material-symbols/svg-600/outlined/add.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
 import { Avatar } from '../../../components/avatar';
diff --git a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
index 1e2446f92b..db89611db2 100644
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
 
 import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/list_editor/components/search.jsx b/app/javascript/mastodon/features/list_editor/components/search.jsx
index 093af5cd4e..1971fd2f76 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/search.jsx
@@ -7,8 +7,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as CancelIcon } from '@material-symbols/svg-600/outlined/cancel.svg';
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
+import CancelIcon from '@material-symbols/svg-600/outlined/cancel.svg?react';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index 55579c2fd1..4ea794bdd4 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -9,9 +9,9 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as DeleteIcon } from '@material-symbols/svg-600/outlined/delete.svg';
-import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
+import DeleteIcon from '@material-symbols/svg-600/outlined/delete.svg?react';
+import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
 import Toggle from 'react-toggle';
 
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index 9014394351..e59a6e4130 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
 
 import { fetchLists } from 'mastodon/actions/lists';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/mutes/index.jsx b/app/javascript/mastodon/features/mutes/index.jsx
index 7f66edc03d..ab0d30fcd1 100644
--- a/app/javascript/mastodon/features/mutes/index.jsx
+++ b/app/javascript/mastodon/features/mutes/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outlined/volume_off.svg';
+import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off.svg?react';
 import { debounce } from 'lodash';
 
 import { fetchMutes, expandMutes } from '../../actions/mutes';
diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
index 54fa16fb67..2e257ed5c3 100644
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import { ReactComponent as DeleteForeverIcon } from '@material-symbols/svg-600/outlined/delete_forever.svg';
+import DeleteForeverIcon from '@material-symbols/svg-600/outlined/delete_forever.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
index 84bd4791ca..56338333b1 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
@@ -3,12 +3,12 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
-import { ReactComponent as InsertChartIcon } from '@material-symbols/svg-600/outlined/insert_chart.svg';
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyAllIcon } from '@material-symbols/svg-600/outlined/reply_all.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star.svg';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
+import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.jsx b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
index 03420b6c01..904b6048ae 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/check.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index ad7308b26f..24cead5a59 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -8,14 +8,14 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
-import { ReactComponent as FlagIcon } from '@material-symbols/svg-600/outlined/flag-fill.svg';
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
-import { ReactComponent as InsertChartIcon } from '@material-symbols/svg-600/outlined/insert_chart.svg';
-import { ReactComponent as PersonIcon } from '@material-symbols/svg-600/outlined/person-fill.svg';
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add-fill.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
+import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
+import FlagIcon from '@material-symbols/svg-600/outlined/flag-fill.svg?react';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
+import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
+import PersonIcon from '@material-symbols/svg-600/outlined/person-fill.svg?react';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add-fill.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
index b7ebb4c467..1c1750f72f 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
-import { ReactComponent as TuneIcon } from '@material-symbols/svg-600/outlined/tune.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react';
 
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 762c96ccca..a841f346dd 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -10,8 +10,8 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as DoneAllIcon } from '@material-symbols/svg-600/outlined/done_all.svg';
-import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications-fill.svg';
+import DoneAllIcon from '@material-symbols/svg-600/outlined/done_all.svg?react';
+import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
 import { debounce } from 'lodash';
 
 import { compareId } from 'mastodon/compare_id';
diff --git a/app/javascript/mastodon/features/onboarding/components/step.jsx b/app/javascript/mastodon/features/onboarding/components/step.jsx
index 1f83f20801..0eca65615c 100644
--- a/app/javascript/mastodon/features/onboarding/components/step.jsx
+++ b/app/javascript/mastodon/features/onboarding/components/step.jsx
@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 
 import { Link } from 'react-router-dom';
 
-import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/done.svg';
+import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
+import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
 
 import { Icon } from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 51677fbc7a..54699a1349 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -8,11 +8,11 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 
-import { ReactComponent as AccountCircleIcon } from '@material-symbols/svg-600/outlined/account_circle.svg';
-import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
-import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
-import { ReactComponent as EditNoteIcon } from '@material-symbols/svg-600/outlined/edit_note.svg';
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
+import AccountCircleIcon from '@material-symbols/svg-600/outlined/account_circle.svg?react';
+import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
+import EditNoteIcon from '@material-symbols/svg-600/outlined/edit_note.svg?react';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
 
 import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
 import { focusCompose } from 'mastodon/actions/compose';
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
index daaef6065c..6765c919e8 100644
--- a/app/javascript/mastodon/features/onboarding/profile.jsx
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -8,8 +8,8 @@ import { useHistory } from 'react-router-dom';
 
 import { useDispatch } from 'react-redux';
 
-import { ReactComponent as AddPhotoAlternateIcon } from '@material-symbols/svg-600/outlined/add_photo_alternate.svg';
-import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
+import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
+import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
 import Toggle from 'react-toggle';
 
 import { updateAccount } from 'mastodon/actions/accounts';
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index adc0f9cba3..657edabd74 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -7,8 +7,8 @@ import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
 
-import { ReactComponent as ArrowRightAltIcon } from '@material-symbols/svg-600/outlined/arrow_right_alt.svg';
-import { ReactComponent as ContentCopyIcon } from '@material-symbols/svg-600/outlined/content_copy.svg';
+import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
 import SwipeableViews from 'react-swipeable-views';
 
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index ed86d19f5c..d73b6d2adf 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -9,11 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as OpenInNewIcon } from '@material-symbols/svg-600/outlined/open_in_new.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
-import { ReactComponent as ReplyAllIcon } from '@material-symbols/svg-600/outlined/reply_all.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star.svg';
+import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
+import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
 
 import { initBoostModal } from 'mastodon/actions/boosts';
 import { replyCompose } from 'mastodon/actions/compose';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
index 80a13bd2e3..608142b988 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.jsx b/app/javascript/mastodon/features/pinned_statuses/index.jsx
index 82398ccda9..2e68336a4f 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.jsx
+++ b/app/javascript/mastodon/features/pinned_statuses/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as PushPinIcon } from '@material-symbols/svg-600/outlined/push_pin.svg';
+import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
 
 import { getStatusList } from 'mastodon/selectors';
 
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 09a9f6821f..6aa6d27b9d 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
 
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/reblogs/index.jsx b/app/javascript/mastodon/features/reblogs/index.jsx
index be17668418..aeba1ecff3 100644
--- a/app/javascript/mastodon/features/reblogs/index.jsx
+++ b/app/javascript/mastodon/features/reblogs/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
+import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
 import { debounce } from 'lodash';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/report/components/option.jsx b/app/javascript/mastodon/features/report/components/option.jsx
index b3602219f5..9ffe43388c 100644
--- a/app/javascript/mastodon/features/report/components/option.jsx
+++ b/app/javascript/mastodon/features/report/components/option.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import classNames from 'classnames';
 
-import { ReactComponent as CheckIcon } from '@material-symbols/svg-600/outlined/done.svg';
+import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
 
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 663bce7431..9355cb1f5c 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -9,17 +9,17 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as BookmarkIcon } from '@material-symbols/svg-600/outlined/bookmark-fill.svg';
-import { ReactComponent as BookmarkBorderIcon } from '@material-symbols/svg-600/outlined/bookmark.svg';
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as ReplyIcon } from '@material-symbols/svg-600/outlined/reply.svg';
-import { ReactComponent as ReplyAllIcon } from '@material-symbols/svg-600/outlined/reply_all.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
-import { ReactComponent as StarBorderIcon } from '@material-symbols/svg-600/outlined/star.svg';
+import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg?react';
+import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
+import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
+import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
 
-import { ReactComponent as RepeatDisabledIcon } from 'mastodon/../svg-icons/repeat_disabled.svg';
-import { ReactComponent as RepeatPrivateIcon } from 'mastodon/../svg-icons/repeat_private.svg';
+import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index d7d688952d..9497acffac 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -10,9 +10,9 @@ import classNames from 'classnames';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { ReactComponent as DescriptionIcon } from '@material-symbols/svg-600/outlined/description-fill.svg';
-import { ReactComponent as OpenInNewIcon } from '@material-symbols/svg-600/outlined/open_in_new.svg';
-import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow-fill.svg';
+import DescriptionIcon from '@material-symbols/svg-600/outlined/description-fill.svg?react';
+import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
+import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
 
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index d8d9559127..03bb6a50bc 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -8,9 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
 
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 3832489764..d4ab3a5dcd 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -12,8 +12,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as VisibilityIcon } from '@material-symbols/svg-600/outlined/visibility.svg';
-import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
+import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
+import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
index ac34f7986c..f690925418 100644
--- a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { followAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
index c6fa8ce363..851acbb719 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
+import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
 
 import { changeBoostPrivacy } from 'mastodon/actions/boosts';
 import AttachmentList from 'mastodon/components/attachment_list';
diff --git a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
index 44165f1417..31c4ce0e97 100644
--- a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
+++ b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
+import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 413c5069f1..7807a103ee 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import escapeTextContentForBrowser from 'escape-html';
 
 import { closeModal } from 'mastodon/actions/modal';
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.jsx b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
index e5c0b5cae9..60d04d2378 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
@@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import api from 'mastodon/api';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.jsx b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
index d90edddec4..3f3855d9f1 100644
--- a/app/javascript/mastodon/features/ui/components/filter_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
 import { fetchStatus } from 'mastodon/actions/statuses';
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 91dca26718..f2998f217a 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import Textarea from 'react-textarea-autosize';
 import { length } from 'stringz';
 // eslint-disable-next-line import/extensions
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
index 314b2a2652..d40c67a752 100644
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
@@ -6,7 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
+import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
 
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 150647ffb3..6ece50184a 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -7,7 +7,7 @@ import { Link, withRouter } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
 
 import { openModal } from 'mastodon/actions/modal';
 import { fetchServer } from 'mastodon/actions/server';
diff --git a/app/javascript/mastodon/features/ui/components/image_modal.jsx b/app/javascript/mastodon/features/ui/components/image_modal.jsx
index c534bf1636..44fb172ad2 100644
--- a/app/javascript/mastodon/features/ui/components/image_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/image_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index ff600730a0..b574668b20 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -5,7 +5,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
 
 import { fetchLists } from 'mastodon/actions/lists';
 
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index 8c06a96531..95d8ae5df1 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -7,9 +7,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ReactComponent as ChevronLeftIcon } from '@material-symbols/svg-600/outlined/chevron_left.svg';
-import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
+import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import ReactSwipeableViews from 'react-swipeable-views';
 
 import { getAverageFromBlurhash } from 'mastodon/blurhash';
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index d1b2a0910b..e5b762807d 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -5,16 +5,16 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
-import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
-import { ReactComponent as BookmarksIcon } from '@material-symbols/svg-600/outlined/bookmarks-fill.svg';
-import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
-import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
-import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
-import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
-import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
-import { ReactComponent as SettingsIcon } from '@material-symbols/svg-600/outlined/settings-fill.svg';
-import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
-import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
+import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
+import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
+import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
+import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
+import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
+import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
+import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
+import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
+import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
+import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
index b3e9950e93..435bebd0b1 100644
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 
-import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications-fill.svg';
+import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
 
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index 3fd8ff127d..27207f2fbf 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -7,7 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
+import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 
 import { submitReport } from 'mastodon/actions/reports';
 import { fetchServer } from 'mastodon/actions/server';
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
index 5e71da9d96..7d4f1f55dd 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
@@ -3,8 +3,8 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { ReactComponent as FullscreenExitIcon } from '@material-symbols/svg-600/outlined/fullscreen_exit.svg';
-import { ReactComponent as RectangleIcon } from '@material-symbols/svg-600/outlined/rectangle.svg';
+import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react';
+import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react';
 
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index e908715e91..73034bbf66 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -7,14 +7,14 @@ import classNames from 'classnames';
 
 import { is } from 'immutable';
 
-import { ReactComponent as FullscreenIcon } from '@material-symbols/svg-600/outlined/fullscreen.svg';
-import { ReactComponent as FullscreenExitIcon } from '@material-symbols/svg-600/outlined/fullscreen_exit.svg';
-import { ReactComponent as PauseIcon } from '@material-symbols/svg-600/outlined/pause.svg';
-import { ReactComponent as PlayArrowIcon } from '@material-symbols/svg-600/outlined/play_arrow-fill.svg';
-import { ReactComponent as RectangleIcon } from '@material-symbols/svg-600/outlined/rectangle.svg';
-import { ReactComponent as VisibilityOffIcon } from '@material-symbols/svg-600/outlined/visibility_off.svg';
-import { ReactComponent as VolumeOffIcon } from '@material-symbols/svg-600/outlined/volume_off-fill.svg';
-import { ReactComponent as VolumeUpIcon } from '@material-symbols/svg-600/outlined/volume_up-fill.svg';
+import FullscreenIcon from '@material-symbols/svg-600/outlined/fullscreen.svg?react';
+import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react';
+import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react';
+import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
+import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react';
+import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
+import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react';
+import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react';
 import { throttle } from 'lodash';
 
 import { Blurhash } from 'mastodon/components/blurhash';
diff --git a/app/javascript/types/image.d.ts b/app/javascript/types/image.d.ts
index 07d1929555..8a08eca9f6 100644
--- a/app/javascript/types/image.d.ts
+++ b/app/javascript/types/image.d.ts
@@ -20,16 +20,20 @@ declare module '*.png' {
 }
 
 declare module '*.svg' {
+  const path: string;
+  export default path;
+}
+
+declare module '*.svg?react' {
   import type React from 'react';
 
   interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {
     title?: string;
   }
 
-  export const ReactComponent: React.FC<SVGPropsWithTitle>;
+  const ReactComponent: React.FC<SVGPropsWithTitle>;
 
-  const path: string;
-  export default path;
+  export default ReactComponent;
 }
 
 declare module '*.webp' {
diff --git a/config/webpack/rules/file.js b/config/webpack/rules/file.js
index 25cda0eae5..fd9b14cad6 100644
--- a/config/webpack/rules/file.js
+++ b/config/webpack/rules/file.js
@@ -4,6 +4,7 @@ const { settings } = require('../configuration');
 
 module.exports = {
   test: new RegExp(`(${settings.static_assets_extensions.join('|')})$`, 'i'),
+  exclude: [/node_modules\/@material-symbols/, /svg-icons/],
   use: [
     {
       loader: 'file-loader',
diff --git a/jest.config.js b/jest.config.js
index b4a34a5abd..7070704c33 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -21,7 +21,7 @@ const config = {
   coverageDirectory: '<rootDir>/coverage',
   moduleDirectories: ['node_modules', '<rootDir>/app/javascript'],
   moduleNameMapper: {
-    '\\.svg$': '<rootDir>/app/javascript/__mocks__/svg.js',
+    '\\.svg\\?react$': '<rootDir>/app/javascript/__mocks__/svg.js',
   },
 };
 

From a90c134850dd173abd3c2fc9258d60bd5262bec2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 08:09:33 -0500
Subject: [PATCH 298/436] Move followable by logic to suggestion class (#28710)

---
 app/models/account.rb                    |  1 -
 app/models/account_suggestions/source.rb | 32 +++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 003b41b015..0fca7ce4bd 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -129,7 +129,6 @@ class Account < ApplicationRecord
   scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
   scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
-  scope :followable_by, ->(account) { joins(arel_table.join(Follow.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(Follow.arel_table[:target_account_id]).and(Follow.arel_table[:account_id].eq(account.id))).join_sources).where(Follow.arel_table[:id].eq(nil)).joins(arel_table.join(FollowRequest.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:id].eq(FollowRequest.arel_table[:target_account_id]).and(FollowRequest.arel_table[:account_id].eq(account.id))).join_sources).where(FollowRequest.arel_table[:id].eq(nil)) }
   scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
   scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
   scope :popular, -> { order('account_stats.followers_count desc') }
diff --git a/app/models/account_suggestions/source.rb b/app/models/account_suggestions/source.rb
index ee93a1342f..d83f5e3773 100644
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@@ -8,11 +8,31 @@ class AccountSuggestions::Source
   protected
 
   def base_account_scope(account)
-    Account.searchable
-           .followable_by(account)
-           .not_excluded_by_account(account)
-           .not_domain_blocked_by_account(account)
-           .where.not(id: account.id)
-           .joins("LEFT OUTER JOIN follow_recommendation_mutes ON follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = #{account.id}").where(follow_recommendation_mutes: { target_account_id: nil })
+    Account
+      .searchable
+      .where.not(follows_sql, id: account.id)
+      .where.not(follow_requests_sql, id: account.id)
+      .not_excluded_by_account(account)
+      .not_domain_blocked_by_account(account)
+      .where.not(id: account.id)
+      .where.not(follow_recommendation_mutes_sql, id: account.id)
+  end
+
+  def follows_sql
+    <<~SQL.squish
+      EXISTS (SELECT 1 FROM follows WHERE follows.target_account_id = accounts.id AND follows.account_id = :id)
+    SQL
+  end
+
+  def follow_requests_sql
+    <<~SQL.squish
+      EXISTS (SELECT 1 FROM follow_requests WHERE follow_requests.target_account_id = accounts.id AND follow_requests.account_id = :id)
+    SQL
+  end
+
+  def follow_recommendation_mutes_sql
+    <<~SQL.squish
+      EXISTS (SELECT 1 FROM follow_recommendation_mutes WHERE follow_recommendation_mutes.target_account_id = accounts.id AND follow_recommendation_mutes.account_id = :id)
+    SQL
   end
 end

From 28fdf933626c99566b0881cb4cb741f595c83644 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 08:10:14 -0500
Subject: [PATCH 299/436] Disable `Rails/LexicallyScopedActionFilter` for
 inherited auth controllers (#28711)

---
 .rubocop.yml      | 6 ++++++
 .rubocop_todo.yml | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index bedd8f7850..a06621d660 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -103,6 +103,12 @@ Rails/Exit:
     - 'config/boot.rb'
     - 'lib/mastodon/cli/*.rb'
 
+# Reason: Conflicts with `Lint/UselessMethodDefinition` for inherited controller actions
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railslexicallyscopedactionfilter
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - 'app/controllers/auth/*'
+
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/*migrate/**/*'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bf4a9a09fe..602d99c9f0 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -64,13 +64,6 @@ Rails/HasAndBelongsToMany:
     - 'app/models/status.rb'
     - 'app/models/tag.rb'
 
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
-Rails/LexicallyScopedActionFilter:
-  Exclude:
-    - 'app/controllers/auth/passwords_controller.rb'
-    - 'app/controllers/auth/registrations_controller.rb'
-
 Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'

From 2c05b8a60d585045e9d12e18ba779c26fb780cce Mon Sep 17 00:00:00 2001
From: MitarashiDango <mitarashi_dango@mail.matcha-soft.com>
Date: Sat, 13 Jan 2024 00:58:28 +0900
Subject: [PATCH 300/436] Fix Undo Announce activity is not sent, when not
 followed by the reblogged post author (#18482)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/lib/status_reach_finder.rb              | 34 ++++++++++-----------
 app/services/reblog_service.rb              |  6 +---
 spec/lib/activitypub/tag_manager_spec.rb    |  8 +++++
 spec/services/reblog_service_spec.rb        |  4 ---
 spec/services/remove_status_service_spec.rb | 18 +++++++++++
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index 36fb0e80fb..17e42e3ec3 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -16,28 +16,28 @@ class StatusReachFinder
   private
 
   def reached_account_inboxes
+    Account.where(id: reached_account_ids).inboxes
+  end
+
+  def reached_account_ids
     # When the status is a reblog, there are no interactions with it
     # directly, we assume all interactions are with the original one
 
     if @status.reblog?
-      []
+      [reblog_of_account_id]
     else
-      Account.where(id: reached_account_ids).inboxes
-    end
-  end
-
-  def reached_account_ids
-    [
-      replied_to_account_id,
-      reblog_of_account_id,
-      mentioned_account_ids,
-      reblogs_account_ids,
-      favourites_account_ids,
-      replies_account_ids,
-    ].tap do |arr|
-      arr.flatten!
-      arr.compact!
-      arr.uniq!
+      [
+        replied_to_account_id,
+        reblog_of_account_id,
+        mentioned_account_ids,
+        reblogs_account_ids,
+        favourites_account_ids,
+        replies_account_ids,
+      ].tap do |arr|
+        arr.flatten!
+        arr.compact!
+        arr.uniq!
+      end
     end
   end
 
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 960315ed8b..cca79eced6 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -43,11 +43,7 @@ class ReblogService < BaseService
   def create_notification(reblog)
     reblogged_status = reblog.reblog
 
-    if reblogged_status.account.local?
-      LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, 'reblog')
-    elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account)
-      ActivityPub::DeliveryWorker.perform_async(build_json(reblog), reblog.account_id, reblogged_status.account.inbox_url)
-    end
+    LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, 'reblog') if reblogged_status.account.local?
   end
 
   def increment_statistics
diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index 2bff125a6a..55e9b4bb51 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -112,6 +112,14 @@ RSpec.describe ActivityPub::TagManager do
       expect(subject.cc(status)).to include(subject.uri_for(foo))
       expect(subject.cc(status)).to_not include(subject.uri_for(alice))
     end
+
+    it 'returns poster of reblogged post, if reblog' do
+      bob    = Fabricate(:account, username: 'bob', domain: 'example.com', inbox_url: 'http://example.com/bob')
+      alice  = Fabricate(:account, username: 'alice')
+      status = Fabricate(:status, visibility: :public, account: bob)
+      reblog = Fabricate(:status, visibility: :public, account: alice, reblog: status)
+      expect(subject.cc(reblog)).to include(subject.uri_for(bob))
+    end
   end
 
   describe '#local_uri?' do
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index c6d13e5a12..357b315af0 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -86,9 +86,5 @@ RSpec.describe ReblogService, type: :service do
     it 'distributes to followers' do
       expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
     end
-
-    it 'sends an announce activity to the author', :sidekiq_inline do
-      expect(a_request(:post, bob.inbox_url)).to have_been_made.once
-    end
   end
 end
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 63a9df548f..109acfb09a 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -116,4 +116,22 @@ RSpec.describe RemoveStatusService, :sidekiq_inline, type: :service do
              )).to have_been_made.once
     end
   end
+
+  context 'when removed status is a reblog of a non-follower' do
+    let!(:original_status) { Fabricate(:status, account: bill, text: 'Hello ThisIsASecret', visibility: :public) }
+    let!(:status) { ReblogService.new.call(alice, original_status) }
+
+    it 'sends Undo activity to followers' do
+      subject.call(status)
+      expect(a_request(:post, bill.inbox_url).with(
+               body: hash_including({
+                 'type' => 'Undo',
+                 'object' => hash_including({
+                   'type' => 'Announce',
+                   'object' => ActivityPub::TagManager.instance.uri_for(original_status),
+                 }),
+               })
+             )).to have_been_made.once
+    end
+  end
 end

From 1070804a1a6121170f7bba923789d73b978e6fe7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Jan 2024 18:00:17 +0100
Subject: [PATCH 301/436] Fix `RedownloadMediaWorker` not being called on
 transient S3 failure (#28714)

---
 app/lib/activitypub/activity/create.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index f6262899a8..5a2d33c1fa 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -283,6 +283,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         RedownloadMediaWorker.perform_in(rand(30..600).seconds, media_attachment.id)
       rescue Seahorse::Client::NetworkingError => e
         Rails.logger.warn "Error storing media attachment: #{e}"
+        RedownloadMediaWorker.perform_async(media_attachment.id)
       end
     end
 

From 6bbcd9348eb9e9afb8b061478f91cfe2ea06b93a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Jan 2024 21:16:48 +0100
Subject: [PATCH 302/436] Switch from 48px weight 600 material symbol icons to
 24px weight 400 icons (#28064)

---
 .../mastodon/components/attachment_list.jsx   |   3 +-
 app/javascript/mastodon/components/badge.jsx  |   6 +-
 .../components/column_back_button.tsx         |   3 +-
 .../mastodon/components/column_header.jsx     |  13 +-
 .../mastodon/components/copy_icon_button.jsx  |   3 +-
 .../components/dismissable_banner.tsx         |   3 +-
 app/javascript/mastodon/components/domain.tsx |   2 +-
 .../mastodon/components/dropdown_menu.jsx     |   2 +-
 .../components/edited_timestamp/index.jsx     |   3 +-
 app/javascript/mastodon/components/icon.tsx   |   3 +-
 .../mastodon/components/load_gap.tsx          |   3 +-
 .../mastodon/components/media_gallery.jsx     |   2 +-
 .../picture_in_picture_placeholder.jsx        |   3 +-
 app/javascript/mastodon/components/poll.jsx   |   2 +-
 app/javascript/mastodon/components/status.jsx |   8 +-
 .../mastodon/components/status_action_bar.jsx |  19 +-
 .../mastodon/components/status_content.jsx    |   3 +-
 .../mastodon/components/verified_badge.tsx    |   2 +-
 .../mastodon/components/visibility_icon.tsx   |   8 +-
 .../mastodon/features/about/index.jsx         |   5 +-
 .../components/follow_request_note.jsx        |   5 +-
 .../features/account/components/header.jsx    |  13 +-
 .../account_gallery/components/media_item.jsx |   7 +-
 .../mastodon/features/audio/index.jsx         |  12 +-
 .../mastodon/features/blocks/index.jsx        |   3 +-
 .../features/bookmarked_statuses/index.jsx    |   2 +-
 .../features/community_timeline/index.jsx     |   3 +-
 .../compose/components/action_bar.jsx         |   2 +-
 .../compose/components/compose_form.jsx       |   2 +-
 .../compose/components/poll_button.jsx        |   2 +-
 .../features/compose/components/poll_form.jsx |   5 +-
 .../compose/components/privacy_dropdown.jsx   |   9 +-
 .../compose/components/reply_indicator.jsx    |   3 +-
 .../features/compose/components/search.jsx    |   7 +-
 .../compose/components/search_results.jsx     |   9 +-
 .../features/compose/components/upload.jsx    |   6 +-
 .../compose/components/upload_button.jsx      |   2 +-
 .../compose/components/upload_progress.jsx    |   2 +-
 .../mastodon/features/compose/index.jsx       |  14 +-
 .../components/conversation.jsx               |   4 +-
 .../features/direct_timeline/index.jsx        |   3 +-
 .../mastodon/features/directory/index.jsx     |   3 +-
 .../mastodon/features/domain_blocks/index.jsx |   3 +-
 .../mastodon/features/explore/index.jsx       |   5 +-
 .../mastodon/features/explore/results.jsx     |   7 +-
 .../features/favourited_statuses/index.jsx    |   2 +-
 .../mastodon/features/favourites/index.jsx    |   2 +-
 .../features/filters/select_filter.jsx        |   2 +-
 .../mastodon/features/firehose/index.jsx      |   3 +-
 .../components/account_authorize.jsx          |   4 +-
 .../features/follow_requests/index.jsx        |   3 +-
 .../mastodon/features/followed_tags/index.jsx |   2 +-
 .../components/announcements.jsx              |   6 +-
 .../features/getting_started/index.jsx        |  23 +-
 .../features/hashtag_timeline/index.jsx       |   2 +-
 .../mastodon/features/home_timeline/index.jsx |   5 +-
 .../features/interaction_modal/index.jsx      |   8 +-
 .../features/keyboard_shortcuts/index.jsx     |   3 +-
 .../features/list_adder/components/list.jsx   |   7 +-
 .../list_editor/components/account.jsx        |   4 +-
 .../list_editor/components/edit_list_form.jsx |   2 +-
 .../list_editor/components/search.jsx         |   5 +-
 .../mastodon/features/list_timeline/index.jsx |   6 +-
 .../mastodon/features/lists/index.jsx         |   3 +-
 .../mastodon/features/mutes/index.jsx         |   3 +-
 .../components/clear_column_button.jsx        |   3 +-
 .../notifications/components/filter_bar.jsx   |  13 +-
 .../components/follow_request.jsx             |   5 +-
 .../notifications/components/notification.jsx |  16 +-
 .../notifications_permission_banner.jsx       |   5 +-
 .../mastodon/features/notifications/index.jsx |   4 +-
 .../features/onboarding/components/step.jsx   |   5 +-
 .../mastodon/features/onboarding/index.jsx    |  11 +-
 .../mastodon/features/onboarding/profile.jsx  |   4 +-
 .../mastodon/features/onboarding/share.jsx    |   4 +-
 .../picture_in_picture/components/footer.jsx  |  11 +-
 .../picture_in_picture/components/header.jsx  |   3 +-
 .../features/pinned_statuses/index.jsx        |   3 +-
 .../features/public_timeline/index.jsx        |   3 +-
 .../mastodon/features/reblogs/index.jsx       |   2 +-
 .../features/report/components/option.jsx     |   3 +-
 .../features/status/components/action_bar.jsx |  17 +-
 .../features/status/components/card.jsx       |   7 +-
 .../status/components/detailed_status.jsx     |   7 +-
 .../mastodon/features/status/index.jsx        |   4 +-
 .../subscribed_languages_modal/index.jsx      |   3 +-
 .../features/ui/components/boost_modal.jsx    |   3 +-
 .../ui/components/bundle_modal_error.jsx      |   2 +-
 .../ui/components/compare_history_modal.jsx   |   2 +-
 .../features/ui/components/embed_modal.jsx    |   3 +-
 .../features/ui/components/filter_modal.jsx   |   3 +-
 .../ui/components/focal_point_modal.jsx       |   2 +-
 .../follow_requests_column_link.jsx           |   3 +-
 .../features/ui/components/header.jsx         |   3 +-
 .../features/ui/components/image_modal.jsx    |   3 +-
 .../features/ui/components/list_panel.jsx     |   3 +-
 .../features/ui/components/media_modal.jsx    |   6 +-
 .../ui/components/navigation_panel.jsx        |  21 +-
 .../components/notifications_counter_icon.js  |   3 +-
 .../features/ui/components/report_modal.jsx   |   3 +-
 .../features/ui/components/zoomable_image.jsx |   5 +-
 .../mastodon/features/video/index.jsx         |  16 +-
 .../400-24px/account_circle-fill.svg          |   1 +
 .../400-24px/account_circle.svg               |   1 +
 .../material-icons/400-24px/add-fill.svg      |   1 +
 .../material-icons/400-24px/add.svg           |   1 +
 .../400-24px/add_photo_alternate-fill.svg     |   1 +
 .../400-24px/add_photo_alternate.svg          |   1 +
 .../400-24px/alternate_email-fill.svg         |   1 +
 .../400-24px/alternate_email.svg              |   1 +
 .../400-24px/arrow_back-fill.svg              |   1 +
 .../material-icons/400-24px/arrow_back.svg    |   1 +
 .../400-24px/arrow_drop_down-fill.svg         |   1 +
 .../400-24px/arrow_drop_down.svg              |   1 +
 .../400-24px/arrow_right_alt-fill.svg         |   1 +
 .../400-24px/arrow_right_alt.svg              |   1 +
 .../material-icons/400-24px/block-fill.svg    |   1 +
 .../material-icons/400-24px/block.svg         |   1 +
 .../material-icons/400-24px/bookmark-fill.svg |   1 +
 .../material-icons/400-24px/bookmark.svg      |   1 +
 .../400-24px/bookmarks-fill.svg               |   1 +
 .../material-icons/400-24px/bookmarks.svg     |   1 +
 .../material-icons/400-24px/campaign-fill.svg |   1 +
 .../material-icons/400-24px/campaign.svg      |   1 +
 .../material-icons/400-24px/cancel-fill.svg   |   1 +
 .../material-icons/400-24px/cancel.svg        |   1 +
 .../400-24px/cancel_presentation-fill.svg     |   1 +
 .../400-24px/cancel_presentation.svg          |   1 +
 .../material-icons/400-24px/check-fill.svg    |   1 +
 .../material-icons/400-24px/check.svg         |   1 +
 .../400-24px/check_box_outline_blank-fill.svg |   1 +
 .../400-24px/check_box_outline_blank.svg      |   1 +
 .../400-24px/chevron_left-fill.svg            |   1 +
 .../material-icons/400-24px/chevron_left.svg  |   1 +
 .../400-24px/chevron_right-fill.svg           |   1 +
 .../material-icons/400-24px/chevron_right.svg |   1 +
 .../material-icons/400-24px/close-fill.svg    |   1 +
 .../material-icons/400-24px/close.svg         |   1 +
 .../400-24px/content_copy-fill.svg            |   1 +
 .../material-icons/400-24px/content_copy.svg  |   1 +
 .../material-icons/400-24px/delete-fill.svg   |   1 +
 .../material-icons/400-24px/delete.svg        |   1 +
 .../400-24px/delete_forever-fill.svg          |   1 +
 .../400-24px/delete_forever.svg               |   1 +
 .../400-24px/description-fill.svg             |   1 +
 .../material-icons/400-24px/description.svg   |   1 +
 .../material-icons/400-24px/done-fill.svg     |   1 +
 .../material-icons/400-24px/done.svg          |   1 +
 .../material-icons/400-24px/done_all-fill.svg |   1 +
 .../material-icons/400-24px/done_all.svg      |   1 +
 .../material-icons/400-24px/download-fill.svg |   1 +
 .../material-icons/400-24px/download.svg      |   1 +
 .../material-icons/400-24px/edit-fill.svg     |   1 +
 .../material-icons/400-24px/edit.svg          |   1 +
 .../400-24px/edit_note-fill.svg               |   1 +
 .../material-icons/400-24px/edit_note.svg     |   1 +
 .../400-24px/expand_more-fill.svg             |   1 +
 .../material-icons/400-24px/expand_more.svg   |   1 +
 .../400-24px/find_in_page-fill.svg            |   1 +
 .../material-icons/400-24px/find_in_page.svg  |   1 +
 .../material-icons/400-24px/flag-fill.svg     |   1 +
 .../material-icons/400-24px/flag.svg          |   1 +
 .../400-24px/fullscreen-fill.svg              |   1 +
 .../material-icons/400-24px/fullscreen.svg    |   1 +
 .../400-24px/fullscreen_exit-fill.svg         |   1 +
 .../400-24px/fullscreen_exit.svg              |   1 +
 .../material-icons/400-24px/group-fill.svg    |   1 +
 .../material-icons/400-24px/group.svg         |   1 +
 .../material-icons/400-24px/home-fill.svg     |   1 +
 .../material-icons/400-24px/home.svg          |   1 +
 .../material-icons/400-24px/info-fill.svg     |   1 +
 .../material-icons/400-24px/info.svg          |   1 +
 .../400-24px/insert_chart-fill.svg            |   1 +
 .../material-icons/400-24px/insert_chart.svg  |   1 +
 .../material-icons/400-24px/link-fill.svg     |   1 +
 .../material-icons/400-24px/link.svg          |   1 +
 .../material-icons/400-24px/list_alt-fill.svg |   1 +
 .../material-icons/400-24px/list_alt.svg      |   1 +
 .../material-icons/400-24px/lock-fill.svg     |   1 +
 .../material-icons/400-24px/lock.svg          |   1 +
 .../400-24px/lock_open-fill.svg               |   1 +
 .../material-icons/400-24px/lock_open.svg     |   1 +
 .../material-icons/400-24px/logout-fill.svg   |   1 +
 .../material-icons/400-24px/logout.svg        |   1 +
 .../material-icons/400-24px/menu-fill.svg     |   1 +
 .../material-icons/400-24px/menu.svg          |   1 +
 .../400-24px/more_horiz-fill.svg              |   1 +
 .../material-icons/400-24px/more_horiz.svg    |   1 +
 .../400-24px/music_note-fill.svg              |   1 +
 .../material-icons/400-24px/music_note.svg    |   1 +
 .../400-24px/notifications-fill.svg           |   1 +
 .../material-icons/400-24px/notifications.svg |   1 +
 .../400-24px/notifications_active-fill.svg    |   1 +
 .../400-24px/notifications_active.svg         |   1 +
 .../400-24px/open_in_new-fill.svg             |   1 +
 .../material-icons/400-24px/open_in_new.svg   |   1 +
 .../material-icons/400-24px/pause-fill.svg    |   1 +
 .../material-icons/400-24px/pause.svg         |   1 +
 .../material-icons/400-24px/person-fill.svg   |   1 +
 .../material-icons/400-24px/person.svg        |   1 +
 .../400-24px/person_add-fill.svg              |   1 +
 .../material-icons/400-24px/person_add.svg    |   1 +
 .../400-24px/play_arrow-fill.svg              |   1 +
 .../material-icons/400-24px/play_arrow.svg    |   1 +
 .../material-icons/400-24px/public-fill.svg   |   1 +
 .../material-icons/400-24px/public.svg        |   1 +
 .../material-icons/400-24px/push_pin-fill.svg |   1 +
 .../material-icons/400-24px/push_pin.svg      |   1 +
 .../400-24px/rectangle-fill.svg               |   1 +
 .../material-icons/400-24px/rectangle.svg     |   1 +
 .../material-icons/400-24px/refresh-fill.svg  |   1 +
 .../material-icons/400-24px/refresh.svg       |   1 +
 .../material-icons/400-24px/repeat-fill.svg   |   1 +
 .../material-icons/400-24px/repeat.svg        |   1 +
 .../material-icons/400-24px/reply-fill.svg    |   1 +
 .../material-icons/400-24px/reply.svg         |   1 +
 .../400-24px/reply_all-fill.svg               |   1 +
 .../material-icons/400-24px/reply_all.svg     |   1 +
 .../material-icons/400-24px/search-fill.svg   |   1 +
 .../material-icons/400-24px/search.svg        |   1 +
 .../material-icons/400-24px/settings-fill.svg |   1 +
 .../material-icons/400-24px/settings.svg      |   1 +
 .../material-icons/400-24px/share-fill.svg    |   1 +
 .../material-icons/400-24px/share.svg         |   1 +
 .../400-24px/smart_toy-fill.svg               |   1 +
 .../material-icons/400-24px/smart_toy.svg     |   1 +
 .../material-icons/400-24px/star-fill.svg     |   1 +
 .../material-icons/400-24px/star.svg          |   1 +
 .../material-icons/400-24px/tag-fill.svg      |   1 +
 .../material-icons/400-24px/tag.svg           |   1 +
 .../material-icons/400-24px/tune-fill.svg     |   1 +
 .../material-icons/400-24px/tune.svg          |   1 +
 .../400-24px/upload_file-fill.svg             |   1 +
 .../material-icons/400-24px/upload_file.svg   |   1 +
 .../400-24px/visibility-fill.svg              |   1 +
 .../material-icons/400-24px/visibility.svg    |   1 +
 .../400-24px/visibility_off-fill.svg          |   1 +
 .../400-24px/visibility_off.svg               |   1 +
 .../400-24px/volume_off-fill.svg              |   1 +
 .../material-icons/400-24px/volume_off.svg    |   1 +
 .../400-24px/volume_up-fill.svg               |   1 +
 .../material-icons/400-24px/volume_up.svg     |   1 +
 app/javascript/material-icons/LICENSE         | 202 ++++++++++++++++++
 app/javascript/material-icons/README.md       |   1 +
 .../styles/mastodon/components.scss           |  12 +-
 config/webpack/rules/file.js                  |   2 +-
 config/webpack/rules/material_icons.js        |   2 +-
 lib/tasks/icons.rake                          |  56 +++++
 package.json                                  |   1 -
 yarn.lock                                     |   8 -
 250 files changed, 649 insertions(+), 313 deletions(-)
 create mode 100644 app/javascript/material-icons/400-24px/account_circle-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/account_circle.svg
 create mode 100644 app/javascript/material-icons/400-24px/add-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/add.svg
 create mode 100644 app/javascript/material-icons/400-24px/add_photo_alternate-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/add_photo_alternate.svg
 create mode 100644 app/javascript/material-icons/400-24px/alternate_email-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/alternate_email.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_back-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_back.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_drop_down-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_drop_down.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_right_alt-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/arrow_right_alt.svg
 create mode 100644 app/javascript/material-icons/400-24px/block-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/block.svg
 create mode 100644 app/javascript/material-icons/400-24px/bookmark-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/bookmark.svg
 create mode 100644 app/javascript/material-icons/400-24px/bookmarks-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/bookmarks.svg
 create mode 100644 app/javascript/material-icons/400-24px/campaign-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/campaign.svg
 create mode 100644 app/javascript/material-icons/400-24px/cancel-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/cancel.svg
 create mode 100644 app/javascript/material-icons/400-24px/cancel_presentation-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/cancel_presentation.svg
 create mode 100644 app/javascript/material-icons/400-24px/check-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/check.svg
 create mode 100644 app/javascript/material-icons/400-24px/check_box_outline_blank-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/check_box_outline_blank.svg
 create mode 100644 app/javascript/material-icons/400-24px/chevron_left-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/chevron_left.svg
 create mode 100644 app/javascript/material-icons/400-24px/chevron_right-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/chevron_right.svg
 create mode 100644 app/javascript/material-icons/400-24px/close-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/close.svg
 create mode 100644 app/javascript/material-icons/400-24px/content_copy-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/content_copy.svg
 create mode 100644 app/javascript/material-icons/400-24px/delete-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/delete.svg
 create mode 100644 app/javascript/material-icons/400-24px/delete_forever-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/delete_forever.svg
 create mode 100644 app/javascript/material-icons/400-24px/description-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/description.svg
 create mode 100644 app/javascript/material-icons/400-24px/done-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/done.svg
 create mode 100644 app/javascript/material-icons/400-24px/done_all-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/done_all.svg
 create mode 100644 app/javascript/material-icons/400-24px/download-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/download.svg
 create mode 100644 app/javascript/material-icons/400-24px/edit-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/edit.svg
 create mode 100644 app/javascript/material-icons/400-24px/edit_note-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/edit_note.svg
 create mode 100644 app/javascript/material-icons/400-24px/expand_more-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/expand_more.svg
 create mode 100644 app/javascript/material-icons/400-24px/find_in_page-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/find_in_page.svg
 create mode 100644 app/javascript/material-icons/400-24px/flag-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/flag.svg
 create mode 100644 app/javascript/material-icons/400-24px/fullscreen-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/fullscreen.svg
 create mode 100644 app/javascript/material-icons/400-24px/fullscreen_exit-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/fullscreen_exit.svg
 create mode 100644 app/javascript/material-icons/400-24px/group-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/group.svg
 create mode 100644 app/javascript/material-icons/400-24px/home-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/home.svg
 create mode 100644 app/javascript/material-icons/400-24px/info-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/info.svg
 create mode 100644 app/javascript/material-icons/400-24px/insert_chart-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/insert_chart.svg
 create mode 100644 app/javascript/material-icons/400-24px/link-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/link.svg
 create mode 100644 app/javascript/material-icons/400-24px/list_alt-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/list_alt.svg
 create mode 100644 app/javascript/material-icons/400-24px/lock-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/lock.svg
 create mode 100644 app/javascript/material-icons/400-24px/lock_open-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/lock_open.svg
 create mode 100644 app/javascript/material-icons/400-24px/logout-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/logout.svg
 create mode 100644 app/javascript/material-icons/400-24px/menu-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/menu.svg
 create mode 100644 app/javascript/material-icons/400-24px/more_horiz-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/more_horiz.svg
 create mode 100644 app/javascript/material-icons/400-24px/music_note-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/music_note.svg
 create mode 100644 app/javascript/material-icons/400-24px/notifications-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/notifications.svg
 create mode 100644 app/javascript/material-icons/400-24px/notifications_active-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/notifications_active.svg
 create mode 100644 app/javascript/material-icons/400-24px/open_in_new-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/open_in_new.svg
 create mode 100644 app/javascript/material-icons/400-24px/pause-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/pause.svg
 create mode 100644 app/javascript/material-icons/400-24px/person-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/person.svg
 create mode 100644 app/javascript/material-icons/400-24px/person_add-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/person_add.svg
 create mode 100644 app/javascript/material-icons/400-24px/play_arrow-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/play_arrow.svg
 create mode 100644 app/javascript/material-icons/400-24px/public-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/public.svg
 create mode 100644 app/javascript/material-icons/400-24px/push_pin-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/push_pin.svg
 create mode 100644 app/javascript/material-icons/400-24px/rectangle-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/rectangle.svg
 create mode 100644 app/javascript/material-icons/400-24px/refresh-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/refresh.svg
 create mode 100644 app/javascript/material-icons/400-24px/repeat-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/repeat.svg
 create mode 100644 app/javascript/material-icons/400-24px/reply-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/reply.svg
 create mode 100644 app/javascript/material-icons/400-24px/reply_all-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/reply_all.svg
 create mode 100644 app/javascript/material-icons/400-24px/search-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/search.svg
 create mode 100644 app/javascript/material-icons/400-24px/settings-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/settings.svg
 create mode 100644 app/javascript/material-icons/400-24px/share-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/share.svg
 create mode 100644 app/javascript/material-icons/400-24px/smart_toy-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/smart_toy.svg
 create mode 100644 app/javascript/material-icons/400-24px/star-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/star.svg
 create mode 100644 app/javascript/material-icons/400-24px/tag-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/tag.svg
 create mode 100644 app/javascript/material-icons/400-24px/tune-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/tune.svg
 create mode 100644 app/javascript/material-icons/400-24px/upload_file-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/upload_file.svg
 create mode 100644 app/javascript/material-icons/400-24px/visibility-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/visibility.svg
 create mode 100644 app/javascript/material-icons/400-24px/visibility_off-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/visibility_off.svg
 create mode 100644 app/javascript/material-icons/400-24px/volume_off-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/volume_off.svg
 create mode 100644 app/javascript/material-icons/400-24px/volume_up-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/volume_up.svg
 create mode 100644 app/javascript/material-icons/LICENSE
 create mode 100644 app/javascript/material-icons/README.md
 create mode 100644 lib/tasks/icons.rake

diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx
index e912d515cd..59d31a3038 100644
--- a/app/javascript/mastodon/components/attachment_list.jsx
+++ b/app/javascript/mastodon/components/attachment_list.jsx
@@ -7,8 +7,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react';
-
+import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index e716421710..bac8096566 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import GroupsIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-import PersonIcon from '@material-symbols/svg-600/outlined/person.svg?react';
-import SmartToyIcon from '@material-symbols/svg-600/outlined/smart_toy.svg?react';
+import GroupsIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
+import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react';
 
 
 export const Badge = ({ icon, label, domain }) => (
diff --git a/app/javascript/mastodon/components/column_back_button.tsx b/app/javascript/mastodon/components/column_back_button.tsx
index 7a23c4e108..f803f86289 100644
--- a/app/javascript/mastodon/components/column_back_button.tsx
+++ b/app/javascript/mastodon/components/column_back_button.tsx
@@ -2,8 +2,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
-
+import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
 
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index a0ce10bf17..3e53902de6 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -6,13 +6,12 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
-import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
-import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
-import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react';
-
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
+import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx
index 0c250a7632..c5216e8f80 100644
--- a/app/javascript/mastodon/components/copy_icon_button.jsx
+++ b/app/javascript/mastodon/components/copy_icon_button.jsx
@@ -7,8 +7,7 @@ import classNames from 'classnames';
 
 import { useDispatch } from 'react-redux';
 
-import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
-
+import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
 import { showAlert } from 'mastodon/actions/alerts';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx
index c35fec983d..d3bc28b9b9 100644
--- a/app/javascript/mastodon/components/dismissable_banner.tsx
+++ b/app/javascript/mastodon/components/dismissable_banner.tsx
@@ -8,8 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { changeSetting } from 'mastodon/actions/settings';
 import { bannerSettings } from 'mastodon/settings';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index 26cc77604e..637c286ce4 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
+import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
 
 import { IconButton } from './icon_button';
 
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 1cb5c03150..a8fcfd1097 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -6,10 +6,10 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { CircularProgress } from 'mastodon/components/circular_progress';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index de4c641cfb..7497ab9922 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -5,8 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from '@material-symbols/svg-600/outlined/arrow_drop_down.svg?react';
-
+import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { Icon }  from 'mastodon/components/icon';
 import InlineAccount from 'mastodon/components/inline_account';
diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx
index 4b17f063b9..948492d91c 100644
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames';
 
-import CheckBoxOutlineBlankIcon from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg?react';
-
+import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react';
 import { isProduction } from 'mastodon/utils/environment';
 
 interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index ea97c3eb57..2a233b6a1c 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -2,8 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 72daeea5a0..c387bb8698 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -8,9 +8,9 @@ import classNames from 'classnames';
 import { is } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
 import { debounce } from 'lodash';
 
+import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 
 import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
index 3ce5ea5a74..e8cfe6cb32 100644
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
@@ -5,8 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CancelPresentationIcon from '@material-symbols/svg-600/outlined/cancel_presentation.svg?react';
-
+import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
 import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index b8f6446409..f85c47bb40 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -7,10 +7,10 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
 import escapeTextContentForBrowser from 'escape-html';
 import spring from 'react-motion/lib/spring';
 
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import emojify from 'mastodon/features/emoji/emoji';
 import Motion from 'mastodon/features/ui/util/optional_motion';
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index f1ea369610..224c8baded 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -7,12 +7,12 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 536ea350ae..e1e0164642 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -9,16 +9,15 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg';
-import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
-import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
-import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
-import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
-
+import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
+import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
 import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index f8ca0b3043..6f28f6d6d5 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -9,8 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
-
+import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PollContainer from 'mastodon/containers/poll_container';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx
index add7c7acdf..4209f68319 100644
--- a/app/javascript/mastodon/components/verified_badge.tsx
+++ b/app/javascript/mastodon/components/verified_badge.tsx
@@ -1,4 +1,4 @@
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index e0ef1372f1..1a75261427 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -1,9 +1,9 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
-import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index 1e43aaea7b..bffac6357a 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -10,9 +10,8 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
-import ExpandMoreIcon from '@material-symbols/svg-600/outlined/expand_more.svg?react';
-
+import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
 import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'mastodon/actions/server';
 import Column from 'mastodon/components/column';
 import { Icon  }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
index da775248ce..a8b61f9eaf 100644
--- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
@@ -3,9 +3,8 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class FollowRequestNote extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index e8b5e72145..6f58ae35f1 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -9,13 +9,12 @@ import { NavLink, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
-import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications.svg?react';
-import NotificationsActiveIcon from '@material-symbols/svg-600/outlined/notifications_active-fill.svg?react';
-import ShareIcon from '@material-symbols/svg-600/outlined/share.svg?react';
-
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react';
+import NotificationsActiveIcon from 'mastodon/../material-icons/400-24px/notifications_active-fill.svg?react';
+import ShareIcon from 'mastodon/../material-icons/400-24px/share.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
index e4495601f5..a35092893d 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
@@ -5,10 +5,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AudiotrackIcon from '@material-symbols/svg-600/outlined/music_note.svg?react';
-import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow.svg?react';
-import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
-
+import AudiotrackIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
+import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow.svg?react';
+import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index 881e5cef1b..9008e05383 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -7,14 +7,14 @@ import classNames from 'classnames';
 
 import { is } from 'immutable';
 
-import DownloadIcon from '@material-symbols/svg-600/outlined/download.svg?react';
-import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react';
-import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
-import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
-import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react';
-import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react';
 import { throttle, debounce } from 'lodash';
 
+import DownloadIcon from 'mastodon/../material-icons/400-24px/download.svg?react';
+import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
+import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video';
 
diff --git a/app/javascript/mastodon/features/blocks/index.jsx b/app/javascript/mastodon/features/blocks/index.jsx
index 7e1eda8aca..656784664f 100644
--- a/app/javascript/mastodon/features/blocks/index.jsx
+++ b/app/javascript/mastodon/features/blocks/index.jsx
@@ -6,9 +6,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
 import { debounce } from 'lodash';
 
+import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
index 767707755b..15db945956 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
 import { debounce } from 'lodash';
 
+import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
 import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx
index 1862cdf902..5bf66c2a34 100644
--- a/app/javascript/mastodon/features/community_timeline/index.jsx
+++ b/app/javascript/mastodon/features/community_timeline/index.jsx
@@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index 42ed78578a..bacafaf1e1 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
+import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
 
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 1570bd4d06..a099707dfb 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -8,9 +8,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
 import { length } from 'stringz';
 
+import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index a5025a0f40..e6ecba1a07 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
+import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 89596815ec..1815e22e6f 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -8,9 +8,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 0dbbcbc256..67298c8c43 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -6,14 +6,13 @@ import { injectIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
-import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index 40e79cafaa..f16a37347c 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -5,8 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 8dbbb0383d..844958bab6 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -8,10 +8,9 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import CancelIcon from '@material-symbols/svg-600/outlined/cancel-fill.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-
+import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { domain, searchEnabled } from 'mastodon/initial_state';
 import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 00d4dc5329..8a63a01c89 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -5,11 +5,10 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
-
+import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
 import { SearchSection } from 'mastodon/features/explore/components/search_section';
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index 88d6f68b54..cb31145e8d 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -5,11 +5,11 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
-import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
 import spring from 'react-motion/lib/spring';
 
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
+import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 201b1b8983..090af86b27 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
+import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index 2c44ac6364..8ed09b36ba 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -3,9 +3,9 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import UploadFileIcon from '@material-symbols/svg-600/outlined/upload_file.svg?react';
 import spring from 'react-motion/lib/spring';
 
+import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index 0b9fa65fe1..a19ae71e8e 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -9,15 +9,15 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-import LogoutIcon from '@material-symbols/svg-600/outlined/logout.svg?react';
-import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
-import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
-import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
 import spring from 'react-motion/lib/spring';
 
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import LogoutIcon from 'mastodon/../material-icons/400-24px/logout.svg?react';
+import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
+import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import Column from 'mastodon/components/column';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 0aeec1e3b0..9ae95dabe9 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -8,10 +8,10 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index 1a11520c3b..effc9f29db 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
 import { connectDirectStream } from 'mastodon/actions/streaming';
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
index 0de77164f5..32d79f23fc 100644
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ b/app/javascript/mastodon/features/directory/index.jsx
@@ -9,8 +9,7 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
 import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/domain_blocks/index.jsx b/app/javascript/mastodon/features/domain_blocks/index.jsx
index 7a57ea1262..5c9b70f02b 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.jsx
+++ b/app/javascript/mastodon/features/domain_blocks/index.jsx
@@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
 import { debounce } from 'lodash';
 
+import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index a59830fb82..96a39f6b35 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -8,9 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
-
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import Search from 'mastodon/features/compose/containers/search_container';
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 665f97f8ff..891bddf737 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -9,10 +9,9 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
-
+import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { submitSearch, expandSearch } from 'mastodon/actions/search';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
 import { Icon } from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.jsx b/app/javascript/mastodon/features/favourited_statuses/index.jsx
index d4716580d8..29fc6925d6 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.jsx
+++ b/app/javascript/mastodon/features/favourited_statuses/index.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
 import { debounce } from 'lodash';
 
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/favourites/index.jsx b/app/javascript/mastodon/features/favourites/index.jsx
index a26afda892..ffab6f02c9 100644
--- a/app/javascript/mastodon/features/favourites/index.jsx
+++ b/app/javascript/mastodon/features/favourites/index.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
 import { debounce } from 'lodash';
 
+import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
 import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/filters/select_filter.jsx b/app/javascript/mastodon/features/filters/select_filter.jsx
index 55f2a8c09f..9bf0c3c8e5 100644
--- a/app/javascript/mastodon/features/filters/select_filter.jsx
+++ b/app/javascript/mastodon/features/filters/select_filter.jsx
@@ -5,9 +5,9 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
 import fuzzysort from 'fuzzysort';
 
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { toServerSideType } from 'mastodon/utils/filters';
 import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 337b9a65b2..22c11a182f 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -6,8 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
-
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
 import { addColumn } from 'mastodon/actions/columns';
 import { changeSetting } from 'mastodon/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
index ed61f2d841..1f40e05992 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 
 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx
index 9f73d09252..683c7b4070 100644
--- a/app/javascript/mastodon/features/follow_requests/index.jsx
+++ b/app/javascript/mastodon/features/follow_requests/index.jsx
@@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
 import { debounce } from 'lodash';
 
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
 import { me } from '../../initial_state';
diff --git a/app/javascript/mastodon/features/followed_tags/index.jsx b/app/javascript/mastodon/features/followed_tags/index.jsx
index d4b26356b3..de3d7670ec 100644
--- a/app/javascript/mastodon/features/followed_tags/index.jsx
+++ b/app/javascript/mastodon/features/followed_tags/index.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 import { debounce } from 'lodash';
 
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Hashtag } from 'mastodon/components/hashtag';
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index 0818da5519..6b752df1bd 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -9,14 +9,14 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
-import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
-import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import ReactSwipeableViews from 'react-swipeable-views';
 
 import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 29bbfd35f6..68ea201387 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -9,18 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
-import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
-import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
-import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
-
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
+import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index bdb8da00a5..35ed4dc609 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -8,9 +8,9 @@ import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
 import { isEqual } from 'lodash';
 
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { connectHashtagStream } from 'mastodon/actions/streaming';
 import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 6fc986393e..1f93278c06 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -10,9 +10,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import CampaignIcon from '@material-symbols/svg-600/outlined/campaign.svg?react';
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-
+import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
 import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 527cba5d97..1d503b7343 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -7,12 +7,12 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
 import { throttle, escapeRegExp } from 'lodash';
 
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import api from 'mastodon/api';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 054797d18f..6d1df6dd0d 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -6,8 +6,7 @@ import { Helmet } from 'react-helmet';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
-
+import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 
diff --git a/app/javascript/mastodon/features/list_adder/components/list.jsx b/app/javascript/mastodon/features/list_adder/components/list.jsx
index 14e320e00b..54ac940da4 100644
--- a/app/javascript/mastodon/features/list_adder/components/list.jsx
+++ b/app/javascript/mastodon/features/list_adder/components/list.jsx
@@ -6,10 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
-
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
diff --git a/app/javascript/mastodon/features/list_editor/components/account.jsx b/app/javascript/mastodon/features/list_editor/components/account.jsx
index 30595ebc8b..f406f24fa7 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/account.jsx
@@ -6,8 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
+import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 
 import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
 import { Avatar } from '../../../components/avatar';
diff --git a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
index db89611db2..ad29d08a93 100644
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
 
 import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/list_editor/components/search.jsx b/app/javascript/mastodon/features/list_editor/components/search.jsx
index 1971fd2f76..4c4138c751 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/search.jsx
@@ -7,9 +7,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import CancelIcon from '@material-symbols/svg-600/outlined/cancel.svg?react';
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-
+import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index 4ea794bdd4..aa87adf52a 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -9,11 +9,11 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import DeleteIcon from '@material-symbols/svg-600/outlined/delete.svg?react';
-import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
 import Toggle from 'react-toggle';
 
+import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
+import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
 import { openModal } from 'mastodon/actions/modal';
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index e59a6e4130..b20bbc6b78 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -9,8 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
-
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/mutes/index.jsx b/app/javascript/mastodon/features/mutes/index.jsx
index ab0d30fcd1..316eaba220 100644
--- a/app/javascript/mastodon/features/mutes/index.jsx
+++ b/app/javascript/mastodon/features/mutes/index.jsx
@@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off.svg?react';
 import { debounce } from 'lodash';
 
+import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
+
 import { fetchMutes, expandMutes } from '../../actions/mutes';
 import { LoadingIndicator } from '../../components/loading_indicator';
 import ScrollableList from '../../components/scrollable_list';
diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
index 2e257ed5c3..ac7860efd4 100644
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
@@ -3,8 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import DeleteForeverIcon from '@material-symbols/svg-600/outlined/delete_forever.svg?react';
-
+import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class ClearColumnButton extends PureComponent {
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
index 56338333b1..f5651a7d44 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
@@ -3,13 +3,12 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
-
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 const tooltips = defineMessages({
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.jsx b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
index 904b6048ae..c6a039adb5 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
@@ -7,9 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 24cead5a59..35b31fcd47 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -8,16 +8,16 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
-import FlagIcon from '@material-symbols/svg-600/outlined/flag-fill.svg?react';
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
-import PersonIcon from '@material-symbols/svg-600/outlined/person-fill.svg?react';
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add-fill.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
+import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
+import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
+import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import AccountContainer from 'mastodon/containers/account_container';
 import StatusContainer from 'mastodon/containers/status_container';
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
index 1c1750f72f..a577abd864 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
@@ -5,9 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index a841f346dd..0751f1620c 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -10,10 +10,10 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import DoneAllIcon from '@material-symbols/svg-600/outlined/done_all.svg?react';
-import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
 import { debounce } from 'lodash';
 
+import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
 import { compareId } from 'mastodon/compare_id';
 import { Icon }  from 'mastodon/components/icon';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
diff --git a/app/javascript/mastodon/features/onboarding/components/step.jsx b/app/javascript/mastodon/features/onboarding/components/step.jsx
index 0eca65615c..46c9b1645d 100644
--- a/app/javascript/mastodon/features/onboarding/components/step.jsx
+++ b/app/javascript/mastodon/features/onboarding/components/step.jsx
@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
 
 import { Link } from 'react-router-dom';
 
-import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
-import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
-
+import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
+import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 54699a1349..9271468da0 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -8,13 +8,12 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 
-import AccountCircleIcon from '@material-symbols/svg-600/outlined/account_circle.svg?react';
-import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
-import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
-import EditNoteIcon from '@material-symbols/svg-600/outlined/edit_note.svg?react';
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
-
 import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
+import AccountCircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
+import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
+import EditNoteIcon from 'mastodon/../material-icons/400-24px/edit_note.svg?react';
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
 import { focusCompose } from 'mastodon/actions/compose';
 import { Icon }  from 'mastodon/components/icon';
 import Column from 'mastodon/features/ui/components/column';
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
index 6765c919e8..5217b42ad5 100644
--- a/app/javascript/mastodon/features/onboarding/profile.jsx
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -8,10 +8,10 @@ import { useHistory } from 'react-router-dom';
 
 import { useDispatch } from 'react-redux';
 
-import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
-import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
 import Toggle from 'react-toggle';
 
+import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
+import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
 import { updateAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index 657edabd74..cde63d0b34 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -7,10 +7,10 @@ import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
 
-import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
-import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
 import SwipeableViews from 'react-swipeable-views';
 
+import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { Icon }  from 'mastodon/components/icon';
 import { me, domain } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index d73b6d2adf..d60cd5e1ef 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -9,12 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
-import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
-
+import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
 import { initBoostModal } from 'mastodon/actions/boosts';
 import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
index 608142b988..12a5566d39 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
@@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.jsx b/app/javascript/mastodon/features/pinned_statuses/index.jsx
index 2e68336a4f..3d6dc753e3 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.jsx
+++ b/app/javascript/mastodon/features/pinned_statuses/index.jsx
@@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
-
+import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
 import { getStatusList } from 'mastodon/selectors';
 
 import { fetchPinnedStatuses } from '../../actions/pin_statuses';
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 6aa6d27b9d..302a2956ed 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
-
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/reblogs/index.jsx b/app/javascript/mastodon/features/reblogs/index.jsx
index aeba1ecff3..0d5183fb88 100644
--- a/app/javascript/mastodon/features/reblogs/index.jsx
+++ b/app/javascript/mastodon/features/reblogs/index.jsx
@@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
 import { debounce } from 'lodash';
 
+import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchReblogs, expandReblogs } from '../../actions/interactions';
diff --git a/app/javascript/mastodon/features/report/components/option.jsx b/app/javascript/mastodon/features/report/components/option.jsx
index 9ffe43388c..d6949f0c51 100644
--- a/app/javascript/mastodon/features/report/components/option.jsx
+++ b/app/javascript/mastodon/features/report/components/option.jsx
@@ -3,8 +3,7 @@ import { PureComponent } from 'react';
 
 import classNames from 'classnames';
 
-import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
-
+import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class Option extends PureComponent {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 9355cb1f5c..b760824558 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -9,15 +9,14 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg?react';
-import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
-import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
-import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
-
+import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
+import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
 import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index 9497acffac..c211dc64c8 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -10,10 +10,9 @@ import classNames from 'classnames';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import DescriptionIcon from '@material-symbols/svg-600/outlined/description-fill.svg?react';
-import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
-import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
-
+import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react';
+import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
+import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 03bb6a50bc..2ebafe7b48 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -8,10 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
-
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index d4ab3a5dcd..c8ccddddbe 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -12,10 +12,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
-import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
 import { HotKeys } from 'react-hotkeys';
 
+import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
+import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import ScrollContainer from 'mastodon/containers/scroll_container';
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
index f690925418..8c1a8f486c 100644
--- a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
@@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { followAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
index 851acbb719..7e9d8c9819 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
@@ -9,8 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
-
+import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
 import { changeBoostPrivacy } from 'mastodon/actions/boosts';
 import AttachmentList from 'mastodon/components/attachment_list';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
index 31c4ce0e97..dd2a10608d 100644
--- a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
+++ b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
+import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 7807a103ee..1080c303c5 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -6,9 +6,9 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import escapeTextContentForBrowser from 'escape-html';
 
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { closeModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
 import InlineAccount from 'mastodon/components/inline_account';
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.jsx b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
index 60d04d2378..595e9771b5 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
@@ -4,8 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import api from 'mastodon/api';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.jsx b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
index 3f3855d9f1..25cda00bea 100644
--- a/app/javascript/mastodon/features/ui/components/filter_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
@@ -5,8 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
 import { fetchStatus } from 'mastodon/actions/statuses';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index f2998f217a..a3bb22bd99 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import Textarea from 'react-textarea-autosize';
 import { length } from 'stringz';
 // eslint-disable-next-line import/extensions
@@ -17,6 +16,7 @@ import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
 
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { Button } from 'mastodon/components/button';
 import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
index d40c67a752..6df753b069 100644
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
@@ -6,8 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
-
+import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import ColumnLink from 'mastodon/features/ui/components/column_link';
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 6ece50184a..b4f388ba84 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -7,8 +7,7 @@ import { Link, withRouter } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { fetchServer } from 'mastodon/actions/server';
 import { Avatar } from 'mastodon/components/avatar';
diff --git a/app/javascript/mastodon/features/ui/components/image_modal.jsx b/app/javascript/mastodon/features/ui/components/image_modal.jsx
index 44fb172ad2..5a700dc1f7 100644
--- a/app/javascript/mastodon/features/ui/components/image_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/image_modal.jsx
@@ -5,8 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 import ImageLoader from './image_loader';
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index b574668b20..634f13e611 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -5,8 +5,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
-
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 
 import ColumnLink from './column_link';
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index 95d8ae5df1..b5b5d88693 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -7,11 +7,11 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
-import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
 import ReactSwipeableViews from 'react-swipeable-views';
 
+import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { getAverageFromBlurhash } from 'mastodon/blurhash';
 import { GIFV } from 'mastodon/components/gifv';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index e5b762807d..72da652b3d 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -5,17 +5,16 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
-import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
-import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
-import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
-import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
-import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
-import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
-import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
-import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
-import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
-import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
-
+import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
+import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
+import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
index 435bebd0b1..34e868acc8 100644
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
-
+import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 
 
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index 27207f2fbf..aae0e96ac4 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -7,8 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
-
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
 import { submitReport } from 'mastodon/actions/reports';
 import { fetchServer } from 'mastodon/actions/server';
 import { expandAccountTimeline } from 'mastodon/actions/timelines';
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
index 7d4f1f55dd..e3fa7c3b8a 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
@@ -3,9 +3,8 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react';
-import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react';
-
+import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
+import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index 73034bbf66..efcbbc174e 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -7,16 +7,16 @@ import classNames from 'classnames';
 
 import { is } from 'immutable';
 
-import FullscreenIcon from '@material-symbols/svg-600/outlined/fullscreen.svg?react';
-import FullscreenExitIcon from '@material-symbols/svg-600/outlined/fullscreen_exit.svg?react';
-import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react';
-import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
-import RectangleIcon from '@material-symbols/svg-600/outlined/rectangle.svg?react';
-import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
-import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react';
-import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react';
 import { throttle } from 'lodash';
 
+import FullscreenIcon from 'mastodon/../material-icons/400-24px/fullscreen.svg?react';
+import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
+import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
+import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
+import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { playerSettings } from 'mastodon/settings';
diff --git a/app/javascript/material-icons/400-24px/account_circle-fill.svg b/app/javascript/material-icons/400-24px/account_circle-fill.svg
new file mode 100644
index 0000000000..1bf9d57a31
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/account_circle-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M234-276q51-39 114-61.5T480-360q69 0 132 22.5T726-276q35-41 54.5-93T800-480q0-133-93.5-226.5T480-800q-133 0-226.5 93.5T160-480q0 59 19.5 111t54.5 93Zm246-164q-59 0-99.5-40.5T340-580q0-59 40.5-99.5T480-720q59 0 99.5 40.5T620-580q0 59-40.5 99.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/account_circle.svg b/app/javascript/material-icons/400-24px/account_circle.svg
new file mode 100644
index 0000000000..ce59194be0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/account_circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M234-276q51-39 114-61.5T480-360q69 0 132 22.5T726-276q35-41 54.5-93T800-480q0-133-93.5-226.5T480-800q-133 0-226.5 93.5T160-480q0 59 19.5 111t54.5 93Zm246-164q-59 0-99.5-40.5T340-580q0-59 40.5-99.5T480-720q59 0 99.5 40.5T620-580q0 59-40.5 99.5T480-440Zm0 360q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q53 0 100-15.5t86-44.5q-39-29-86-44.5T480-280q-53 0-100 15.5T294-220q39 29 86 44.5T480-160Zm0-360q26 0 43-17t17-43q0-26-17-43t-43-17q-26 0-43 17t-17 43q0 26 17 43t43 17Zm0-60Zm0 360Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/add-fill.svg b/app/javascript/material-icons/400-24px/add-fill.svg
new file mode 100644
index 0000000000..f8bc9309ce
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/add-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-440H200v-80h240v-240h80v240h240v80H520v240h-80v-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/add.svg b/app/javascript/material-icons/400-24px/add.svg
new file mode 100644
index 0000000000..f8bc9309ce
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-440H200v-80h240v-240h80v240h240v80H520v240h-80v-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/add_photo_alternate-fill.svg b/app/javascript/material-icons/400-24px/add_photo_alternate-fill.svg
new file mode 100644
index 0000000000..deb3f8e0d9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/add_photo_alternate-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h360v200h80v80h200v360q0 33-23.5 56.5T760-120H200Zm40-160h480L570-480 450-320l-90-120-120 160Zm440-320v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/add_photo_alternate.svg b/app/javascript/material-icons/400-24px/add_photo_alternate.svg
new file mode 100644
index 0000000000..0ae8ad841c
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/add_photo_alternate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h360v80H200v560h560v-360h80v360q0 33-23.5 56.5T760-120H200Zm480-480v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80ZM240-280h480L570-480 450-320l-90-120-120 160Zm-40-480v560-560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/alternate_email-fill.svg b/app/javascript/material-icons/400-24px/alternate_email-fill.svg
new file mode 100644
index 0000000000..7648cf9755
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/alternate_email-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480v58q0 59-40.5 100.5T740-280q-35 0-66-15t-52-43q-29 29-65.5 43.5T480-280q-83 0-141.5-58.5T280-480q0-83 58.5-141.5T480-680q83 0 141.5 58.5T680-480v58q0 26 17 44t43 18q26 0 43-18t17-44v-58q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93h200v80H480Zm0-280q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/alternate_email.svg b/app/javascript/material-icons/400-24px/alternate_email.svg
new file mode 100644
index 0000000000..7648cf9755
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/alternate_email.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480v58q0 59-40.5 100.5T740-280q-35 0-66-15t-52-43q-29 29-65.5 43.5T480-280q-83 0-141.5-58.5T280-480q0-83 58.5-141.5T480-680q83 0 141.5 58.5T680-480v58q0 26 17 44t43 18q26 0 43-18t17-44v-58q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93h200v80H480Zm0-280q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_back-fill.svg b/app/javascript/material-icons/400-24px/arrow_back-fill.svg
new file mode 100644
index 0000000000..cba0c8b2a8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_back-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m313-440 224 224-57 56-320-320 320-320 57 56-224 224h487v80H313Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_back.svg b/app/javascript/material-icons/400-24px/arrow_back.svg
new file mode 100644
index 0000000000..cba0c8b2a8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_back.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m313-440 224 224-57 56-320-320 320-320 57 56-224 224h487v80H313Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_drop_down-fill.svg b/app/javascript/material-icons/400-24px/arrow_drop_down-fill.svg
new file mode 100644
index 0000000000..48c72546df
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_drop_down-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-360 280-560h400L480-360Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_drop_down.svg b/app/javascript/material-icons/400-24px/arrow_drop_down.svg
new file mode 100644
index 0000000000..48c72546df
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_drop_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-360 280-560h400L480-360Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_right_alt-fill.svg b/app/javascript/material-icons/400-24px/arrow_right_alt-fill.svg
new file mode 100644
index 0000000000..4bf73bb6da
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_right_alt-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m560-240-56-58 142-142H160v-80h486L504-662l56-58 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/arrow_right_alt.svg b/app/javascript/material-icons/400-24px/arrow_right_alt.svg
new file mode 100644
index 0000000000..4bf73bb6da
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/arrow_right_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m560-240-56-58 142-142H160v-80h486L504-662l56-58 240 240-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/block-fill.svg b/app/javascript/material-icons/400-24px/block-fill.svg
new file mode 100644
index 0000000000..20e9889ae8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/block-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/block.svg b/app/javascript/material-icons/400-24px/block.svg
new file mode 100644
index 0000000000..20e9889ae8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/block.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q54 0 104-17.5t92-50.5L228-676q-33 42-50.5 92T160-480q0 134 93 227t227 93Zm252-124q33-42 50.5-92T800-480q0-134-93-227t-227-93q-54 0-104 17.5T284-732l448 448Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bookmark-fill.svg b/app/javascript/material-icons/400-24px/bookmark-fill.svg
new file mode 100644
index 0000000000..3a7b4d2e8b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bookmark-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bookmark.svg b/app/javascript/material-icons/400-24px/bookmark.svg
new file mode 100644
index 0000000000..a8226a6d87
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bookmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bookmarks-fill.svg b/app/javascript/material-icons/400-24px/bookmarks-fill.svg
new file mode 100644
index 0000000000..f5231f925a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bookmarks-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-40v-640q0-33 23.5-56.5T200-760h400q33 0 56.5 23.5T680-680v640L400-160 120-40Zm640-120v-680H240v-80h520q33 0 56.5 23.5T840-840v680h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bookmarks.svg b/app/javascript/material-icons/400-24px/bookmarks.svg
new file mode 100644
index 0000000000..67dffd6857
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bookmarks.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-40v-640q0-33 23.5-56.5T200-760h400q33 0 56.5 23.5T680-680v640L400-160 120-40Zm80-122 200-86 200 86v-518H200v518Zm560 2v-680H240v-80h520q33 0 56.5 23.5T840-840v680h-80ZM200-680h400-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/campaign-fill.svg b/app/javascript/material-icons/400-24px/campaign-fill.svg
new file mode 100644
index 0000000000..3df7275bf6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/campaign-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-440v-80h160v80H720Zm48 280-128-96 48-64 128 96-48 64Zm-80-480-48-64 128-96 48 64-128 96ZM200-200v-160h-40q-33 0-56.5-23.5T80-440v-80q0-33 23.5-56.5T160-600h160l200-120v480L320-360h-40v160h-80Zm360-146v-268q27 24 43.5 58.5T620-480q0 41-16.5 75.5T560-346Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/campaign.svg b/app/javascript/material-icons/400-24px/campaign.svg
new file mode 100644
index 0000000000..a6d893fed4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/campaign.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-440v-80h160v80H720Zm48 280-128-96 48-64 128 96-48 64Zm-80-480-48-64 128-96 48 64-128 96ZM200-200v-160h-40q-33 0-56.5-23.5T80-440v-80q0-33 23.5-56.5T160-600h160l200-120v480L320-360h-40v160h-80Zm240-182v-196l-98 58H160v80h182l98 58Zm120 36v-268q27 24 43.5 58.5T620-480q0 41-16.5 75.5T560-346ZM300-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cancel-fill.svg b/app/javascript/material-icons/400-24px/cancel-fill.svg
new file mode 100644
index 0000000000..f7d476f253
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cancel-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m336-280 144-144 144 144 56-56-144-144 144-144-56-56-144 144-144-144-56 56 144 144-144 144 56 56ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cancel.svg b/app/javascript/material-icons/400-24px/cancel.svg
new file mode 100644
index 0000000000..8504fbfdad
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cancel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m336-280 144-144 144 144 56-56-144-144 144-144-56-56-144 144-144-144-56 56 144 144-144 144 56 56ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cancel_presentation-fill.svg b/app/javascript/material-icons/400-24px/cancel_presentation-fill.svg
new file mode 100644
index 0000000000..8e8e6a1ee6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cancel_presentation-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m376-320 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/cancel_presentation.svg b/app/javascript/material-icons/400-24px/cancel_presentation.svg
new file mode 100644
index 0000000000..c0da419cd0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/cancel_presentation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m376-320 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm0-80h640v-480H160v480Zm0 0v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/check-fill.svg b/app/javascript/material-icons/400-24px/check-fill.svg
new file mode 100644
index 0000000000..1655d12bf3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/check.svg b/app/javascript/material-icons/400-24px/check.svg
new file mode 100644
index 0000000000..1655d12bf3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/check_box_outline_blank-fill.svg b/app/javascript/material-icons/400-24px/check_box_outline_blank-fill.svg
new file mode 100644
index 0000000000..3f7df315a5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check_box_outline_blank-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/check_box_outline_blank.svg b/app/javascript/material-icons/400-24px/check_box_outline_blank.svg
new file mode 100644
index 0000000000..3f7df315a5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/check_box_outline_blank.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chevron_left-fill.svg b/app/javascript/material-icons/400-24px/chevron_left-fill.svg
new file mode 100644
index 0000000000..53783746ae
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chevron_left-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chevron_left.svg b/app/javascript/material-icons/400-24px/chevron_left.svg
new file mode 100644
index 0000000000..53783746ae
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chevron_left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chevron_right-fill.svg b/app/javascript/material-icons/400-24px/chevron_right-fill.svg
new file mode 100644
index 0000000000..4100467365
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chevron_right-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/chevron_right.svg b/app/javascript/material-icons/400-24px/chevron_right.svg
new file mode 100644
index 0000000000..4100467365
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/chevron_right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/close-fill.svg b/app/javascript/material-icons/400-24px/close-fill.svg
new file mode 100644
index 0000000000..5a60c58e77
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/close-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/close.svg b/app/javascript/material-icons/400-24px/close.svg
new file mode 100644
index 0000000000..5a60c58e77
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/content_copy-fill.svg b/app/javascript/material-icons/400-24px/content_copy-fill.svg
new file mode 100644
index 0000000000..dabf094503
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/content_copy-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/content_copy.svg b/app/javascript/material-icons/400-24px/content_copy.svg
new file mode 100644
index 0000000000..d875c84491
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/content_copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm160-240v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/delete-fill.svg b/app/javascript/material-icons/400-24px/delete-fill.svg
new file mode 100644
index 0000000000..59d1abb8bc
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/delete-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm80-160h80v-360h-80v360Zm160 0h80v-360h-80v360Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/delete.svg b/app/javascript/material-icons/400-24px/delete.svg
new file mode 100644
index 0000000000..560d174b9b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/delete.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520ZM360-280h80v-360h-80v360Zm160 0h80v-360h-80v360ZM280-720v520-520Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/delete_forever-fill.svg b/app/javascript/material-icons/400-24px/delete_forever-fill.svg
new file mode 100644
index 0000000000..40fe4497f5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/delete_forever-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m376-300 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56Zm-96 180q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/delete_forever.svg b/app/javascript/material-icons/400-24px/delete_forever.svg
new file mode 100644
index 0000000000..763f517d1d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/delete_forever.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m376-300 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56Zm-96 180q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520Zm-400 0v520-520Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/description-fill.svg b/app/javascript/material-icons/400-24px/description-fill.svg
new file mode 100644
index 0000000000..07998b29d6
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/description-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520h200L520-800v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/description.svg b/app/javascript/material-icons/400-24px/description.svg
new file mode 100644
index 0000000000..309a4f5b38
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/description.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/done-fill.svg b/app/javascript/material-icons/400-24px/done-fill.svg
new file mode 100644
index 0000000000..1655d12bf3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/done-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/done.svg b/app/javascript/material-icons/400-24px/done.svg
new file mode 100644
index 0000000000..1655d12bf3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/done.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/done_all-fill.svg b/app/javascript/material-icons/400-24px/done_all-fill.svg
new file mode 100644
index 0000000000..8f05228c40
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/done_all-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M268-240 42-466l57-56 170 170 56 56-57 56Zm226 0L268-466l56-57 170 170 368-368 56 57-424 424Zm0-226-57-56 198-198 57 56-198 198Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/done_all.svg b/app/javascript/material-icons/400-24px/done_all.svg
new file mode 100644
index 0000000000..8f05228c40
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/done_all.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M268-240 42-466l57-56 170 170 56 56-57 56Zm226 0L268-466l56-57 170 170 368-368 56 57-424 424Zm0-226-57-56 198-198 57 56-198 198Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/download-fill.svg b/app/javascript/material-icons/400-24px/download-fill.svg
new file mode 100644
index 0000000000..6a171ea822
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/download-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-320 280-520l56-58 104 104v-326h80v326l104-104 56 58-200 200ZM240-160q-33 0-56.5-23.5T160-240v-120h80v120h480v-120h80v120q0 33-23.5 56.5T720-160H240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/download.svg b/app/javascript/material-icons/400-24px/download.svg
new file mode 100644
index 0000000000..6a171ea822
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/download.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-320 280-520l56-58 104 104v-326h80v326l104-104 56 58-200 200ZM240-160q-33 0-56.5-23.5T160-240v-120h80v120h480v-120h80v120q0 33-23.5 56.5T720-160H240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/edit-fill.svg b/app/javascript/material-icons/400-24px/edit-fill.svg
new file mode 100644
index 0000000000..278e79978e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/edit-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-120v-170l528-527q12-11 26.5-17t30.5-6q16 0 31 6t26 18l55 56q12 11 17.5 26t5.5 30q0 16-5.5 30.5T817-647L290-120H120Zm584-528 56-56-56-56-56 56 56 56Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/edit.svg b/app/javascript/material-icons/400-24px/edit.svg
new file mode 100644
index 0000000000..cb81b11302
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-200h57l391-391-57-57-391 391v57Zm-80 80v-170l528-527q12-11 26.5-17t30.5-6q16 0 31 6t26 18l55 56q12 11 17.5 26t5.5 30q0 16-5.5 30.5T817-647L290-120H120Zm640-584-56-56 56 56Zm-141 85-28-29 57 57-29-28Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/edit_note-fill.svg b/app/javascript/material-icons/400-24px/edit_note-fill.svg
new file mode 100644
index 0000000000..b18db1df8e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/edit_note-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-400v-80h280v80H160Zm0-160v-80h440v80H160Zm0-160v-80h440v80H160Zm360 560v-123l221-220q9-9 20-13t22-4q12 0 23 4.5t20 13.5l37 37q8 9 12.5 20t4.5 22q0 11-4 22.5T863-380L643-160H520Zm263-224 37-39-37-37-38 38 38 38Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/edit_note.svg b/app/javascript/material-icons/400-24px/edit_note.svg
new file mode 100644
index 0000000000..cf7e98405a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/edit_note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-400v-80h280v80H160Zm0-160v-80h440v80H160Zm0-160v-80h440v80H160Zm360 560v-123l221-220q9-9 20-13t22-4q12 0 23 4.5t20 13.5l37 37q8 9 12.5 20t4.5 22q0 11-4 22.5T863-380L643-160H520Zm300-263-37-37 37 37ZM580-220h38l121-122-18-19-19-18-122 121v38Zm141-141-19-18 37 37-18-19Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/expand_more-fill.svg b/app/javascript/material-icons/400-24px/expand_more-fill.svg
new file mode 100644
index 0000000000..0c8f273596
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/expand_more-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/expand_more.svg b/app/javascript/material-icons/400-24px/expand_more.svg
new file mode 100644
index 0000000000..0c8f273596
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/expand_more.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/find_in_page-fill.svg b/app/javascript/material-icons/400-24px/find_in_page-fill.svg
new file mode 100644
index 0000000000..146f838a27
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/find_in_page-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h360l200 240v466L618-360q11-17 16.5-37t5.5-43q0-66-47-113t-113-47q-66 0-113 47t-47 113q0 66 47 113t113 47q23 0 43-5.5t37-16.5L768-96q-23 10-48 13t-50 3H240Zm240-280q-33 0-56.5-23.5T400-440q0-33 23.5-56.5T480-520q33 0 56.5 23.5T560-440q0 33-23.5 56.5T480-360Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/find_in_page.svg b/app/javascript/material-icons/400-24px/find_in_page.svg
new file mode 100644
index 0000000000..f21c2786ca
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/find_in_page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m590-160 80 80H240q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h360l200 240v480q0 20-8.5 36.5T768-96L560-302q-17 11-37 16.5t-43 5.5q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 43T618-360l102 104v-356L562-800H240v640h350ZM480-360q33 0 56.5-23.5T560-440q0-33-23.5-56.5T480-520q-33 0-56.5 23.5T400-440q0 33 23.5 56.5T480-360Zm0-80Zm0 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/flag-fill.svg b/app/javascript/material-icons/400-24px/flag-fill.svg
new file mode 100644
index 0000000000..e44a94d90b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/flag-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120v-680h360l16 80h224v400H520l-16-80H280v280h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/flag.svg b/app/javascript/material-icons/400-24px/flag.svg
new file mode 100644
index 0000000000..cb4c810e08
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/flag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120v-680h360l16 80h224v400H520l-16-80H280v280h-80Zm300-440Zm86 160h134v-240H510l-16-80H280v240h290l16 80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/fullscreen-fill.svg b/app/javascript/material-icons/400-24px/fullscreen-fill.svg
new file mode 100644
index 0000000000..940c878a7d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/fullscreen-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-120v-200h80v120h120v80H120Zm520 0v-80h120v-120h80v200H640ZM120-640v-200h200v80H200v120h-80Zm640 0v-120H640v-80h200v200h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/fullscreen.svg b/app/javascript/material-icons/400-24px/fullscreen.svg
new file mode 100644
index 0000000000..940c878a7d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/fullscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-120v-200h80v120h120v80H120Zm520 0v-80h120v-120h80v200H640ZM120-640v-200h200v80H200v120h-80Zm640 0v-120H640v-80h200v200h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/fullscreen_exit-fill.svg b/app/javascript/material-icons/400-24px/fullscreen_exit-fill.svg
new file mode 100644
index 0000000000..d9d45a6c6a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/fullscreen_exit-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-120v-120H120v-80h200v200h-80Zm400 0v-200h200v80H720v120h-80ZM120-640v-80h120v-120h80v200H120Zm520 0v-200h80v120h120v80H640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/fullscreen_exit.svg b/app/javascript/material-icons/400-24px/fullscreen_exit.svg
new file mode 100644
index 0000000000..d9d45a6c6a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/fullscreen_exit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-120v-120H120v-80h200v200h-80Zm400 0v-200h200v80H720v120h-80ZM120-640v-80h120v-120h80v200H120Zm520 0v-200h80v120h120v80H640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/group-fill.svg b/app/javascript/material-icons/400-24px/group-fill.svg
new file mode 100644
index 0000000000..c0d6cef5c5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/group-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm720 0v-120q0-44-24.5-84.5T666-434q51 6 96 20.5t84 35.5q36 20 55 44.5t19 53.5v120H760ZM360-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm400-160q0 66-47 113t-113 47q-11 0-28-2.5t-28-5.5q27-32 41.5-71t14.5-81q0-42-14.5-81T544-792q14-5 28-6.5t28-1.5q66 0 113 47t47 113Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/group.svg b/app/javascript/material-icons/400-24px/group.svg
new file mode 100644
index 0000000000..dbc2c937e4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/group.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm720 0v-120q0-44-24.5-84.5T666-434q51 6 96 20.5t84 35.5q36 20 55 44.5t19 53.5v120H760ZM360-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm400-160q0 66-47 113t-113 47q-11 0-28-2.5t-28-5.5q27-32 41.5-71t14.5-81q0-42-14.5-81T544-792q14-5 28-6.5t28-1.5q66 0 113 47t47 113ZM120-240h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0 320Zm0-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/home-fill.svg b/app/javascript/material-icons/400-24px/home-fill.svg
new file mode 100644
index 0000000000..e254416380
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/home-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-120v-480l320-240 320 240v480H560v-280H400v280H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/home.svg b/app/javascript/material-icons/400-24px/home.svg
new file mode 100644
index 0000000000..d700ddea7b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-200h120v-240h240v240h120v-360L480-740 240-560v360Zm-80 80v-480l320-240 320 240v480H520v-240h-80v240H160Zm320-350Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/info-fill.svg b/app/javascript/material-icons/400-24px/info-fill.svg
new file mode 100644
index 0000000000..0232e17ad0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/info-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/info.svg b/app/javascript/material-icons/400-24px/info.svg
new file mode 100644
index 0000000000..05606f4e59
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/insert_chart-fill.svg b/app/javascript/material-icons/400-24px/insert_chart-fill.svg
new file mode 100644
index 0000000000..12d137ca89
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/insert_chart-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-280h80v-280h-80v280Zm160 0h80v-400h-80v400Zm160 0h80v-160h-80v160ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/insert_chart.svg b/app/javascript/material-icons/400-24px/insert_chart.svg
new file mode 100644
index 0000000000..4f2a10be59
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/insert_chart.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-280h80v-280h-80v280Zm160 0h80v-400h-80v400Zm160 0h80v-160h-80v160ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm0-560v560-560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/link-fill.svg b/app/javascript/material-icons/400-24px/link-fill.svg
new file mode 100644
index 0000000000..319a0681c4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-280H280q-83 0-141.5-58.5T80-480q0-83 58.5-141.5T280-680h160v80H280q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h320v80H320Zm200 160v-80h160q50 0 85-35t35-85q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 83-58.5 141.5T680-280H520Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/link.svg b/app/javascript/material-icons/400-24px/link.svg
new file mode 100644
index 0000000000..319a0681c4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-280H280q-83 0-141.5-58.5T80-480q0-83 58.5-141.5T280-680h160v80H280q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h320v80H320Zm200 160v-80h160q50 0 85-35t35-85q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 83-58.5 141.5T680-280H520Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/list_alt-fill.svg b/app/javascript/material-icons/400-24px/list_alt-fill.svg
new file mode 100644
index 0000000000..6aa8b50823
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/list_alt-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-280q17 0 28.5-11.5T360-320q0-17-11.5-28.5T320-360q-17 0-28.5 11.5T280-320q0 17 11.5 28.5T320-280Zm0-160q17 0 28.5-11.5T360-480q0-17-11.5-28.5T320-520q-17 0-28.5 11.5T280-480q0 17 11.5 28.5T320-440Zm0-160q17 0 28.5-11.5T360-640q0-17-11.5-28.5T320-680q-17 0-28.5 11.5T280-640q0 17 11.5 28.5T320-600Zm120 320h240v-80H440v80Zm0-160h240v-80H440v80Zm0-160h240v-80H440v80ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/list_alt.svg b/app/javascript/material-icons/400-24px/list_alt.svg
new file mode 100644
index 0000000000..cca8ab1955
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/list_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-280q17 0 28.5-11.5T360-320q0-17-11.5-28.5T320-360q-17 0-28.5 11.5T280-320q0 17 11.5 28.5T320-280Zm0-160q17 0 28.5-11.5T360-480q0-17-11.5-28.5T320-520q-17 0-28.5 11.5T280-480q0 17 11.5 28.5T320-440Zm0-160q17 0 28.5-11.5T360-640q0-17-11.5-28.5T320-680q-17 0-28.5 11.5T280-640q0 17 11.5 28.5T320-600Zm120 320h240v-80H440v80Zm0-160h240v-80H440v80Zm0-160h240v-80H440v80ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm0-560v560-560Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/lock-fill.svg b/app/javascript/material-icons/400-24px/lock-fill.svg
new file mode 100644
index 0000000000..0815d78418
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/lock-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-80q-33 0-56.5-23.5T160-160v-400q0-33 23.5-56.5T240-640h40v-80q0-83 58.5-141.5T480-920q83 0 141.5 58.5T680-720v80h40q33 0 56.5 23.5T800-560v400q0 33-23.5 56.5T720-80H240Zm240-200q33 0 56.5-23.5T560-360q0-33-23.5-56.5T480-440q-33 0-56.5 23.5T400-360q0 33 23.5 56.5T480-280ZM360-640h240v-80q0-50-35-85t-85-35q-50 0-85 35t-35 85v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/lock.svg b/app/javascript/material-icons/400-24px/lock.svg
new file mode 100644
index 0000000000..20b9e3984e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-80q-33 0-56.5-23.5T160-160v-400q0-33 23.5-56.5T240-640h40v-80q0-83 58.5-141.5T480-920q83 0 141.5 58.5T680-720v80h40q33 0 56.5 23.5T800-560v400q0 33-23.5 56.5T720-80H240Zm0-80h480v-400H240v400Zm240-120q33 0 56.5-23.5T560-360q0-33-23.5-56.5T480-440q-33 0-56.5 23.5T400-360q0 33 23.5 56.5T480-280ZM360-640h240v-80q0-50-35-85t-85-35q-50 0-85 35t-35 85v80ZM240-160v-400 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/lock_open-fill.svg b/app/javascript/material-icons/400-24px/lock_open-fill.svg
new file mode 100644
index 0000000000..60309dce5e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/lock_open-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-640h360v-80q0-50-35-85t-85-35q-50 0-85 35t-35 85h-80q0-83 58.5-141.5T480-920q83 0 141.5 58.5T680-720v80h40q33 0 56.5 23.5T800-560v400q0 33-23.5 56.5T720-80H240q-33 0-56.5-23.5T160-160v-400q0-33 23.5-56.5T240-640Zm240 360q33 0 56.5-23.5T560-360q0-33-23.5-56.5T480-440q-33 0-56.5 23.5T400-360q0 33 23.5 56.5T480-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/lock_open.svg b/app/javascript/material-icons/400-24px/lock_open.svg
new file mode 100644
index 0000000000..824c70b7c4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/lock_open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-640h360v-80q0-50-35-85t-85-35q-50 0-85 35t-35 85h-80q0-83 58.5-141.5T480-920q83 0 141.5 58.5T680-720v80h40q33 0 56.5 23.5T800-560v400q0 33-23.5 56.5T720-80H240q-33 0-56.5-23.5T160-160v-400q0-33 23.5-56.5T240-640Zm0 480h480v-400H240v400Zm240-120q33 0 56.5-23.5T560-360q0-33-23.5-56.5T480-440q-33 0-56.5 23.5T400-360q0 33 23.5 56.5T480-280ZM240-160v-400 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/logout-fill.svg b/app/javascript/material-icons/400-24px/logout-fill.svg
new file mode 100644
index 0000000000..4881453501
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/logout-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h280v80H200Zm440-160-55-58 102-102H360v-80h327L585-622l55-58 200 200-200 200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/logout.svg b/app/javascript/material-icons/400-24px/logout.svg
new file mode 100644
index 0000000000..4881453501
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/logout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h280v80H200Zm440-160-55-58 102-102H360v-80h327L585-622l55-58 200 200-200 200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/menu-fill.svg b/app/javascript/material-icons/400-24px/menu-fill.svg
new file mode 100644
index 0000000000..2f427e91c8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/menu-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/menu.svg b/app/javascript/material-icons/400-24px/menu.svg
new file mode 100644
index 0000000000..2f427e91c8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/menu.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/more_horiz-fill.svg b/app/javascript/material-icons/400-24px/more_horiz-fill.svg
new file mode 100644
index 0000000000..e777154892
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/more_horiz-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/more_horiz.svg b/app/javascript/material-icons/400-24px/more_horiz.svg
new file mode 100644
index 0000000000..e777154892
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/more_horiz.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/music_note-fill.svg b/app/javascript/material-icons/400-24px/music_note-fill.svg
new file mode 100644
index 0000000000..b10ad1921a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/music_note-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M400-120q-66 0-113-47t-47-113q0-66 47-113t113-47q23 0 42.5 5.5T480-418v-422h240v160H560v400q0 66-47 113t-113 47Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/music_note.svg b/app/javascript/material-icons/400-24px/music_note.svg
new file mode 100644
index 0000000000..b10ad1921a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/music_note.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M400-120q-66 0-113-47t-47-113q0-66 47-113t113-47q23 0 42.5 5.5T480-418v-422h240v160H560v400q0 66-47 113t-113 47Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/notifications-fill.svg b/app/javascript/material-icons/400-24px/notifications-fill.svg
new file mode 100644
index 0000000000..0730efefca
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/notifications-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-200v-80h80v-280q0-83 50-147.5T420-792v-28q0-25 17.5-42.5T480-880q25 0 42.5 17.5T540-820v28q80 20 130 84.5T720-560v280h80v80H160ZM480-80q-33 0-56.5-23.5T400-160h160q0 33-23.5 56.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/notifications.svg b/app/javascript/material-icons/400-24px/notifications.svg
new file mode 100644
index 0000000000..dbfe0e0409
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/notifications.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-200v-80h80v-280q0-83 50-147.5T420-792v-28q0-25 17.5-42.5T480-880q25 0 42.5 17.5T540-820v28q80 20 130 84.5T720-560v280h80v80H160Zm320-300Zm0 420q-33 0-56.5-23.5T400-160h160q0 33-23.5 56.5T480-80ZM320-280h320v-280q0-66-47-113t-113-47q-66 0-113 47t-47 113v280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/notifications_active-fill.svg b/app/javascript/material-icons/400-24px/notifications_active-fill.svg
new file mode 100644
index 0000000000..856a0ed8a5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/notifications_active-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-200v-80h80v-280q0-83 50-147.5T420-792v-28q0-25 17.5-42.5T480-880q25 0 42.5 17.5T540-820v28q80 20 130 84.5T720-560v280h80v80H160ZM480-80q-33 0-56.5-23.5T400-160h160q0 33-23.5 56.5T480-80ZM80-560q0-100 44.5-183.5T244-882l47 64q-60 44-95.5 111T160-560H80Zm720 0q0-80-35.5-147T669-818l47-64q75 55 119.5 138.5T880-560h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/notifications_active.svg b/app/javascript/material-icons/400-24px/notifications_active.svg
new file mode 100644
index 0000000000..1389a10e0a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/notifications_active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-560q0-100 44.5-183.5T244-882l47 64q-60 44-95.5 111T160-560H80Zm720 0q0-80-35.5-147T669-818l47-64q75 55 119.5 138.5T880-560h-80ZM160-200v-80h80v-280q0-83 50-147.5T420-792v-28q0-25 17.5-42.5T480-880q25 0 42.5 17.5T540-820v28q80 20 130 84.5T720-560v280h80v80H160Zm320-300Zm0 420q-33 0-56.5-23.5T400-160h160q0 33-23.5 56.5T480-80ZM320-280h320v-280q0-66-47-113t-113-47q-66 0-113 47t-47 113v280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/open_in_new-fill.svg b/app/javascript/material-icons/400-24px/open_in_new-fill.svg
new file mode 100644
index 0000000000..42895ffd13
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/open_in_new-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/open_in_new.svg b/app/javascript/material-icons/400-24px/open_in_new.svg
new file mode 100644
index 0000000000..42895ffd13
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/open_in_new.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/pause-fill.svg b/app/javascript/material-icons/400-24px/pause-fill.svg
new file mode 100644
index 0000000000..fc9a8074de
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/pause-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-200v-560h160v560H560Zm-320 0v-560h160v560H240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/pause.svg b/app/javascript/material-icons/400-24px/pause.svg
new file mode 100644
index 0000000000..95bc792fc3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/pause.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M520-200v-560h240v560H520Zm-320 0v-560h240v560H200Zm400-80h80v-400h-80v400Zm-320 0h80v-400h-80v400Zm0-400v400-400Zm320 0v400-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person-fill.svg b/app/javascript/material-icons/400-24px/person-fill.svg
new file mode 100644
index 0000000000..73ef1efc10
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM160-160v-112q0-34 17.5-62.5T224-378q62-31 126-46.5T480-440q66 0 130 15.5T736-378q29 15 46.5 43.5T800-272v112H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person.svg b/app/javascript/material-icons/400-24px/person.svg
new file mode 100644
index 0000000000..a3f6b246c8
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-480q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM160-160v-112q0-34 17.5-62.5T224-378q62-31 126-46.5T480-440q66 0 130 15.5T736-378q29 15 46.5 43.5T800-272v112H160Zm80-80h480v-32q0-11-5.5-20T700-306q-54-27-109-40.5T480-360q-56 0-111 13.5T260-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T560-640q0-33-23.5-56.5T480-720q-33 0-56.5 23.5T400-640q0 33 23.5 56.5T480-560Zm0-80Zm0 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_add-fill.svg b/app/javascript/material-icons/400-24px/person_add-fill.svg
new file mode 100644
index 0000000000..3fa7f65288
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_add-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-400v-120H600v-80h120v-120h80v120h120v80H800v120h-80Zm-360-80q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/person_add.svg b/app/javascript/material-icons/400-24px/person_add.svg
new file mode 100644
index 0000000000..39b592bf04
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/person_add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-400v-120H600v-80h120v-120h80v120h120v80H800v120h-80Zm-360-80q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47ZM40-160v-112q0-34 17.5-62.5T104-378q62-31 126-46.5T360-440q66 0 130 15.5T616-378q29 15 46.5 43.5T680-272v112H40Zm80-80h480v-32q0-11-5.5-20T580-306q-54-27-109-40.5T360-360q-56 0-111 13.5T140-306q-9 5-14.5 14t-5.5 20v32Zm240-320q33 0 56.5-23.5T440-640q0-33-23.5-56.5T360-720q-33 0-56.5 23.5T280-640q0 33 23.5 56.5T360-560Zm0-80Zm0 400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/play_arrow-fill.svg b/app/javascript/material-icons/400-24px/play_arrow-fill.svg
new file mode 100644
index 0000000000..6465b90222
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/play_arrow-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-200v-560l440 280-440 280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/play_arrow.svg b/app/javascript/material-icons/400-24px/play_arrow.svg
new file mode 100644
index 0000000000..52f0fcc9c4
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/play_arrow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-200v-560l440 280-440 280Zm80-280Zm0 134 210-134-210-134v268Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/public-fill.svg b/app/javascript/material-icons/400-24px/public-fill.svg
new file mode 100644
index 0000000000..1e9e79de4d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/public-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm-40-82v-78q-33 0-56.5-23.5T360-320v-40L168-552q-3 18-5.5 36t-2.5 36q0 121 79.5 212T440-162Zm276-102q20-22 36-47.5t26.5-53q10.5-27.5 16-56.5t5.5-59q0-98-54.5-179T600-776v16q0 33-23.5 56.5T520-680h-80v80q0 17-11.5 28.5T400-560h-80v80h240q17 0 28.5 11.5T600-440v120h40q26 0 47 15.5t29 40.5Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/public.svg b/app/javascript/material-icons/400-24px/public.svg
new file mode 100644
index 0000000000..1e9e79de4d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/public.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm-40-82v-78q-33 0-56.5-23.5T360-320v-40L168-552q-3 18-5.5 36t-2.5 36q0 121 79.5 212T440-162Zm276-102q20-22 36-47.5t26.5-53q10.5-27.5 16-56.5t5.5-59q0-98-54.5-179T600-776v16q0 33-23.5 56.5T520-680h-80v80q0 17-11.5 28.5T400-560h-80v80h240q17 0 28.5 11.5T600-440v120h40q26 0 47 15.5t29 40.5Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/push_pin-fill.svg b/app/javascript/material-icons/400-24px/push_pin-fill.svg
new file mode 100644
index 0000000000..6095ba77ee
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/push_pin-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m640-480 80 80v80H520v240l-40 40-40-40v-240H240v-80l80-80v-280h-40v-80h400v80h-40v280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/push_pin.svg b/app/javascript/material-icons/400-24px/push_pin.svg
new file mode 100644
index 0000000000..e1abd900a7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/push_pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m640-480 80 80v80H520v240l-40 40-40-40v-240H240v-80l80-80v-280h-40v-80h400v80h-40v280Zm-286 80h252l-46-46v-314H400v314l-46 46Zm126 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/rectangle-fill.svg b/app/javascript/material-icons/400-24px/rectangle-fill.svg
new file mode 100644
index 0000000000..64b038f268
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/rectangle-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-160v-640h800v640H80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/rectangle.svg b/app/javascript/material-icons/400-24px/rectangle.svg
new file mode 100644
index 0000000000..ada92f2cf5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/rectangle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-160v-640h800v640H80Zm80-80h640v-480H160v480Zm0 0v-480 480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/refresh-fill.svg b/app/javascript/material-icons/400-24px/refresh-fill.svg
new file mode 100644
index 0000000000..a7a6bc801b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/refresh-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-160q-134 0-227-93t-93-227q0-134 93-227t227-93q69 0 132 28.5T720-690v-110h80v280H520v-80h168q-32-56-87.5-88T480-720q-100 0-170 70t-70 170q0 100 70 170t170 70q77 0 139-44t87-116h84q-28 106-114 173t-196 67Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/refresh.svg b/app/javascript/material-icons/400-24px/refresh.svg
new file mode 100644
index 0000000000..a7a6bc801b
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/refresh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-160q-134 0-227-93t-93-227q0-134 93-227t227-93q69 0 132 28.5T720-690v-110h80v280H520v-80h168q-32-56-87.5-88T480-720q-100 0-170 70t-70 170q0 100 70 170t170 70q77 0 139-44t87-116h84q-28 106-114 173t-196 67Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/repeat-fill.svg b/app/javascript/material-icons/400-24px/repeat-fill.svg
new file mode 100644
index 0000000000..c1b09d8026
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/repeat-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-80 120-240l160-160 56 58-62 62h406v-160h80v240H274l62 62-56 58Zm-80-440v-240h486l-62-62 56-58 160 160-160 160-56-58 62-62H280v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/repeat.svg b/app/javascript/material-icons/400-24px/repeat.svg
new file mode 100644
index 0000000000..c1b09d8026
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/repeat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M280-80 120-240l160-160 56 58-62 62h406v-160h80v240H274l62 62-56 58Zm-80-440v-240h486l-62-62 56-58 160 160-160 160-56-58 62-62H280v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/reply-fill.svg b/app/javascript/material-icons/400-24px/reply-fill.svg
new file mode 100644
index 0000000000..eb661f2823
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/reply-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M760-200v-160q0-50-35-85t-85-35H273l144 144-57 56-240-240 240-240 57 56-144 144h367q83 0 141.5 58.5T840-360v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/reply.svg b/app/javascript/material-icons/400-24px/reply.svg
new file mode 100644
index 0000000000..eb661f2823
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/reply.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M760-200v-160q0-50-35-85t-85-35H273l144 144-57 56-240-240 240-240 57 56-144 144h367q83 0 141.5 58.5T840-360v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/reply_all-fill.svg b/app/javascript/material-icons/400-24px/reply_all-fill.svg
new file mode 100644
index 0000000000..74c9573eaf
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/reply_all-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-280 80-520l240-240 57 56-184 184 184 184-57 56Zm480 80v-160q0-50-35-85t-85-35H433l144 144-57 56-240-240 240-240 57 56-144 144h247q83 0 141.5 58.5T880-360v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/reply_all.svg b/app/javascript/material-icons/400-24px/reply_all.svg
new file mode 100644
index 0000000000..74c9573eaf
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/reply_all.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M320-280 80-520l240-240 57 56-184 184 184 184-57 56Zm480 80v-160q0-50-35-85t-85-35H433l144 144-57 56-240-240 240-240 57 56-144 144h247q83 0 141.5 58.5T880-360v160h-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/search-fill.svg b/app/javascript/material-icons/400-24px/search-fill.svg
new file mode 100644
index 0000000000..ef0d0521eb
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/search-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/search.svg b/app/javascript/material-icons/400-24px/search.svg
new file mode 100644
index 0000000000..ef0d0521eb
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/settings-fill.svg b/app/javascript/material-icons/400-24px/settings-fill.svg
new file mode 100644
index 0000000000..f133479502
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/settings-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm112-260q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/settings.svg b/app/javascript/material-icons/400-24px/settings.svg
new file mode 100644
index 0000000000..817c782f05
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/share-fill.svg b/app/javascript/material-icons/400-24px/share-fill.svg
new file mode 100644
index 0000000000..5a6b0d0a8d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-80q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5L322-392q-17 15-38 23.5t-44 8.5q-50 0-85-35t-35-85q0-50 35-85t85-35q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-23 0-44-8.5T638-672L356-508q2 6 3 13.5t1 14.5q0 7-1 14.5t-3 13.5l282 164q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/share.svg b/app/javascript/material-icons/400-24px/share.svg
new file mode 100644
index 0000000000..6876cd42da
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M720-80q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5L322-392q-17 15-38 23.5t-44 8.5q-50 0-85-35t-35-85q0-50 35-85t85-35q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-23 0-44-8.5T638-672L356-508q2 6 3 13.5t1 14.5q0 7-1 14.5t-3 13.5l282 164q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35Zm0-640q17 0 28.5-11.5T760-760q0-17-11.5-28.5T720-800q-17 0-28.5 11.5T680-760q0 17 11.5 28.5T720-720ZM240-440q17 0 28.5-11.5T280-480q0-17-11.5-28.5T240-520q-17 0-28.5 11.5T200-480q0 17 11.5 28.5T240-440Zm480 280q17 0 28.5-11.5T760-200q0-17-11.5-28.5T720-240q-17 0-28.5 11.5T680-200q0 17 11.5 28.5T720-160Zm0-600ZM240-480Zm480 280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/smart_toy-fill.svg b/app/javascript/material-icons/400-24px/smart_toy-fill.svg
new file mode 100644
index 0000000000..df417f5ff7
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/smart_toy-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-360q-50 0-85-35t-35-85q0-50 35-85t85-35v-80q0-33 23.5-56.5T240-760h120q0-50 35-85t85-35q50 0 85 35t35 85h120q33 0 56.5 23.5T800-680v80q50 0 85 35t35 85q0 50-35 85t-85 35v160q0 33-23.5 56.5T720-120H240q-33 0-56.5-23.5T160-200v-160Zm200-80q25 0 42.5-17.5T420-500q0-25-17.5-42.5T360-560q-25 0-42.5 17.5T300-500q0 25 17.5 42.5T360-440Zm240 0q25 0 42.5-17.5T660-500q0-25-17.5-42.5T600-560q-25 0-42.5 17.5T540-500q0 25 17.5 42.5T600-440ZM320-280h320v-80H320v80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/smart_toy.svg b/app/javascript/material-icons/400-24px/smart_toy.svg
new file mode 100644
index 0000000000..b84efc73b1
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/smart_toy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M160-360q-50 0-85-35t-35-85q0-50 35-85t85-35v-80q0-33 23.5-56.5T240-760h120q0-50 35-85t85-35q50 0 85 35t35 85h120q33 0 56.5 23.5T800-680v80q50 0 85 35t35 85q0 50-35 85t-85 35v160q0 33-23.5 56.5T720-120H240q-33 0-56.5-23.5T160-200v-160Zm200-80q25 0 42.5-17.5T420-500q0-25-17.5-42.5T360-560q-25 0-42.5 17.5T300-500q0 25 17.5 42.5T360-440Zm240 0q25 0 42.5-17.5T660-500q0-25-17.5-42.5T600-560q-25 0-42.5 17.5T540-500q0 25 17.5 42.5T600-440ZM320-280h320v-80H320v80Zm-80 80h480v-480H240v480Zm240-240Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star-fill.svg b/app/javascript/material-icons/400-24px/star-fill.svg
new file mode 100644
index 0000000000..cb2231e634
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/star-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m233-80 65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/star.svg b/app/javascript/material-icons/400-24px/star.svg
new file mode 100644
index 0000000000..1736e085d0
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m354-247 126-76 126 77-33-144 111-96-146-13-58-136-58 135-146 13 111 97-33 143ZM233-80l65-281L80-550l288-25 112-265 112 265 288 25-218 189 65 281-247-149L233-80Zm247-350Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/tag-fill.svg b/app/javascript/material-icons/400-24px/tag-fill.svg
new file mode 100644
index 0000000000..ce76d537b3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/tag-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m240-160 40-160H120l20-80h160l40-160H180l20-80h160l40-160h80l-40 160h160l40-160h80l-40 160h160l-20 80H660l-40 160h160l-20 80H600l-40 160h-80l40-160H360l-40 160h-80Zm140-240h160l40-160H420l-40 160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/tag.svg b/app/javascript/material-icons/400-24px/tag.svg
new file mode 100644
index 0000000000..ce76d537b3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m240-160 40-160H120l20-80h160l40-160H180l20-80h160l40-160h80l-40 160h160l40-160h80l-40 160h160l-20 80H660l-40 160h160l-20 80H600l-40 160h-80l40-160H360l-40 160h-80Zm140-240h160l40-160H420l-40 160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/tune-fill.svg b/app/javascript/material-icons/400-24px/tune-fill.svg
new file mode 100644
index 0000000000..887f8bd498
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/tune-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-120v-240h80v80h320v80H520v80h-80Zm-320-80v-80h240v80H120Zm160-160v-80H120v-80h160v-80h80v240h-80Zm160-80v-80h400v80H440Zm160-160v-240h80v80h160v80H680v80h-80Zm-480-80v-80h400v80H120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/tune.svg b/app/javascript/material-icons/400-24px/tune.svg
new file mode 100644
index 0000000000..887f8bd498
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/tune.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-120v-240h80v80h320v80H520v80h-80Zm-320-80v-80h240v80H120Zm160-160v-80H120v-80h160v-80h80v240h-80Zm160-80v-80h400v80H440Zm160-160v-240h80v80h160v80H680v80h-80Zm-480-80v-80h400v80H120Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/upload_file-fill.svg b/app/javascript/material-icons/400-24px/upload_file-fill.svg
new file mode 100644
index 0000000000..639d77af36
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/upload_file-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-200h80v-167l64 64 56-57-160-160-160 160 57 56 63-63v167ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520h200L520-800v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/upload_file.svg b/app/javascript/material-icons/400-24px/upload_file.svg
new file mode 100644
index 0000000000..40ce5b65e5
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/upload_file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M440-200h80v-167l64 64 56-57-160-160-160 160 57 56 63-63v167ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/visibility-fill.svg b/app/javascript/material-icons/400-24px/visibility-fill.svg
new file mode 100644
index 0000000000..44b5f4c606
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/visibility-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-320q75 0 127.5-52.5T660-500q0-75-52.5-127.5T480-680q-75 0-127.5 52.5T300-500q0 75 52.5 127.5T480-320Zm0-72q-45 0-76.5-31.5T372-500q0-45 31.5-76.5T480-608q45 0 76.5 31.5T588-500q0 45-31.5 76.5T480-392Zm0 192q-146 0-266-81.5T40-500q54-137 174-218.5T480-800q146 0 266 81.5T920-500q-54 137-174 218.5T480-200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/visibility.svg b/app/javascript/material-icons/400-24px/visibility.svg
new file mode 100644
index 0000000000..8fe45d09af
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/visibility.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M480-320q75 0 127.5-52.5T660-500q0-75-52.5-127.5T480-680q-75 0-127.5 52.5T300-500q0 75 52.5 127.5T480-320Zm0-72q-45 0-76.5-31.5T372-500q0-45 31.5-76.5T480-608q45 0 76.5 31.5T588-500q0 45-31.5 76.5T480-392Zm0 192q-146 0-266-81.5T40-500q54-137 174-218.5T480-800q146 0 266 81.5T920-500q-54 137-174 218.5T480-200Zm0-300Zm0 220q113 0 207.5-59.5T832-500q-50-101-144.5-160.5T480-720q-113 0-207.5 59.5T128-500q50 101 144.5 160.5T480-280Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/visibility_off-fill.svg b/app/javascript/material-icons/400-24px/visibility_off-fill.svg
new file mode 100644
index 0000000000..e21fbd88df
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/visibility_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M792-56 624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM480-320q11 0 20.5-1t20.5-4L305-541q-3 11-4 20.5t-1 20.5q0 75 52.5 127.5T480-320Zm292 18L645-428q7-17 11-34.5t4-37.5q0-75-52.5-127.5T480-680q-20 0-37.5 4T408-664L306-766q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302ZM587-486 467-606q28-5 51.5 4.5T559-574q17 18 24.5 41.5T587-486Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/visibility_off.svg b/app/javascript/material-icons/400-24px/visibility_off.svg
new file mode 100644
index 0000000000..d98cf8d942
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/visibility_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m644-428-58-58q9-47-27-88t-93-32l-58-58q17-8 34.5-12t37.5-4q75 0 127.5 52.5T660-500q0 20-4 37.5T644-428Zm128 126-58-56q38-29 67.5-63.5T832-500q-50-101-143.5-160.5T480-720q-29 0-57 4t-55 12l-62-62q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302Zm20 246L624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM222-624q-29 26-53 57t-41 67q50 101 143.5 160.5T480-280q20 0 39-2.5t39-5.5l-36-38q-11 3-21 4.5t-21 1.5q-75 0-127.5-52.5T300-500q0-11 1.5-21t4.5-21l-84-82Zm319 93Zm-151 75Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/volume_off-fill.svg b/app/javascript/material-icons/400-24px/volume_off-fill.svg
new file mode 100644
index 0000000000..b3d12d4d98
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/volume_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M792-56 671-177q-25 16-53 27.5T560-131v-82q14-5 27.5-10t25.5-12L480-368v208L280-360H120v-240h128L56-792l56-56 736 736-56 56Zm-8-232-58-58q17-31 25.5-65t8.5-70q0-94-55-168T560-749v-82q124 28 202 125.5T840-481q0 53-14.5 102T784-288ZM650-422l-90-90v-130q47 22 73.5 66t26.5 96q0 15-2.5 29.5T650-422ZM480-592 376-696l104-104v208Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/volume_off.svg b/app/javascript/material-icons/400-24px/volume_off.svg
new file mode 100644
index 0000000000..a0acf63747
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/volume_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M792-56 671-177q-25 16-53 27.5T560-131v-82q14-5 27.5-10t25.5-12L480-368v208L280-360H120v-240h128L56-792l56-56 736 736-56 56Zm-8-232-58-58q17-31 25.5-65t8.5-70q0-94-55-168T560-749v-82q124 28 202 125.5T840-481q0 53-14.5 102T784-288ZM650-422l-90-90v-130q47 22 73.5 66t26.5 96q0 15-2.5 29.5T650-422ZM480-592 376-696l104-104v208Zm-80 238v-94l-72-72H200v80h114l86 86Zm-36-130Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/volume_up-fill.svg b/app/javascript/material-icons/400-24px/volume_up-fill.svg
new file mode 100644
index 0000000000..dd5771215e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/volume_up-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-131v-82q90-26 145-100t55-168q0-94-55-168T560-749v-82q124 28 202 125.5T840-481q0 127-78 224.5T560-131ZM120-360v-240h160l200-200v640L280-360H120Zm440 40v-322q47 22 73.5 66t26.5 96q0 51-26.5 94.5T560-320Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/volume_up.svg b/app/javascript/material-icons/400-24px/volume_up.svg
new file mode 100644
index 0000000000..fd9006a6d2
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/volume_up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M560-131v-82q90-26 145-100t55-168q0-94-55-168T560-749v-82q124 28 202 125.5T840-481q0 127-78 224.5T560-131ZM120-360v-240h160l200-200v640L280-360H120Zm440 40v-322q47 22 73.5 66t26.5 96q0 51-26.5 94.5T560-320ZM400-606l-86 86H200v80h114l86 86v-252ZM300-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/LICENSE b/app/javascript/material-icons/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/app/javascript/material-icons/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/app/javascript/material-icons/README.md b/app/javascript/material-icons/README.md
new file mode 100644
index 0000000000..1479cb2255
--- /dev/null
+++ b/app/javascript/material-icons/README.md
@@ -0,0 +1 @@
+Files in this directory are Material Symbols icons fetched using the `icons:download` task.
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 462dd82ac0..7f0f15f113 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -187,8 +187,8 @@
 
 .icon {
   flex: 0 0 auto;
-  width: 20px;
-  height: 20px;
+  width: 24px;
+  height: 24px;
   aspect-ratio: 1;
 
   path {
@@ -200,7 +200,7 @@
   display: inline-flex;
   color: $action-button-color;
   border: 0;
-  padding: 2px;
+  padding: 0;
   border-radius: 4px;
   background: transparent;
   cursor: pointer;
@@ -2322,7 +2322,7 @@ $ui-header-height: 55px;
 .drawer__tab {
   display: flex;
   flex: 1 1 auto;
-  padding: 15px 5px 13px;
+  padding: 13px 3px 11px;
   color: $darker-text-color;
   text-decoration: none;
   text-align: center;
@@ -3205,7 +3205,7 @@ $ui-header-height: 55px;
   align-items: center;
   gap: 5px;
   font-size: 16px;
-  padding: 15px;
+  padding: 13px;
   text-decoration: none;
   overflow: hidden;
   white-space: nowrap;
@@ -3804,7 +3804,7 @@ a.status-card {
     gap: 5px;
     margin: 0;
     border: 0;
-    padding: 15px;
+    padding: 13px;
     padding-inline-end: 0;
     color: inherit;
     background: transparent;
diff --git a/config/webpack/rules/file.js b/config/webpack/rules/file.js
index fd9b14cad6..71ae2afe03 100644
--- a/config/webpack/rules/file.js
+++ b/config/webpack/rules/file.js
@@ -4,7 +4,7 @@ const { settings } = require('../configuration');
 
 module.exports = {
   test: new RegExp(`(${settings.static_assets_extensions.join('|')})$`, 'i'),
-  exclude: [/node_modules\/@material-symbols/, /svg-icons/],
+  exclude: [/material-icons/, /svg-icons/],
   use: [
     {
       loader: 'file-loader',
diff --git a/config/webpack/rules/material_icons.js b/config/webpack/rules/material_icons.js
index 048e198ef2..65045036c3 100644
--- a/config/webpack/rules/material_icons.js
+++ b/config/webpack/rules/material_icons.js
@@ -1,6 +1,6 @@
 module.exports = {
   test: /\.svg$/,
-  include: [/node_modules\/@material-symbols/, /svg-icons/],
+  include: [/material-icons/, /svg-icons/],
   issuer: /\.[jt]sx?$/,
   use: [
     {
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
new file mode 100644
index 0000000000..3e3d0daac5
--- /dev/null
+++ b/lib/tasks/icons.rake
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+def download_material_icon(icon, weight: 400, filled: false, size: 20)
+  url_template = Addressable::Template.new('https://fonts.gstatic.com/s/i/short-term/release/materialsymbolsoutlined/{icon}/{axes}/{size}px.svg')
+
+  variant = filled ? '-fill' : ''
+
+  axes = []
+  axes << "wght#{weight}" if weight != 400
+  axes << 'fill1' if filled
+  axes = axes.join.presence || 'default'
+
+  url = url_template.expand(icon: icon, axes: axes, size: size).to_s
+  path = Rails.root.join('app', 'javascript', 'material-icons', "#{weight}-#{size}px", "#{icon}#{variant}.svg")
+  FileUtils.mkdir_p(File.dirname(path))
+
+  File.write(path, HTTP.get(url).to_s)
+end
+
+def find_used_icons
+  icons_by_weight_and_size = {}
+
+  Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path|
+    File.open(path, 'r') do |file|
+      pattern = %r{\Aimport .* from 'mastodon/../material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
+      file.each_line do |line|
+        match = pattern.match(line)
+        next if match.blank?
+
+        weight = match['weight'].to_i
+        size = match['size'].to_i
+
+        icons_by_weight_and_size[weight] ||= {}
+        icons_by_weight_and_size[weight][size] ||= Set.new
+
+        icons_by_weight_and_size[weight][size] << match['icon']
+      end
+    end
+  end
+
+  icons_by_weight_and_size
+end
+
+namespace :icons do
+  desc 'Download used Material Symbols icons'
+  task download: :environment do
+    find_used_icons.each do |weight, icons_by_size|
+      icons_by_size.each do |size, icons|
+        icons.each do |icon|
+          download_material_icon(icon, weight: weight, size: size)
+          download_material_icon(icon, weight: weight, size: size, filled: true)
+        end
+      end
+    end
+  end
+end
diff --git a/package.json b/package.json
index e3ba91f45c..d0b1b2e71c 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
-    "@material-symbols/svg-600": "^0.14.0",
     "@rails/ujs": "^7.1.1",
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^5.5.0",
diff --git a/yarn.lock b/yarn.lock
index feb2bed2b4..3a7563b31b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2310,7 +2310,6 @@ __metadata:
     "@formatjs/intl-pluralrules": "npm:^5.2.2"
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
-    "@material-symbols/svg-600": "npm:^0.14.0"
     "@rails/ujs": "npm:^7.1.1"
     "@reduxjs/toolkit": "npm:^2.0.1"
     "@svgr/webpack": "npm:^5.5.0"
@@ -2504,13 +2503,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@material-symbols/svg-600@npm:^0.14.0":
-  version: 0.14.4
-  resolution: "@material-symbols/svg-600@npm:0.14.4"
-  checksum: 3522055022b6e062399c9da3c701f0306f9f1bd8d5839fbf638fd2e56d97564528ca409901d7599730bf2f67df50754da859a9f499cb7156ead83890511f9d1f
-  languageName: node
-  linkType: hard
-
 "@nodelib/fs.scandir@npm:2.1.5":
   version: 2.1.5
   resolution: "@nodelib/fs.scandir@npm:2.1.5"

From cc3ff66246b3d1467e5afa1d53efd9e1d3ad2ca0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 17:39:23 -0500
Subject: [PATCH 303/436] Use rubygems released version of `omniauth-cas` gem
 (#28719)

---
 Gemfile      |  3 +--
 Gemfile.lock | 16 +++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index a393b14471..2d4e504ac7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,8 +39,7 @@ end
 
 gem 'net-ldap', '~> 0.18'
 
-# TODO: Point back at released omniauth-cas gem when new version is released
-gem 'omniauth-cas', github: 'dlindahl/omniauth-cas', ref: '9d9d3a91b316c55d49ab6e621977f2067010c5bf'
+gem 'omniauth-cas', '~> 3.0.0.beta.1'
 gem 'omniauth-saml', '~> 2.0'
 gem 'omniauth_openid_connect', '~> 0.6.1'
 gem 'omniauth', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index ccb9f4b115..e9c62eb115 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,16 +7,6 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
-GIT
-  remote: https://github.com/dlindahl/omniauth-cas.git
-  revision: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
-  ref: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
-  specs:
-    omniauth-cas (3.0.0)
-      addressable (~> 2.8)
-      nokogiri (~> 1.12)
-      omniauth (~> 2.1)
-
 GIT
   remote: https://github.com/jhawthorn/nsa.git
   revision: e020fcc3a54d993ab45b7194d89ab720296c111b
@@ -484,6 +474,10 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
+    omniauth-cas (3.0.0.beta.1)
+      addressable (~> 2.8)
+      nokogiri (~> 1.12)
+      omniauth (~> 2.1)
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
@@ -894,7 +888,7 @@ DEPENDENCIES
   nsa!
   oj (~> 3.14)
   omniauth (~> 2.0)
-  omniauth-cas!
+  omniauth-cas (~> 3.0.0.beta.1)
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.6.1)

From e72676e83a3c638ddacbb89cfe15fe9b1b83b92f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Jan 2024 04:47:25 -0500
Subject: [PATCH 304/436] Improve `api/v1/markers#create` performance against
 simultaneous requests (#28718)

---
 app/controllers/api/v1/markers_controller.rb  |  2 +-
 .../api/v1/markers_spec.rb}                   | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename spec/{controllers/api/v1/markers_controller_spec.rb => requests/api/v1/markers_spec.rb} (62%)

diff --git a/app/controllers/api/v1/markers_controller.rb b/app/controllers/api/v1/markers_controller.rb
index f8dfba8a94..8eaf7767df 100644
--- a/app/controllers/api/v1/markers_controller.rb
+++ b/app/controllers/api/v1/markers_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::MarkersController < Api::BaseController
       @markers = {}
 
       resource_params.each_pair do |timeline, timeline_params|
-        @markers[timeline] = current_user.markers.find_or_initialize_by(timeline: timeline)
+        @markers[timeline] = current_user.markers.find_or_create_by(timeline: timeline)
         @markers[timeline].update!(timeline_params)
       end
     end
diff --git a/spec/controllers/api/v1/markers_controller_spec.rb b/spec/requests/api/v1/markers_spec.rb
similarity index 62%
rename from spec/controllers/api/v1/markers_controller_spec.rb
rename to spec/requests/api/v1/markers_spec.rb
index e954bbd1b6..a1ca4ba754 100644
--- a/spec/controllers/api/v1/markers_controller_spec.rb
+++ b/spec/requests/api/v1/markers_spec.rb
@@ -2,20 +2,18 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::MarkersController do
-  render_views
+RSpec.describe 'API Markers' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'read:statuses write:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  let!(:user)  { Fabricate(:user) }
-  let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses write:statuses') }
-
-  before { allow(controller).to receive(:doorkeeper_token) { token } }
-
-  describe 'GET #index' do
+  describe 'GET /api/v1/markers' do
     before do
       Fabricate(:marker, timeline: 'home', last_read_id: 123, user: user)
       Fabricate(:marker, timeline: 'notifications', last_read_id: 456, user: user)
 
-      get :index, params: { timeline: %w(home notifications) }
+      get '/api/v1/markers', headers: headers, params: { timeline: %w(home notifications) }
     end
 
     it 'returns markers', :aggregate_failures do
@@ -29,10 +27,10 @@ RSpec.describe Api::V1::MarkersController do
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/markers' do
     context 'when no marker exists' do
       before do
-        post :create, params: { home: { last_read_id: '69420' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
       end
 
       it 'creates a marker', :aggregate_failures do
@@ -44,8 +42,8 @@ RSpec.describe Api::V1::MarkersController do
 
     context 'when a marker exists' do
       before do
-        post :create, params: { home: { last_read_id: '69420' } }
-        post :create, params: { home: { last_read_id: '70120' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '69420' } }
+        post '/api/v1/markers', headers: headers, params: { home: { last_read_id: '70120' } }
       end
 
       it 'updates a marker', :aggregate_failures do

From 58830be94329ce1a541f1f79c9e4e70aef430b19 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:36:30 +0100
Subject: [PATCH 305/436] Streaming: Rework websocket server initialisation &
 authentication code (#28631)

---
 streaming/index.js | 128 +++++++++++++++++++++++++++++++++------------
 1 file changed, 95 insertions(+), 33 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 42d0afc7c5..c8124fcc0f 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -182,14 +182,74 @@ const CHANNEL_NAMES = [
 ];
 
 const startServer = async () => {
+  const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
+  const server = http.createServer();
+  const wss = new WebSocket.Server({ noServer: true });
+
+  // Set the X-Request-Id header on WebSockets:
+  wss.on("headers", function onHeaders(headers, req) {
+    headers.push(`X-Request-Id: ${req.id}`);
+  });
+
   const app = express();
 
   app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');
 
-  const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
-  const server = http.createServer(app);
   app.use(cors());
 
+  // Handle eventsource & other http requests:
+  server.on('request', app);
+
+  // Handle upgrade requests:
+  server.on('upgrade', async function handleUpgrade(request, socket, head) {
+    /** @param {Error} err */
+    const onSocketError = (err) => {
+      log.error(`Error with websocket upgrade: ${err}`);
+    };
+
+    socket.on('error', onSocketError);
+
+    // Authenticate:
+    try {
+      await accountFromRequest(request);
+    } catch (err) {
+      log.error(`Error authenticating request: ${err}`);
+
+      // Unfortunately for using the on('upgrade') setup, we need to manually
+      // write a HTTP Response to the Socket to close the connection upgrade
+      // attempt, so the following code is to handle all of that.
+      const statusCode = err.status ?? 401;
+
+      /** @type {Record<string, string | number>} */
+      const headers = {
+        'Connection': 'close',
+        'Content-Type': 'text/plain',
+        'Content-Length': 0,
+        'X-Request-Id': request.id,
+        // TODO: Send the error message via header so it can be debugged in
+        // developer tools
+      };
+
+      // Ensure the socket is closed once we've finished writing to it:
+      socket.once('finish', () => {
+        socket.destroy();
+      });
+
+      // Write the HTTP response manually:
+      socket.end(`HTTP/1.1 ${statusCode} ${http.STATUS_CODES[statusCode]}\r\n${Object.keys(headers).map((key) => `${key}: ${headers[key]}`).join('\r\n')}\r\n\r\n`);
+
+      return;
+    }
+
+    wss.handleUpgrade(request, socket, head, function done(ws) {
+      // Remove the error handler:
+      socket.removeListener('error', onSocketError);
+
+      // Start the connection:
+      wss.emit('connection', ws, request);
+    });
+  });
+
   /**
    * @type {Object.<string, Array.<function(Object<string, any>): void>>}
    */
@@ -360,10 +420,19 @@ const startServer = async () => {
   const isInScope = (req, necessaryScopes) =>
     req.scopes.some(scope => necessaryScopes.includes(scope));
 
+  /**
+   * @typedef ResolvedAccount
+   * @property {string} accessTokenId
+   * @property {string[]} scopes
+   * @property {string} accountId
+   * @property {string[]} chosenLanguages
+   * @property {string} deviceId
+   */
+
   /**
    * @param {string} token
    * @param {any} req
-   * @returns {Promise.<void>}
+   * @returns {Promise<ResolvedAccount>}
    */
   const accountFromToken = (token, req) => new Promise((resolve, reject) => {
     pgPool.connect((err, client, done) => {
@@ -394,14 +463,20 @@ const startServer = async () => {
         req.chosenLanguages = result.rows[0].chosen_languages;
         req.deviceId = result.rows[0].device_id;
 
-        resolve();
+        resolve({
+          accessTokenId: result.rows[0].id,
+          scopes: result.rows[0].scopes.split(' '),
+          accountId: result.rows[0].account_id,
+          chosenLanguages: result.rows[0].chosen_languages,
+          deviceId: result.rows[0].device_id
+        });
       });
     });
   });
 
   /**
    * @param {any} req
-   * @returns {Promise.<void>}
+   * @returns {Promise<ResolvedAccount>}
    */
   const accountFromRequest = (req) => new Promise((resolve, reject) => {
     const authorization = req.headers.authorization;
@@ -494,25 +569,6 @@ const startServer = async () => {
     reject(err);
   });
 
-  /**
-   * @param {any} info
-   * @param {function(boolean, number, string): void} callback
-   */
-  const wsVerifyClient = (info, callback) => {
-    // When verifying the websockets connection, we no longer pre-emptively
-    // check OAuth scopes and drop the connection if they're missing. We only
-    // drop the connection if access without token is not allowed by environment
-    // variables. OAuth scope checks are moved to the point of subscription
-    // to a specific stream.
-
-    accountFromRequest(info.req).then(() => {
-      callback(true, undefined, undefined);
-    }).catch(err => {
-      log.error(info.req.requestId, err.toString());
-      callback(false, 401, 'Unauthorized');
-    });
-  };
-
   /**
    * @typedef SystemMessageHandlers
    * @property {function(): void} onKill
@@ -944,8 +1000,8 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} req
-   * @param {any} ws
+   * @param {http.IncomingMessage} req
+   * @param {WebSocket} ws
    * @param {string[]} streamName
    * @returns {function(string, string): void}
    */
@@ -955,7 +1011,9 @@ const startServer = async () => {
       return;
     }
 
-    ws.send(JSON.stringify({ stream: streamName, event, payload }), (err) => {
+    const message = JSON.stringify({ stream: streamName, event, payload });
+
+    ws.send(message, (/** @type {Error} */ err) => {
       if (err) {
         log.error(req.requestId, `Failed to send to websocket: ${err}`);
       }
@@ -992,8 +1050,6 @@ const startServer = async () => {
     });
   });
 
-  const wss = new WebSocket.Server({ server, verifyClient: wsVerifyClient });
-
   /**
    * @typedef StreamParams
    * @property {string} [tag]
@@ -1173,8 +1229,8 @@ const startServer = async () => {
 
   /**
    * @typedef WebSocketSession
-   * @property {any} socket
-   * @property {any} request
+   * @property {WebSocket} websocket
+   * @property {http.IncomingMessage} request
    * @property {Object.<string, { channelName: string, listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
    */
 
@@ -1297,7 +1353,11 @@ const startServer = async () => {
     }
   };
 
-  wss.on('connection', (ws, req) => {
+  /**
+   * @param {WebSocket & { isAlive: boolean }} ws
+   * @param {http.IncomingMessage} req
+   */
+  function onConnection(ws, req) {
     // Note: url.parse could throw, which would terminate the connection, so we
     // increment the connected clients metric straight away when we establish
     // the connection, without waiting:
@@ -1375,7 +1435,9 @@ const startServer = async () => {
     if (location && location.query.stream) {
       subscribeWebsocketToChannel(session, firstParam(location.query.stream), location.query);
     }
-  });
+  }
+
+  wss.on('connection', onConnection);
 
   setInterval(() => {
     wss.clients.forEach(ws => {

From e81c5c0a5124fe900bd2ae631a34acedef4d9bcd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jan 2024 11:45:48 +0100
Subject: [PATCH 306/436] Ignore the devise-two-factor advisory as we have rate
 limits in place (#28733)

---
 .bundler-audit.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .bundler-audit.yml

diff --git a/.bundler-audit.yml b/.bundler-audit.yml
new file mode 100644
index 0000000000..0671df390f
--- /dev/null
+++ b/.bundler-audit.yml
@@ -0,0 +1,6 @@
+---
+ignore:
+  # devise-two-factor advisory about brute-forcing TOTP
+  # We have rate-limits on authentication endpoints in place (including second
+  # factor verification) since Mastodon v3.2.0
+  - CVE-2024-0227

From 1012ffac9e5c476e1da6fbabe265a5916409c23e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:06:25 +0100
Subject: [PATCH 307/436] New Crowdin Translations (automated) (#28721)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ast.json | 11 ++++-----
 app/javascript/mastodon/locales/hi.json  | 29 ++++++++++++++++++++++++
 config/locales/ast.yml                   | 19 ++++++++++++++++
 config/locales/lt.yml                    | 11 +++++++--
 config/locales/nl.yml                    |  4 ++--
 config/locales/simple_form.ast.yml       | 10 ++++++++
 config/locales/sk.yml                    |  4 ++++
 7 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index c4238edcd4..4b555c4829 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -13,14 +13,12 @@
   "about.rules": "Normes del sirvidor",
   "account.account_note_header": "Nota",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
-  "account.badges.bot": "Automatizáu",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
   "account.block_short": "Bloquiar",
   "account.blocked": "Perfil bloquiáu",
   "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
-  "account.cancel_follow_request": "Atayar siguimientu",
   "account.copy": "Copiar I'enllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
@@ -28,13 +26,11 @@
   "account.edit_profile": "Editar el perfil",
   "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
-  "account.featured_tags.last_status_at": "Últimu estáu en {date}",
-  "account.featured_tags.last_status_never": "Sin estaos",
+  "account.featured_tags.last_status_never": "Nun hai nengún artículu",
   "account.featured_tags.title": "Etiquetes destacaes de: {name}",
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
-  "account.followers_counter": "{count, plural, one {{counter} Siguíu} other {{counter} Siguíos}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural,one {Sigue a {counter}} other {Sigue a {counter}}}",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
@@ -42,7 +38,6 @@
   "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
-  "account.languages": "Camudar llingües suscrites",
   "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {date}",
   "account.media": "Multimedia",
   "account.mention": "Mentar a @{name}",
@@ -108,6 +103,7 @@
   "community.column_settings.remote_only": "Namás lo remoto",
   "compose.language.change": "Camudar la llingua",
   "compose.language.search": "Buscar llingües…",
+  "compose.published.body": "Espublizóse l'artículu.",
   "compose_form.direct_message_warning_learn_more": "Saber más",
   "compose_form.encryption_warning": "Los artículos de Mastodon nun tán cifraos de puntu a puntu. Nun compartas nengún tipu d'información sensible per Mastodon.",
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
@@ -299,6 +295,7 @@
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Zarrar la sesión",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
+  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes ya otres páxines específiques ábrense por defeutu na interfaz web clásica.",
   "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
@@ -334,7 +331,7 @@
   "notifications.group": "{count} avisos",
   "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
-  "onboarding.actions.go_to_explore": "See what's trending",
+  "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
   "onboarding.start.lead": "Xá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu ya non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
   "onboarding.start.skip": "¿Nun precises ayuda pa comenzar?",
   "onboarding.steps.follow_people.body": "Mastodon trata namás de siguir a cuentes interesantes.",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 76d7c1d381..412159bef9 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -386,6 +386,7 @@
   "navigation_bar.security": "सुरक्षा",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} ने अभी पोस्ट किया",
   "notifications.clear": "सूचनाएं हटाए",
   "notifications.column_settings.admin.report": "नई रिपोर्ट:",
   "notifications.column_settings.favourite": "पसंदीदा:",
@@ -399,9 +400,12 @@
   "notifications.column_settings.show": "कॉलम में दिखाएँ",
   "notifications.column_settings.sound": "ध्वनि चलाएँ",
   "notifications.column_settings.status": "New toots:",
+  "notifications.column_settings.unread_notifications.category": "अपठित सूचनाएं",
+  "notifications.column_settings.unread_notifications.highlight": "अपठित सूचनाओं को हाइलाइट करें",
   "notifications.column_settings.update": "संपादन:",
   "notifications.filter.all": "सभी",
   "notifications.filter.boosts": "बूस्ट",
+  "notifications.filter.favourites": "पसंदीदा",
   "notifications.filter.follows": "फॉलो",
   "notifications.filter.mentions": "उल्लेख",
   "notifications.filter.polls": "चुनाव परिणाम",
@@ -416,6 +420,7 @@
   "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "अपना प्रोफाइल खोजने योग्य बनाएं",
   "onboarding.profile.discoverable_hint": "जब आप मॅस्टोडॉन पर डिस्कवरेबिलिटी चुनते हैं तो आपके पोस्ट ट्रेंडिंग और सर्च में दिख सकते हैं और आपका प्रोफाइल आपके ही जैसे अकाउंट्स को सुझाया जा सकता है।",
+  "onboarding.profile.display_name": "प्रदर्शित नाम",
   "onboarding.share.message": "मैं {username} मॅस्टोडॉन पर हूं! मुझे यहां {url} फॉलो करें",
   "onboarding.share.next_steps": "आगे कि संभवित विधि",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -445,6 +450,9 @@
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
+  "relative_time.days": "{number}दिन",
+  "relative_time.full.days": "{number, plural, one {# दिन} other {# दिन}} पहले",
+  "relative_time.full.hours": "{number, plural,one {# घंटा} other {# घंटे}} पहले",
   "relative_time.full.just_now": "अभी-अभी",
   "relative_time.full.minutes": "{number, plural, one {# मिनट} other {# मिनट}} पहले",
   "relative_time.full.seconds": "{number, plural, one {# सेकंड} other {# सेकंड}} पहले",
@@ -454,15 +462,23 @@
   "relative_time.seconds": "{number} सेकंड",
   "relative_time.today": "आज",
   "reply_indicator.cancel": "रद्द करें",
+  "report.block": "ब्लॉक",
   "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।",
   "report.categories.other": "अन्य",
   "report.categories.spam": "अवांछित",
   "report.category.title_account": "रूपरेखा",
   "report.close": "स्वीकार करें",
   "report.comment.title": "क्या और कुछ है जिसके बारे में आपको लगता है कि हमें सूचित होना चाहिए?",
+  "report.next": "आगे",
   "report.placeholder": "Type or paste additional comments",
   "report.reasons.dislike": "मुझे यह पसंद नहीं है",
+  "report.reasons.legal": "यह अवैध है",
+  "report.reasons.legal_description": "आप मानते हैं कि यह आपके या सर्वर के देश के कानून का उल्लंघन करता है",
   "report.reasons.other": "कुछ और है।",
+  "report.reasons.violation": "यह सर्वर नियमों का उल्लंघन करता है",
+  "report.rules.title": "किन नियमों का उल्लंघन हो रहा है?",
+  "report.statuses.subtitle": "लागू होने वाले सभी का चयन करें",
+  "report.statuses.title": "क्या ऐसे कोई पोस्ट हैं जो इस रिपोर्ट का समर्थन करते हों?",
   "report.submit": "सबमिट करें",
   "report.target": "Report {target}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
@@ -480,11 +496,24 @@
   "search_results.statuses": "Toots",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "@{name} को ब्लॉक करें",
+  "status.bookmark": "बुकमार्क",
+  "status.cannot_reblog": "रिपोस्ट को बूस्ट नहीं किया जा सकता",
   "status.copy": "Copy link to status",
+  "status.delete": "हटाएं",
+  "status.detailed_status": "विस्तृत वार्ता दृश्य",
   "status.direct": "निजी संदेश @{name} से",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
+  "status.media.open": "खोलने के लिए क्लिक करें",
+  "status.media.show": "दिखाने के लिए क्लिक करें",
+  "status.mention": "@{name} का उल्लेख करें",
+  "status.more": "अतिरिक्त",
+  "status.mute": "@{name} म्यूट करें",
+  "status.mute_conversation": "इस वार्तालाप को म्यूट करें",
   "status.open": "Expand this status",
+  "status.pin": "प्रोफ़ाइल पर पिन करें",
   "status.pinned": "Pinned toot",
+  "status.read_more": "और पढ़ें",
   "status.reblog": "बूस्ट",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.replied_to": "{name} का उत्तर दें",
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 08717c840e..a32413cb9a 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -23,6 +23,8 @@ ast:
       are_you_sure: "¿De xuru que quies facer esta aición?"
       avatar: Avatar
       by_domain: Dominiu
+      change_role:
+        label: Camudar el rol
       confirming: En confirmación
       disabled: Conxelóse
       display_name: Nome visible
@@ -59,6 +61,7 @@ ast:
       suspend: Suspender
       title: Cuentes
       username: Nome d'usuariu
+      warn: Alvertir
       web: Web
     action_logs:
       actions:
@@ -181,6 +184,7 @@ ast:
       availability:
         no_failures_recorded: Nun se rexistró nengún fallu.
         title: Disponibilidá
+      back_to_warning: Alvertencia
       by_domain: Dominiu
       content_policies:
         comment: Nota interna
@@ -461,6 +465,7 @@ ast:
     delete_account_html: Si quies desaniciar la cuenta, pues facelo <a href="%{path}">equí</a>. Va pidísete que confirmes l'aición.
     description:
       prefix_sign_up: "¡Rexístrate güei en Mastodon!"
+    didnt_get_confirmation: "¿Nun recibiesti l'enllaz de confirmación?"
     dont_have_your_security_key: "¿Nun tienes una llave de seguranza?"
     forgot_password: "¿Escaeciesti la contraseña?"
     login: Aniciar la sesión
@@ -477,6 +482,8 @@ ast:
       accept: Aceptar
       back: Atrás
     security: Seguranza
+    setup:
+      link_not_received: "¿Nun consiguiesti l'enllaz?"
     sign_in:
       preamble_html: Anicia la sesión colos tos datos d'accesu en <strong>%{domain}</strong>. Si la cuenta ta agospiada n'otru sirvidor, nun vas ser a aniciar la sesión equí.
       title: Aniciu de la sesión en «%{domain}»
@@ -535,6 +542,9 @@ ast:
       your_appeal_approved: Aprobóse la to apellación
       your_appeal_pending: Unviesti una apellación
       your_appeal_rejected: Refugóse la to apellación
+  edit_profile:
+    basic_information: Información básica
+    other: Otres preferencies
   errors:
     '400': La solicitú qu'unviesti nun yera válida o yera incorreuta.
     '403': Nun tienes permisu pa ver esta páxina.
@@ -622,6 +632,7 @@ ast:
       muting: Llista de perfiles colos avisos desactivaos
     upload: Xubir
   invites:
+    delete: Desactivar
     expired: Caducó
     expires_in:
       '1800': 30 minutos
@@ -715,6 +726,14 @@ ast:
     other: Otres preferencies
     posting_defaults: Configuración predeterminada del espublizamientu d'artículos
     public_timelines: Llinies de tiempu públiques
+  privacy:
+    hint_html: "<strong>Personaliza cómo quies s'atope esti perfil ya los sos artículos.</strong> Hai una variedá de funciones de Mastodon que puen ayudate a algamar audiencies más grandes cuando s'activen. Dedica un momentu pa revisar estes opciones y asegurate de que s'axusten al to casu."
+    privacy: Privacidá
+    reach: Algame
+    reach_hint_html: Controla si quies que te descubran ya te sigan perfiles nuevos. ¿Quies que los tos artículos apaezan na pantalla «Esploración»? ¿Quies qu'otres persones te vean na recomendación de cuentes? ¿Quies aceptar toles solicitúes de siguimientu automáticamente o tener un control minuciosu de caúna?
+    search: Busca
+    search_hint_html: Controla cómo quies que t'atopen. ¿Quies que la xente t'atope polo qu'espublices públicamente? ¿Quies que la xente fuera de Mástodon atope esti perfil cuando busque na web? Ten en cuenta que nun se pue garantizar la esclusión total de tolos motores de busca.
+    title: Privacidá ya algame
   privacy_policy:
     title: Política de privacidá
   relationships:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index b194011a42..8de969f646 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -48,15 +48,22 @@ lt:
         new_email: Naujas el pašto adresas
         submit: Pakeisti el pašto adresą
         title: Pakeisti el pašto adresą vartotojui %{username}
+      change_role:
+        label: Keisti vaidmenį
+        no_role: Jokios vaidmenį
+        title: Keisti vaidmenį %{username}
       confirm: Patvirtinti
       confirmed: Patvirtinta
       confirming: Tvirtinama
+      custom: Pasirinktinis
+      delete: Ištrinti duomenis
       deleted: Ištrinti
       demote: Pažeminti
       disable: Išjungti
-      disable_two_factor_authentication: Išjungti 2 faktorių autentifikaciją
+      disable_sign_in_token_auth: Išjungti el. pašto prieigos rakto tapatybės nustatymą
+      disable_two_factor_authentication: Išjungti 2FA
       disabled: Išjungta
-      display_name: Matomas vardas
+      display_name: Rodomas vardas
       domain: Domenas
       edit: Keisti
       email: El paštas
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 34769e08ec..3429ab0e82 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -425,7 +425,7 @@ nl:
       view: Domeinblokkade bekijken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
-      allow_registrations_with_approval: Inschrijvingen met goedkeuring toestaan
+      allow_registrations_with_approval: Registraties met goedkeuring toestaan
       attempts_over_week:
         one: "%{count} registratiepoging tijdens de afgelopen week"
         other: "%{count} registratiepogingen tijdens de afgelopen week"
@@ -571,7 +571,7 @@ nl:
       enable_hint: Eenmaal ingeschakeld gaat jouw server zich op alle openbare berichten van deze relayserver abonneren en stuurt het de openbare berichten van jouw server naar de relayserver.
       enabled: Ingeschakeld
       inbox_url: Relay-URL
-      pending: Aan het wachten op toestemming van de relayserver
+      pending: Aan het wachten op goedkeuring van de relayserver
       save_and_enable: Opslaan en inschakelen
       setup: Een verbinding met een relayserver maken
       signatures_not_enabled: Federatierelays werken mogelijk niet goed wanneer de veilige modus of de beperkte federatiemodus is ingeschakeld
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 4ffc4bd166..9b560b67eb 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -2,6 +2,9 @@
 ast:
   simple_form:
     hints:
+      account:
+        note: 'Pues @mentar a otros perfiles o poner #etiquetes.'
+        unlocked: Los perfiles van ser a siguite ensin solicitar la to aprobación. Desmarca esta opción si quies revisar les solicitúes de siguimientu y escoyer si aceptales o refugales.
       admin_account_action:
         text_html: Opcional. Pues usar la sintaxis de los artículos ya amestar <a href="%{path}">alvertencies preconfiguraes</a> p'aforrar tiempu
         type_html: Escueyi qué facer con <strong>%{acct}</strong>
@@ -59,9 +62,11 @@ ast:
         chosen_languages: Namás los artículos de les llingües que marques son los que van apaecer nes llinies de tiempu públiques
     labels:
       account:
+        discoverable: Destacar el perfil ya los artículos nos algoritmos de descubrimientu
         fields:
           name: Etiqueta
           value: Conteníu
+        indexable: Incluyir los artículos públicos nos resultaos de busca
       account_warning_preset:
         title: Títulu
       admin_account_action:
@@ -166,9 +171,13 @@ ast:
         pending_account: Una cuenta nueva precisa una revisión
         reblog: Daquién compartió'l to artículu
         report: Unvióse un informe nuevu
+        software_updates:
+          label: Hai disponible un anovamientu de Mastodon
         trending_tag: Una tendencia rique una revisión
       rule:
         text: Norma
+      settings:
+        indexable: Incluyir la páxina del perfil nos motores de busca
       tag:
         listable: Permitir qu'esta etiqueta apaeza nes busques ya nes suxerencies
         name: Etiqueta
@@ -176,6 +185,7 @@ ast:
         usable: Permitir que los artículos usen esta etiqueta
       user:
         role: Rol
+        time_zone: Fusu horariu
       user_role:
         name: Nome
         permissions_as_keys: Permisos
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a91f1d620e..9390a713bc 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -448,6 +448,7 @@ sk:
         title: Moderácia
       private_comment: Súkromný komentár
       public_comment: Verejný komentár
+      purge: Vyčisti
       title: Federácia
       total_blocked_by_us: Nami blokované
       total_followed_by_them: Nimi sledované
@@ -600,6 +601,8 @@ sk:
         title: Ohľadom
       appearance:
         title: Vzhľad
+      branding:
+        title: Značka
       content_retention:
         title: Ponechanie obsahu
       discovery:
@@ -721,6 +724,7 @@ sk:
       disable: Vypni
       disabled: Vypnuté
       enable: Povoľ
+      enabled: Aktívne
       status: Stav
   admin_mailer:
     new_appeal:

From 8013d6c56d4003dadb74dbabc8c8c97568f9f336 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:06:28 +0100
Subject: [PATCH 308/436] Update dependency faker to v3.2.3 (#28720)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index e9c62eb115..0bc7815d85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -257,7 +257,7 @@ GEM
       tzinfo
     excon (0.109.0)
     fabrication (2.31.0)
-    faker (3.2.2)
+    faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)

From 8cb4825c8bbfb5ca9c9f96058de053b7d7bf218b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jan 2024 12:06:48 +0100
Subject: [PATCH 309/436] Fix sign-up restrictions based on email addresses not
 being enforced (#28732)

---
 app/models/user.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 0c589f8068..f5ed3fa462 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -187,7 +187,7 @@ class User < ApplicationRecord
 
   def confirm
     new_user      = !confirmed?
-    self.approved = true if open_registrations? && !sign_up_from_ip_requires_approval?
+    self.approved = true if grant_approval_on_confirmation?
 
     super
 
@@ -206,7 +206,7 @@ class User < ApplicationRecord
 
   def confirm!
     new_user      = !confirmed?
-    self.approved = true if open_registrations?
+    self.approved = true if grant_approval_on_confirmation?
 
     skip_confirmation!
     save!
@@ -426,6 +426,11 @@ class User < ApplicationRecord
     end
   end
 
+  def grant_approval_on_confirmation?
+    # Re-check approval on confirmation if the server has switched to open registrations
+    open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
+  end
+
   def sign_up_from_ip_requires_approval?
     !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
   end

From 367be82a29a217ad86313815c278880d127c8acb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:09:28 +0100
Subject: [PATCH 310/436] Update libretranslate/libretranslate Docker tag to
 v1.5.4 (#28727)

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

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 21ee078d60..88979723c3 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -70,7 +70,7 @@ services:
         hard: -1
 
   libretranslate:
-    image: libretranslate/libretranslate:v1.5.3
+    image: libretranslate/libretranslate:v1.5.4
     restart: unless-stopped
     volumes:
       - lt-data:/home/libretranslate/.local

From b5afbe0a61a00ed890f975d1c5e0d1312c6a2589 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:17:25 +0100
Subject: [PATCH 311/436] Update dependency bootsnap to v1.17.1 (#28713)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 0bc7815d85..290702eea9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,7 +155,7 @@ GEM
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     blurhash (0.1.7)
-    bootsnap (1.17.0)
+    bootsnap (1.17.1)
       msgpack (~> 1.2)
     brakeman (6.1.1)
       racc

From a2f02a07758c32f0dcc6388b4f30ca5a84e762f3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Jan 2024 08:46:47 -0500
Subject: [PATCH 312/436] Disable `Rails/SkipsModelValidations` cop (#28712)

---
 .rubocop.yml                                  |  5 +--
 .rubocop_todo.yml                             | 35 -------------------
 .../admin/system_check/media_privacy_check.rb |  2 +-
 app/lib/attachment_batch.rb                   |  2 +-
 app/models/bulk_import.rb                     |  4 +--
 app/models/follow_request.rb                  |  2 +-
 app/models/form/import.rb                     |  2 +-
 spec/services/reblog_service_spec.rb          |  2 +-
 spec/workers/redownload_avatar_worker_spec.rb |  2 +-
 spec/workers/redownload_header_worker_spec.rb |  2 +-
 10 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a06621d660..fcdc4e06cb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -109,9 +109,10 @@ Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/auth/*'
 
+# Reason: There are appropriate times to use these features
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
 Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/*migrate/**/*'
+  Enabled: false
 
 # Reason: We want to preserve the ability to migrate from arbitrary old versions,
 # and cannot guarantee that every installation has run every migration as they upgrade.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 602d99c9f0..2c2366c9cf 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -80,41 +80,6 @@ Rails/RakeEnvironment:
     - 'lib/tasks/repo.rake'
     - 'lib/tasks/statistics.rake'
 
-# Configuration parameters: ForbiddenMethods, AllowedMethods.
-# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'app/controllers/admin/invites_controller.rb'
-    - 'app/controllers/concerns/session_tracking_concern.rb'
-    - 'app/models/concerns/account/merging.rb'
-    - 'app/models/concerns/expireable.rb'
-    - 'app/models/status.rb'
-    - 'app/models/trends/links.rb'
-    - 'app/models/trends/preview_card_batch.rb'
-    - 'app/models/trends/preview_card_provider_batch.rb'
-    - 'app/models/trends/status_batch.rb'
-    - 'app/models/trends/statuses.rb'
-    - 'app/models/trends/tag_batch.rb'
-    - 'app/models/trends/tags.rb'
-    - 'app/models/user.rb'
-    - 'app/services/activitypub/process_status_update_service.rb'
-    - 'app/services/approve_appeal_service.rb'
-    - 'app/services/block_domain_service.rb'
-    - 'app/services/delete_account_service.rb'
-    - 'app/services/process_mentions_service.rb'
-    - 'app/services/unallow_domain_service.rb'
-    - 'app/services/unblock_domain_service.rb'
-    - 'app/services/update_status_service.rb'
-    - 'app/workers/activitypub/post_upgrade_worker.rb'
-    - 'app/workers/move_worker.rb'
-    - 'app/workers/scheduler/ip_cleanup_scheduler.rb'
-    - 'app/workers/scheduler/scheduled_statuses_scheduler.rb'
-    - 'lib/mastodon/cli/accounts.rb'
-    - 'lib/mastodon/cli/maintenance.rb'
-    - 'spec/lib/activitypub/activity/follow_spec.rb'
-    - 'spec/services/follow_service_spec.rb'
-    - 'spec/services/update_account_service_spec.rb'
-
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
diff --git a/app/lib/admin/system_check/media_privacy_check.rb b/app/lib/admin/system_check/media_privacy_check.rb
index 1df05b120e..2ddc8e8b07 100644
--- a/app/lib/admin/system_check/media_privacy_check.rb
+++ b/app/lib/admin/system_check/media_privacy_check.rb
@@ -78,7 +78,7 @@ class Admin::SystemCheck::MediaPrivacyCheck < Admin::SystemCheck::BaseCheck
     @media_attachment ||= begin
       attachment = Account.representative.media_attachments.first
       if attachment.present?
-        attachment.touch # rubocop:disable Rails/SkipsModelValidations
+        attachment.touch
         attachment
       else
         create_test_attachment!
diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
index b28f5c3d7f..32ccb0b13c 100644
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -37,7 +37,7 @@ class AttachmentBatch
 
   def clear
     remove_files
-    batch.update_all(nullified_attributes) # rubocop:disable Rails/SkipsModelValidations
+    batch.update_all(nullified_attributes)
   end
 
   private
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index 810e471849..406fb2aba2 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -44,8 +44,8 @@ class BulkImport < ApplicationRecord
 
   def self.progress!(bulk_import_id, imported: false)
     # Use `increment_counter` so that the incrementation is done atomically in the database
-    BulkImport.increment_counter(:processed_items, bulk_import_id) # rubocop:disable Rails/SkipsModelValidations
-    BulkImport.increment_counter(:imported_items, bulk_import_id) if imported # rubocop:disable Rails/SkipsModelValidations
+    BulkImport.increment_counter(:processed_items, bulk_import_id)
+    BulkImport.increment_counter(:imported_items, bulk_import_id) if imported
 
     # Since the incrementation has been done atomically, concurrent access to `bulk_import` is now bening
     bulk_import = BulkImport.find(bulk_import_id)
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 3c5e8f96f0..c13cc718d8 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -33,7 +33,7 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     follow = account.follow!(target_account, reblogs: show_reblogs, notify: notify, languages: languages, uri: uri, bypass_limit: true)
-    ListAccount.where(follow_request: self).update_all(follow_request_id: nil, follow_id: follow.id) # rubocop:disable Rails/SkipsModelValidations
+    ListAccount.where(follow_request: self).update_all(follow_request_id: nil, follow_id: follow.id)
     MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index 712acf3706..fc83d9c58c 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -69,7 +69,7 @@ class Form::Import
     ApplicationRecord.transaction do
       now = Time.now.utc
       @bulk_import = current_account.bulk_imports.create(type: type, overwrite: overwrite || false, state: :unconfirmed, original_filename: data.original_filename, likely_mismatched: likely_mismatched?)
-      nb_items = BulkImportRow.insert_all(parsed_rows.map { |row| { bulk_import_id: bulk_import.id, data: row, created_at: now, updated_at: now } }).length # rubocop:disable Rails/SkipsModelValidations
+      nb_items = BulkImportRow.insert_all(parsed_rows.map { |row| { bulk_import_id: bulk_import.id, data: row, created_at: now, updated_at: now } }).length
       @bulk_import.update(total_items: nb_items)
     end
   end
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index 357b315af0..e5d0a2d6ce 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe ReblogService, type: :service do
           Status
             .where(id: reblog_of_id)
             .where(text: 'discard-status-text')
-            .update_all(deleted_at: Time.now.utc) # rubocop:disable Rails/SkipsModelValidations
+            .update_all(deleted_at: Time.now.utc)
         end
       end
     end
diff --git a/spec/workers/redownload_avatar_worker_spec.rb b/spec/workers/redownload_avatar_worker_spec.rb
index 4ab368e12f..6ef320bc4f 100644
--- a/spec/workers/redownload_avatar_worker_spec.rb
+++ b/spec/workers/redownload_avatar_worker_spec.rb
@@ -41,7 +41,7 @@ describe RedownloadAvatarWorker do
     it 'reprocesses a remote avatar' do
       stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
       account = Fabricate(:account, avatar_remote_url: 'https://example.host/file')
-      account.update_column(:avatar_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+      account.update_column(:avatar_file_name, nil)
 
       result = worker.perform(account.id)
 
diff --git a/spec/workers/redownload_header_worker_spec.rb b/spec/workers/redownload_header_worker_spec.rb
index 3b6f497bb8..746c1a63ff 100644
--- a/spec/workers/redownload_header_worker_spec.rb
+++ b/spec/workers/redownload_header_worker_spec.rb
@@ -41,7 +41,7 @@ describe RedownloadHeaderWorker do
     it 'reprocesses a remote header' do
       stub_request(:get, 'https://example.host/file').to_return request_fixture('avatar.txt')
       account = Fabricate(:account, header_remote_url: 'https://example.host/file')
-      account.update_column(:header_file_name, nil) # rubocop:disable Rails/SkipsModelValidations
+      account.update_column(:header_file_name, nil)
 
       result = worker.perform(account.id)
 

From e621c1c44c49dbed58e6961ad868d356f0534490 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jan 2024 18:10:57 +0100
Subject: [PATCH 313/436] Fix registrations not checking MX records for email
 domain blocks requiring approval (#28608)

---
 app/models/user.rb                            | 25 +++++++++--
 .../auth/registrations_controller_spec.rb     | 41 ++++++++++++++++++-
 spec/services/app_sign_up_service_spec.rb     | 33 +++++++++++++++
 3 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index f5ed3fa462..4bc19b16a6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -149,6 +149,10 @@ class User < ApplicationRecord
     end
   end
 
+  def self.skip_mx_check?
+    Rails.env.local?
+  end
+
   def role
     if role_id.nil?
       UserRole.everyone
@@ -436,9 +440,24 @@ class User < ApplicationRecord
   end
 
   def sign_up_email_requires_approval?
-    return false unless email.present? || unconfirmed_email.present?
+    return false if email.blank?
 
-    EmailDomainBlock.requires_approval?(email.presence || unconfirmed_email, attempt_ip: sign_up_ip)
+    _, domain = email.split('@', 2)
+    return false if domain.blank?
+
+    records = []
+
+    # Doing this conditionally is not very satisfying, but this is consistent
+    # with the MX records validations we do and keeps the specs tractable.
+    unless self.class.skip_mx_check?
+      Resolv::DNS.open do |dns|
+        dns.timeouts = 5
+
+        records = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }.compact_blank
+      end
+    end
+
+    EmailDomainBlock.requires_approval?(records + [domain], attempt_ip: sign_up_ip)
   end
 
   def open_registrations?
@@ -489,7 +508,7 @@ class User < ApplicationRecord
   end
 
   def validate_email_dns?
-    email_changed? && !external? && !Rails.env.local?
+    email_changed? && !external? && !self.class.skip_mx_check?
   end
 
   def validate_role_elevation
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index bd1c616595..0b7f02f590 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -137,12 +137,49 @@ RSpec.describe Auth::RegistrationsController do
 
     context 'when user has an email address requiring approval' do
       subject do
-        Setting.registrations_mode = 'open'
-        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'example.com')
         request.headers['Accept-Language'] = accept_language
         post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
       end
 
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'example.com')
+      end
+
+      it 'creates unapproved user and redirects to setup' do
+        subject
+        expect(response).to redirect_to auth_setup_path
+
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+        expect(user.approved).to be(false)
+      end
+    end
+
+    context 'when user has an email address requiring approval through a MX record' do
+      subject do
+        request.headers['Accept-Language'] = accept_language
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
+      end
+
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'mail.example.com')
+        allow(User).to receive(:skip_mx_check?).and_return(false)
+
+        resolver = instance_double(Resolv::DNS, :timeouts= => nil)
+
+        allow(resolver).to receive(:getresources)
+          .with('example.com', Resolv::DNS::Resource::IN::MX)
+          .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'mail.example.com')])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
+        allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      end
+
       it 'creates unapproved user and redirects to setup' do
         subject
         expect(response).to redirect_to auth_setup_path
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
index 86e64dab21..b37b6da1f0 100644
--- a/spec/services/app_sign_up_service_spec.rb
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -48,6 +48,39 @@ RSpec.describe AppSignUpService, type: :service do
       end
     end
 
+    context 'when the email address requires approval through MX records' do
+      before do
+        Setting.registrations_mode = 'open'
+        Fabricate(:email_domain_block, allow_with_approval: true, domain: 'smtp.email.com')
+        allow(User).to receive(:skip_mx_check?).and_return(false)
+
+        resolver = instance_double(Resolv::DNS, :timeouts= => nil)
+
+        allow(resolver).to receive(:getresources)
+          .with('email.com', Resolv::DNS::Resource::IN::MX)
+          .and_return([instance_double(Resolv::DNS::Resource::MX, exchange: 'smtp.email.com')])
+        allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::A).and_return([])
+        allow(resolver).to receive(:getresources).with('email.com', Resolv::DNS::Resource::IN::AAAA).and_return([])
+        allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::A).and_return([instance_double(Resolv::DNS::Resource::IN::A, address: '2.3.4.5')])
+        allow(resolver).to receive(:getresources).with('smtp.email.com', Resolv::DNS::Resource::IN::AAAA).and_return([instance_double(Resolv::DNS::Resource::IN::AAAA, address: 'fd00::2')])
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+      end
+
+      it 'creates an unapproved user', :aggregate_failures do
+        access_token = subject.call(app, remote_ip, params)
+        expect(access_token).to_not be_nil
+        expect(access_token.scopes.to_s).to eq 'read write'
+
+        user = User.find_by(id: access_token.resource_owner_id)
+        expect(user).to_not be_nil
+        expect(user.confirmed?).to be false
+        expect(user.approved?).to be false
+
+        expect(user.account).to_not be_nil
+        expect(user.invite_request).to be_nil
+      end
+    end
+
     context 'when registrations are closed' do
       before do
         Setting.registrations_mode = 'none'

From 98b5f85f10a3af50a54fcd79e09fc9fd88f774fa Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jan 2024 19:04:58 +0100
Subject: [PATCH 314/436] Rename and refactor `User#confirm!` to
 `User#mark_email_as_confirmed!` (#28735)

---
 .../admin/confirmations_controller.rb         |  2 +-
 app/models/concerns/user/omniauthable.rb      |  2 +-
 app/models/user.rb                            | 54 +++++++++----------
 lib/mastodon/cli/accounts.rb                  |  2 +-
 spec/features/oauth_spec.rb                   |  2 +-
 spec/models/user_spec.rb                      |  4 +-
 spec/policies/user_policy_spec.rb             |  2 +-
 7 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index 6f4e426797..7ccf5c9012 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -7,7 +7,7 @@ module Admin
 
     def create
       authorize @user, :confirm?
-      @user.confirm!
+      @user.mark_email_as_confirmed!
       log_action :confirm, @user
       redirect_to admin_accounts_path
     end
diff --git a/app/models/concerns/user/omniauthable.rb b/app/models/concerns/user/omniauthable.rb
index 6d1d1b8cc3..113bfda230 100644
--- a/app/models/concerns/user/omniauthable.rb
+++ b/app/models/concerns/user/omniauthable.rb
@@ -61,7 +61,7 @@ module User::Omniauthable
         user.account.avatar_remote_url = nil
       end
 
-      user.confirm! if email_is_verified
+      user.mark_email_as_confirmed! if email_is_verified
       user.save!
       user
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4bc19b16a6..5c90af56d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -190,37 +190,16 @@ class User < ApplicationRecord
   end
 
   def confirm
-    new_user      = !confirmed?
-    self.approved = true if grant_approval_on_confirmation?
-
-    super
-
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
-
-      if approved?
-        prepare_new_user!
-      else
-        notify_staff_about_pending_account!
-      end
+    wrap_email_confirmation do
+      super
     end
   end
 
-  def confirm!
-    new_user      = !confirmed?
-    self.approved = true if grant_approval_on_confirmation?
-
-    skip_confirmation!
-    save!
-
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
-
-      prepare_new_user! if approved?
+  # Mark current email as confirmed, bypassing Devise
+  def mark_email_as_confirmed!
+    wrap_email_confirmation do
+      skip_confirmation!
+      save!
     end
   end
 
@@ -435,6 +414,25 @@ class User < ApplicationRecord
     open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
   end
 
+  def wrap_email_confirmation
+    new_user      = !confirmed?
+    self.approved = true if grant_approval_on_confirmation?
+
+    yield
+
+    if new_user
+      # Avoid extremely unlikely race condition when approving and confirming
+      # the user at the same time
+      reload unless approved?
+
+      if approved?
+        prepare_new_user!
+      else
+        notify_staff_about_pending_account!
+      end
+    end
+  end
+
   def sign_up_from_ip_requires_approval?
     !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
   end
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 4146753035..9dc65c1477 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -105,7 +105,7 @@ module Mastodon::CLI
       if user.save
         if options[:confirmed]
           user.confirmed_at = nil
-          user.confirm!
+          user.mark_email_as_confirmed!
         end
 
         user.approve! if options[:approve]
diff --git a/spec/features/oauth_spec.rb b/spec/features/oauth_spec.rb
index 967956cc8e..70356784d2 100644
--- a/spec/features/oauth_spec.rb
+++ b/spec/features/oauth_spec.rb
@@ -49,7 +49,7 @@ describe 'Using OAuth from an external app' do
     let(:user)     { Fabricate(:user, email: email, password: password) }
 
     before do
-      user.confirm!
+      user.mark_email_as_confirmed!
       user.approve!
     end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 7f68671df4..213022e830 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -461,12 +461,12 @@ RSpec.describe User do
     end
   end
 
-  describe '#confirm!' do
+  describe '#mark_email_as_confirmed!' do
     subject(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
 
     before do
       ActionMailer::Base.deliveries.clear
-      user.confirm!
+      user.mark_email_as_confirmed!
     end
 
     after { ActionMailer::Base.deliveries.clear }
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index fa476a9fc3..7854547d26 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe UserPolicy do
 
       context 'when record.confirmed?' do
         it 'denies' do
-          john.user.confirm!
+          john.user.mark_email_as_confirmed!
           expect(subject).to_not permit(admin, john.user)
         end
       end

From 7f471e70c0e1cc106747634d20f173a68a9272d7 Mon Sep 17 00:00:00 2001
From: HTeuMeuLeu <remi@hteumeuleu.fr>
Date: Mon, 15 Jan 2024 19:18:59 +0100
Subject: [PATCH 315/436] Update new email templates (#28416)

Co-authored-by: Matt Jankowski <matt@jankowski.online>
---
 .../inter/inter-variable-font-slnt-wght.woff2 | Bin 0 -> 325956 bytes
 .../mailer-new/common/header-bg-end.png       | Bin 0 -> 4720 bytes
 .../mailer-new/common/header-bg-start.png     | Bin 0 -> 3171 bytes
 .../images/mailer-new/common/logo-footer.png  | Bin 0 -> 2418 bytes
 .../images/mailer-new/common/logo-header.png  | Bin 0 -> 10846 bytes
 .../mailer-new/heading/2fa-disabled.png       | Bin 0 -> 1945 bytes
 .../images/mailer-new/heading/2fa-enabled.png | Bin 0 -> 1939 bytes
 .../mailer-new/heading/2fa-recovery.png       | Bin 0 -> 2461 bytes
 .../mailer-new/heading/appeal-approved.png    | Bin 0 -> 1937 bytes
 .../mailer-new/heading/appeal-rejected.png    | Bin 0 -> 1672 bytes
 .../images/mailer-new/heading/archive.png     | Bin 0 -> 1504 bytes
 .../images/mailer-new/heading/boost.png       | Bin 0 -> 1613 bytes
 .../images/mailer-new/heading/email.png       | Bin 0 -> 1615 bytes
 .../images/mailer-new/heading/favorite.png    | Bin 0 -> 2112 bytes
 .../images/mailer-new/heading/follow.png      | Bin 0 -> 1837 bytes
 .../images/mailer-new/heading/key-added.png   | Bin 0 -> 2022 bytes
 .../images/mailer-new/heading/key-deleted.png | Bin 0 -> 1779 bytes
 .../mailer-new/heading/key-disabled.png       | Bin 0 -> 1940 bytes
 .../images/mailer-new/heading/key-enabled.png | Bin 0 -> 1937 bytes
 .../images/mailer-new/heading/login.png       | Bin 0 -> 1918 bytes
 .../images/mailer-new/heading/mention.png     | Bin 0 -> 2522 bytes
 .../images/mailer-new/heading/password.png    | Bin 0 -> 2249 bytes
 .../images/mailer-new/heading/user.png        | Bin 0 -> 1837 bytes
 .../images/mailer-new/heading/warning.png     | Bin 0 -> 1929 bytes
 .../mailer-new/welcome/checkbox-off.png       | Bin 0 -> 954 bytes
 .../images/mailer-new/welcome/checkbox-on.png | Bin 0 -> 1074 bytes
 .../images/mailer-new/welcome/step1-on.png    | Bin 0 -> 1065 bytes
 .../images/mailer-new/welcome/step2-off.png   | Bin 0 -> 505 bytes
 .../images/mailer-new/welcome/step3-off.png   | Bin 0 -> 688 bytes
 .../images/mailer-new/welcome/step4-off.png   | Bin 0 -> 709 bytes
 .../images/mailer-new/welcome/step5-off.png   | Bin 0 -> 547 bytes
 app/javascript/styles/fonts/inter.scss        |   8 +
 app/javascript/styles/mailer.scss             | 924 +++++++++---------
 app/mailers/notification_mailer.rb            |   2 +
 .../application/mailer/_button.html.haml      |   4 +
 .../application/mailer/_checklist.html.haml   |  29 +
 app/views/application/mailer/_frame.html.haml |   4 +
 .../application/mailer/_heading.html.haml     |  13 +
 app/views/layouts/mailer.html.haml            | 125 ++-
 .../notification_mailer/_status.html.haml     |  68 +-
 .../notification_mailer/favourite.html.haml   |  56 +-
 .../notification_mailer/follow.html.haml      |  52 +-
 .../follow_request.html.haml                  |  52 +-
 .../notification_mailer/mention.html.haml     |  56 +-
 .../notification_mailer/reblog.html.haml      |  56 +-
 .../user_mailer/appeal_approved.html.haml     |  73 +-
 .../user_mailer/appeal_rejected.html.haml     |  73 +-
 app/views/user_mailer/backup_ready.html.haml  |  69 +-
 .../confirmation_instructions.html.haml       |  96 +-
 app/views/user_mailer/email_changed.html.haml |  69 +-
 .../user_mailer/password_change.html.haml     |  50 +-
 .../reconfirmation_instructions.html.haml     |  71 +-
 .../reset_password_instructions.html.haml     |  70 +-
 .../user_mailer/suspicious_sign_in.html.haml  |  95 +-
 .../user_mailer/two_factor_disabled.html.haml |  53 +-
 .../user_mailer/two_factor_enabled.html.haml  |  53 +-
 ...wo_factor_recovery_codes_changed.html.haml |  53 +-
 app/views/user_mailer/warning.html.haml       | 136 +--
 .../webauthn_credential_added.html.haml       |  55 +-
 .../webauthn_credential_deleted.html.haml     |  55 +-
 .../user_mailer/webauthn_disabled.html.haml   |  53 +-
 .../user_mailer/webauthn_enabled.html.haml    |  53 +-
 app/views/user_mailer/welcome.html.haml       | 118 +--
 config/initializers/premailer_rails.rb        |   1 +
 config/locales/devise.en.yml                  |  13 +-
 config/locales/en.yml                         |   8 +-
 66 files changed, 932 insertions(+), 1834 deletions(-)
 create mode 100644 app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2
 create mode 100644 app/javascript/images/mailer-new/common/header-bg-end.png
 create mode 100644 app/javascript/images/mailer-new/common/header-bg-start.png
 create mode 100644 app/javascript/images/mailer-new/common/logo-footer.png
 create mode 100644 app/javascript/images/mailer-new/common/logo-header.png
 create mode 100644 app/javascript/images/mailer-new/heading/2fa-disabled.png
 create mode 100644 app/javascript/images/mailer-new/heading/2fa-enabled.png
 create mode 100644 app/javascript/images/mailer-new/heading/2fa-recovery.png
 create mode 100755 app/javascript/images/mailer-new/heading/appeal-approved.png
 create mode 100644 app/javascript/images/mailer-new/heading/appeal-rejected.png
 create mode 100644 app/javascript/images/mailer-new/heading/archive.png
 create mode 100644 app/javascript/images/mailer-new/heading/boost.png
 create mode 100644 app/javascript/images/mailer-new/heading/email.png
 create mode 100644 app/javascript/images/mailer-new/heading/favorite.png
 create mode 100644 app/javascript/images/mailer-new/heading/follow.png
 create mode 100755 app/javascript/images/mailer-new/heading/key-added.png
 create mode 100755 app/javascript/images/mailer-new/heading/key-deleted.png
 create mode 100755 app/javascript/images/mailer-new/heading/key-disabled.png
 create mode 100644 app/javascript/images/mailer-new/heading/key-enabled.png
 create mode 100644 app/javascript/images/mailer-new/heading/login.png
 create mode 100644 app/javascript/images/mailer-new/heading/mention.png
 create mode 100755 app/javascript/images/mailer-new/heading/password.png
 create mode 100644 app/javascript/images/mailer-new/heading/user.png
 create mode 100755 app/javascript/images/mailer-new/heading/warning.png
 create mode 100644 app/javascript/images/mailer-new/welcome/checkbox-off.png
 create mode 100644 app/javascript/images/mailer-new/welcome/checkbox-on.png
 create mode 100644 app/javascript/images/mailer-new/welcome/step1-on.png
 create mode 100755 app/javascript/images/mailer-new/welcome/step2-off.png
 create mode 100755 app/javascript/images/mailer-new/welcome/step3-off.png
 create mode 100755 app/javascript/images/mailer-new/welcome/step4-off.png
 create mode 100755 app/javascript/images/mailer-new/welcome/step5-off.png
 create mode 100644 app/javascript/styles/fonts/inter.scss
 create mode 100644 app/views/application/mailer/_button.html.haml
 create mode 100644 app/views/application/mailer/_checklist.html.haml
 create mode 100644 app/views/application/mailer/_frame.html.haml
 create mode 100644 app/views/application/mailer/_heading.html.haml

diff --git a/app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2 b/app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..e6345f2e3d462ea7f5c0dc51b7aa3ae965acb9fd
GIT binary patch
literal 325956
zcmV)UK(N1ePew8T0RR911o=b&6951J3{YSI1o+JW0RR9100000000000000000000
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%0D=P`fV2uDkPGx&7BPWAix>s_E{D%)Q7;hP3Xnks
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
BdWrx5

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/common/header-bg-end.png b/app/javascript/images/mailer-new/common/header-bg-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..900196678a3346cd6a396e7ae472ade2a6e22bc9
GIT binary patch
literal 4720
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/common/header-bg-start.png b/app/javascript/images/mailer-new/common/header-bg-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..0037c1ad933ec87c22430b9a3696b54227cb8a01
GIT binary patch
literal 3171
zcmaJ@dpwkB8-9$YTCG#9cC*`hcYK?WIfY@IMUGRB(>PAdyco=(nZaNzvX!L1^sPb%
z%BHeKa!QWd3MH$QC6Opf!nY(X;(JC^zu&j*{4vkr_uTh$Ki75N*ZuBy*=DDxpsoM_
zP;{`jaRUJJ6waGgV&Ff4!lJ`ro!FKkcIO9)qXL8|uwwHAQN)285RAH^0qp2qH&Ign
z<h3~-3^9Y|Ol9%8_yE}%yo4)&)&Q7VNCW|_FjR~LqQM-V8E&ky7Kd=yX1E;&G$Ku~
z1r6cY#|TmPm~9@cm@t+x8)spTm`bS70T&eqAQEmkPehfN;THT-;as*&z#$7q#9?N*
zcR?{|F31+X5JimfBs~_9NJ1!Zrf*0#GB&1AD4P&6k-V8eG$fD>^vIj31{5kuA6fk2
z;Eh6d5Y^3Q>*9TIWrhn8iv?5yAu1{gAGI0J7X}kZ#>U13BAGxY>%kLxqG+BtK%&PJ
zX)bxNK}9SfM<C|#d5FwoKp;OtY=(o;zIz5&@ZK#?v<MXhjUWjS5J-5U>{&|(X|#Vn
z%H_U4EfTw-AL9L6$0Cnt0ZMQ~Mf?aM3z8S4DZ5HQ-6BK-#C)L#pC7)2q)P~2%om05
z1qj&yPeL}*0$3cLY)5;+ghrz}@I>MO9t(A_F~dP8cn*h6wX&j+tc{7Ajf@RQB$BPI
z^=3nok)ghozL6Eh$dE{0vbEu}BDg3|ykyJ%V5|R0TUkbM1@LAYRLF@$*;|EtF0$}y
zD(BO&kUr^e(U$$`SYX<G;vEDS3_-^2M_ey$!32^`-)Apeyw87>2a{e1v)iGL@fd)W
zcN}c2JS1H&d-&l$?U8Hzlf_NyUa!2O=T=eWUKZ}q+77xRf^IWx!}ADlG#l6~qw5FO
zmEX=7IY`JDojfyo!@4b%#<D*8D+WKag2W(~wm2_ix_AW!uj%UCZ5>;^R!L<leADP2
zr=NXdV@E4mwFZR)EhlTo`<o|Br@E_r1EVnj$u~za!15vh$!bdjD8k5A9}Ni90l4|m
zP_MACS{M@S9rBKhggv}&=MDm~{X>sN2?gFFpUIl}y?gi0ruee%9eG}LRxA6#@R*uQ
zz~ly`A?3*$&$n}04O)lh3!-8|sS5lJP0N@)ZKcnOdhD2{Yv(#U9*z;da#=Sa+&@4E
z=B^pqu{E_O%qC@J#eEi$5#7vh2w7MaUCST!zZ{Pnt2&asgNT(yH+KVD1`-%@Kt<Q!
z{OQxDi!R(%0`)$AhnpCu9l6)$opkAHt0z{EWmoQ01pT+t(({iw<B1qR8oX!OenR^K
z)+tN9ac^URe|4xLfRC%2PrPTj=n%}iUN*ANI}!<@P_b21RGf<Bh7U2g3g`Vti!t>N
zCWku+G-k}y%gTXfG|V!6oPz+QE%dqmomrp3-X9uA`f_`zAUS=b<5_nn^J>W)2143i
zzi>*bz7mEEAbe*E<NSOKkCn>TrCx1S@UW-aTTC^+9YQ8wI2C%yTVAw$>Z{FMXF5@S
zEWXz#>%^7ibuAMME_{psk+t+!kAG8MmRY9+r1k5=_a99n%<D)$k3}2v_N6?rO#+Xb
z6ja-MoA%B3h<c}!S~c8sK(|XelbzwHH8xr`>{wyyne|#XHB(q2<-MFeIZVCoU$h*w
ztLtj`&kL+x94$%{Y53066%y%Zg%z_~=Wiyu%j=EkK{kU_!0G}oImGbW`0=8ht}1ix
z=L*Yv)pxn^F`)muP3dO;9#JAEGE{Yeifx?Mw9iAItX0wO_0FFD@I@LFNzmnaoA_O4
zB-8g34EpO0bb;m16|EnoACM6RIX`c8@;F7zAHE_Vh)qa-@u;hGxU#oI-m@`|4nl1W
z%S-gVbkxo{TSe@uj7#t)QOQBe^3y)BYq{yKKTxo9d7IUAGqaK)74}shNRPJtvJ(R~
z-x0ByhUNOw@i)I~oSJSvt|qZPm)IZPF%`+{uKHEUU}L6ZSs{0o22JjE0nwfJljHM0
z+OvPTeIO;h({aVnNN-n{Ha*ns@Mq(?!e9IM<bj}$=S`jbQx>zWTDgTaue?$J`?S9P
z9$oFI_<XOM9>SQ=E~Pr(rop51@iMbOEJ)Trm-zn`=y4z%Kl3E}ZOFh2ADU`cP1wWN
zem)~GhmsGA4|iRy5Dh%LaqA%CL0j4DRgnqa?ssP{F3a5My1~dqKRhbKweV_%hD)<f
z413^a@YJZ}ja=?;sT<XD8rre@ow5F~AZtfVq#e_TOgf@o&i+n;Wy61!U1APY(iz%J
zyz*ScW$l^FdweC+xA%*y<Eg51`zPfRwtL(SqkBK}x!!p1-13)7z=i~?GU%4wF}Z&b
zkOc;dkxa)&)qfUvUMkOom0|hCC59(Npuk&`o}3=D2GlqF_l|(&{$%FaBMNp`|AEit
z66{5=Y=Z2b4Jtm2;+7^c<Q8cEo<6u6(n>UGv(k}nf{c?YeRr+`#ar@jtNtB~AB1cv
zlVCzoOsDHLR~)K6tkjkVkzZ}g(#+-88ZdN@I?I9i+~|sWAuQK4&oBQ)rX$<d>M4z0
zjcu7!E;zO!Zik8GH}{VxWN<iqPPq4#jcZa5rFzLD%YBQjyHgLQ(zY|HkN|}QiJ(OR
zsBjKJ?S&M}BzST7pu~&1oRd{jRt|TOl&n>Mjq3T$C{O*kU1uVt=IfQ<s@El0W!vZa
zay6pDW6l?r#}_b5@b+wHWzd~Ek^4;9JU--cOX6kkYbK)>aiKXFf;T@3JRUr`Uj3Aj
zFg&p8EAtDtb*}|sLtP<`W_GX7CY5MksR(a9FmtUuA``>&-&G}f)l`&HeS(qbT_WhS
zAb(#?L{r+>+R_s;G|~nzK2Ybr@seAt!=(Z0nXD?$!zNHDjk}lPiFLo9Qx?I6sNSh5
zYxyD&i?rpPBluOuv?v*b<TG?=N4MH-rKvjc6jlJ6EX@UTnJT{1^96WRbcy@Ejq6X7
zZ)Do9;JCv!m3*cs?Jks)O=?bgAlZzvM;_o>(%$#7MFb&(e5(y1_@^V#+jnQamA*;L
z))*an)P^d+a9zdI_btO>o84Pq8el=-o@8pw)6RN{taT)qbT-frf0h!1%{U!9>SJN5
zFO3Z8{GzDjqH%2B?2YjOVMI08jvnZA0nGbdG=1Bg4XL`i&Ef~QA&&sGuehZ-fAplu
z6--_2o`Y>uzw7q>r?K{J64N582_dav?;dJ<RT|a-^{YK}zVDRuJB<y^(`sL@&-otr
zVz*6$0_eUI`>K8}doFNp_g_iD%Wo*C_BF|p27ej51oJ!b`v@lp*W)Mjf|~Y~up{E~
zMWW!=w79-p?Hr7hqEeUYCmrig*WKYiKQVmvrgm7J??jI!lvHEIWlK%JG`BPt^_n2V
z_GIG`7Z>Lj=XY?n^;+Fps6%%2oEHX$2I_LK`NFTC2eF2ing@?%VUmBTT}1?x9rdBd
TZ!x=MpZyND+iVJ~ckcclmW$@9

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/common/logo-footer.png b/app/javascript/images/mailer-new/common/logo-footer.png
new file mode 100644
index 0000000000000000000000000000000000000000..2baafd8d7f8af9dd87e1f2b4a7fe63bc48c5d118
GIT binary patch
literal 2418
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
TlUiQOe?de~e?k@hK+=BzF!=m!

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/common/logo-header.png b/app/javascript/images/mailer-new/common/logo-header.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a6bddaa104c7eb11a09160f599dc1d2491755d
GIT binary patch
literal 10846
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/2fa-disabled.png b/app/javascript/images/mailer-new/heading/2fa-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1e342a87cdcbc1564b8f46716770e54932e42cb
GIT binary patch
literal 1945
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/2fa-enabled.png b/app/javascript/images/mailer-new/heading/2fa-enabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ce3e04f848c2ade09c9d2fb61ba1789cd891f78
GIT binary patch
literal 1939
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
Z`5#^g!s90fo;d&j002ovPDHLkV1mJ?au5Ij

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/2fa-recovery.png b/app/javascript/images/mailer-new/heading/2fa-recovery.png
new file mode 100644
index 0000000000000000000000000000000000000000..cefb21e1eb0e2b2e8b586af2d006b9fd166a66e3
GIT binary patch
literal 2461
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
bqS^cl(R|fHyb>yH00000NkvXXu0mjfSdgWZ

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/appeal-approved.png b/app/javascript/images/mailer-new/heading/appeal-approved.png
new file mode 100755
index 0000000000000000000000000000000000000000..b2476ec346b8dd050c29ea9cde84b7608fdada7b
GIT binary patch
literal 1937
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
XU(v$Hspbu`00000NkvXXu0mjfh&GH~

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/appeal-rejected.png b/app/javascript/images/mailer-new/heading/appeal-rejected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ae38ad0c18ae18f00308f9ee36c9510858f3a55
GIT binary patch
literal 1672
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/archive.png b/app/javascript/images/mailer-new/heading/archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0c7fad84dc54d7352190817c613946910d58f73
GIT binary patch
literal 1504
zcma)+do&XY9LHxyjHNAM9toq7h9r+9T*eq?x?b%TBHij1^O~&Or4TZ&i+dwm-j}>4
zuaMW~QCP-el<9g@tSF3#yUw})+;i?9_ngo7_x*i;=luTro!>p2s{;hA3<dxI5R9W8
zUgRO)B_%1UEdHvq$fQFYeZl|$1?}$=!{8CiqM=wA-oX}7HKh7p6hOf?E;ax_EmdaQ
zUjhJ-h``v{oFRz`@@ub8qU94}qlob>$>5kunV^A7PtQK4OS4lUQ_l_&5#bR)1Y-_+
zG>v|cN3T5);ama|C@F@<lb+O#c^n9I0l0nKmz*O+x(6Vfvjd&ldt2r9IXcz5EOTO_
zgsDXk7!4QV<6SxAt#1*RCsPwBTes@2;FK6v#xXBfp(%h!_SJ2d$3{b4Wm$KMC*YMF
zgQlc;XL!Ey&56b#t*}6fQD`F#nytEb3@!ekFi91|AIzA<g=R9v<^~!jR3mrkApGdu
zMbwP++=@0bGl4h2iXo`zC<}Z}%EuB-j~SccqCI*vdKX%~!z+RX7Pv#DSWua*$Gm-7
zu_GB~p=3QR&%69-0Ef!65xgx2cC)p&aNC`aYQ7|FGPVQ<DO3J4+cGW>+CxXpI*C!e
zC8dxTgs!kMOZ9%d-&!D(3W|s5to=&c7=W4U^-f<ZWqW?umP`5+qSuBkUrjXSL38{4
z#FIcxS<y#$Qd+n|H&p>rR*UVM@3Iel68r;&6`+=cL`K|FL7ChfxI6Mr(UVh3=zINV
z1UeXA)b+8_#QTmWjF`i4Jz_wl^BJr%>sm8qSL^f?a8@c<{y!O##Sd(&)--SlyMieG
zhEh4=3ACvWNN64*KPJbGe#R8BCwz(&ei6T02>icjq50dECBR`d*Tw7FltgE}s$J{q
z#g56Sj&ED_<m7uDIsQ{^GA~|!eyQarR3}jrr3gDM&9nQ-3qygL2o$w{K?4W{7MxnF
zbh8a;w4ASg_B{)Ql!5M{$PAcUrZ8=X+bL#usARvf^u2GhZBq$Kb`Y(MtX#?Hl%`NW
z7>uJyg_@_GruH1~ztH0uz)H_O5uNf5&qKmENGkNajNou6N+<o5C>Sv_!W_lO#?J?z
z%&fa4Tk4oFps&-%siH-^Nq%^CPraxyRUdZ?P@Xe-BZaLqQ_Ja#n%B`CZrrprurONL
zY>yFUJXN!3sWtAOtccy5s20sN4XvhgW?$FqqcG9>DCH!w@KkGu424l(1K;0PhB4E_
z{lhsa%bjP8_GRr>ZL6IaQ@XQ?15<{Qup7zE$(}h%Fr@O0D&$BS%QUXfaP{#$>+PMr
zSybsMVUhj<^S6nFgh9Ml`0XY=Mn-AoDok-`X<@K_Xqb@9zc6=UUF<sQaqPCz#$}2t
z*EZ}y#WDR6(>JX@AFMDSnbMz+kg;?^#$UXJk5%WXRjWkw!$o>t9r=AaF`?M=%a`8^
z%bSbddf4yz+~rRB7yc9nTu;|7$VbA7NxKF)0H^i!q;~*F5PJlr`^c3%H0{iIJ_Kla
zS9FSv!4*Gt=jWb6j+CW8y<xVu=zXFh&Ta;Hb>*16QXb#y9SJ9&XB7<x&mMPjZ<4T=
zOwDrtIy)Ar>r#l@dtdTI;aY?BeOowgCdfFcox9#E@0?n|X#_D(mM!^IFXcX85#G3{
zrF?h;`iE0n+!d~k_^X!bPtd*@%ul0}xYpbFIbX{Nbe@H}cX_Vff-mx12P!i11;?sj
zt@I2r=)?F`>t;jmH|q_$avNkr=A*O4Z5wnoAEZazWNQjjutyFX!M+s?4g^c&FyNM^
zlIBPbjg{Ze;k90ihbhr@BkDp%U&?NAX;~A4jzD-S3o9A)wO<7X(||?Uj@59N*z6R2
zLrrXjg4cbfML7R7Dh9!4n!VLzDJYd5<)k^r*?&dP)weCNTSAr++m}p0B$r8(hmPuA
bzIk#QMBce8ax-kvLk3{%UG1uD{cisaA<@44

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/boost.png b/app/javascript/images/mailer-new/heading/boost.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33b759976fae85374c78ca4d468daddada55541
GIT binary patch
literal 1613
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
LNkvXXu0mjfhS27L

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/email.png b/app/javascript/images/mailer-new/heading/email.png
new file mode 100644
index 0000000000000000000000000000000000000000..c922c5239eefc957cb07ff5d035a938145c8653e
GIT binary patch
literal 1615
zcmaJ>do&XY9G;ogW|T(_Juq2}Qmm1;8DS3#hiFc_d9_e;B^0~1UAbf);d*Q?yBfJk
zg&x|v+p=aJ%}FJRxZNZxE|TYP_5VHhobUU6=ljm@zwewcmrOdQ12usH0013-KU~nJ
z(!X;nc=O7~=JA^Xq5Fj=0{}ZMzf;3MXy43csF56W3=3#h?w;H<pg1q07XWa#P+R?j
z76732!5`-plBO|LEe_ljXVfYFrxMnM+c6NL1de2t!H6%L_!k21SD2*m^>bg|AV}N1
zi@V9!ThMCy1`8K0fEp|E9Qp+XEi73n>}hJ|Zw_%{jC@e{V`k0guf?{bZ%EP0$)gi%
zDXB&jKsyEf3m{li!`FhHV0gOM2-bg+O+Nkm)|eGyH`prM{9S)k!wGau1_JE%q@ShH
z`}`;Ru2(tzZkEo2VeUS$uYm`W3Tq)kCxoHR4%>@1EjG+iB~BaFEXH~M5cSOV;>vOX
zC`i?!88*XHEg6-rdnd+>pBkRr$C0L+Dt>~y^}?uu<B<rx7BzR`>+_fCrinI1cqG=4
zZ}~!tT`HTn%f|4+v4KNEpy5PYJp3dyzYf2^U-HfxUNQaH_pv+>@<CVo^{F#&<~eoU
zhvi%sOv8|*cZZ18{k7N&I?(vXpxL2whZ?tlo`%U4$E6H@C^j%)!h@WVgP$a#1jj_d
zcq)>uWu-sX*n6yt#PcN9IGwf5H!uP{sxr%ufJQNqlHG>K$&+e(#=x949937N72!UP
zovvpoKB3qlgOS^f^09i5_8xGtQl!X!0ynAyKGlCt2j)eG)LsawrT-7WW5(XzGgWNO
zv}`!=cBJMs!>3UADzWCM6KG+PS#GyhG)Wob?2;_DO1^#GF5RBl$A?g(K_?=$-idR9
z35+YhUf3h`keBS|%(-U(+!;TYQyveUFkcd`&$qta=S&=1TTMx)RAC%%j(5c&tujvq
zhKe0~cuEcN!46~PB|h)Z+1Zu#xt5K&3di$VqhX&{DFKleMLfvvy^ZJpnOc4=jNkI$
z@`4oO3X5|hQi1!E=Jv`YZn4uDmawB=veF%NdDkz-ybrxsx>Du4^N3sI0q&n;uL!UW
zPrP`k(w8*yqJhyBCEA{rHu$iQMv0h<3PtW!sR6EOWK-<SjP%=*om87C6iU<?b$+J(
zgQ%3@^uO+!riwBoTuf0X(?c2dA`YMY9CQEdXQz~t=*;_%b#Bj`v%egFRURSaIH3Ja
zmfhC%Rv`@q+e|LYvx6Um&$lLzS9{8ROe_UTIi3kAFY~1}w$4VFz34*+5UV+hK!bzM
zoNK{x7QSZ5dNhK!Dgg%}d^*CR`B!uNm;^@};iM`-1|>MzacohEjjeiiMYM8XZrgPw
zatF{LLU7oe*x2e{=2?G~LnBlZRUjnY#DHdd_}2AMvy#{($fd-e|GRP?#PyC+<J(li
z1nJ>ydZut$_Mt~s>A9-fyYtK`+xITBf~0|J`QpYEhs{sdgi<FL?cu7d#Tlvm<{n71
z9VeNQd!**kyNow2rTC_HV|wP1vS4O@8+Z4<JEDy>qOQJE?&6uX>8pAhK0js;uHSqV
zGTw1E2M$b}_w^Y0YvdAjh?M@x(YXj-05$v{=xV#N5Iff`6euzZJT3uPTG{9NQMZcN
zh--(Qyp`apJR9!_&0w>@JU_(<iEL{!E&JkG?3+7W_IDB$B)WpgvywqQI)NQgYVe+I
zd90rOo2ETK2pU$aFhj(IxTm*b%Id94y#=hN(Ly9S*h;f1Eu7Gw+A`|LK)&ClD)gGw
zty-`>-^ArE#5aUmpgNbp5dn|c6HOh^X|$LTVAfgk=tdzwO{=V%CcJ=bqih=<Jmk}S
zk1WcHY`V>b$B9xg4i3ke&KPYnPdYa+K;S=Ho$8vXvtD_LOw`4;qaQx&0i~(GR9fF(
z9c~9!QVw>5jYan0aI12!T$hqtL!ww`{fb)4dt$okOm?OqvMZt9h6!spT;j!CANRI`
zV-eF8u^pt)9OwFYCL}3bhyE5+!PZq@j>!RurhO>bK49Wmd!1agk-!3Vb1J5~#Gtd_
n6V=XK<}zeAi@kKaKVe<-$6Fx?<WU7>bN>PUJ|tW-mdg4Uv_9t$

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/favorite.png b/app/javascript/images/mailer-new/heading/favorite.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e483ee9b2b18cb84809d59a2267fe069bafec1b
GIT binary patch
literal 2112
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/follow.png b/app/javascript/images/mailer-new/heading/follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff5b7e00424a68bbce7494b4ec83e1991dd1c44d
GIT binary patch
literal 1837
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
bX+Hl0{JvL4fttx*00000NkvXXu0mjfe<x*R

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/key-added.png b/app/javascript/images/mailer-new/heading/key-added.png
new file mode 100755
index 0000000000000000000000000000000000000000..82dcd464bf3213e535aa852d04392881b494e586
GIT binary patch
literal 2022
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
Ef&-DKJpcdz

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/key-deleted.png b/app/javascript/images/mailer-new/heading/key-deleted.png
new file mode 100755
index 0000000000000000000000000000000000000000..2930f591a09963cd87ab35f64520ce6d6c9d8eec
GIT binary patch
literal 1779
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
VvhFQN7B2t*002ovPDHLkV1ge1AJ+f?

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/key-disabled.png b/app/javascript/images/mailer-new/heading/key-disabled.png
new file mode 100755
index 0000000000000000000000000000000000000000..e0f259359aebd3150822dc05d39366025019bc94
GIT binary patch
literal 1940
zcmV;F2W$9=P)<h;3K|Lk000e1NJLTq003|R003|Z1^@s6#^Cfz00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2PsKJK~#7F?VLYs
zQ&$wm&wEB8L)y9mi6DqDDyWsHlt7onh~SJcr3;Ltuz~^`5(Cb_ABm+%tk7fx20F3Y
zBqD^N#2GpOt?CF6sRY!B45>wZd%qW7bL}{B>=^r=r}LAnJU>5Mkw1Uu-gD2n&!Z-g
zN+hDRv^4BTBE70mh>_>@>C@5TLs%wDN@YFY&lHrJqe3A)G&7T>4dPLQKr}y}A5}^v
zv|tGm8X=>Iu5U!lx&<r=M|76NVa;S*N3XGZg{(`!2l4nt5$^M%1xX&Bo*t{?`r4%W
z`(rwG-_wVEB(#F8cH_``-00W3;K9LzC$xC8B;vIa7-lv#Ffd%}!Zig9LZ(vVBq6gM
zL_N>D2MyM`Xw?u}9Pg4Ow4Jra#i|0rx=^14XV7|#9Dew4V#WE&6U7M&#ykm|ZjsXy
zoBfp&n-ycA7B592o{L0_nLrt30u~3%7zwV@mx{-e_K8vmEr!m&NN}B;>gd=#luqaH
zq~t&?-bE5P5T$(nta%bRP~69kk_(Lk6C`k=<ibEeFA^Cgffb%ohl9ToKKY`<=+|&y
zf&`xA^TR&*zEm0b(&y_~+DigYl#2O!l{7{IOY{PFFUG(a30#TRtjG&aBLZ?q1Z0i~
z$ec|SQZ{vUQRIs+g5&=_e4vkuixfseCE!>4_fz-LqqOzVA=*?F&#?6RHRWb!>CNOM
zy`7q(u;8WRaYf95aNk|HK%LvSuj_h<nZ0$3{=R>oxWnFo-;9pZ&SS?`oJYv~s6!`!
z8xc|s5ZVYnfAc1BhP8m-Y7r1J4G`_s?b|`9#KWd*?_S!Wg^nILK%L#)!MWJUlfm)R
zOP7c%k&&LBBr#-{{_=MoKVEu{v2E_m8G85lF)b}Dthhe^?p-kU;Q=>7P=LR1=s)^>
z9APOST(@WRQw@4vk7v)XU86!iU-P|iDMUms3ET+2+_#V3YsXd--gQ{!fpDK;K~F@o
z4UA)$#K5%%gkz4d6L5=85zK58j)D6c1!JGd5Am5%J)7kQI{~*24wjB{Po4xRL8Cyt
zmwM7;*k(<LxWG<8+a<5=+@X!~-kPo2KMpRi5)iXT6F%Xd#plmyqafWdVHBTl=ZhTR
zC7`uDW|H(~V1HKS5}fNuHG-&Y9Bt+gqZNd<8c`2VFJGo@M~(#JA-Af92uRBg+(<go
zP9%gfM+9V!2*?}}kU1hCb3{Pqh=9xy0hz-hkvBb_n~S|HhRy5jLTdyry`)aJ6{2+l
zHM({cT2bwIsY_Naw;wtwARM>v>Q!ed<S04)e*V0Zj&xGM-WxZ{#It)mTSaA)Fhra?
zeVSauxiPT2B4ncKjs~Q52-vMF6uVBH3ZCPCLO6FVoH{oP-C=cEqeAe<_3Le^(V6yp
zyJx1`!JZkX1hgA&f&JyR3;c-8*asK7)^g#NfL1#L9N@yFp>q6nt>r=zdFF_K%n<>Z
z6WX2_Z2Am#9_dL3a=7;u+s(p4C<UzCHwdsK_NPus!ba#qD0b{t%h#}r*Cgd(B6I@U
z+pV$nY{6PN!E4-F=W7wF5NfYqB9Am%r;&i;wP5dq&f~&#%aKqCXeZndY|G$aaLyK%
zTkCu+!X=<~7WNF9t<&FMxl;Cej$!M3EkZX2VxL2`z3w>2`EC@e5xO)2V;|~vyNb6E
z!I<}Ua*|%&y&Jml2|}3%+7p<tBTH$_5doPa0y4*00bMGby1Z}RDFN*&JXTFyXe-3J
zs#$(RDzcIL(tHk_bD-S^gQ`MjMK^XU>DsfW?6zK5BybJq`a<z*|6yXHOt?2wQ?&T(
z8MP9u=GYMc?n8d*ngg9|>_s6Ko!RYlpAEt~#B0Wlg_@0%lNfwa_`>YF3APKYpZ+#7
z;-q-M`Fm!Yy9jP>u^a!zP0}+N=R#&B&M&3m3tVvgOKc~S$TLR-WR3{P91)N?A|P`_
zK;}Te90_a@0eO>!fEf~aqEyz`>uB>Nuta&@oKJ;<IFK(HpE^5#C4nb}LfRinr*k@%
zrb*yNW@u(6n8YBKJ|KY=dhQbJR$WfyJ34+QNhf%r!zca(0wRnWMFkd&BYfiE(^8ta
zkPWI(7&FHu0mX$p&>D>y_W`f+f^<BN`*HM<;3C<?^z?4~#ENQ!w&#x|q0~ikTAQKD
zlPd&-J@tj>NN@_J)K7NkG*qnz>I=saYe{f|VBCB3sOpMYWVJU<ym*m5(bMDUK{7!?
z+X%#)o=&dzx<@rg4Gau>p7)DBjFQkwkQJQM;*GC$QB46ss=q(x`F=_t#z<%d8B8Xt
zjd_)<OF%;^9#85wTqNOh5#-`)h0IFo5)i<R<atRQR!@-7ES48h^lDg89jb%61vCUg
z>Isext)nD~e`Dw}UQh{YKsZCg0@@fc$@lv_rFykP@jOO?As0N9%4osngDwbNNN-d$
aoBsjvPR<Ikj&L;q0000<MNUMnLSTZc5sbb7

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/key-enabled.png b/app/javascript/images/mailer-new/heading/key-enabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2476ec346b8dd050c29ea9cde84b7608fdada7b
GIT binary patch
literal 1937
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
XU(v$Hspbu`00000NkvXXu0mjfh&GH~

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/login.png b/app/javascript/images/mailer-new/heading/login.png
new file mode 100644
index 0000000000000000000000000000000000000000..89a6e9ee335aa8368f932f3167a8df21529b2131
GIT binary patch
literal 1918
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
Ef_qVqzW@LL

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/mention.png b/app/javascript/images/mailer-new/heading/mention.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4dccff8ef2f2f5c799d5355d7d711994c4e9468
GIT binary patch
literal 2522
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/password.png b/app/javascript/images/mailer-new/heading/password.png
new file mode 100755
index 0000000000000000000000000000000000000000..552c7c06870404a177c46609133c2df0f3e2d60e
GIT binary patch
literal 2249
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
Xfnf9LBW!=~00000NkvXXu0mjf`*J87

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/user.png b/app/javascript/images/mailer-new/heading/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1dd58a18d2f36571834e4a8fa41574004b65a88
GIT binary patch
literal 1837
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
b(tJJu0AFED39z0T00000NkvXXu0mjfl7e+a

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/heading/warning.png b/app/javascript/images/mailer-new/heading/warning.png
new file mode 100755
index 0000000000000000000000000000000000000000..7764837abef6e61296ac8aa1c156c4327e8f91f0
GIT binary patch
literal 1929
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
P00000NkvXXu0mjfT1tpw

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/checkbox-off.png b/app/javascript/images/mailer-new/welcome/checkbox-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..51c190efe6dde5e4710d3242c32a5e4b5abc2d9c
GIT binary patch
literal 954
zcmV;r14aCaP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+000AlNkl<Zc-pO4
z%}x_h6ux)b(z?V&bqS`p=(a0&MWP80(7h%+fEXU2L>>Ue2S64sTp+S@rEE-GQHY7r
zggBPY+^a-{CNyoP;dsuR4!3dW-^_eB3}I-#@7(V@cjn%TQ2=Rv_aH-e<G@fEa*zUl
zV$&Kl=JgZ(R@uM)YS4h!eZ8Zqjd>D^Hxqd{t*S&jVEj;<_AHBlj6kl}ndmn(p#@#I
z1O#3^Xycueo{ZX5Gm~T@`RXon<!8`=LGa)#n8_m{{V^0AA4y2A{SQ_>3f(|tor@bC
zuKYQzKaedKFfK0e(;D2`;WT&I@ZPc9nnr&;m;_xv5%p0FYhaLpIVWsQ1PS-Kki+_3
zI*-YmE<}OHMlFlMGx&B#*%}><iVJ@kez|#l60&NkO=`<HIQ9FfY6%%K2&6r$K}WR5
zBtaaXZeFt{;@8ihRpG3L1*EXZe-GlK<L4mIB*4)l2lU^*Pwklms9hWL|Ifj4Ry8ys
z2{gG`{h*CODZQhi4N0IyLGQ2tNbVpMaBJ}sFrB3As>RG#GoXj_B_x4MjyV+wNLpf*
z6!mXXATE*WfACr5bkYLlbe}*K1(LR?k`fkMgclN^W!8lx;L!|f<unQ~*dphhh884&
zw%?|lLEk!PJWX<;Ija>CV6a6;3rRjIjutqBD~U>~l%beAi6o$GK?%qndC*6VXBy5S
zF3wTFeMJIb1VB>E@AFB$aQ5edh)u}8NzMxmr?KmAY?U$<BVgXhBE6l*9AduomAyYl
zYaqNovS<$W3a&!%BHBaS7JI3b;ebQ$WXhp9b-WR0<8{1Iobu}rL9&EM7qaf&<Px4w
z?;J2anG=Q#qTbFs2WZs9n_soJou_!QP&shxNH&!+i&-*C!}&PdciwD4{beCr%5eQS
z21$Ud`Vz${dr8?WGC1-M{+CZ}^_9h}@aab$sLU)r-)(GZpm73CXoGikgz7@e9HB7S
z*SCsO*gI^_SSOs`ED9*%Zt+Y)gDYQqb9*uC(_5zc@lM5-NRbHkMeggv`kLBR2l|X@
zm92K`E8ic?<O)bm&U3Ul#)f1G7NNNmvgKSkH-qEe4J5|D1X43O*FGja$iAK;5t2c}
zM24lv5E^(VO$7`*U5?Iz^I#dQ(jVn?aHV^E=rSD`{mX<tDIV;&AvT|mCem*j6U)%2
c;v*X6KcV4J8%*kM?EnA(07*qoM6N<$f)RJQ2><{9

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/checkbox-on.png b/app/javascript/images/mailer-new/welcome/checkbox-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..162095e7df3df7aded49886f48a7fd4087e96c35
GIT binary patch
literal 1074
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V6+SH32_B-|Ns9FBpVtULPJA=
z3?OiDa4<GDhOj+7J+-v7R8&+T;+B?{3JMCkODp82Wm?WD)S6Rh)t#Z-9jntCsn-yz
z)s<kdyg+YJiQb|d-MN_tGt%{^r0Op%0&?{hWNR(R)0v&EGdD|jd6Dk2LcPU#dJFS(
zmlx_SE6`n9s0HLM&eH*sU|H=Yh1yH<b(iGpEXvbcR;aVQP-j`8?oyygf$m~3xx5f)
zh|bb{y`=>@OAB;Y6zQ%g1e&J149o?~0@=Dt3-rL^KodYxV7ow;g6svG36uqzysQuy
z4o|<lJ^k|b-Y1tf+&i`5-pR!`4@|qfqvpi&niI?N4$sX$G&gbYl#uN`?wgve)>Huv
zF?!r|3>YqvB|(0{42+CS%uLKItSqeTZ0u|toE(CJLPBC<;$jjCii%3AYK~6M&aQ3=
zi76?C1%*W=B@K;@jm<3+CQg_<Y4Vf>3l=U~w0^^ejhpr#IC${<g$oxiUbz3@!Grhj
zKX5(szt6zH<mKt&7*cVocN%;7Wdo7c#oF0BHga-qUSswq_Ed)EVh6=3H;rb^m=bFC
z>wkSix@3q<bW#4C;+*;Kf9?IfCV981X4-$19d|eAq!zMWI}!C&-|o(do|ADr&wlgp
zhHglocO!Riq+L@3^Iq5Bi+c}$jdZxJTK+X?sxgDs+s$GdGHjx<7D`F%RX?_Ry6u$N
zi<CE}F;#JG5X%3}`BLrF=i`x=7jSEYTA1Y+^?ds$&RlcTB&+jq>5;x!vKjI*;s2QS
z@BdTs`}!QlL(?Bze^&A5?oxpSo#T@Bau1Hn-%b1<&sli&^yGbc{$V0)Cmb8@8~OF0
zIPhtHjqH=TZF3T$6^k$Y{+O<x?`CAqU{kbwTgT5Q4?Q<UG&xP>dGg_dn<(2lqw@J?
zYY!jpSDKif5R>bp@;Bi0Y*W>)+Y99U&n=r~&de$D{b5n&EW3L#{T<tN=W?98|57D&
zL!U=_s=KXy4{MQ){N>(Hv;KWMeC0)*&J0t7h2Lh&W*kdXW1P6}?wR#3I(Wh!d@Q+k
zgg<>s!Fe^ompj!CSLP~<KXOtnKlEp<3+M4>nZjQ-NA@et+d5~$^LcUKKcDA&(Xsf;
z3K6gEdt>kVnu;c@J96K2_2lBiRyMmY%?n!e>DeaJwD7D)az0z0tk~1IM%go6e#)v8
z?)F=qVpm_^c2-;BH|gBV)~jF3kL-(`Ykk#Mc&&zhR4J2Xk@u`JtGn;s<=wiulymv%
z>mSeXaXX!e@SnJPu1aU$QWlxmjZfqzs80%7RU<6O{D!CbKHmmCA$FZN1@n)7b2GTJ
c(v9_m{km4>nExMI3PCyC)78&qol`;+00|A^7ytkO

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step1-on.png b/app/javascript/images/mailer-new/welcome/step1-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3776d17dfb7e7ab4694cf0b1786916c34ad768c
GIT binary patch
literal 1065
zcmV+^1lIeBP)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th0002qP)t-sDXnk-
z001ngaV@8DEv9fRsBtZ)asaATEv9fPs&N4S|0}I?Dy4BNsB<l;aU7~~Bd&BUrf)5%
zaU-s1Ev9iSr*R>%ZzQ&DEvRoRsd6W=b}X@PEU0iMvU4q`axSWGC#rTQs&6f+a4V*8
zEv9fRr*SQ(aw(~B0Dyojrf?vya3ZRAE~s%TsBtc+a4n~CEU0oUr*SQ(a4e{EEv9ZN
zs&Xl*bS<fI0GVbps&_1=a4n{BE2(cJwtpm~Z7!#AE2(lMq<<!+b1<K9K)--2s&Or-
zaWk1_BC2LBr*Q(22+sfj07-OGPE#2GjN;>O#RKs+0W~%?nh6$ueire?7Y=@!Cl^u_
zU?(RhL~zFOw?qQC5D$!DsG6v$sZwEJM7ISG#>P_)4w`)q6c7Y&VFeE`^?xG(00OZ|
zL_t(|UhSD_bJ{Qvh8G#11XHI8gfl77gewPa(k5xHrl<b@AF3?l7tAmn)>b}bCeJ6q
zFb})lmF!tl2?Vtt-8!+UcPF)=1R!)9kmX?Ft_gz%6{HcY3f=cqn0M|{cnx16<4-L_
zd`4o_!T`R)#y|@jWQ;~EbjcvD5>ALrhDakaNjsn#8Kp)OGRh5g$tYcFlS!a^b-Zyh
zh=hnvPsjvEk>kk)o?{;s)y)zcu+FMffP+L=9yf((j?0O1m-4dXNX0O!qypd8PN$mF
z7e{1uD1%m7)!e=iCLmzs`@9ZqptqOH=qO(w#U2Q83P)cV9d>=Clvk<llhmMNKC2JA
z{Df!A^#UY%F6GA$#6iVmt@?&daT^;`i~c_bhe~3@t%{Qt;|xjjLbO)`j4viEGPUgU
zuHrrdq@I-DHhg`+E3`_kvg~6)s0G%(%9*z2i_RFrkTP<VWt;O6X&$HRfzAynU#9D?
zDt%5@hbXv|vO}8RYFR=0jH)0t&0KYej_b~o@*?vawh%oj9T7TlV^{b>qzrs)J@~jO
z4|Gw0KbM+|mKLBWm;APYvL}QM9omN3*#BjR(b!w<R2w^T3$i=a9|&-YEO8ud$KhVu
z&9);mST>F$)(I<;vh1wsa91v)#~C3$CWo~*7GUfpHv*x1lEsr!b>jHKOt<(Vj`0dN
zDORC1zc!RtsyK(l0vm1y5je*t%wv4qB!rJ|M4N!SGJJgeeW{gId=VuNc<`}#T0CPO
zheCwMmW=UssQ~^wQ36l2s2DB#)`M*rL05==FA^fM`}9hAqitAceu(jxj50Mp2pXBa
zhyj%zjAr~2<G#{&GRD20aE{E5OwA8<6@Sc(ov&YLFs>ODuFQR~{&HbT`Kdpwyj%c5
jZTei#A$z`Aef{wdI}C@qJ4V;j00000NkvXXu0mjfn>)*X

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step2-off.png b/app/javascript/images/mailer-new/welcome/step2-off.png
new file mode 100755
index 0000000000000000000000000000000000000000..a262454d2d51eb788973ccb1be7e26c109615c9c
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBJOX?|T+`D2C#C!c@{&{khlc(K
zf|Qj1xw-#=;<2&+GcrJ2AR8!^knq2u0mL;n{$E)5KPCNtbo74*hyO{b|C3YxAB^@)
z1DYaU666;w*~5^}%qY$$A|`f}pHqOThm|vkk0s$o*cBrN21ZX$7srr_xVJYi<~1Ae
zv<0#s=ag1l6Kj6&zps07qC%AV)juAqr@Y^GDKOxUbi0-Bu{-QlyDmImy{4<lj&0NQ
zT2`+m&399{f0<j|*&ToI^drV2>zQ8tR7lrZAi}TY#i)F6*Ih^d1Amy(R3xltaYPD8
zao(D0B<6D^`QSVzF`h54w$3<s&nDT`{Jh`!F4nmZ*Ssm)*mSg7?#a$q!3Q7JO4zMu
zJH2#8Is^Omm(lB+t{TTV$gXZ@_&P@*;CH-&b#J-xDYgys-0z*$kUo$lC(CrDQbxq2
ze$yfM^(z~{E;W#6F`erp%GkVif5N{ih7GG4UwB*A=iHJpD=64+7ICosro%t(6r&^W
z5`ET(YByN^5mHV(*b>j;%gDu5D)@4#@wM6$%E#XE`5l<5S+$Zo&N|*Ns%QGLiYwhg
s_IfIt#2-B?bewE>bDsSrjn$u+5B^Zz<yE)Q78vdfp00i_>zopr09#4evj6}9

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step3-off.png b/app/javascript/images/mailer-new/welcome/step3-off.png
new file mode 100755
index 0000000000000000000000000000000000000000..972de65a569aff9f6854996174fc45d1786a9dfd
GIT binary patch
literal 688
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBCIt9|xTdB32QrgV{-=OZXefvQ
z1j(uYb94U#Wn*LiXJmjFK=I_1{|O2IfohVH{x>xIPfiA*)YSilh5wC>L0Y1t|0jV3
zK_t+?bdVrWO-kzjBp^!p@8AFu1Zn}w0=Xa)z-*x5Kr?}YQ74bq10AGa666;w$<VX1
zhgqC4pHD<gj6dkH0B11MtVgDttRMM4*3EhpG|TL0@Jg0Mmn#Jy>sB09?~2M*U|?We
z;OXKRQW5v|=E=NI4g#$g7j;xC7;ZECEMmm}Kj8iUvc^6q*Dae1e!F!k?bH1<@wRr!
z?5g8Ap?o}B&+(j^8TynX?Os4tY8g|Mzijla^9g01b9bK-nX~%3YYoSOee#cFnKPQ%
z1#=l}4@Suy=xIo;-r&--&)rnfc$!v|*<vB?XC?=ln2jPXTzLQD&VTWL#q3|Mao^lN
zcahDs?_vHH?<<S-m9`tK_jfVpo|wJBeT#5pvdzvP3nU-P9(8)MQPm(RO?>Y3`$zYk
zNV(Og{bWM-zIcJ(jk!-dHCEg^c`!PpV^7`;W&IA$dmi?IPXbqee)T!IXE{T&4Xfk4
zCIx@T3Ck6ZbUU_x5aIc9|HNyKq9=?FUj-IaNqmquUd_(ne9*bU&z8rd&$-VaVNP+x
zg-#2B75o1P6x`u?cj>^w6Ir*O+!g7ppTsrs?Tp38xF>QhHJPF>9W*P#q<Hd!r4#Q=
zC^~R%u5kjNebSQ%gX8>;TN|6ERmoK){kX#}r&1eXk^La0ORn_b=Ffj-w|xwFySwV%
uyg0olQ|5hCpU$lq{WSBsd}V5AC3D_RN4+nORXc&v%;4$j=d#Wzp$Pzj&O(L&

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step4-off.png b/app/javascript/images/mailer-new/welcome/step4-off.png
new file mode 100755
index 0000000000000000000000000000000000000000..f45e9a2c9ac1818f2819a0895e8794ee5c6c5be0
GIT binary patch
literal 709
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBdINkyT+`D21DQ!F|C3Yyhlc(K
zf)pS-8ARsh{!dN)pOX4NHugVISw;qkOiuZqkN{EuR19P%C4n?HG=M~mjsGVl|1T{3
z4>S#efZBl~Kq(*tNCMSINB>Vu1Ze?sQ_}xuW`d*=Q~o<RfMh#A1v>#<qgN8-7c9xp
zlh4d3Zq~zRdQ?nAjQ_DfKIeAzk4zs~k8u|4IO_88QNs2|d@i$QC92O#WZ~=I<G{ec
zxYN_cF{I+w+nYD@nhgY6A2#>im6#<oYi;$ccdsk|A7AZoc1qi7BVo;{pJH2M{@f5s
zQfc;S$+YeJvDspszO&kfpA(mNJbYE7Eg>{T&e?p1yz^U?|D5x@{X_rcG;gw-Y`X2B
zf^DhcmV+$D{k{h63vHak4hNjt(6Us*pmnA96@$=3p5SDc8C@1X*7vQO^E={Tm;TMF
z4`!>iHBTK{V6IqM_V&)#$ju(L8&!T9<zMbg;Z*hiBy!)+v+9M<3Be<qt2+Ik<T8HT
zrof$XXQFY*o$T*#Jg)D)xB5Y7{ps}=ER^z}&ppk$v*{G?&wts+U)xq~NbQsnWiY5$
zt4#b{6me$GY+a9ax^d>_BI2w%KTejPJACTZIm>t%w})|OpG@06>*S%^=TbOdrEki)
znWI)-x&5K(`gQN>54}z+vVXyL{>i^->OvuBp70%S3+}m4m!B&<<=%;#EKAuJFZj~a
zbV*v|%cmFLstz}O_&YDZy2#r0{+B0ZT9Yh$=FH2Ov)TU0iiB00>^Y*`BDhXWdf8WA
zcqe`5ktwDJmp+`h^6SENA2)vf*~fP*`ZUW@k!|*RArgAa&K+kJTy}NCdHJhbKL32o
Zt$4wVVVOzqYGCv;c)I$ztaD0e0su0)U7P>_

literal 0
HcmV?d00001

diff --git a/app/javascript/images/mailer-new/welcome/step5-off.png b/app/javascript/images/mailer-new/welcome/step5-off.png
new file mode 100755
index 0000000000000000000000000000000000000000..ca270f54781c5a6516884e48c26892a9e73a7d45
GIT binary patch
literal 547
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB@&kNAT+`D2C#C!c@<K!Z13^m4
z|K!yFxw-#iWB&uCGBQ9UNHFDpLc)Kbn&jmFNlE`38vduG|1T^Aae-3C#{ZL&|3^pv
zPfZ1j0LfI4uB6oe4h|qTNEcY8+=&nspk*p0L4LuKJq*l@;`w}HB4YeOj|Dhq1v3S4
zK6=DDi_g?-*2km4EOj40uC&?khk=37-qXb~q$2L^P0#$p3Ic5p`8Qu>)h~U##&_4*
z|Nnbg<sY5$<2x$6GPANzCa(7gE3d}6kl^W3_RCIJEj@P1Qe&;#t|-5zQ%MWw{*s%*
zAMqxz@1XAsLy`M!4=m(Q_ZY5l>R-8{Z2{}-SROBfNs1B86Ll{%P7cdBkku-+M#gJ{
z*205ckKd*ECp|0mT(^k(+WC{VyOg#@2-fDf7A!jG$#T13m!I5*`^rWp1|59IuL!aR
zb~E;H@UT@V3axZ3{P-uIz1RSXdLQyiDSh7EZ1Dd7lWEasmfBCVx%gbpxLxb#QOWt!
z*3QW2cd@-xvFniX#Pu(l?kUd|H<l|`zkJ5>pK2Sk_VN83uS_g7MZ|jU=w7RxqkKz=
z&HC6>&F?|eE8p(fc{R!Am5$h^tY14HOz^w?^10Izsp;STK9n*I+sE+MLA&bl^MqT#
Ppl9%O^>bP0l+XkKKuh;E

literal 0
HcmV?d00001

diff --git a/app/javascript/styles/fonts/inter.scss b/app/javascript/styles/fonts/inter.scss
new file mode 100644
index 0000000000..bb4899b701
--- /dev/null
+++ b/app/javascript/styles/fonts/inter.scss
@@ -0,0 +1,8 @@
+@font-face {
+  font-family: Inter;
+  src: url('../fonts/inter/inter-variable-font-slnt-wght.woff2')
+    format('woff2-variations');
+  font-weight: 100 900;
+  font-style: normal;
+  mso-generic-font-family: swiss; /* stylelint-disable-line property-no-unknown -- Proprietary property for Outlook on Windows. */
+}
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 92d00cae8b..6d0168969e 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -1,574 +1,534 @@
-@import 'mastodon/variables';
-@import 'fonts/roboto';
+@import 'fonts/inter';
 
-table,
-td,
-div {
-  box-sizing: border-box;
-}
-
-html,
 body {
-  width: 100% !important;
-  min-width: 100%;
+  accent-color: #6364ff;
+  word-break: break-word;
   margin: 0;
+  background-color: #f3f2f5;
   padding: 0;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-
-.email-body {
-  td,
-  div,
-  a,
-  span {
-    line-height: inherit;
-  }
-}
-
-a {
-  &,
-  &:visited,
-  span {
-    text-decoration: none;
-    color: $ui-highlight-color;
-  }
-
-  #outlook & {
-    padding: 0;
-  }
-}
-
-img {
-  outline: none;
-  border: 0;
-  text-decoration: none;
-  -ms-interpolation-mode: bicubic;
-  clear: both;
-  line-height: 100%;
-}
-
-table {
-  border-spacing: 0;
-  mso-table-lspace: 0;
-  mso-table-rspace: 0;
-}
-
-td {
-  vertical-align: top;
-}
-
-.auto-dir {
-  p {
-    unicode-bidi: plaintext;
-  }
-
-  a {
-    unicode-bidi: isolate;
-  }
-}
-
-.email-table,
-.content-section,
-.column,
-.column-cell {
-  width: 100%;
-  min-width: 100%;
-}
-
-.email-body {
-  font-size: 0 !important;
-  line-height: 100%;
-  text-align: center;
-  padding-left: 16px;
-  padding-right: 16px;
-}
-
-.email-start {
-  padding-top: 32px;
-}
-
-.email-end {
-  padding-bottom: 32px;
-}
-
-.email-body,
-html,
-body {
-  background-color: lighten($ui-base-color, 4%);
-}
-
-.email-container,
-.email-row,
-.col-0,
-.col-1,
-.col-2,
-.col-3,
-.col-4,
-.col-5,
-.col-6 {
-  font-size: 0;
-  display: inline-block;
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-  vertical-align: top;
-}
-
-.content-cell {
-  width: 100%;
-  min-width: 100%;
-  min-width: 0 !important;
-}
-
-.column-cell {
-  padding-top: 16px;
-  padding-bottom: 16px;
-  vertical-align: top;
-
-  &.button-cell {
-    padding-top: 0;
-  }
-}
-
-.email-container {
-  max-width: 632px;
-  margin: 0 auto;
-  text-align: center;
-}
-
-.email-row {
-  display: block;
-  max-width: 600px !important;
-  margin: 0 auto;
-  text-align: center;
-  clear: both;
-}
-
-.col-0 {
-  max-width: 50px;
-}
-
-.col-1 {
-  max-width: 100px;
-}
-
-.col-2 {
-  max-width: 200px;
-}
-
-.col-3 {
-  max-width: 300px;
-}
-
-.col-4 {
-  max-width: 400px;
-}
-
-.col-5 {
-  max-width: 500px;
-}
-
-.col-6 {
-  max-width: 600px;
-}
-
-.column-cell,
-.column-cell td,
-p {
-  font-family: Helvetica, Arial, sans-serif;
-
-  @media only screen {
-    font-family: $font-sans-serif, sans-serif !important;
-  }
-}
-
-.email-body .column-cell,
-.column-cell,
-p {
-  font-size: 15px;
-  line-height: 23px;
-  color: $ui-primary-color;
-  mso-line-height-rule: exactly;
-  text-rendering: optimizelegibility;
-}
-
-p {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 16px;
-
-  &.small {
-    font-size: 13px;
-  }
-
-  &.lead {
-    font-size: 19px;
-    line-height: 27px;
-  }
+  -webkit-text-size-adjust: none;
+  text-size-adjust: none;
 }
 
+p,
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
-  color: $ui-secondary-color;
-  margin-left: 0;
-  margin-right: 0;
-  margin-top: 20px;
-  margin-bottom: 8px;
+  margin: 0;
+  background-color: transparent;
   padding: 0;
-  font-weight: 500;
+  border: none;
+  font-family: Inter, 'Lucida Grande', sans-serif;
 }
 
-h1 {
-  font-size: 26px;
-  line-height: 36px;
+img {
+  max-width: 100%;
+  height: auto;
+  border: none;
+  text-indent: 0;
+  vertical-align: middle;
+  color: inherit;
+  font-family: inherit;
 }
 
-h2 {
-  font-size: 23px;
-  line-height: 30px;
+table {
+  border: none;
 }
 
-h3 {
-  font-size: 19px;
-  line-height: 25px;
+table + p {
+  margin-top: 16px;
 }
 
-h5 {
-  font-size: 16px;
-  line-height: 21px;
-  font-weight: 700;
-  color: lighten($ui-base-color, 34%);
+.email {
+  min-width: 280px;
+  font-family: Inter, 'Lucida Grande', sans-serif;
+  word-break: break-word;
+  color: #17063b;
+  background-color: #f3f2f5;
 }
 
-.input-cell {
-  h5 {
-    margin-top: 4px;
-  }
-}
-
-.input {
-  td {
-    background: darken($ui-base-color, 8%);
-    border-radius: 4px;
-    padding: 16px;
-    line-height: 20px;
-    mso-line-height-rule: exactly;
-    text-align: center;
-    font-weight: 500;
-    font-size: 17px;
-  }
-}
-
-.content-cell,
-.blank-cell {
+.email-container {
+  max-width: 740px;
+  margin: 0 auto;
   width: 100%;
-  font-size: 0;
-  text-align: center;
-  vertical-align: top;
-  padding-left: 16px;
-  padding-right: 16px;
 }
 
-.content-cell {
-  background-color: darken($ui-base-color, 4%);
-
-  &.darker {
-    background-color: darken($ui-base-color, 8%);
-  }
+// Outer email card
+.email-card-table {
+  border-collapse: collapse;
+  width: 100%;
 }
 
-.hero {
-  background-color: $ui-base-color;
-  padding-top: 20px;
+.email-card-td {
+  overflow: hidden;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 4%);
+  background-color: #fff;
 }
 
-.hero-with-button {
-  padding-bottom: 16px;
-
-  h1 {
-    margin-bottom: 4px;
-  }
-
-  p.lead {
-    margin-bottom: 32px;
-  }
+// Inner email card
+.email-inner-card-table {
+  border-collapse: separate;
+  width: 100%;
+  border-radius: 12px;
 }
 
-.header {
-  border-radius: 5px 5px 0 0;
-  background-color: darken($ui-base-color, 8%);
-
-  .column-cell {
-    text-align: center;
-    padding-top: 20px;
-    padding-bottom: 8px;
-  }
+.email-inner-card-td-without-padding,
+.email-inner-card-td {
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 4px 16px 0 rgba(23, 6, 59, 8%);
+  background-color: #fff;
+  border: 1px solid #dfdee3;
 }
 
-.content-start {
-  padding-top: 32px;
+.email-inner-card-td {
+  padding: 24px;
 }
 
-.content-end {
-  border-radius: 0 0 5px 5px;
-  padding-top: 16px;
+// Utility classes
+.email-w-full {
+  width: 100%;
 }
 
-.footer {
-  .column-cell,
+.email-prose {
   p {
-    color: lighten($ui-base-color, 34%);
-  }
-
-  p {
-    margin-bottom: 0;
-    font-size: 13px;
-
-    &.small {
-      margin-bottom: 0;
-    }
-  }
-
-  a {
-    color: lighten($ui-base-color, 34%);
-    text-decoration: underline;
-  }
-
-  img {
-    opacity: 0.3;
-  }
-}
-
-.logo {
-  position: relative;
-  left: -4px;
-}
-
-.button {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-
-  td {
+    color: #17063b;
+    font-size: 14px;
     line-height: 20px;
-    mso-line-height-rule: exactly;
-    border-radius: 4px;
-    text-align: center;
-    font-weight: 500;
-    font-size: 17px;
-    padding: 0 !important;
 
-    a,
-    a span {
-      color: $primary-text-color;
-      display: block !important;
-      text-align: center !important;
-      vertical-align: top !important;
-      line-height: inherit !important;
+    &:not(:last-child) {
+      margin-bottom: 16px;
     }
 
-    a {
-      padding: 10px 22px !important;
-      line-height: 26px !important;
-      font-weight: 500 !important;
-    }
-  }
+    a:not([class]) {
+      color: #6364ff;
+      text-decoration: none;
 
-  &.button-small {
-    td {
-      border-radius: 4px;
-      font-size: 14px;
-      padding: 8px 16px;
-
-      a {
-        padding: 5px 16px !important;
-        line-height: 26px !important;
+      &:hover {
+        color: #563acc !important;
       }
     }
   }
 }
 
-.button-default {
-  background-color: darken($ui-base-color, 8%);
+.email-padding-24 {
+  padding: 24px;
 }
 
-.button-primary {
-  background-color: darken($ui-highlight-color, 3%);
+.email-padding-top-24 {
+  padding-top: 24px;
 }
 
-.text-center {
-  text-align: center;
+.email-border-top {
+  border-top: 1px solid #dfdee3;
 }
 
-.text-right {
+.email-border-bottom {
+  border-bottom: 1px solid #dfdee3;
+}
+
+// Header
+.email-header-td {
+  padding: 16px 32px;
+  background-color: #1b001f;
+  background-image: url('../images/mailer-new/common/header-bg-start.png');
+  background-position: left top;
+  background-repeat: repeat;
+}
+
+.email-header-logo-table {
+  width: auto;
+  margin: 0;
+}
+
+.email-header-logo-td {
+  padding: 16px 0;
+  font-size: 0;
+
+  img {
+    color: #fff;
+    font-size: 16px;
+    font-weight: bold;
+    max-height: 40px;
+  }
+}
+
+.email-header-logo-a {
+  display: inline-block;
+
+  img {
+    display: inline-block;
+    color: #fff;
+  }
+}
+
+.email-header-logo-div {
+  max-height: 0;
+}
+
+.email-header-logo-p {
+  word-break: break-all;
+  padding-left: 40px;
+  padding-top: 26px;
+  font-size: 11px;
+  line-height: 13px;
+  color: #8d808f;
+  text-align: left;
+}
+
+.email-header-logo-span {
+  display: block;
   text-align: right;
 }
 
-.padded {
-  padding-left: 16px;
-  padding-right: 16px;
+.email-header-heading-td {
+  padding: 16px 0;
 }
 
-.padded-bottom {
-  padding-bottom: 32px;
-}
-
-.margin-bottom {
-  margin-bottom: 20px;
-}
-
-.hero-icon {
-  width: 64px;
-
-  td {
-    text-align: center;
-    vertical-align: middle;
-    line-height: 100%;
-    mso-line-height-rule: exactly;
-    padding: 16px;
-    border-radius: 80px;
-    background: $success-green;
-  }
-
-  &.warning-icon td {
-    background: $gold-star;
-  }
-
-  &.alert-icon td {
-    background: $error-red;
-  }
+.email-header-heading-img-td {
+  width: 56px;
+  text-align: left;
+  vertical-align: top;
 
   img {
-    max-width: 32px;
-    width: 32px;
-    height: 32px;
-    display: block;
-    line-height: 100%;
+    width: 56px;
+    height: 56px;
+    border-radius: 12px;
   }
 }
 
-.hr {
-  width: 100%;
+.email-header-heading-txt-td {
+  vertical-align: middle;
+  padding-left: 16px;
+  padding-right: 16px;
 
-  td {
-    font-size: 0;
-    line-height: 1px;
-    mso-line-height-rule: exactly;
-    min-height: 1px;
-    overflow: hidden;
-    height: 2px;
-    background-color: transparent !important;
-    border-top: 1px solid lighten($ui-base-color, 8%);
-  }
-}
-
-.status {
-  padding-bottom: 32px;
-
-  &--highlighted {
-    border: 1px solid lighten($ui-base-color, 8%);
-    border-radius: 4px;
-    padding-bottom: 16px;
-    margin-bottom: 16px;
-  }
-
-  .status-header {
-    td {
-      font-size: 14px;
-      padding-bottom: 15px;
-    }
-
-    bdi {
-      color: $white;
-      font-size: 16px;
-      display: block;
-      font-weight: 500;
-    }
-
-    td:first-child {
-      padding-right: 10px;
-    }
-
-    img {
-      width: 48px;
-      height: 48px;
-      border-radius: 4px;
-    }
+  h1 {
+    margin-bottom: 5px;
+    color: #fff;
+    font-size: 24px;
+    line-height: 28px;
+    font-weight: 600;
   }
 
   p {
-    font-size: 19px;
-    margin-bottom: 20px;
+    color: #a399a5;
+    font-size: 18px;
+    line-height: 21.6px;
+    font-weight: 500;
+  }
 
-    &.status-footer {
-      color: lighten($ui-base-color, 26%);
-      font-size: 14px;
-      margin-bottom: 0;
+  &:only-child {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
 
-      a {
-        color: lighten($ui-base-color, 26%);
+// To make the design work with images off
+// we create an empty div that overlaps with
+// the rest of the content with a dark background.
+.email-header-after-div {
+  max-height: 0;
+}
+
+.email-header-after-inside-div {
+  height: 30px;
+  background-color: #1b001f;
+}
+
+// Body content
+.email-body-td {
+  background-image: url('../images/mailer-new/common/header-bg-end.png');
+  background-position: left top;
+  background-repeat: no-repeat;
+}
+
+.email-body-padding-td {
+  padding: 0 32px 32px;
+  mso-padding-alt: 32px;
+}
+
+.email-body-padding-td {
+  & > p {
+    font-size: 14px;
+    line-height: 20px;
+    color: #17063b;
+
+    a {
+      color: #6364ff;
+      text-decoration: none;
+
+      &:hover {
+        color: #563acc !important;
       }
     }
   }
 }
 
-.border-top {
-  border-top: 1px solid lighten($ui-base-color, 8%);
+// Footer
+.email-footer-td {
+  padding: 28px 32px 32px;
+  text-align: center;
 }
 
-ul {
-  padding-left: 15px;
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 16px;
+.email-footer-logo-a {
+  display: inline-block;
+}
 
-  li {
-    margin-bottom: 16px;
-    color: lighten($ui-base-color, 26%);
+.email-footer-p {
+  color: #9b94ab;
+  text-align: center;
+  font-size: 12px;
+  line-height: 20px;
 
-    span {
-      color: $ui-primary-color;
+  a {
+    color: #9b94ab;
+    text-decoration: underline;
+  }
+
+  &:first-child {
+    margin-bottom: 12px;
+  }
+}
+
+// Button
+.email-btn-table {
+  margin: 0;
+  max-width: 100%;
+  border-collapse: separate;
+  border-radius: 8px;
+  background-color: #6364ff;
+}
+
+.email-btn-td {
+  height: 40px;
+  text-align: center;
+  mso-padding-alt: 0 35px;
+}
+
+.email-btn-a {
+  display: block;
+  border-radius: 8px;
+  padding-left: 35px;
+  padding-right: 35px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  text-align: center;
+  font-family: Inter, 'Lucida Grande', sans-serif;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 20px;
+  color: #fff;
+  text-decoration: none;
+  transition: background-color 0.3s ease-in-out;
+}
+
+// Status
+.email-status-header-img {
+  vertical-align: top;
+  width: 48px;
+
+  img {
+    width: 48px;
+    height: 48px;
+    border-radius: 8px;
+    overflow: hidden;
+  }
+}
+
+.email-status-header-text {
+  padding-left: 16px;
+  padding-right: 16px;
+  vertical-align: middle;
+}
+
+.email-status-header-name {
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  color: #17063b;
+}
+
+.email-status-header-handle {
+  font-size: 14px;
+  line-height: 20px;
+  color: #746a89;
+}
+
+.email-status-content {
+  padding-top: 24px;
+}
+
+.email-status-spoiler {
+  color: #746a89;
+  font-style: italic;
+  margin-bottom: 8px;
+}
+
+.email-status-prose {
+  p {
+    font-size: 14px;
+    line-height: 20px;
+    color: #17063b;
+  }
+
+  a {
+    color: #6364ff;
+    text-decoration: none;
+
+    &:hover {
+      color: #563acc !important;
     }
   }
 }
 
-ul.rules-list {
-  padding-top: 0;
-}
+.email-status-media {
+  margin-top: 16px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #17063b;
 
-@media only screen and (device-width >= 768px) and (device-width <= 1024px) and (orientation: landscape) {
-  body {
-    min-height: 1024px !important;
+  img {
+    border-radius: 8px;
+  }
+
+  a {
+    color: #6364ff;
+    text-decoration: none;
+
+    &:hover {
+      color: #563acc !important;
+    }
   }
 }
 
-@media (width <= 697px) {
-  .email-container,
-  .col-1,
-  .col-2,
-  .col-3,
-  .col-4,
-  .col-5,
-  .col-6 {
-    width: 100% !important;
-    max-width: none !important;
+.email-status-footer {
+  margin-top: 16px;
+  font-size: 12px;
+  line-height: 16px;
+  color: #746a89;
+
+  a {
+    color: #746a89;
   }
 
-  .email-start {
-    padding-top: 16px !important;
-  }
-
-  .email-end {
-    padding-bottom: 16px !important;
-  }
-
-  .padded {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
+  a:hover {
+    color: #746a89 !important;
+    text-decoration: underline !important;
+  }
+}
+
+// Purple frame for emphasis
+.email-frame-table {
+  background-color: #efefff;
+  border-radius: 8px;
+}
+
+.email-frame-td {
+  padding: 16px;
+}
+
+.email-frame-wrapper-td {
+  padding-bottom: 16px;
+}
+
+.email-frame-td > p {
+  text-align: center;
+  font-size: 16px;
+  line-height: 24px;
+}
+
+// Checklist item
+.email-checklist-wrapper-td {
+  padding: 4px 0;
+}
+
+.email-checklist-table {
+  border-radius: 12px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #efefff;
+  background-color: #fff;
+}
+
+.email-checklist-td {
+  padding: 16px;
+}
+
+.email-checklist-icons-td {
+  width: 84px;
+  vertical-align: top;
+}
+
+.email-checklist-icons-checkbox-td {
+  width: 20px;
+  vertical-align: middle;
+
+  img {
+    max-width: 100%;
+    width: 20px;
+  }
+}
+
+.email-checklist-icons-step-td {
+  width: 64px;
+  text-align: center;
+  vertical-align: middle;
+
+  img {
+    max-width: 100%;
+    width: 40px;
+  }
+}
+
+.email-checklist-text-td {
+  h3 {
+    margin: 0 0 4px;
+    color: #17063b;
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 16.8px;
+  }
+
+  p {
+    margin: 0 0 2px;
+    color: #746a89;
+    font-size: 14px;
+    line-height: 16.8px;
+  }
+
+  .email-btn-table {
+    width: 100px;
+  }
+
+  .email-btn-td {
+    mso-padding-alt: 10px;
+  }
+
+  .email-btn-a {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+
+// Responsive
+/* stylelint-disable-next-line media-feature-range-notation -- Basic media queries have better support across email clients. */
+@media only screen and (min-width: 740px) {
+  .email-desktop-p-8 {
+    padding: 32px !important;
+  }
+
+  .email-desktop-rounded-16px {
+    border-radius: 16px !important;
+  }
+
+  .email-header-td {
+    border-radius: 16px 16px 0 0 !important;
+  }
+
+  .email-desktop-flex {
+    display: flex;
   }
 }
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 5eecfed104..4eb38ec340 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -12,6 +12,8 @@ class NotificationMailer < ApplicationMailer
 
   default to: -> { email_address_with_name(@user.email, @me.username) }
 
+  layout 'mailer'
+
   def mention
     return unless @user.functional? && @status.present?
 
diff --git a/app/views/application/mailer/_button.html.haml b/app/views/application/mailer/_button.html.haml
new file mode 100644
index 0000000000..61430732eb
--- /dev/null
+++ b/app/views/application/mailer/_button.html.haml
@@ -0,0 +1,4 @@
+%table.email-btn-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-btn-td
+      = link_to "#{text} ➜", url, class: 'email-btn-a email-btn-hover'
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
new file mode 100644
index 0000000000..9ee9655939
--- /dev/null
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -0,0 +1,29 @@
+%table.email-w-full.email-checklist-wrapper-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-checklist-wrapper-td
+      %table.email-w-full.email-checklist-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-checklist-td
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-checklist-icons-td
+                  %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                    %tr
+                      %td.email-checklist-icons-checkbox-td
+                        - if defined?(checked) && checked
+                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
+                        - else
+                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
+                      %td.email-checklist-icons-step-td
+                        - if defined?(step_image_url)
+                          = image_tag step_image_url, alt: '', width: 40, height: 40
+                %td.email-checklist-text-td
+                  .email-desktop-flex
+                    %div
+                      - if defined?(title)
+                        %h3= title
+                      - if defined?(text)
+                        %p= text
+                    %div
+                      - if defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
+                        = render 'application/mailer/button', text: button_text, url: button_url
diff --git a/app/views/application/mailer/_frame.html.haml b/app/views/application/mailer/_frame.html.haml
new file mode 100644
index 0000000000..74403e7678
--- /dev/null
+++ b/app/views/application/mailer/_frame.html.haml
@@ -0,0 +1,4 @@
+%table.email-w-full.email-frame-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-frame-td
+      %p= text
diff --git a/app/views/application/mailer/_heading.html.haml b/app/views/application/mailer/_heading.html.haml
new file mode 100644
index 0000000000..9fc5dc7471
--- /dev/null
+++ b/app/views/application/mailer/_heading.html.haml
@@ -0,0 +1,13 @@
+%table.email-w-full.email-header-heading-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-header-heading-td
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          - if defined?(heading_image_url)
+            %td.email-header-heading-img-td
+              = image_tag heading_image_url, alt: '', width: 56, height: 56
+          %td.email-header-heading-txt-td
+            - if defined?(heading_title)
+              %h1= heading_title
+            - if defined?(heading_subtitle)
+              %p= heading_subtitle
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index 7fa344a9b7..c0f9a0a559 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -1,54 +1,87 @@
 !!!
-%html{ lang: I18n.locale }
+%html{ lang: I18n.locale, dir: locale_direction }
   %head
-    %meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8' }/
-    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, shrink-to-fit=no' }
-
+    %meta{ 'charset' => 'utf-8' }
+    %title Mastodon
+    %meta{ name: 'x-apple-disable-message-reformatting' }
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
+    %meta{ name: 'format-detection', content: 'telephone=no, date=no, address=no, email=no, url=no' }
+    %meta{ name: 'supported-color-schemes', content: 'light' }
+    %style
+      \table { mso-table-lspace: 0pt; mso-table-rspace: 0pt; }
+    %style{ 'data-premailer': 'ignore' }
+      \.email a { color: inherit; text-decoration: none; }
+      \.email-btn-hover:hover { background-color: #563acc !important; }
+    /[if mso]
+      <xml>
+      <o:OfficeDocumentSettings xmlns:o="urn:schemas-microsoft-com:office:office">
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+      </xml>
     = stylesheet_pack_tag 'mailer'
-  %body{ dir: locale_direction }
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
-      %tbody
+  %body
+    .email{ dir: locale_direction }
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
         %tr
-          %td.email-body.email-start
+          %td.email-desktop-p-8
             .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.header
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.column-cell
-                                  = link_to root_url do
-                                    = image_tag full_pack_url('media/images/mailer/wordmark.png'), alt: 'Mastodon', height: 34, class: 'logo'
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:740px;" role="presentation"><tr><td>
+              %table.email-w-full.email-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-card-td.email-desktop-rounded-16px
 
-    = yield
+                    -# Header
+                    %table.email-header-table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                      %tr
+                        %td.email-header-td
 
-    %table.email-table{ cellspacing: 0, cellpadding: 0 }
-      %tbody
-        %tr
-          %td.email-body.email-end
+                          -# Logo
+                          %table.email-header-logo-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                            %tr
+                              %td.email-header-logo-td
+                                /[if mso]
+                                  <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="false" stroke="false" style="position:absolute; left:40px; top:26px; width:636px;"><v:textbox style="mso-fit-shape-to-text:true" inset="0,0,0,0">
+                                .email-header-logo-div
+                                  %p.email-header-logo-p
+                                    %span.email-header-logo-span
+                                      = '/ '
+                                      = site_hostname
+                                /[if mso]
+                                  </v:textbox></v:rect>
+                                = link_to root_url, class: 'email-header-logo-a' do
+                                  = image_tag full_pack_url('media/images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
+
+                          -# Heading
+                          = yield :heading
+
+                    .email-header-after-div
+                      .email-header-after-inside-div
+                    %table.email-body-table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                      %tr
+                        %td.email-body-td
+                          -# Content
+                          = yield
+
+              /[if mso]
+                </td></tr></table>
+
+            -# Footer
             .email-container
-              %table.content-section{ cellspacing: 0, cellpadding: 0 }
-                %tbody
-                  %tr
-                    %td.content-cell.content-end
-                      != '&nbsp; '
-                  %tr
-                    %td.blank-cell.footer
-                      .email-row
-                        .col-6
-                          %table.column{ cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %td.column-cell
-                                %p= t 'about.hosted_on', domain: site_hostname
-                                %p
-                                  = link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
-                                  - if defined?(@unsubscribe_url)
-                                    ·
-                                    = link_to t('application_mailer.unsubscribe'), @unsubscribe_url
-                              %td.column-cell.text-right
-                                = link_to root_url do
-                                  = image_tag full_pack_url('media/images/mailer/logo.png'), alt: 'Mastodon', height: 24
+              /[if mso]
+                <table border="0" cellpadding="0" cellspacing="0" align="center" style="width:740px;" role="presentation"><tr><td>
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-footer-td
+                    %p.email-footer-p
+                      = link_to root_url, class: 'email-footer-logo-a' do
+                        = image_tag full_pack_url('media/images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
+                    %p.email-footer-p
+                      = t 'about.hosted_on', domain: site_hostname
+                    %p.email-footer-p
+                      = link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
+                      - if defined?(@unsubscribe_url)
+                        ·
+                        = link_to t('application_mailer.unsubscribe'), @unsubscribe_url
+              /[if mso]
+                </td></tr></table>
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index e053a30fde..bf38dc9aa2 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -1,45 +1,31 @@
-- i ||= 0
-- highlighted ||= false
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-header-img
+      = image_tag full_asset_url(status.account.avatar.url), alt: '', width: 48, height: 48
+    %td.email-status-header-text
+      %h2.email-status-header-name
+        = display_name(status.account)
+      %p.email-status-header-handle
+        @#{status.account.pretty_acct}
 
-%table.email-table{ cellspacing: 0, cellpadding: 0, dir: 'ltr' }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell{ class: i.zero? ? 'content-start' : nil }
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded.status{ class: highlighted ? 'status--highlighted' : '' }
-                              %table.status-header{ cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td{ align: 'left', width: 48 }
-                                      = image_tag full_asset_url(status.account.avatar.url), alt: ''
-                                    %td{ align: 'left' }
-                                      %bdi= display_name(status.account)
-                                      @#{status.account.pretty_acct}
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-content
+      .auto-dir
+        - if status.spoiler_text?
+          %p.email-status-spoiler
+            = status.spoiler_text
 
-                              - if status.spoiler_text?
-                                .auto-dir
-                                  %p
-                                    = status.spoiler_text
+        .email-status-prose
+          = status_content_format(status)
 
-                              .auto-dir
-                                = status_content_format(status)
+        - if status.ordered_media_attachments.size.positive?
+          %p.email-status-media
+            - status.ordered_media_attachments.each do |a|
+              - if status.local?
+                = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
+              - else
+                = link_to a.remote_url, a.remote_url
 
-                                - if status.ordered_media_attachments.size.positive?
-                                  %p
-                                    - status.ordered_media_attachments.each do |a|
-                                      - if status.local?
-                                        = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
-                                      - else
-                                        = link_to a.remote_url, a.remote_url
-
-                              %p.status-footer
-                                = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
+      %p.email-status-footer
+        = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index 325f0aff5f..26bb31731a 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/favorite.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_grade.png'), alt: ''
-
-                              %h1= t 'notification_mailer.favourite.title'
-                              %p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('application_mailer.view_status'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index f250cbbd2a..2f7ba0a9c5 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -1,43 +1,9 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
-
-                              %h1= t 'notification_mailer.follow.title'
-                              %p.lead= t('notification_mailer.follow.body', name: @account.pretty_acct)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@account.pretty_acct}") do
-                                    %span= t 'application_mailer.view_profile'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/user.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 3885a411d9..275d0c5b0e 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -1,43 +1,9 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
-
-                              %h1= t 'notification_mailer.follow_request.title'
-                              %p.lead= t('notification_mailer.follow_request.body', name: @account.pretty_acct)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url('follow_requests') do
-                                    %span= t 'notification_mailer.follow_request.action'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/follow.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index e830644c3f..2420a42bf7 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/mention.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_reply.png'), alt: ''
-
-                              %h1= t 'notification_mailer.mention.title'
-                              %p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'notification_mailer.mention.action'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('notification_mailer.mention.action'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index e4f9441236..b32c984708 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -1,45 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/boost.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_cached.png'), alt: ''
-
-                              %h1= t 'notification_mailer.reblog.title'
-                              %p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)
-
-= render 'status', status: @status, time_zone: @me.user_time_zone
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start.border-top
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
-                                    %span= t 'application_mailer.view_status'
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('application_mailer.view_status'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 223ba7f0b8..2cf62de39b 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -1,61 +1,12 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
-
-                              %h1= t 'user_mailer.appeal_approved.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_approved.explanation',
-                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
-                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to root_url do
-                                    %span= t 'user_mailer.appeal_approved.action'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-approved.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.appeal_approved.explanation',
+                  appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                  strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('user_mailer.appeal_approved.action'), url: root_url
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index 59354f1d40..c24cf7647f 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -1,61 +1,12 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
-
-                              %h1= t 'user_mailer.appeal_rejected.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_rejected.explanation',
-                                    appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
-                                    strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to root_url do
-                                    %span= t 'user_mailer.appeal_approved.action'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-rejected.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.appeal_rejected.explanation',
+                  appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone),
+                  strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('user_mailer.appeal_approved.action'), url: root_url
diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml
index 465ead2c8b..4a1e7b1c65 100644
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@@ -1,59 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_file_download.png'), alt: ''
-
-                              %h1= t 'user_mailer.backup_ready.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.backup_ready.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to download_backup_url(@backup) do
-                                    %span= t 'exports.archive_takeout.download'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/archive.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.backup_ready.extra'
+            = render 'application/mailer/button', text: t('exports.archive_takeout.download'), url: download_backup_url(@backup)
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 447e689b40..4fd66d0791 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -1,80 +1,16 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.confirmation_instructions.title'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  - if @resource.created_by_application
-                                    = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
-                                      %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
-                                  - else
-                                    = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                      %span= t 'devise.mailer.confirmation_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname
+            - if @resource.created_by_application
+              = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+              = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
+                %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
+            - else
+              = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
+            %p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 96be8624d9..741c2bde18 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -1,58 +1,11 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.email_changed.title'
-                              %p.lead= t 'devise.mailer.email_changed.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.input-cell
-                          %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td= @resource.unconfirmed_email
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.email_changed.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            = render 'application/mailer/frame', text: @resource.unconfirmed_email
+            %p= t 'devise.mailer.email_changed.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 559abf027c..08b4ecbbd6 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -1,40 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.password_change.title'
-                              %p.lead= t 'devise.mailer.password_change.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.password_change.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.password_change.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 7f10ba94fd..8aa2230151 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -1,60 +1,11 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
-
-                              %h1= t 'devise.mailer.reconfirmation_instructions.title'
-                              %p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                    %span= t 'devise.mailer.confirmation_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reconfirmation_instructions.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t('devise.mailer.reconfirmation_instructions.explanation')
+            = render 'application/mailer/button', text: t('devise.mailer.confirmation_instructions.action'), url: confirmation_url(@resource, confirmation_token: @token)
+            %p= t 'devise.mailer.reconfirmation_instructions.extra'
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index eeed38c9e4..0db79daaf1 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -1,60 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.reset_password_instructions.title'
-                              %p.lead= t 'devise.mailer.reset_password_instructions.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_password_url(@resource, reset_password_token: @token) do
-                                    %span= t 'devise.mailer.reset_password_instructions.action'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %p= t 'devise.mailer.reset_password_instructions.extra'
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.reset_password_instructions.extra'
+            = render 'application/mailer/button', text: t('devise.mailer.reset_password_instructions.action'), url: edit_password_url(@resource, reset_password_token: @token)
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index 0cd21b4e60..e2cb916bfe 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -1,71 +1,24 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.warning-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'user_mailer.suspicious_sign_in.title'
-                              %p= t 'user_mailer.suspicious_sign_in.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.suspicious_sign_in.details'
-                          %tr
-                            %td.column-cell.text-center
-                              %p
-                                %strong #{t('sessions.ip')}:
-                                = @remote_ip
-                                %br/
-                                %strong #{t('sessions.browser')}:
-                                %span{ title: @user_agent }
-                                  = t 'sessions.description',
-                                      browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
-                                      platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
-                                %br/
-                                = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.suspicious_sign_in.further_actions_html',
-                                    action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/login.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.suspicious_sign_in.details'
+            %p
+              %strong #{t('sessions.ip')}:
+              = @remote_ip
+              %br/
+              %strong #{t('sessions.browser')}:
+              %span{ title: @user_agent }
+                = t 'sessions.description',
+                    browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+                    platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+              %br/
+              %strong #{t('sessions.date')}:
+              = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+      %p= t 'user_mailer.suspicious_sign_in.further_actions_html',
+            action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/two_factor_disabled.html.haml b/app/views/user_mailer/two_factor_disabled.html.haml
index 651c6f940e..0d8ff5c690 100644
--- a/app/views/user_mailer/two_factor_disabled.html.haml
+++ b/app/views/user_mailer/two_factor_disabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_disabled.title'
-                              %p.lead= t 'devise.mailer.two_factor_disabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-disabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_disabled.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/two_factor_enabled.html.haml b/app/views/user_mailer/two_factor_enabled.html.haml
index fc31bd979f..6fe03eab2b 100644
--- a/app/views/user_mailer/two_factor_enabled.html.haml
+++ b/app/views/user_mailer/two_factor_enabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_enabled.title'
-                              %p.lead= t 'devise.mailer.two_factor_enabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-enabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_enabled.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
index 833708868b..dff0620cef 100644
--- a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
+++ b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.two_factor_recovery_codes_changed.title'
-                              %p.lead= t 'devise.mailer.two_factor_recovery_codes_changed.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-recovery.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.two_factor_recovery_codes_changed.explanation'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 5d64e83247..4dfbfc231d 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -1,98 +1,46 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: full_pack_url('media/images/mailer-new/heading/warning.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td-without-padding
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
+                %td.email-prose.email-padding-24
+                  - unless @warning.none_action?
+                    %p= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance
 
-                              %h1= t "user_mailer.warning.title.#{@warning.action}"
+                  - if @warning.text.present?
+                    = linkify(@warning.text)
 
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+                  - if @warning.report && !@warning.report.other?
+                    %p
+                      %strong= t('user_mailer.warning.reason')
+                      = t("user_mailer.warning.categories.#{@warning.report.category}")
+
+                    - if @warning.report.violation? && @warning.report.rule_ids.present?
+                      %ul.rules-list
+                        - @warning.report.rules.each do |rule|
+                          %li= rule.text
+
+                  - unless @statuses.empty?
+                    %p
+                      %strong= t('user_mailer.warning.statuses')
+
+            - unless @statuses.empty?
+              %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td.email-border-top
+                    - @statuses.each_with_index do |status, i|
+                      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                        %tr
+                          %td.email-border-bottom.email-padding-24
+                            = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence
+
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              - unless @warning.none_action?
-                                %p= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance
-
-                              - if @warning.text.present?
-                                = linkify(@warning.text)
-
-                              - if @warning.report && !@warning.report.other?
-                                %p
-                                  %strong= t('user_mailer.warning.reason')
-                                  = t("user_mailer.warning.categories.#{@warning.report.category}")
-
-                                - if @warning.report.violation? && @warning.report.rule_ids.present?
-                                  %ul.rules-list
-                                    - @warning.report.rules.each do |rule|
-                                      %li= rule.text
-
-                              - unless @statuses.empty?
-                                %p
-                                  %strong= t('user_mailer.warning.statuses')
-
-- unless @statuses.empty?
-  - @statuses.each_with_index do |status, i|
-    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell{ class: @statuses.blank? ? '' : 'content-start' }
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to disputes_strike_url(@warning) do
-                                    %span= t 'user_mailer.warning.appeal'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center
-                              %p= t 'user_mailer.warning.appeal_description', instance: @instance
+                %td.email-prose.email-padding-24
+                  %p= t 'user_mailer.warning.appeal_description', instance: @instance
+                  = render 'application/mailer/button', text: t('user_mailer.warning.appeal'), url: disputes_strike_url(@warning)
diff --git a/app/views/user_mailer/webauthn_credential_added.html.haml b/app/views/user_mailer/webauthn_credential_added.html.haml
index 2ecb62d967..334eb3e32d 100644
--- a/app/views/user_mailer/webauthn_credential_added.html.haml
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@@ -1,44 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-added.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_credential.added.title'
-                              %p.lead #{t('devise.mailer.webauthn_credential.added.explanation')}:
-                              %p.lead= @webauthn_credential.nickname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+                %td.email-frame-wrapper-td
+                  = render 'application/mailer/frame', text: @webauthn_credential.nickname
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_credential_deleted.html.haml b/app/views/user_mailer/webauthn_credential_deleted.html.haml
index f282985b14..5fad523b4e 100644
--- a/app/views/user_mailer/webauthn_credential_deleted.html.haml
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@@ -1,44 +1,13 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-deleted.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_credential.deleted.title'
-                              %p.lead #{t('devise.mailer.webauthn_credential.deleted.explanation')}:
-                              %p.lead= @webauthn_credential.nickname
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+                %td.email-frame-wrapper-td
+                  = render 'application/mailer/frame', text: @webauthn_credential.nickname
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_disabled.html.haml b/app/views/user_mailer/webauthn_disabled.html.haml
index 81a2a7954c..0174125362 100644
--- a/app/views/user_mailer/webauthn_disabled.html.haml
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_disabled.title'
-                              %p.lead= t 'devise.mailer.webauthn_disabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-disabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.webauthn_disabled.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/webauthn_enabled.html.haml b/app/views/user_mailer/webauthn_enabled.html.haml
index f08e764e8d..3257d14df9 100644
--- a/app/views/user_mailer/webauthn_enabled.html.haml
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@@ -1,43 +1,10 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
-
-                              %h1= t 'devise.mailer.webauthn_enabled.title'
-                              %p.lead= t 'devise.mailer.webauthn_enabled.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
-              %tr
-                %td.content-cell.content-start
-                  %table.column{ cellspacing: 0, cellpadding: 0 }
-                    %tbody
-                      %tr
-                        %td.column-cell.button-cell
-                          %table.button{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                            %tbody
-                              %tr
-                                %td.button-primary
-                                  = link_to edit_user_registration_url do
-                                    %span= t('settings.account_settings')
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-enabled.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'devise.mailer.webauthn_enabled.extra'
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index 0d8a15cfd7..b77d40fb05 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -1,99 +1,25 @@
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.welcome.title', name: @resource.account.username), heading_subtitle: t('user_mailer.welcome.explanation')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td-without-padding
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.hero
-                  .email-row
-                    .col-6
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.text-center.padded
-                              %table.hero-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td
-                                      = image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
-
-                              %h1= t 'user_mailer.welcome.title', name: @resource.account.username
-                              %p.lead= t 'user_mailer.welcome.explanation'
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+                %td.email-prose.email-padding-24
+                  %p
+                    %b= t 'user_mailer.welcome.full_handle'
+                  = render 'application/mailer/frame', text: "#{@resource.account.username}@#{@instance}"
+                  %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.content-start
-                  .email-row
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.input-cell.text-center.padded-bottom
-                              %h5= t 'user_mailer.welcome.full_handle'
-                              %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td @#{@resource.account.username}@#{@instance}
-                    .col-3
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell
-                              %p= t 'user_mailer.welcome.full_handle_hint', instance: @instance
-
-%table.email-table{ cellspacing: 0, cellpadding: 0 }
-  %tbody
-    %tr
-      %td.email-body
-        .email-container
-          %table.content-section{ cellspacing: 0, cellpadding: 0 }
-            %tbody
+                %td.email-border-top.email-prose.email-padding-24
+                  %p= t 'user_mailer.welcome.edit_profile_step'
+                  = render 'application/mailer/button', text: t('user_mailer.welcome.edit_profile_action'), url: settings_profile_url
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
-                %td.content-cell.content-start.border-top
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.edit_profile_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to settings_profile_url do
-                                        %span= t 'user_mailer.welcome.edit_profile_action'
-
-              %tr
-                %td.content-cell.padded-bottom
-                  .email-row
-                    .col-4
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              = t 'user_mailer.welcome.final_step'
-                    .col-2
-                      %table.column{ cellspacing: 0, cellpadding: 0 }
-                        %tbody
-                          %tr
-                            %td.column-cell.padded
-                              %table.button.button-small{ align: 'left', cellspacing: 0, cellpadding: 0 }
-                                %tbody
-                                  %tr
-                                    %td.button-primary
-                                      = link_to web_url do
-                                        %span= t 'user_mailer.welcome.final_action'
+                %td.email-border-top.email-prose.email-padding-24
+                  %p= t 'user_mailer.welcome.edit_profile_step'
+                  = render 'application/mailer/button', text: t('user_mailer.welcome.final_action'), url: web_url
diff --git a/config/initializers/premailer_rails.rb b/config/initializers/premailer_rails.rb
index 52576ef883..5e9576be7a 100644
--- a/config/initializers/premailer_rails.rb
+++ b/config/initializers/premailer_rails.rb
@@ -5,4 +5,5 @@ require_relative '../../lib/premailer_webpack_strategy'
 Premailer::Rails.config.merge!(remove_ids: true,
                                adapter: :nokogiri,
                                generate_text_part: false,
+                               css_to_attributes: false,
                                strategies: [PremailerWebpackStrategy])
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index eef8214817..4439397c8e 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -47,16 +47,19 @@ en:
         subject: 'Mastodon: Reset password instructions'
         title: Password reset
       two_factor_disabled:
-        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
+        explanation: Login is now possible using only e-mail address and password.
         subject: 'Mastodon: Two-factor authentication disabled'
+        subtitle: Two-factor authentication for your account has been disabled.
         title: 2FA disabled
       two_factor_enabled:
-        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
+        explanation: A token generated by the paired TOTP app will be required for login.
         subject: 'Mastodon: Two-factor authentication enabled'
+        subtitle: Two-factor authentication has been enabled for your account.
         title: 2FA enabled
       two_factor_recovery_codes_changed:
         explanation: The previous recovery codes have been invalidated and new ones generated.
         subject: 'Mastodon: Two-factor recovery codes re-generated'
+        subtitle: The previous recovery codes have been invalidated and new ones generated.
         title: 2FA recovery codes changed
       unlock_instructions:
         subject: 'Mastodon: Unlock instructions'
@@ -70,11 +73,13 @@ en:
           subject: 'Mastodon: Security key deleted'
           title: One of your security keys has been deleted
       webauthn_disabled:
-        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
+        explanation: Authentication with security keys has been disabled for your account.
+        extra: Login is now possible using only the token generated by the paired TOTP app.
         subject: 'Mastodon: Authentication with security keys disabled'
         title: Security keys disabled
       webauthn_enabled:
-        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
+        explanation: Security key authentication has been enabled for your account.
+        extra: Your security key can now be used for login.
         subject: 'Mastodon: Security key authentication enabled'
         title: Security keys enabled
     omniauth_callbacks:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50f814a81d..78820c3b59 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1609,6 +1609,7 @@ en:
       unknown_browser: Unknown Browser
       weibo: Weibo
     current_session: Current session
+    date: Date
     description: "%{browser} on %{platform}"
     explanation: These are the web browsers currently logged in to your Mastodon account.
     ip: IP
@@ -1775,16 +1776,19 @@ en:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Go to your account
+      action: Account Settings
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
       subject: Your appeal from %{date} has been approved
+      subtitle: Your account is once again in good standing.
       title: Appeal approved
     appeal_rejected:
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been rejected.
       subject: Your appeal from %{date} has been rejected
+      subtitle: Your appeal has been rejected.
       title: Appeal rejected
     backup_ready:
-      explanation: You requested a full backup of your Mastodon account. It's now ready for download!
+      explanation: You requested a full backup of your Mastodon account.
+      extra: It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
     suspicious_sign_in:

From b4c332104a8b3748f619de250f77c0acc8e80628 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 15 Jan 2024 16:26:11 -0500
Subject: [PATCH 316/436] Use top-level `warn` in JS errors check (#28745)

---
 spec/support/javascript_errors.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/support/javascript_errors.rb b/spec/support/javascript_errors.rb
index bdce1cc76d..a36bf6017e 100644
--- a/spec/support/javascript_errors.rb
+++ b/spec/support/javascript_errors.rb
@@ -9,8 +9,8 @@ RSpec.configure do |config|
           expect(error.level).to_not eq('SEVERE'), error.message
           next unless error.level == 'WARNING'
 
-          $stderr.warn 'WARN: javascript warning'
-          $stderr.warn error.message
+          warn 'WARN: javascript warning'
+          warn error.message
         end
       end
     end

From f09035cc3fa58b283edd56d472dfd9ab04713217 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:32:40 +0100
Subject: [PATCH 317/436] Update dependency stackprof to v0.2.26 (#28743)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 290702eea9..d8e67b6bec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -730,7 +730,7 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    stackprof (0.2.25)
+    stackprof (0.2.26)
     statsd-ruby (1.5.0)
     stoplight (3.0.2)
       redlock (~> 1.0)

From f0abba67db86fb8f514bbf8f5854d4501680cdc6 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Tue, 16 Jan 2024 17:35:54 +0900
Subject: [PATCH 318/436] Ignore RecordNotUnique errors in LinkCrawlWorker
 (#28748)

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

diff --git a/app/workers/link_crawl_worker.rb b/app/workers/link_crawl_worker.rb
index b3d8aa2646..c63af1e43a 100644
--- a/app/workers/link_crawl_worker.rb
+++ b/app/workers/link_crawl_worker.rb
@@ -7,7 +7,7 @@ class LinkCrawlWorker
 
   def perform(status_id)
     FetchLinkCardService.new.call(Status.find(status_id))
-  rescue ActiveRecord::RecordNotFound
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordNotUnique
     true
   end
 end

From 01b6c83c369061c2175d50dfb3ae1db502862664 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Tue, 16 Jan 2024 11:27:26 +0100
Subject: [PATCH 319/436] Add a new `@/` alias for the root frontend directory
 and use it where possible (#28753)

---
 .../mastodon/components/attachment_list.jsx   |  2 +-
 app/javascript/mastodon/components/badge.jsx  |  6 ++---
 .../components/column_back_button.tsx         |  2 +-
 .../mastodon/components/column_header.jsx     | 12 +++++-----
 .../mastodon/components/copy_icon_button.jsx  |  2 +-
 .../components/dismissable_banner.tsx         |  2 +-
 app/javascript/mastodon/components/domain.tsx |  2 +-
 .../mastodon/components/dropdown_menu.jsx     |  2 +-
 .../components/edited_timestamp/index.jsx     |  2 +-
 app/javascript/mastodon/components/icon.tsx   |  2 +-
 .../mastodon/components/load_gap.tsx          |  2 +-
 app/javascript/mastodon/components/logo.tsx   |  2 +-
 .../mastodon/components/media_gallery.jsx     |  2 +-
 .../picture_in_picture_placeholder.jsx        |  2 +-
 app/javascript/mastodon/components/poll.jsx   |  2 +-
 .../components/regeneration_indicator.jsx     |  2 +-
 app/javascript/mastodon/components/status.jsx |  8 +++----
 .../mastodon/components/status_action_bar.jsx | 22 +++++++++----------
 .../mastodon/components/status_content.jsx    |  2 +-
 .../mastodon/components/verified_badge.tsx    |  2 +-
 .../mastodon/components/visibility_icon.tsx   |  8 +++----
 .../mastodon/features/about/index.jsx         |  4 ++--
 .../components/follow_request_note.jsx        |  4 ++--
 .../features/account/components/header.jsx    | 12 +++++-----
 .../account_gallery/components/media_item.jsx |  6 ++---
 .../mastodon/features/audio/index.jsx         | 12 +++++-----
 .../mastodon/features/blocks/index.jsx        |  2 +-
 .../features/bookmarked_statuses/index.jsx    |  2 +-
 .../features/community_timeline/index.jsx     |  2 +-
 .../compose/components/action_bar.jsx         |  2 +-
 .../compose/components/compose_form.jsx       |  2 +-
 .../compose/components/poll_button.jsx        |  2 +-
 .../features/compose/components/poll_form.jsx |  4 ++--
 .../compose/components/privacy_dropdown.jsx   |  8 +++----
 .../compose/components/reply_indicator.jsx    |  2 +-
 .../features/compose/components/search.jsx    |  6 ++---
 .../compose/components/search_results.jsx     |  8 +++----
 .../features/compose/components/upload.jsx    |  6 ++---
 .../compose/components/upload_button.jsx      |  2 +-
 .../compose/components/upload_progress.jsx    |  2 +-
 .../mastodon/features/compose/index.jsx       | 14 ++++++------
 .../components/conversation.jsx               |  4 ++--
 .../features/direct_timeline/index.jsx        |  2 +-
 .../mastodon/features/directory/index.jsx     |  2 +-
 .../mastodon/features/domain_blocks/index.jsx |  2 +-
 .../mastodon/features/explore/index.jsx       |  4 ++--
 .../mastodon/features/explore/results.jsx     |  6 ++---
 .../features/favourited_statuses/index.jsx    |  2 +-
 .../mastodon/features/favourites/index.jsx    |  2 +-
 .../features/filters/select_filter.jsx        |  2 +-
 .../mastodon/features/firehose/index.jsx      |  2 +-
 .../components/account_authorize.jsx          |  4 ++--
 .../features/follow_requests/index.jsx        |  2 +-
 .../mastodon/features/followed_tags/index.jsx |  2 +-
 .../components/announcements.jsx              |  8 +++----
 .../features/getting_started/index.jsx        | 22 +++++++++----------
 .../features/hashtag_timeline/index.jsx       |  2 +-
 .../components/explore_prompt.tsx             |  2 +-
 .../mastodon/features/home_timeline/index.jsx |  4 ++--
 .../features/interaction_modal/index.jsx      |  8 +++----
 .../features/keyboard_shortcuts/index.jsx     |  2 +-
 .../features/list_adder/components/list.jsx   |  6 ++---
 .../list_editor/components/account.jsx        |  4 ++--
 .../list_editor/components/edit_list_form.jsx |  2 +-
 .../list_editor/components/search.jsx         |  4 ++--
 .../mastodon/features/list_timeline/index.jsx |  6 ++---
 .../mastodon/features/lists/index.jsx         |  2 +-
 .../mastodon/features/mutes/index.jsx         |  2 +-
 .../components/clear_column_button.jsx        |  2 +-
 .../notifications/components/filter_bar.jsx   | 12 +++++-----
 .../components/follow_request.jsx             |  4 ++--
 .../notifications/components/notification.jsx | 16 +++++++-------
 .../notifications_permission_banner.jsx       |  4 ++--
 .../mastodon/features/notifications/index.jsx |  4 ++--
 .../features/onboarding/components/step.jsx   |  4 ++--
 .../mastodon/features/onboarding/index.jsx    | 12 +++++-----
 .../mastodon/features/onboarding/profile.jsx  |  4 ++--
 .../mastodon/features/onboarding/share.jsx    |  4 ++--
 .../picture_in_picture/components/footer.jsx  | 10 ++++-----
 .../picture_in_picture/components/header.jsx  |  2 +-
 .../features/pinned_statuses/index.jsx        |  2 +-
 .../features/public_timeline/index.jsx        |  2 +-
 .../mastodon/features/reblogs/index.jsx       |  2 +-
 .../features/report/components/option.jsx     |  2 +-
 .../features/status/components/action_bar.jsx | 20 ++++++++---------
 .../features/status/components/card.jsx       |  6 ++---
 .../status/components/detailed_status.jsx     |  6 ++---
 .../mastodon/features/status/index.jsx        |  4 ++--
 .../subscribed_languages_modal/index.jsx      |  2 +-
 .../features/ui/components/boost_modal.jsx    |  2 +-
 .../ui/components/bundle_modal_error.jsx      |  2 +-
 .../ui/components/compare_history_modal.jsx   |  2 +-
 .../features/ui/components/embed_modal.jsx    |  2 +-
 .../features/ui/components/filter_modal.jsx   |  2 +-
 .../ui/components/focal_point_modal.jsx       |  2 +-
 .../follow_requests_column_link.jsx           |  2 +-
 .../features/ui/components/header.jsx         |  2 +-
 .../features/ui/components/image_modal.jsx    |  2 +-
 .../features/ui/components/list_panel.jsx     |  2 +-
 .../features/ui/components/media_modal.jsx    |  6 ++---
 .../ui/components/navigation_panel.jsx        | 20 ++++++++---------
 .../components/notifications_counter_icon.js  |  2 +-
 .../features/ui/components/report_modal.jsx   |  2 +-
 .../features/ui/components/zoomable_image.jsx |  4 ++--
 .../mastodon/features/video/index.jsx         | 16 +++++++-------
 config/webpack/shared.js                      |  3 +++
 lib/tasks/icons.rake                          |  2 +-
 tsconfig.json                                 |  3 ++-
 108 files changed, 253 insertions(+), 249 deletions(-)

diff --git a/app/javascript/mastodon/components/attachment_list.jsx b/app/javascript/mastodon/components/attachment_list.jsx
index 59d31a3038..c5ac046751 100644
--- a/app/javascript/mastodon/components/attachment_list.jsx
+++ b/app/javascript/mastodon/components/attachment_list.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
+import LinkIcon from '@/material-icons/400-24px/link.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
diff --git a/app/javascript/mastodon/components/badge.jsx b/app/javascript/mastodon/components/badge.jsx
index bac8096566..646655c249 100644
--- a/app/javascript/mastodon/components/badge.jsx
+++ b/app/javascript/mastodon/components/badge.jsx
@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
-import GroupsIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
-import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react';
+import GroupsIcon from '@/material-icons/400-24px/group.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person.svg?react';
+import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
 export const Badge = ({ icon, label, domain }) => (
diff --git a/app/javascript/mastodon/components/column_back_button.tsx b/app/javascript/mastodon/components/column_back_button.tsx
index f803f86289..af38c1e110 100644
--- a/app/javascript/mastodon/components/column_back_button.tsx
+++ b/app/javascript/mastodon/components/column_back_button.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
 
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 3e53902de6..901888e750 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -6,12 +6,12 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
diff --git a/app/javascript/mastodon/components/copy_icon_button.jsx b/app/javascript/mastodon/components/copy_icon_button.jsx
index c5216e8f80..0c3c6c290b 100644
--- a/app/javascript/mastodon/components/copy_icon_button.jsx
+++ b/app/javascript/mastodon/components/copy_icon_button.jsx
@@ -7,7 +7,7 @@ import classNames from 'classnames';
 
 import { useDispatch } from 'react-redux';
 
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { showAlert } from 'mastodon/actions/alerts';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx
index d3bc28b9b9..bc40e46f8d 100644
--- a/app/javascript/mastodon/components/dismissable_banner.tsx
+++ b/app/javascript/mastodon/components/dismissable_banner.tsx
@@ -8,7 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { changeSetting } from 'mastodon/actions/settings';
 import { bannerSettings } from 'mastodon/settings';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index 637c286ce4..ed5e8e7e4c 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 
 import { IconButton } from './icon_button';
 
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index a8fcfd1097..04c8bb0980 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { CircularProgress } from 'mastodon/components/circular_progress';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.jsx b/app/javascript/mastodon/components/edited_timestamp/index.jsx
index 7497ab9922..4ca00f8dda 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.jsx
+++ b/app/javascript/mastodon/components/edited_timestamp/index.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react';
+import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { Icon }  from 'mastodon/components/icon';
 import InlineAccount from 'mastodon/components/inline_account';
diff --git a/app/javascript/mastodon/components/icon.tsx b/app/javascript/mastodon/components/icon.tsx
index 948492d91c..f388380c44 100644
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 
-import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react';
+import CheckBoxOutlineBlankIcon from '@/material-icons/400-24px/check_box_outline_blank.svg?react';
 import { isProduction } from 'mastodon/utils/environment';
 
 interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 2a233b6a1c..1d4193a359 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 
 import { useIntl, defineMessages } from 'react-intl';
 
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/components/logo.tsx b/app/javascript/mastodon/components/logo.tsx
index 928aa29a7c..b7f8bd6695 100644
--- a/app/javascript/mastodon/components/logo.tsx
+++ b/app/javascript/mastodon/components/logo.tsx
@@ -1,4 +1,4 @@
-import logo from 'mastodon/../images/logo.svg';
+import logo from '@/images/logo.svg';
 
 export const WordmarkLogo: React.FC = () => (
   <svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index c387bb8698..e5200371ae 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { debounce } from 'lodash';
 
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 
 import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
index e8cfe6cb32..50f91a9275 100644
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
+import CancelPresentationIcon from '@/material-icons/400-24px/cancel_presentation.svg?react';
 import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
 import { Icon }  from 'mastodon/components/icon';
 
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index f85c47bb40..c7036d111b 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import escapeTextContentForBrowser from 'escape-html';
 import spring from 'react-motion/lib/spring';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import emojify from 'mastodon/features/emoji/emoji';
 import Motion from 'mastodon/features/ui/util/optional_motion';
diff --git a/app/javascript/mastodon/components/regeneration_indicator.jsx b/app/javascript/mastodon/components/regeneration_indicator.jsx
index 052e25f25f..d42a7d7c72 100644
--- a/app/javascript/mastodon/components/regeneration_indicator.jsx
+++ b/app/javascript/mastodon/components/regeneration_indicator.jsx
@@ -1,6 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
-import illustration from 'mastodon/../images/elephant_ui_working.svg';
+import illustration from '@/images/elephant_ui_working.svg';
 
 const RegenerationIndicator = () => (
   <div className='regeneration-indicator'>
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 224c8baded..ff4fe92525 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -9,10 +9,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index e1e0164642..bfe77a4900 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -9,17 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
-import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
-import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
+import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 6f28f6d6d5..4a7ba941eb 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -9,7 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import PollContainer from 'mastodon/containers/poll_container';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx
index 4209f68319..626cc500d6 100644
--- a/app/javascript/mastodon/components/verified_badge.tsx
+++ b/app/javascript/mastodon/components/verified_badge.tsx
@@ -1,4 +1,4 @@
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index 1a75261427..d6ad4095eb 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -1,9 +1,9 @@
 import { defineMessages, useIntl } from 'react-intl';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 
 import { Icon } from './icon';
 
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index bffac6357a..3287631ed1 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -10,8 +10,8 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import ExpandMoreIcon from '@/material-icons/400-24px/expand_more.svg?react';
 import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'mastodon/actions/server';
 import Column from 'mastodon/components/column';
 import { Icon  }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
index a8b61f9eaf..d57fd030b2 100644
--- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
@@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class FollowRequestNote extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 6f58ae35f1..233d208c64 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -9,12 +9,12 @@ import { NavLink, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react';
-import NotificationsActiveIcon from 'mastodon/../material-icons/400-24px/notifications_active-fill.svg?react';
-import ShareIcon from 'mastodon/../material-icons/400-24px/share.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import ShareIcon from '@/material-icons/400-24px/share.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
index a35092893d..087e775753 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.jsx
@@ -5,9 +5,9 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AudiotrackIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import AudiotrackIcon from '@/material-icons/400-24px/music_note.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx
index 9008e05383..fdc1b0be0f 100644
--- a/app/javascript/mastodon/features/audio/index.jsx
+++ b/app/javascript/mastodon/features/audio/index.jsx
@@ -9,12 +9,12 @@ import { is } from 'immutable';
 
 import { throttle, debounce } from 'lodash';
 
-import DownloadIcon from 'mastodon/../material-icons/400-24px/download.svg?react';
-import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
-import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
+import DownloadIcon from '@/material-icons/400-24px/download.svg?react';
+import PauseIcon from '@/material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video';
 
diff --git a/app/javascript/mastodon/features/blocks/index.jsx b/app/javascript/mastodon/features/blocks/index.jsx
index 656784664f..1a631d3d07 100644
--- a/app/javascript/mastodon/features/blocks/index.jsx
+++ b/app/javascript/mastodon/features/blocks/index.jsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
 
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
index 15db945956..5494ad44b0 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
 import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx
index 5bf66c2a34..0aa1f9aa23 100644
--- a/app/javascript/mastodon/features/community_timeline/index.jsx
+++ b/app/javascript/mastodon/features/community_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index bacafaf1e1..411ad77c79 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
 
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index a099707dfb..fd66874e71 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index e6ecba1a07..4900d38119 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 1815e22e6f..929b2be57a 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -8,8 +8,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 67298c8c43..c3446b8d60 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -9,10 +9,10 @@ import classNames from 'classnames';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index f16a37347c..8051e01db4 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 844958bab6..0bcc41b929 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -8,9 +8,9 @@ import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { domain, searchEnabled } from 'mastodon/initial_state';
 import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index 8a63a01c89..694deea04e 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -5,10 +5,10 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadMore } from 'mastodon/components/load_more';
 import { SearchSection } from 'mastodon/features/explore/components/search_section';
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index cb31145e8d..76d394af7a 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -7,9 +7,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import spring from 'react-motion/lib/spring';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 090af86b27..923d6a3c47 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
+import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index 8ed09b36ba..e4973b24fd 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 
 import spring from 'react-motion/lib/spring';
 
-import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
+import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index a19ae71e8e..ea3a149501 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -11,13 +11,13 @@ import { connect } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import LogoutIcon from 'mastodon/../material-icons/400-24px/logout.svg?react';
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import Column from 'mastodon/components/column';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 9ae95dabe9..274cfa69f5 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -10,8 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index effc9f29db..af29d7a5b8 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
 import { connectDirectStream } from 'mastodon/actions/streaming';
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
index 32d79f23fc..0d3408146e 100644
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ b/app/javascript/mastodon/features/directory/index.jsx
@@ -9,7 +9,7 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
 import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import Column from 'mastodon/components/column';
diff --git a/app/javascript/mastodon/features/domain_blocks/index.jsx b/app/javascript/mastodon/features/domain_blocks/index.jsx
index 5c9b70f02b..964eada9c1 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.jsx
+++ b/app/javascript/mastodon/features/domain_blocks/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
+import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
 
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index 96a39f6b35..8ebaccd013 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -8,8 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import Search from 'mastodon/features/compose/containers/search_container';
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 891bddf737..355c0f1c4c 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -9,9 +9,9 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { submitSearch, expandSearch } from 'mastodon/actions/search';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
 import { Icon } from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.jsx b/app/javascript/mastodon/features/favourited_statuses/index.jsx
index 29fc6925d6..8e65ff5b68 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.jsx
+++ b/app/javascript/mastodon/features/favourited_statuses/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/favourites/index.jsx b/app/javascript/mastodon/features/favourites/index.jsx
index ffab6f02c9..27ca169409 100644
--- a/app/javascript/mastodon/features/favourites/index.jsx
+++ b/app/javascript/mastodon/features/favourites/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/filters/select_filter.jsx b/app/javascript/mastodon/features/filters/select_filter.jsx
index 9bf0c3c8e5..5b2eb64952 100644
--- a/app/javascript/mastodon/features/filters/select_filter.jsx
+++ b/app/javascript/mastodon/features/filters/select_filter.jsx
@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 
 import fuzzysort from 'fuzzysort';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { toServerSideType } from 'mastodon/utils/filters';
 import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index 22c11a182f..6355efbfe0 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -6,7 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { addColumn } from 'mastodon/actions/columns';
 import { changeSetting } from 'mastodon/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
index 1f40e05992..dd308c87cb 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
 import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
diff --git a/app/javascript/mastodon/features/follow_requests/index.jsx b/app/javascript/mastodon/features/follow_requests/index.jsx
index 683c7b4070..7d651f2ca6 100644
--- a/app/javascript/mastodon/features/follow_requests/index.jsx
+++ b/app/javascript/mastodon/features/follow_requests/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
 import ScrollableList from '../../components/scrollable_list';
diff --git a/app/javascript/mastodon/features/followed_tags/index.jsx b/app/javascript/mastodon/features/followed_tags/index.jsx
index de3d7670ec..21248e6de9 100644
--- a/app/javascript/mastodon/features/followed_tags/index.jsx
+++ b/app/javascript/mastodon/features/followed_tags/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
 import ColumnHeader from 'mastodon/components/column_header';
 import { Hashtag } from 'mastodon/components/hashtag';
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index 6b752df1bd..ea36cefd7d 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -13,10 +13,10 @@ import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 import ReactSwipeableViews from 'react-swipeable-views';
 
-import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
+import elephantUIPlane from '@/images/elephant_ui_plane.svg';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import { Icon }  from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 68ea201387..53bb22ddb2 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -9,17 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
-import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
-import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index 35ed4dc609..f431a7e9b7 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { isEqual } from 'lodash';
 
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { connectHashtagStream } from 'mastodon/actions/streaming';
 import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';
diff --git a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
index 9eeec00e34..960d30e2ca 100644
--- a/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
@@ -2,7 +2,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
-import background from 'mastodon/../images/friends-cropped.png';
+import background from '@/images/friends-cropped.png';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 
 export const ExplorePrompt = () => (
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 1f93278c06..069f52b0be 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -10,8 +10,8 @@ import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
+import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 1d503b7343..07f1e6fe5a 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -9,10 +9,10 @@ import { connect } from 'react-redux';
 
 import { throttle, escapeRegExp } from 'lodash';
 
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import api from 'mastodon/api';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 6d1df6dd0d..622ca525c1 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 
diff --git a/app/javascript/mastodon/features/list_adder/components/list.jsx b/app/javascript/mastodon/features/list_adder/components/list.jsx
index 54ac940da4..a7cfd60bf3 100644
--- a/app/javascript/mastodon/features/list_adder/components/list.jsx
+++ b/app/javascript/mastodon/features/list_adder/components/list.jsx
@@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
diff --git a/app/javascript/mastodon/features/list_editor/components/account.jsx b/app/javascript/mastodon/features/list_editor/components/account.jsx
index f406f24fa7..77d32af80a 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/account.jsx
@@ -6,8 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
 import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
 import { Avatar } from '../../../components/avatar';
diff --git a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
index ad29d08a93..89f596636e 100644
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 
 import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
 import { IconButton } from '../../../components/icon_button';
diff --git a/app/javascript/mastodon/features/list_editor/components/search.jsx b/app/javascript/mastodon/features/list_editor/components/search.jsx
index 4c4138c751..097d4f3f41 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.jsx
+++ b/app/javascript/mastodon/features/list_editor/components/search.jsx
@@ -7,8 +7,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index aa87adf52a..24bf122fac 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -11,9 +11,9 @@ import { connect } from 'react-redux';
 
 import Toggle from 'react-toggle';
 
-import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
 import { openModal } from 'mastodon/actions/modal';
diff --git a/app/javascript/mastodon/features/lists/index.jsx b/app/javascript/mastodon/features/lists/index.jsx
index b20bbc6b78..a7648f55b2 100644
--- a/app/javascript/mastodon/features/lists/index.jsx
+++ b/app/javascript/mastodon/features/lists/index.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
diff --git a/app/javascript/mastodon/features/mutes/index.jsx b/app/javascript/mastodon/features/mutes/index.jsx
index 316eaba220..3b50244ea4 100644
--- a/app/javascript/mastodon/features/mutes/index.jsx
+++ b/app/javascript/mastodon/features/mutes/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
 
 import { fetchMutes, expandMutes } from '../../actions/mutes';
 import { LoadingIndicator } from '../../components/loading_indicator';
diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
index ac7860efd4..73eaecba59 100644
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
+import DeleteForeverIcon from '@/material-icons/400-24px/delete_forever.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class ClearColumnButton extends PureComponent {
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
index f5651a7d44..c288c2c0de 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx
@@ -3,12 +3,12 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 const tooltips = defineMessages({
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.jsx b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
index c6a039adb5..4024455cbd 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.jsx
@@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 35b31fcd47..d7101f8384 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -10,14 +10,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
-import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
-import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import AccountContainer from 'mastodon/containers/account_container';
 import StatusContainer from 'mastodon/containers/status_container';
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
index a577abd864..1cdf5b5dfe 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
-import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
 import { requestBrowserPermission } from 'mastodon/actions/notifications';
 import { changeSetting } from 'mastodon/actions/settings';
 import { Button } from 'mastodon/components/button';
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 0751f1620c..30c63ed32a 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -12,8 +12,8 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react';
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import { compareId } from 'mastodon/compare_id';
 import { Icon }  from 'mastodon/components/icon';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
diff --git a/app/javascript/mastodon/features/onboarding/components/step.jsx b/app/javascript/mastodon/features/onboarding/components/step.jsx
index 46c9b1645d..a2a1653b8a 100644
--- a/app/javascript/mastodon/features/onboarding/components/step.jsx
+++ b/app/javascript/mastodon/features/onboarding/components/step.jsx
@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 
 import { Link } from 'react-router-dom';
 
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon } from 'mastodon/components/icon';
 
 export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index 9271468da0..5900b9ec76 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -8,12 +8,12 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 
-import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
-import AccountCircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
-import EditNoteIcon from 'mastodon/../material-icons/400-24px/edit_note.svg?react';
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import illustration from '@/images/elephant_ui_conversation.svg';
+import AccountCircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
+import EditNoteIcon from '@/material-icons/400-24px/edit_note.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import { focusCompose } from 'mastodon/actions/compose';
 import { Icon }  from 'mastodon/components/icon';
 import Column from 'mastodon/features/ui/components/column';
diff --git a/app/javascript/mastodon/features/onboarding/profile.jsx b/app/javascript/mastodon/features/onboarding/profile.jsx
index 5217b42ad5..14250ae39b 100644
--- a/app/javascript/mastodon/features/onboarding/profile.jsx
+++ b/app/javascript/mastodon/features/onboarding/profile.jsx
@@ -10,8 +10,8 @@ import { useDispatch } from 'react-redux';
 
 import Toggle from 'react-toggle';
 
-import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
-import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
+import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import { updateAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index cde63d0b34..32a86ab6cc 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -9,8 +9,8 @@ import { Link } from 'react-router-dom';
 
 import SwipeableViews from 'react-swipeable-views';
 
-import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
+import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { Icon }  from 'mastodon/components/icon';
 import { me, domain } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
index d60cd5e1ef..8dfbf54cb6 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
@@ -9,11 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
+import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
 import { initBoostModal } from 'mastodon/actions/boosts';
 import { replyCompose } from 'mastodon/actions/compose';
 import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
index 12a5566d39..31073d7387 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.jsx b/app/javascript/mastodon/features/pinned_statuses/index.jsx
index 3d6dc753e3..921e9a6072 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.jsx
+++ b/app/javascript/mastodon/features/pinned_statuses/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import { getStatusList } from 'mastodon/selectors';
 
 import { fetchPinnedStatuses } from '../../actions/pin_statuses';
diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx
index 302a2956ed..3601dfeae8 100644
--- a/app/javascript/mastodon/features/public_timeline/index.jsx
+++ b/app/javascript/mastodon/features/public_timeline/index.jsx
@@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
 import { domain } from 'mastodon/initial_state';
 
diff --git a/app/javascript/mastodon/features/reblogs/index.jsx b/app/javascript/mastodon/features/reblogs/index.jsx
index 0d5183fb88..3d1fc94cb7 100644
--- a/app/javascript/mastodon/features/reblogs/index.jsx
+++ b/app/javascript/mastodon/features/reblogs/index.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchReblogs, expandReblogs } from '../../actions/interactions';
diff --git a/app/javascript/mastodon/features/report/components/option.jsx b/app/javascript/mastodon/features/report/components/option.jsx
index d6949f0c51..7aa0dd1379 100644
--- a/app/javascript/mastodon/features/report/components/option.jsx
+++ b/app/javascript/mastodon/features/report/components/option.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import classNames from 'classnames';
 
-import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
+import CheckIcon from '@/material-icons/400-24px/done.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 export default class Option extends PureComponent {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index b760824558..4cb06aac2c 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -9,16 +9,16 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
-import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
-import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
-import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
+import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index c211dc64c8..f37b558c4c 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -10,9 +10,9 @@ import classNames from 'classnames';
 import Immutable from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react';
-import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
+import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
+import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index 2ebafe7b48..437e9e86bf 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -8,9 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index c8ccddddbe..a3034bb570 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -14,8 +14,8 @@ import { connect } from 'react-redux';
 
 import { HotKeys } from 'react-hotkeys';
 
-import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import ScrollContainer from 'mastodon/containers/scroll_container';
diff --git a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
index 8c1a8f486c..0531346f91 100644
--- a/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
+++ b/app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
@@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { followAccount } from 'mastodon/actions/accounts';
 import { Button } from 'mastodon/components/button';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.jsx b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
index 7e9d8c9819..3b3e1e3f97 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.jsx
@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import { changeBoostPrivacy } from 'mastodon/actions/boosts';
 import AttachmentList from 'mastodon/components/attachment_list';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
index dd2a10608d..d1c9e36883 100644
--- a/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
+++ b/app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 1080c303c5..4227c74131 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 
 import escapeTextContentForBrowser from 'escape-html';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { closeModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
 import InlineAccount from 'mastodon/components/inline_account';
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.jsx b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
index 595e9771b5..a4e5fc9dfb 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
@@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import api from 'mastodon/api';
 import { IconButton } from 'mastodon/components/icon_button';
 
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.jsx b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
index 25cda00bea..477575bd7b 100644
--- a/app/javascript/mastodon/features/ui/components/filter_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
 import { fetchStatus } from 'mastodon/actions/statuses';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index a3bb22bd99..25ad1e2e9f 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -16,7 +16,7 @@ import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Button } from 'mastodon/components/button';
 import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
index 6df753b069..4aa0092631 100644
--- a/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
+++ b/app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
@@ -6,7 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
 import { List as ImmutableList } from 'immutable';
 import { connect } from 'react-redux';
 
-import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import { fetchFollowRequests } from 'mastodon/actions/accounts';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import ColumnLink from 'mastodon/features/ui/components/column_link';
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index b4f388ba84..2f8636b12a 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -7,7 +7,7 @@ import { Link, withRouter } from 'react-router-dom';
 
 import { connect } from 'react-redux';
 
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { fetchServer } from 'mastodon/actions/server';
 import { Avatar } from 'mastodon/components/avatar';
diff --git a/app/javascript/mastodon/features/ui/components/image_modal.jsx b/app/javascript/mastodon/features/ui/components/image_modal.jsx
index 5a700dc1f7..f08ce15342 100644
--- a/app/javascript/mastodon/features/ui/components/image_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/image_modal.jsx
@@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 import ImageLoader from './image_loader';
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.jsx b/app/javascript/mastodon/features/ui/components/list_panel.jsx
index 634f13e611..fec21f14ca 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/list_panel.jsx
@@ -5,7 +5,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import { fetchLists } from 'mastodon/actions/lists';
 
 import ColumnLink from './column_link';
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index b5b5d88693..0f6e8a727b 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -9,9 +9,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import ReactSwipeableViews from 'react-swipeable-views';
 
-import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
-import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { getAverageFromBlurhash } from 'mastodon/blurhash';
 import { GIFV } from 'mastodon/components/gifv';
 import { Icon }  from 'mastodon/components/icon';
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 72da652b3d..d3f46c6d46 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -5,16 +5,16 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
-import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
-import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
-import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
-import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
-import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
-import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
-import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
+import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import TagIcon from '@/material-icons/400-24px/tag.svg?react';
 import { WordmarkLogo } from 'mastodon/components/logo';
 import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
index 34e868acc8..7d59d616d8 100644
--- a/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
+++ b/app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 
-import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 
 
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.jsx b/app/javascript/mastodon/features/ui/components/report_modal.jsx
index aae0e96ac4..6584364609 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/report_modal.jsx
@@ -7,7 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { submitReport } from 'mastodon/actions/reports';
 import { fetchServer } from 'mastodon/actions/server';
 import { expandAccountTimeline } from 'mastodon/actions/timelines';
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
index e3fa7c3b8a..272a3cff00 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.jsx
@@ -3,8 +3,8 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
-import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
+import FullscreenExitIcon from '@/material-icons/400-24px/fullscreen_exit.svg?react';
+import RectangleIcon from '@/material-icons/400-24px/rectangle.svg?react';
 import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/video/index.jsx b/app/javascript/mastodon/features/video/index.jsx
index efcbbc174e..89a8ba560a 100644
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@@ -9,14 +9,14 @@ import { is } from 'immutable';
 
 import { throttle } from 'lodash';
 
-import FullscreenIcon from 'mastodon/../material-icons/400-24px/fullscreen.svg?react';
-import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
-import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
-import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
-import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
-import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
-import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
+import FullscreenIcon from '@/material-icons/400-24px/fullscreen.svg?react';
+import FullscreenExitIcon from '@/material-icons/400-24px/fullscreen_exit.svg?react';
+import PauseIcon from '@/material-icons/400-24px/pause.svg?react';
+import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
+import RectangleIcon from '@/material-icons/400-24px/rectangle.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import VolumeOffIcon from '@/material-icons/400-24px/volume_off-fill.svg?react';
+import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 import { playerSettings } from 'mastodon/settings';
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 7c00d85d36..8e77a840a5 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -96,6 +96,9 @@ module.exports = {
       resolve(settings.source_path),
       'node_modules',
     ],
+    alias: {
+      "@": resolve(settings.source_path),
+    }
   },
 
   resolveLoader: {
diff --git a/lib/tasks/icons.rake b/lib/tasks/icons.rake
index 3e3d0daac5..374ea149fe 100644
--- a/lib/tasks/icons.rake
+++ b/lib/tasks/icons.rake
@@ -22,7 +22,7 @@ def find_used_icons
 
   Dir[Rails.root.join('app', 'javascript', '**', '*.*s*')].map do |path|
     File.open(path, 'r') do |file|
-      pattern = %r{\Aimport .* from 'mastodon/../material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
+      pattern = %r{\Aimport .* from '@/material-icons/(?<weight>[0-9]+)-(?<size>[0-9]+)px/(?<icon>[^-]*)(?<fill>-fill)?.svg\?react';}
       file.each_line do |line|
         match = pattern.match(line)
         next if match.blank?
diff --git a/tsconfig.json b/tsconfig.json
index d1a77e5493..a193ea35f2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "tsBuildInfoFile": "tmp/cache/tsconfig.tsbuildinfo",
     "paths": {
       "mastodon": ["app/javascript/mastodon"],
-      "mastodon/*": ["app/javascript/mastodon/*"]
+      "mastodon/*": ["app/javascript/mastodon/*"],
+      "@/*": ["app/javascript/*"]
     }
   },
   "include": [

From e85e2929aac2b86f8c7d4060b04330bf70e83c5f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:53:32 +0100
Subject: [PATCH 320/436] Update eslint (non-major) (#28729)

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

diff --git a/yarn.lock b/yarn.lock
index 3a7563b31b..26368006d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3679,14 +3679,14 @@ __metadata:
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.0.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0"
+  version: 6.19.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.16.0"
-    "@typescript-eslint/type-utils": "npm:6.16.0"
-    "@typescript-eslint/utils": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/type-utils": "npm:6.19.0"
+    "@typescript-eslint/utils": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -3699,54 +3699,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c8a68e0953d8b94f6b85d3a82090e61e670bcb0945cbee4d741321c56db727429ad47c48b8403ad1dab3b0842689bd2d4b85c99b76c51ac4f5be7f5f61c4c314
+  checksum: ab1a5ace6663b0c6d2418e321328fa28aa4bdc4b5fae257addec01346fb3a9c2d3a2960ade0f7114e6974c513a28632c9e8e602333cc0fab3135c445babdef59
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/parser@npm:6.17.0"
+  version: 6.19.0
+  resolution: "@typescript-eslint/parser@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 66b53159688083eb48259de5b4daf076f3de284ac3b4d2618bda3f7ab2d8ee27b01ae851b08e8487047e33ff3668424f17d677d66413164cb231f1519dcff82f
+  checksum: d547bfb1aaed112cfc0f9f0be8506a280952ba3b61be42b749352139361bd94e4a47fa043d819e19c6a498cacbd8bb36a46e3628c436a7e2009e7ac27afc8861
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.16.0"
+"@typescript-eslint/scope-manager@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
-  checksum: 3b275e528d19f4f36c4acd6cb872b5f004175512dce30cef0ac7a9121bb23d21e5e0f4b62658dbfea2b15851e7fa930372696f25a6c87492f863171ab56f5364
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+  checksum: 1ec7b9dedca7975f0aa4543c1c382f7d6131411bd443a5f9b96f137acb6adb450888ed13c95f6d26546b682b2e0579ce8a1c883fdbe2255dc0b61052193b8243
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.17.0"
+"@typescript-eslint/type-utils@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/type-utils@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
-  checksum: b7ac7d9c39515c2a1b3844577fab967bf126ec25ccf28076240748b3f42d60ab3e64131bfffee61f66251bdf2d59e50e39f5cb0bee7987c85c49140c75d26b5f
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/type-utils@npm:6.16.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.16.0"
-    "@typescript-eslint/utils": "npm:6.16.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/utils": "npm:6.19.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -3754,30 +3744,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a5339cc1375d12411fcb242249143b28401fb18890bb2a1cff5275ba946affb4a2066cd8203e83ac383bd9d791a79ea6ee1cbf7a30deed5c832ed002897bbf82
+  checksum: 5b146b985481e587122026c703ac9f537ad7e90eee1dca814971bca0d7e4a5d4ff9861fb4bf749014c28c6a4fbb4a01a4527355961315eb9501f3569f8e8dd38
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/types@npm:6.16.0"
-  checksum: 74d9a8b7fd1b85fd1824295c92bc2f506148e450c9897f65ddaa089091017df4e25676c5b098b75c8f00529b84492f303a6b1870bb0ffee83997081325891d53
+"@typescript-eslint/types@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/types@npm:6.19.0"
+  checksum: 6f81860a3c14df55232c2e6dec21fb166867b9f30b3c3369b325aef5ee1c7e41e827c0504654daa49c8ff1a3a9ca9d9bfe76786882b6212a7c1b58991a9c80b9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/types@npm:6.17.0"
-  checksum: c458d985b9ab4f369018536bcb88f0aedafb0c8c4b22ffd376e0c0c768a44e3956475c85ebeef40ae44238841c8df268893477b85873aa2621995c37e738e37e
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
+"@typescript-eslint/typescript-estree@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/visitor-keys": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -3787,63 +3770,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c7109e90b40b3c8f1042beb7f1a7a97eeba3b6a903acd82df4947900d68bd31d04b530a190c099666c5ca4886efc162de7b42de754a44b189e41237210797d9e
+  checksum: 5b365f009e43c7beafdbb7d8ecad78ee1087b0a4338cd9ec695eed514b7b4c1089e56239761139ddae629ec0ce8d428840c6ebfeea3618d2efe00c84f8794da5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:9.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 5a858288bb05f45a2a45b04394115826ff19f85555144bfb67dc281d4e75fc3a1e1aceb3dee68022e86b91f199d1310c15bda3100a4890004b8e474d86afad51
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:6.16.0, @typescript-eslint/utils@npm:^6.5.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/utils@npm:6.16.0"
+"@typescript-eslint/utils@npm:6.19.0, @typescript-eslint/utils@npm:^6.5.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/utils@npm:6.19.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.16.0"
-    "@typescript-eslint/types": "npm:6.16.0"
-    "@typescript-eslint/typescript-estree": "npm:6.16.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 586c4c0e1ca249daf9958f0d88df3af010a7592a19db1a7dc198754542b584314896536fe56ea9c93dd0ddd531154e7697002643d46e24a8d3a459721a626e91
+  checksum: 343ff4cd4f7e102df8c46b41254d017a33d95df76455531fda679fdb92aebb9c111df8ee9ab54972e73c1e8fad9dd7e421001233f0aee8115384462b0821852e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.16.0":
-  version: 6.16.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.16.0"
+"@typescript-eslint/visitor-keys@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.16.0"
+    "@typescript-eslint/types": "npm:6.19.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 13c4d90355e288eac432d2845e37bb2acc03dab6d8568564558c1914a9aa44352f2a7ff29d0f50e0b3e68d66cca5f27b2732af5ff193b82571b4366309842880
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.17.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 75a48f5810c6a69bc1c082b07d2b840c40895807b1b4ecf9d3ab9eb783176eeb3e7b11eb89d652e8331da79d604f82300f315ffc21cd937819197a8601b48d1d
+  checksum: bb34e922e018aadf34866995ea5949d6623f184cc4f6470ab05767dd208ffabb003b7dc3872199714574b7f10afe89d49c6f89a4e8d086edea82be73e189f1bb
   languageName: node
   linkType: hard
 
@@ -7341,9 +7295,9 @@ __metadata:
   linkType: hard
 
 "eslint-define-config@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "eslint-define-config@npm:2.0.0"
-  checksum: 617c3143bc1ed8df0b20ae632d428d5f241dbb04483631e1410c58fe65ba3e503cf94631c5973115482b58ba464d052422a718c0f4d49182f8d13ffbb36bf1d6
+  version: 2.1.0
+  resolution: "eslint-define-config@npm:2.1.0"
+  checksum: 034bd6bfbfec2db6c720a51815de6b072efeef7afbf99d90c23a1871f9cd741bb77f9d34e0bc2465262298c6110c5c45b704714d8575c6567fd2df963fb792ea
   languageName: node
   linkType: hard
 
@@ -7437,8 +7391,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^48.0.0":
-  version: 48.0.1
-  resolution: "eslint-plugin-jsdoc@npm:48.0.1"
+  version: 48.0.2
+  resolution: "eslint-plugin-jsdoc@npm:48.0.2"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.41.0"
     are-docs-informative: "npm:^0.0.2"
@@ -7451,7 +7405,7 @@ __metadata:
     spdx-expression-parse: "npm:^4.0.0"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 9b211cfb2e07e076dad12681cd2045c65766dd24fe9399fd0adeaf6f8785f9a4dd58608f1183195f63d3c6c91013aa1cf9edc9101580cff9cb60e1e688f456f9
+  checksum: 6e6062c22fa4039e4be898a62f8ca0edef8bcbdc8257abb18302471e9819ccd63941971cf8de0ccf4eb59b3508902aa06de56214d80bdfc9bde7cadb94906190
   languageName: node
   linkType: hard
 
@@ -7482,8 +7436,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-prettier@npm:^5.0.0":
-  version: 5.1.2
-  resolution: "eslint-plugin-prettier@npm:5.1.2"
+  version: 5.1.3
+  resolution: "eslint-plugin-prettier@npm:5.1.3"
   dependencies:
     prettier-linter-helpers: "npm:^1.0.0"
     synckit: "npm:^0.8.6"
@@ -7497,7 +7451,7 @@ __metadata:
       optional: true
     eslint-config-prettier:
       optional: true
-  checksum: e16c9fbb0e9f8da45bdbb1cf6e4a190266235c3686deede3815196d2604bbe2bac531d1fc9adc3c0b9a03d88b55bd3bfaa4f9d85e34e73dc040d545a1931fab9
+  checksum: f45d5fc1fcfec6b0cf038a7a65ddd10a25df4fe3f9e1f6b7f0d5100e66f046a26a2492e69ee765dddf461b93c114cf2e1eb18d4970aafa6f385448985c136e09
   languageName: node
   linkType: hard
 

From 4e277f83dc740b3a842c7fd8ed167c3c76fcabf8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:34:22 +0100
Subject: [PATCH 321/436] Update devDependencies (non-major) (#28728)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/reducers/accounts.ts | 22 +++++++------------
 yarn.lock                                    | 23 +++++++++++++-------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/javascript/mastodon/reducers/accounts.ts b/app/javascript/mastodon/reducers/accounts.ts
index e6f07340c0..5a9cc7220c 100644
--- a/app/javascript/mastodon/reducers/accounts.ts
+++ b/app/javascript/mastodon/reducers/accounts.ts
@@ -59,25 +59,19 @@ export const accountsReducer: Reducer<typeof initialState> = (
     return normalizeAccounts(state, action.payload.accounts);
   else if (followAccountSuccess.match(action)) {
     return state
-      .update(
-        action.payload.relationship.id,
-        (account) => account?.update('followers_count', (n) => n + 1),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => n + 1),
       )
-      .update(
-        getCurrentUser(),
-        (account) => account?.update('following_count', (n) => n + 1),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => n + 1),
       );
   } else if (unfollowAccountSuccess.match(action))
     return state
-      .update(
-        action.payload.relationship.id,
-        (account) =>
-          account?.update('followers_count', (n) => Math.max(0, n - 1)),
+      .update(action.payload.relationship.id, (account) =>
+        account?.update('followers_count', (n) => Math.max(0, n - 1)),
       )
-      .update(
-        getCurrentUser(),
-        (account) =>
-          account?.update('following_count', (n) => Math.max(0, n - 1)),
+      .update(getCurrentUser(), (account) =>
+        account?.update('following_count', (n) => Math.max(0, n - 1)),
       );
   else return state;
 };
diff --git a/yarn.lock b/yarn.lock
index 26368006d1..a8aa653844 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2895,15 +2895,15 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.0.0":
-  version: 6.1.6
-  resolution: "@testing-library/jest-dom@npm:6.1.6"
+  version: 6.2.0
+  resolution: "@testing-library/jest-dom@npm:6.2.0"
   dependencies:
     "@adobe/css-tools": "npm:^4.3.2"
     "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
     css.escape: "npm:^1.5.1"
-    dom-accessibility-api: "npm:^0.5.6"
+    dom-accessibility-api: "npm:^0.6.3"
     lodash: "npm:^4.17.15"
     redent: "npm:^3.0.0"
   peerDependencies:
@@ -2920,7 +2920,7 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: f98f79f3e470517469c86947d0ff1bb83ac2e59fd2a29728ab306eca5fba63c948084ec06b7b531642e6002d1f0211d918c298c628f0d386c0ef63ba881c47ba
+  checksum: 71421693e0ad6a46be7d16f00b58a45725c238693972b8b5b1fd9ab797902ccf1209cf259afe8da1bf59d7c958762c46ee85d1aa5b164a5ec330981ea2376b08
   languageName: node
   linkType: hard
 
@@ -6780,13 +6780,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.9":
   version: 0.5.16
   resolution: "dom-accessibility-api@npm:0.5.16"
   checksum: b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
   languageName: node
   linkType: hard
 
+"dom-accessibility-api@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "dom-accessibility-api@npm:0.6.3"
+  checksum: 10bee5aa514b2a9a37c87cd81268db607a2e933a050074abc2f6fa3da9080ebed206a320cbc123567f2c3087d22292853bdfdceaffdd4334ffe2af9510b29360
+  languageName: node
+  linkType: hard
+
 "dom-helpers@npm:^3.4.0":
   version: 3.4.0
   resolution: "dom-helpers@npm:3.4.0"
@@ -13201,11 +13208,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
+  version: 3.2.2
+  resolution: "prettier@npm:3.2.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: facc944ba20e194ff4db765e830ffbcb642803381f0d2033ed397e79904fa4ccc877dc25ad68f42d36985c01d051c990ca1b905fb83d2d7d65fe69e4386fa1a3
+  checksum: e84d0d2a4ce2b88ee1636904effbdf68b59da63d9f887128f2ed5382206454185432e7c0a9578bc4308bc25d099cfef47fd0b9c211066777854e23e65e34044d
   languageName: node
   linkType: hard
 

From bd538598c2f5196ef009a80ade31f72df6b6259f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:34:53 +0100
Subject: [PATCH 322/436] Update formatjs monorepo (#28751)

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

diff --git a/yarn.lock b/yarn.lock
index a8aa653844..b05a43982e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1811,6 +1811,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/ecma402-abstract@npm:1.18.2":
+  version: 1.18.2
+  resolution: "@formatjs/ecma402-abstract@npm:1.18.2"
+  dependencies:
+    "@formatjs/intl-localematcher": "npm:0.5.4"
+    tslib: "npm:^2.4.0"
+  checksum: 87afb37dd937555e712ca85d5142a9083d617c491d1dddf8d660fdfb6186272d2bc75b78809b076388d26f016200c8bddbce73281fd707eb899da2bf3bc9b7ca
+  languageName: node
+  linkType: hard
+
 "@formatjs/fast-memoize@npm:2.2.0":
   version: 2.2.0
   resolution: "@formatjs/fast-memoize@npm:2.2.0"
@@ -1831,6 +1841,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/icu-messageformat-parser@npm:2.7.5":
+  version: 2.7.5
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.5"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/icu-skeleton-parser": "npm:1.7.2"
+    tslib: "npm:^2.4.0"
+  checksum: b1995ee0844c48d1b4bf184017a65600eb1d324107046c8b67d77e08d7da74bbbbf00dccbf2bc418480c8510443b3eb157646404fbacd71fa6e7d572d0ffc910
+  languageName: node
+  linkType: hard
+
 "@formatjs/icu-skeleton-parser@npm:1.7.0":
   version: 1.7.0
   resolution: "@formatjs/icu-skeleton-parser@npm:1.7.0"
@@ -1841,25 +1862,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-displaynames@npm:6.6.4":
-  version: 6.6.4
-  resolution: "@formatjs/intl-displaynames@npm:6.6.4"
+"@formatjs/icu-skeleton-parser@npm:1.7.2":
+  version: 1.7.2
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.7.2"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     tslib: "npm:^2.4.0"
-  checksum: 009e443dd0d10776b8573d0181407d4c0d6c7a2ff537a5ea1e36413d1b08db9c21dfef272eabab8efabd01a58b64f663a30e4d584fd761df3fd68a5d23fe444b
+  checksum: 7ca30ac360a5a971b5a06b4ae0263f0ddbde4751ff470486767f544f0399c5c85affab7170e5dd227c65afac4797e79a5e8abe65a70a335b96ab77b5d314abcb
   languageName: node
   linkType: hard
 
-"@formatjs/intl-listformat@npm:7.5.3":
-  version: 7.5.3
-  resolution: "@formatjs/intl-listformat@npm:7.5.3"
+"@formatjs/intl-displaynames@npm:6.6.6":
+  version: 6.6.6
+  resolution: "@formatjs/intl-displaynames@npm:6.6.6"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
     tslib: "npm:^2.4.0"
-  checksum: de741ce84b16fed57016afbfe446ebd57cd23a046859a9353f5d455f8bc9114493bf83b9e18429268c7ce8f77bc54516a9b8190baf09fbb25c9b06cfc80101d4
+  checksum: 4ba40057cfafaabf04485137bc96705d5ed7ac48f17ed7dfe8dbd7f71119667b6c0b7fa75469e32b70c9bada2c5d03af37a5261d655a37b81c63ba907edbb2e8
+  languageName: node
+  linkType: hard
+
+"@formatjs/intl-listformat@npm:7.5.5":
+  version: 7.5.5
+  resolution: "@formatjs/intl-listformat@npm:7.5.5"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
+    tslib: "npm:^2.4.0"
+  checksum: bc9d8cbe42bd9513db0b2b221c0b1a752892005a90fa629b4cf7df1cbd3b96997cddbf420e562ebdfdc691a28d9b759ccae9633d5987aa0bceed5aef77a07ca4
   languageName: node
   linkType: hard
 
@@ -1872,34 +1903,63 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-pluralrules@npm:^5.2.2":
-  version: 5.2.10
-  resolution: "@formatjs/intl-pluralrules@npm:5.2.10"
+"@formatjs/intl-localematcher@npm:0.5.4":
+  version: 0.5.4
+  resolution: "@formatjs/intl-localematcher@npm:0.5.4"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/intl-localematcher": "npm:0.5.2"
     tslib: "npm:^2.4.0"
-  checksum: 1050416613e80bff2c58546c80c8d52ed97847d13c90535a53d058e44969369b50e1cfdb464e9e9ef4802c934c84ea0e656c3f4e3b4d5ac7496b722c759da4cf
+  checksum: c9ff5d34ca8b6fe59f8f303a3cc31a92d343e095a6987e273e5cc23f0fe99feb557a392a05da95931c7d24106acb6988e588d00ddd05b0934005aafd7fdbafe6
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.9.9":
-  version: 2.9.9
-  resolution: "@formatjs/intl@npm:2.9.9"
+"@formatjs/intl-pluralrules@npm:^5.2.2":
+  version: 5.2.12
+  resolution: "@formatjs/intl-pluralrules@npm:5.2.12"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/intl-localematcher": "npm:0.5.4"
+    tslib: "npm:^2.4.0"
+  checksum: 0f4d9f4f272dd962b2f742519045ad43a1b6358755787d3394efcc5884b02184cc8d76fb13d98b1f30c41a813b81f82dd2342e1fb0fbd7b7efa69f5d0d59c4d0
+  languageName: node
+  linkType: hard
+
+"@formatjs/intl@npm:2.9.11":
+  version: 2.9.11
+  resolution: "@formatjs/intl@npm:2.9.11"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/intl-displaynames": "npm:6.6.4"
-    "@formatjs/intl-listformat": "npm:7.5.3"
-    intl-messageformat: "npm:10.5.8"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/intl-displaynames": "npm:6.6.6"
+    "@formatjs/intl-listformat": "npm:7.5.5"
+    intl-messageformat: "npm:10.5.10"
     tslib: "npm:^2.4.0"
   peerDependencies:
-    typescript: 5
+    typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: b26904da605ab309535dfbbfbd403a3bb33d51d3c969c548b88fa04755be3aff60b1bddd1c453514a84048c7432271cef507ac66de32dcfa66b3f842a1ddb977
+  checksum: 003a4356e698cf847aeb701565cad701f3afba2a31d8d3c2fe0d5790d90ef866bea30cf2cc20151b15085db10e436376d38c10b911b3fe5afdef5c32333d09f3
+  languageName: node
+  linkType: hard
+
+"@formatjs/ts-transformer@npm:3.13.11":
+  version: 3.13.11
+  resolution: "@formatjs/ts-transformer@npm:3.13.11"
+  dependencies:
+    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@types/json-stable-stringify": "npm:^1.0.32"
+    "@types/node": "npm:14 || 16 || 17"
+    chalk: "npm:^4.0.0"
+    json-stable-stringify: "npm:^1.0.1"
+    tslib: "npm:^2.4.0"
+    typescript: "npm:5"
+  peerDependencies:
+    ts-jest: ">=27"
+  peerDependenciesMeta:
+    ts-jest:
+      optional: true
+  checksum: 2f7c48e742a152d0499615d01113fab23089c3c56beaa3234f53bbe48393b6351c68eba1aa23d6dec57ebfd7b1d12b165215950eeb87dd90072519dcc0a2e022
   languageName: node
   linkType: hard
 
@@ -4694,21 +4754,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.1":
-  version: 10.5.10
-  resolution: "babel-plugin-formatjs@npm:10.5.10"
+  version: 10.5.12
+  resolution: "babel-plugin-formatjs@npm:10.5.12"
   dependencies:
     "@babel/core": "npm:^7.10.4"
     "@babel/helper-plugin-utils": "npm:^7.10.4"
     "@babel/plugin-syntax-jsx": "npm:7"
     "@babel/traverse": "npm:7"
     "@babel/types": "npm:^7.12.11"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/ts-transformer": "npm:3.13.9"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/ts-transformer": "npm:3.13.11"
     "@types/babel__core": "npm:^7.1.7"
     "@types/babel__helper-plugin-utils": "npm:^7.10.0"
     "@types/babel__traverse": "npm:^7.1.7"
     tslib: "npm:^2.4.0"
-  checksum: bff65cd2a88a0ae00eabab1d022ffc44c4385b7e529cac42375bb1828c678c7a71a78f644512e5d1dd8cd532d418c16acdbabcef2bf6670e24404f4f164a74ce
+  checksum: 64fe3a38b283bb46e5528ad2f72287ca8a163227b0eea3bbe1bedff6d885b2be38c9fb8ed3843a72b723aeb2a7ad4d32b48e52030698631dc646aa15017f4208
   languageName: node
   linkType: hard
 
@@ -9260,15 +9320,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.8, intl-messageformat@npm:^10.3.5":
-  version: 10.5.8
-  resolution: "intl-messageformat@npm:10.5.8"
+"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
+  version: 10.5.10
+  resolution: "intl-messageformat@npm:10.5.10"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
     "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
     tslib: "npm:^2.4.0"
-  checksum: 1d2854aae8471ec48165ca265760d6c5b1814eca831c88db698eb29b5ed20bee21ca8533090c9d28d9c6f1d844dda210b0bc58a2e036446158fae0845e5eed4f
+  checksum: 2016c0561e5172b28f180669e28992d04944752d61ebcb539232cc289e7627fd92fe64c73985bc32bddd5cc683f7b77863c1b58507d214ce3a87982d50571658
   languageName: node
   linkType: hard
 
@@ -13568,26 +13628,26 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^6.4.2":
-  version: 6.5.5
-  resolution: "react-intl@npm:6.5.5"
+  version: 6.6.1
+  resolution: "react-intl@npm:6.6.1"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    "@formatjs/intl": "npm:2.9.9"
-    "@formatjs/intl-displaynames": "npm:6.6.4"
-    "@formatjs/intl-listformat": "npm:7.5.3"
+    "@formatjs/ecma402-abstract": "npm:1.18.2"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.5"
+    "@formatjs/intl": "npm:2.9.11"
+    "@formatjs/intl-displaynames": "npm:6.6.6"
+    "@formatjs/intl-listformat": "npm:7.5.5"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.5.8"
+    intl-messageformat: "npm:10.5.10"
     tslib: "npm:^2.4.0"
   peerDependencies:
     react: ^16.6.0 || 17 || 18
-    typescript: 5
+    typescript: ^4.7 || 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 9ff6200f195557804b735d618ee593aed7848e84213ac4eb9c57708f55c0d93232e0dd338c990348ba3b1d73dca071502a2051d4a2790838d962c3ccde87fa6c
+  checksum: 9277269eadbe432a9651af66402240b8a91a567c769ac9c1a774575999f63689a31dccf22a09a1d78d1b8fed4ecad103bdcc609e476ee7e60dabf0cbce6556d3
   languageName: node
   linkType: hard
 

From 8cc322a0e10a5455f2def59b9492edb1fcc098b4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:06:38 +0100
Subject: [PATCH 323/436] Update dependency concurrent-ruby to v1.2.3 (#28754)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d8e67b6bec..1592a7b572 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,7 @@ GEM
     climate_control (0.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)

From 0ce081fe494712e8fe6f785aeaa33994bbeb1a24 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 04:08:17 -0500
Subject: [PATCH 324/436] Remove monkey patch in favor of supported Devise
 config value (#28760)

---
 config/initializers/devise.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 2c6099623d..f935090efc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,15 +2,6 @@
 
 require 'devise/strategies/authenticatable'
 
-# TODO: Remove this patch when this PR or similar is merged into Devise:
-# https://github.com/heartcombo/devise/pull/5645
-# We rely on ENV vars and not secrets/credentials, so the deprecation is just noise.
-class Devise::SecretKeyFinder
-  def find
-    @application.secret_key_base
-  end
-end
-
 Warden::Manager.after_set_user except: :fetch do |user, warden|
   session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
   session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
@@ -133,9 +124,11 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
-  # by default. You can change it below and use your own secret key.
-  # config.secret_key = '2f86974c4dd7735170fd70fbf399f7a477ffd635ef240d07a22cf4bd7cd13dbae17c4383a2996d0c1e79a991ec18a91a17424c53e4771adb75a8b21904bd1403'
+  #
+  # Set explicitly to Rails default to avoid deprecation warnings.
+  # https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856
+  # Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
+  config.secret_key = Rails.application.secret_key_base
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

From 259874f2aceb6282081f303800f5f40b2510e875 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:11:18 +0100
Subject: [PATCH 325/436] Update dependency @rails/ujs to v7.1.3 (#28771)

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

diff --git a/yarn.lock b/yarn.lock
index b05a43982e..953147fe4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2675,9 +2675,9 @@ __metadata:
   linkType: hard
 
 "@rails/ujs@npm:^7.1.1":
-  version: 7.1.2
-  resolution: "@rails/ujs@npm:7.1.2"
-  checksum: 072962733c371fa0fff5e88a0aecd8e91c892f9dc2d31723b7586b45c723206d6b82ac71b0d7db26ea0a5ce60e0832430b061e4669b8f2aa813c3ea975aac98a
+  version: 7.1.3
+  resolution: "@rails/ujs@npm:7.1.3"
+  checksum: 68112d9add9dbc59b40c2ec1bc095a67445c57d20d0ab7d817ce3de0cd90374e2690af8ad54ce6ecc2d1c748b34c0c44d0fbd2f515ce2c443d7c5d23d00b9ce5
   languageName: node
   linkType: hard
 

From afb5e6cf46723ce70bd6a45c62c23466ceb9d985 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:11:22 +0100
Subject: [PATCH 326/436] Update dependency rails to v7.1.3 (#28772)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 1592a7b572..736a829f07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,35 +21,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    actioncable (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailbox (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
-      actionpack (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionmailer (7.1.3)
+      actionpack (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activesupport (= 7.1.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
-      actionview (= 7.1.2)
-      activesupport (= 7.1.2)
+    actionpack (7.1.3)
+      actionview (= 7.1.3)
+      activesupport (= 7.1.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -57,15 +57,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
-      actionpack (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    actiontext (7.1.3)
+      actionpack (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
-      activesupport (= 7.1.2)
+    actionview (7.1.3)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -75,22 +75,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.2)
-      activesupport (= 7.1.2)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
-      activesupport (= 7.1.2)
-    activerecord (7.1.2)
-      activemodel (= 7.1.2)
-      activesupport (= 7.1.2)
+    activemodel (7.1.3)
+      activesupport (= 7.1.3)
+    activerecord (7.1.3)
+      activemodel (= 7.1.3)
+      activesupport (= 7.1.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
-      actionpack (= 7.1.2)
-      activejob (= 7.1.2)
-      activerecord (= 7.1.2)
-      activesupport (= 7.1.2)
+    activestorage (7.1.3)
+      actionpack (= 7.1.3)
+      activejob (= 7.1.3)
+      activerecord (= 7.1.3)
+      activesupport (= 7.1.3)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -454,7 +454,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.4)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -462,7 +462,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.16.0)
@@ -552,27 +552,27 @@ GEM
       rack
     rack-proxy (0.7.6)
       rack
-    rack-session (1.0.1)
+    rack-session (1.0.2)
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.2)
-      actioncable (= 7.1.2)
-      actionmailbox (= 7.1.2)
-      actionmailer (= 7.1.2)
-      actionpack (= 7.1.2)
-      actiontext (= 7.1.2)
-      actionview (= 7.1.2)
-      activejob (= 7.1.2)
-      activemodel (= 7.1.2)
-      activerecord (= 7.1.2)
-      activestorage (= 7.1.2)
-      activesupport (= 7.1.2)
+    rails (7.1.3)
+      actioncable (= 7.1.3)
+      actionmailbox (= 7.1.3)
+      actionmailer (= 7.1.3)
+      actionpack (= 7.1.3)
+      actiontext (= 7.1.3)
+      actionview (= 7.1.3)
+      activejob (= 7.1.3)
+      activemodel (= 7.1.3)
+      activerecord (= 7.1.3)
+      activestorage (= 7.1.3)
+      activesupport (= 7.1.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -587,9 +587,9 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.2)
-      actionpack (= 7.1.2)
-      activesupport (= 7.1.2)
+    railties (7.1.3)
+      actionpack (= 7.1.3)
+      activesupport (= 7.1.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)

From 1b0cb3b54d1a1b08922527aefc8135d56d3a1a8d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 04:18:13 -0500
Subject: [PATCH 327/436] Announcement reactions query spec improvement and
 refactor (#28768)

---
 app/models/announcement.rb       | 41 +++++++++++++++++++++++---------
 spec/models/announcement_spec.rb | 23 ++++++++++++------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 86f7037a56..e630570020 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -75,22 +75,41 @@ class Announcement < ApplicationRecord
   end
 
   def reactions(account = nil)
-    records = begin
-      scope = announcement_reactions.group(:announcement_id, :name, :custom_emoji_id).order(Arel.sql('MIN(created_at) ASC'))
-
-      if account.nil?
-        scope.select('name, custom_emoji_id, count(*) as count, false as me')
-      else
-        scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from announcement_reactions r where r.account_id = #{account.id} and r.announcement_id = announcement_reactions.announcement_id and r.name = announcement_reactions.name) as me")
+    grouped_ordered_announcement_reactions.select(
+      [:name, :custom_emoji_id, 'COUNT(*) as count'].tap do |values|
+        values << value_for_reaction_me_column(account)
       end
-    end.to_a
-
-    ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
-    records
+    ).to_a.tap do |records|
+      ActiveRecord::Associations::Preloader.new(records: records, associations: :custom_emoji).call
+    end
   end
 
   private
 
+  def grouped_ordered_announcement_reactions
+    announcement_reactions
+      .group(:announcement_id, :name, :custom_emoji_id)
+      .order(
+        Arel.sql('MIN(created_at)').asc
+      )
+  end
+
+  def value_for_reaction_me_column(account)
+    if account.nil?
+      'FALSE AS me'
+    else
+      <<~SQL.squish
+        EXISTS(
+          SELECT 1
+          FROM announcement_reactions inner_reactions
+          WHERE inner_reactions.account_id = #{account.id}
+            AND inner_reactions.announcement_id = announcement_reactions.announcement_id
+            AND inner_reactions.name = announcement_reactions.name
+        ) AS me
+      SQL
+    end
+  end
+
   def set_published
     return unless scheduled_at.blank? || scheduled_at.past?
 
diff --git a/spec/models/announcement_spec.rb b/spec/models/announcement_spec.rb
index 612ba8bb0d..1e7283ca77 100644
--- a/spec/models/announcement_spec.rb
+++ b/spec/models/announcement_spec.rb
@@ -115,26 +115,35 @@ describe Announcement do
 
   describe '#reactions' do
     context 'with announcement_reactions present' do
+      let(:account_reaction_emoji) { Fabricate :custom_emoji }
+      let(:other_reaction_emoji) { Fabricate :custom_emoji }
       let!(:account) { Fabricate(:account) }
       let!(:announcement) { Fabricate(:announcement) }
-      let!(:announcement_reaction) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago) }
-      let!(:announcement_reaction_account) { Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account) }
 
       before do
-        Fabricate(:announcement_reaction)
+        Fabricate(:announcement_reaction, announcement: announcement, created_at: 10.days.ago, name: other_reaction_emoji.shortcode)
+        Fabricate(:announcement_reaction, announcement: announcement, created_at: 5.days.ago, account: account, name: account_reaction_emoji.shortcode)
+        Fabricate(:announcement_reaction) # For some other announcement
       end
 
       it 'returns the announcement reactions for the announcement' do
         results = announcement.reactions
 
-        expect(results.first.name).to eq(announcement_reaction.name)
-        expect(results.last.name).to eq(announcement_reaction_account.name)
+        expect(results).to have_attributes(
+          size: eq(2),
+          first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+          last: have_attributes(name: account_reaction_emoji.shortcode, me: false)
+        )
       end
 
-      it 'returns the announcement reactions for the announcement limited to account' do
+      it 'returns the announcement reactions for the announcement with `me` set correctly' do
         results = announcement.reactions(account)
 
-        expect(results.first.name).to eq(announcement_reaction.name)
+        expect(results).to have_attributes(
+          size: eq(2),
+          first: have_attributes(name: other_reaction_emoji.shortcode, me: false),
+          last: have_attributes(name: account_reaction_emoji.shortcode, me: true)
+        )
       end
     end
   end

From c523a9601b40719f8f3efb6c66842544dd25656d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 04:22:16 -0500
Subject: [PATCH 328/436] Rename local webpack* var in development env CSP
 config (#28766)

---
 config/initializers/content_security_policy.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index a8b61e356f..e43e38786c 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -52,9 +52,9 @@ Rails.application.config.content_security_policy do |p|
 
   if Rails.env.development?
     webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
-    webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
+    front_end_build_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{webpacker_public_host}" }
 
-    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
+    p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url, *front_end_build_urls
     p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
   else
     p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url

From baab58c80b5e98c705e63cfb9d8c496269c58227 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 Jan 2024 11:42:47 +0100
Subject: [PATCH 329/436] Fix various icon alignment issues (#28775)

---
 app/javascript/styles/mastodon/components.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 7f0f15f113..ab8939e131 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1398,8 +1398,7 @@ body > [data-popper-placement] {
   .icon {
     width: 15px;
     height: 15px;
-    position: relative;
-    top: 0.145em;
+    vertical-align: middle;
   }
 }
 
@@ -5544,6 +5543,10 @@ a.status-card {
     padding-inline-end: 10px;
   }
 
+  .icon {
+    vertical-align: middle;
+  }
+
   .button {
     flex: 0 0 auto;
   }
@@ -6170,6 +6173,7 @@ a.status-card {
 
     .icon {
       color: $dark-text-color;
+      vertical-align: middle;
     }
   }
 }

From cb5ac15923332a198148756ebcaef78cb0eff10b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 17 Jan 2024 13:19:51 +0100
Subject: [PATCH 330/436] Use a helper to avoid using `media/` asset prefixes
 (#28756)

---
 app/helpers/mascot_helper.rb                              | 2 +-
 app/helpers/routing_helper.rb                             | 8 ++++++--
 app/serializers/manifest_serializer.rb                    | 2 +-
 app/serializers/rest/instance_serializer.rb               | 2 +-
 app/serializers/rest/v1/instance_serializer.rb            | 2 +-
 app/views/application/mailer/_checklist.html.haml         | 4 ++--
 app/views/layouts/application.html.haml                   | 6 +++---
 app/views/layouts/mailer.html.haml                        | 4 ++--
 app/views/notification_mailer/favourite.html.haml         | 2 +-
 app/views/notification_mailer/follow.html.haml            | 2 +-
 app/views/notification_mailer/follow_request.html.haml    | 2 +-
 app/views/notification_mailer/mention.html.haml           | 2 +-
 app/views/notification_mailer/reblog.html.haml            | 2 +-
 app/views/shared/_og.html.haml                            | 2 +-
 app/views/user_mailer/appeal_approved.html.haml           | 2 +-
 app/views/user_mailer/appeal_rejected.html.haml           | 2 +-
 app/views/user_mailer/backup_ready.html.haml              | 2 +-
 app/views/user_mailer/confirmation_instructions.html.haml | 2 +-
 app/views/user_mailer/email_changed.html.haml             | 2 +-
 app/views/user_mailer/password_change.html.haml           | 2 +-
 .../user_mailer/reconfirmation_instructions.html.haml     | 2 +-
 .../user_mailer/reset_password_instructions.html.haml     | 2 +-
 app/views/user_mailer/suspicious_sign_in.html.haml        | 2 +-
 app/views/user_mailer/two_factor_disabled.html.haml       | 2 +-
 app/views/user_mailer/two_factor_enabled.html.haml        | 2 +-
 .../two_factor_recovery_codes_changed.html.haml           | 2 +-
 app/views/user_mailer/warning.html.haml                   | 2 +-
 app/views/user_mailer/webauthn_credential_added.html.haml | 2 +-
 .../user_mailer/webauthn_credential_deleted.html.haml     | 2 +-
 app/views/user_mailer/webauthn_disabled.html.haml         | 2 +-
 app/views/user_mailer/webauthn_enabled.html.haml          | 2 +-
 31 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/app/helpers/mascot_helper.rb b/app/helpers/mascot_helper.rb
index 8ee04383ec..34b656411e 100644
--- a/app/helpers/mascot_helper.rb
+++ b/app/helpers/mascot_helper.rb
@@ -2,7 +2,7 @@
 
 module MascotHelper
   def mascot_url
-    full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
+    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
   def instance_presenter
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 2fb9ce72cb..15d988f64d 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -24,8 +24,12 @@ module RoutingHelper
     Rails.configuration.action_controller.asset_host || root_url
   end
 
-  def full_pack_url(source, **options)
-    full_asset_url(asset_pack_path(source, **options))
+  def frontend_asset_path(source, **options)
+    asset_pack_path("media/#{source}", **options)
+  end
+
+  def frontend_asset_url(source, **options)
+    full_asset_url(frontend_asset_path(source, **options))
   end
 
   def use_storage?
diff --git a/app/serializers/manifest_serializer.rb b/app/serializers/manifest_serializer.rb
index 501bb788e7..1c1f7d0ad5 100644
--- a/app/serializers/manifest_serializer.rb
+++ b/app/serializers/manifest_serializer.rb
@@ -39,7 +39,7 @@ class ManifestSerializer < ActiveModel::Serializer
   def icons
     ICON_SIZES.map do |size|
       {
-        src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
+        src: frontend_asset_url("icons/android-chrome-#{size}x#{size}.png"),
         sizes: "#{size}x#{size}",
         type: 'image/png',
         purpose: 'any maskable',
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index d7ed381e16..fa926cd287 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -28,7 +28,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       }
     else
       {
-        url: full_pack_url('media/images/preview.png'),
+        url: frontend_asset_url('images/preview.png'),
       }
     end
   end
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index 99d1b2bd62..fdf939cfc3 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -33,7 +33,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
   end
 
   def thumbnail
-    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : full_pack_url('media/images/preview.png')
+    instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url(:'@1x')) : frontend_asset_url('images/preview.png')
   end
 
   def stats
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 9ee9655939..83072bd36b 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -11,9 +11,9 @@
                     %tr
                       %td.email-checklist-icons-checkbox-td
                         - if defined?(checked) && checked
-                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-on.png'), alt: '', width: 20, height: 20
                         - else
-                          = image_tag full_pack_url('media/images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
+                          = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                       %td.email-checklist-icons-step-td
                         - if defined?(step_image_url)
                           = image_tag step_image_url, alt: '', width: 40, height: 40
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6f6b1825f6..c721073670 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,12 +14,12 @@
     %link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
 
     - %w(16 32 48).each do |size|
-      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
+      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
 
     - %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
-      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
+      %link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: frontend_asset_path("icons/apple-touch-icon-#{size}x#{size}.png") }/
 
-    %link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
+    %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
     %meta{ name: 'theme-color', content: '#191b22' }/
     %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
diff --git a/app/views/layouts/mailer.html.haml b/app/views/layouts/mailer.html.haml
index c0f9a0a559..270f2b1e0c 100644
--- a/app/views/layouts/mailer.html.haml
+++ b/app/views/layouts/mailer.html.haml
@@ -50,7 +50,7 @@
                                 /[if mso]
                                   </v:textbox></v:rect>
                                 = link_to root_url, class: 'email-header-logo-a' do
-                                  = image_tag full_pack_url('media/images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
+                                  = image_tag frontend_asset_url('images/mailer-new/common/logo-header.png'), alt: 'Mastodon', width: 157, height: 40
 
                           -# Heading
                           = yield :heading
@@ -75,7 +75,7 @@
                   %td.email-footer-td
                     %p.email-footer-p
                       = link_to root_url, class: 'email-footer-logo-a' do
-                        = image_tag full_pack_url('media/images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
+                        = image_tag frontend_asset_url('images/mailer-new/common/logo-footer.png'), alt: 'Mastodon', width: 44, height: 44
                     %p.email-footer-p
                       = t 'about.hosted_on', domain: site_hostname
                     %p.email-footer-p
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index 26bb31731a..62c0a39abe 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/favorite.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.favourite.title'), heading_subtitle: t('notification_mailer.favourite.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/favorite.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index 2f7ba0a9c5..607cdb3666 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/user.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow.title'), heading_subtitle: t('notification_mailer.follow.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/user.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 275d0c5b0e..12e3e2ee33 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/follow.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.follow_request.title'), heading_subtitle: t('notification_mailer.follow_request.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/follow.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 2420a42bf7..83fa5086a6 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/mention.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.mention.title'), heading_subtitle: t('notification_mailer.mention.body', name: @status.account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/mention.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index b32c984708..f91c678cf5 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: full_pack_url('media/images/mailer-new/heading/boost.png')
+  = render 'application/mailer/heading', heading_title: t('notification_mailer.reblog.title'), heading_subtitle: t('notification_mailer.reblog.body', name: @account.pretty_acct), heading_image_url: frontend_asset_url('images/mailer-new/heading/boost.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index 385351ee14..d1e3cd9c6f 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -8,7 +8,7 @@
 = opengraph 'og:type', 'website'
 = opengraph 'og:title', instance_presenter.title
 = opengraph 'og:description', description
-= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png', protocol: :request))
+= opengraph 'og:image', full_asset_url(thumbnail&.file&.url(:'@1x') || frontend_asset_path('images/preview.png'))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
 = opengraph 'twitter:card', 'summary_large_image'
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 2cf62de39b..54e9a94a54 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-approved.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_approved.title'), heading_subtitle: t('user_mailer.appeal_approved.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-approved.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index c24cf7647f..b493712b05 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/appeal-rejected.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.appeal_rejected.title'), heading_subtitle: t('user_mailer.appeal_rejected.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/appeal-rejected.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/backup_ready.html.haml b/app/views/user_mailer/backup_ready.html.haml
index 4a1e7b1c65..99a48e7fdb 100644
--- a/app/views/user_mailer/backup_ready.html.haml
+++ b/app/views/user_mailer/backup_ready.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/archive.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.backup_ready.title'), heading_subtitle: t('user_mailer.backup_ready.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/archive.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 4fd66d0791..74b2d49a47 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.confirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml
index 741c2bde18..71678ad029 100644
--- a/app/views/user_mailer/email_changed.html.haml
+++ b/app/views/user_mailer/email_changed.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.email_changed.title'), heading_subtitle: t('devise.mailer.email_changed.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/password_change.html.haml b/app/views/user_mailer/password_change.html.haml
index 08b4ecbbd6..44c8c0dcaf 100644
--- a/app/views/user_mailer/password_change.html.haml
+++ b/app/views/user_mailer/password_change.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.password_change.title'), heading_subtitle: t('devise.mailer.password_change.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/reconfirmation_instructions.html.haml b/app/views/user_mailer/reconfirmation_instructions.html.haml
index 8aa2230151..854887a7e0 100644
--- a/app/views/user_mailer/reconfirmation_instructions.html.haml
+++ b/app/views/user_mailer/reconfirmation_instructions.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: full_pack_url('media/images/mailer-new/heading/email.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reconfirmation_instructions.title'), heading_image_url: frontend_asset_url('images/mailer-new/heading/email.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/reset_password_instructions.html.haml b/app/views/user_mailer/reset_password_instructions.html.haml
index 0db79daaf1..a1384fcc27 100644
--- a/app/views/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/user_mailer/reset_password_instructions.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/password.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.reset_password_instructions.title'), heading_subtitle: t('devise.mailer.reset_password_instructions.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/password.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index e2cb916bfe..deee7a1ce1 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/login.png')
+  = render 'application/mailer/heading', heading_title: t('user_mailer.suspicious_sign_in.title'), heading_subtitle: t('user_mailer.suspicious_sign_in.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_disabled.html.haml b/app/views/user_mailer/two_factor_disabled.html.haml
index 0d8ff5c690..28f6ca6600 100644
--- a/app/views/user_mailer/two_factor_disabled.html.haml
+++ b/app/views/user_mailer/two_factor_disabled.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-disabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_disabled.title'), heading_subtitle: t('devise.mailer.two_factor_disabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-disabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_enabled.html.haml b/app/views/user_mailer/two_factor_enabled.html.haml
index 6fe03eab2b..691dc661a0 100644
--- a/app/views/user_mailer/two_factor_enabled.html.haml
+++ b/app/views/user_mailer/two_factor_enabled.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-enabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_enabled.title'), heading_subtitle: t('devise.mailer.two_factor_enabled.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-enabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
index dff0620cef..2d063e4c76 100644
--- a/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
+++ b/app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: full_pack_url('media/images/mailer-new/heading/2fa-recovery.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.two_factor_recovery_codes_changed.title'), heading_subtitle: t('devise.mailer.two_factor_recovery_codes_changed.subtitle'), heading_image_url: frontend_asset_url('images/mailer-new/heading/2fa-recovery.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index 4dfbfc231d..837cde550e 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: full_pack_url('media/images/mailer-new/heading/warning.png')
+  = render 'application/mailer/heading', heading_title: t("user_mailer.warning.title.#{@warning.action}"), heading_image_url: frontend_asset_url('images/mailer-new/heading/warning.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_credential_added.html.haml b/app/views/user_mailer/webauthn_credential_added.html.haml
index 334eb3e32d..3e16766238 100644
--- a/app/views/user_mailer/webauthn_credential_added.html.haml
+++ b/app/views/user_mailer/webauthn_credential_added.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-added.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.added.title'), heading_subtitle: t('devise.mailer.webauthn_credential.added.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-added.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_credential_deleted.html.haml b/app/views/user_mailer/webauthn_credential_deleted.html.haml
index 5fad523b4e..59dcb75d3a 100644
--- a/app/views/user_mailer/webauthn_credential_deleted.html.haml
+++ b/app/views/user_mailer/webauthn_credential_deleted.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-deleted.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_credential.deleted.title'), heading_subtitle: t('devise.mailer.webauthn_credential.deleted.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-deleted.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_disabled.html.haml b/app/views/user_mailer/webauthn_disabled.html.haml
index 0174125362..0f7c534bc4 100644
--- a/app/views/user_mailer/webauthn_disabled.html.haml
+++ b/app/views/user_mailer/webauthn_disabled.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-disabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_disabled.title'), heading_subtitle: t('devise.mailer.webauthn_disabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-disabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td
diff --git a/app/views/user_mailer/webauthn_enabled.html.haml b/app/views/user_mailer/webauthn_enabled.html.haml
index 3257d14df9..cd11aa5a40 100644
--- a/app/views/user_mailer/webauthn_enabled.html.haml
+++ b/app/views/user_mailer/webauthn_enabled.html.haml
@@ -1,5 +1,5 @@
 = content_for :heading do
-  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: full_pack_url('media/images/mailer-new/heading/key-enabled.png')
+  = render 'application/mailer/heading', heading_title: t('devise.mailer.webauthn_enabled.title'), heading_subtitle: t('devise.mailer.webauthn_enabled.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/key-enabled.png')
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-body-padding-td

From 9a475ea8b32eed5ce163600d4747fe553bb7045e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 08:38:37 -0500
Subject: [PATCH 331/436] Finish up the CLI spec area pattern adoption for
 `CLI::Accounts#refresh` specs (#28764)

---
 spec/lib/mastodon/cli/accounts_spec.rb | 258 +++++++++++--------------
 1 file changed, 111 insertions(+), 147 deletions(-)

diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 64df29ebb3..26ad983bbc 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -660,106 +660,69 @@ describe Mastodon::CLI::Accounts do
   end
 
   describe '#refresh' do
+    let(:action) { :refresh }
+
     context 'with --all option' do
-      let!(:local_account)              { Fabricate(:account, domain: nil) }
-      let!(:remote_account_example_com) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_net)        { Fabricate(:account, domain: 'example.net') }
-      let(:scope)                       { Account.remote }
+      let(:options) { { all: true } }
+      let!(:local_account) { Fabricate(:account, domain: nil) }
+      let(:remote_com_avatar_url) { 'https://example.host/avatar/com' }
+      let(:remote_com_header_url) { 'https://example.host/header/com' }
+      let(:remote_account_example_com) { Fabricate(:account, domain: 'example.com', avatar_remote_url: remote_com_avatar_url, header_remote_url: remote_com_header_url) }
+      let(:remote_net_avatar_url) { 'https://example.host/avatar/net' }
+      let(:remote_net_header_url) { 'https://example.host/header/net' }
+      let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: remote_net_avatar_url, header_remote_url: remote_net_header_url) }
+      let(:scope) { Account.remote }
 
       before do
-        # TODO: we should be using `stub_parallelize_with_progress!` but
-        # this makes the assertions harder to write
-        allow(cli).to receive(:parallelize_with_progress).and_yield(remote_account_example_com)
-                                                         .and_yield(account_example_net)
-                                                         .and_return([2, nil])
-        cli.options = { all: true }
+        stub_parallelize_with_progress!
+
+        stub_request(:get, remote_com_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_com_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_net_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, remote_net_header_url)
+          .to_return request_fixture('avatar.txt')
+
+        remote_account_example_com
+          .update_column(:avatar_file_name, nil)
+        account_example_net
+          .update_column(:avatar_file_name, nil)
       end
 
-      it 'refreshes the avatar for all remote accounts' do
-        allow(remote_account_example_com).to receive(:reset_avatar!)
-        allow(account_example_net).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
+      it 'refreshes the avatar and header for all remote accounts' do
+        expect { subject }
           .to output_results('Refreshed 2 accounts')
+          .and not_change(local_account, :updated_at)
 
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(remote_account_example_com).to have_received(:reset_avatar!).once
-        expect(account_example_net).to have_received(:reset_avatar!).once
-      end
-
-      it 'does not refresh avatar for local accounts' do
-        allow(local_account).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(local_account).to_not have_received(:reset_avatar!)
-      end
-
-      it 'refreshes the header for all remote accounts' do
-        allow(remote_account_example_com).to receive(:reset_header!)
-        allow(account_example_net).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(remote_account_example_com).to have_received(:reset_header!).once
-        expect(account_example_net).to have_received(:reset_header!).once
-      end
-
-      it 'does not refresh the header for local accounts' do
-        allow(local_account).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(local_account).to_not have_received(:reset_header!)
-      end
-
-      it 'displays a successful message' do
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
+        # One request from factory creation, one more from task
+        expect(a_request(:get, remote_com_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_com_header_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_net_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, remote_net_header_url))
+          .to have_been_made.at_least_times(2)
       end
 
       context 'with --dry-run option' do
-        before do
-          cli.options = { all: true, dry_run: true }
-        end
+        let(:options) { { all: true, dry_run: true } }
 
-        it 'does not refresh the avatar for any account' do
-          allow(local_account).to receive(:reset_avatar!)
-          allow(remote_account_example_com).to receive(:reset_avatar!)
-          allow(account_example_net).to receive(:reset_avatar!)
-
-          expect { cli.refresh }
+        it 'does not refresh the avatar or header for any account' do
+          expect { subject }
             .to output_results('Refreshed 2 accounts')
 
-          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-          expect(local_account).to_not have_received(:reset_avatar!)
-          expect(remote_account_example_com).to_not have_received(:reset_avatar!)
-          expect(account_example_net).to_not have_received(:reset_avatar!)
-        end
-
-        it 'does not refresh the header for any account' do
-          allow(local_account).to receive(:reset_header!)
-          allow(remote_account_example_com).to receive(:reset_header!)
-          allow(account_example_net).to receive(:reset_header!)
-
-          expect { cli.refresh }
-            .to output_results('Refreshed 2 accounts')
-
-          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-          expect(local_account).to_not have_received(:reset_header!)
-          expect(remote_account_example_com).to_not have_received(:reset_header!)
-          expect(account_example_net).to_not have_received(:reset_header!)
-        end
-
-        it 'displays a successful message with (DRY RUN)' do
-          expect { cli.refresh }
-            .to output_results('Refreshed 2 accounts (DRY RUN)')
+          # One request from factory creation, none from task due to dry run
+          expect(a_request(:get, remote_com_avatar_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_com_header_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_net_avatar_url))
+            .to have_been_made.once
+          expect(a_request(:get, remote_net_header_url))
+            .to have_been_made.once
         end
       end
     end
@@ -782,7 +745,7 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_avatar!)
         allow(account_example_com_b).to receive(:reset_avatar!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_avatar!).once
@@ -792,7 +755,7 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the avatar for unspecified accounts' do
         allow(account_example_net).to receive(:reset_avatar!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_avatar!)
@@ -802,7 +765,7 @@ describe Mastodon::CLI::Accounts do
         allow(account_example_com_a).to receive(:reset_header!)
         allow(account_example_com_b).to receive(:reset_header!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_com_a).to have_received(:reset_header!).once
@@ -812,7 +775,7 @@ describe Mastodon::CLI::Accounts do
       it 'does not reset the header for unspecified accounts' do
         allow(account_example_net).to receive(:reset_header!)
 
-        expect { cli.refresh(*arguments) }
+        expect { subject }
           .to output_results('OK')
 
         expect(account_example_net).to_not have_received(:reset_header!)
@@ -822,7 +785,7 @@ describe Mastodon::CLI::Accounts do
         it 'displays a failure message' do
           allow(account_example_com_a).to receive(:reset_avatar!).and_raise(Mastodon::UnexpectedResponseError)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
         end
       end
@@ -831,22 +794,20 @@ describe Mastodon::CLI::Accounts do
         it 'exits with an error message' do
           allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results('No such account')
             .and raise_error(SystemExit)
         end
       end
 
       context 'with --dry-run option' do
-        before do
-          cli.options = { dry_run: true }
-        end
+        let(:options) { { dry_run: true } }
 
         it 'does not refresh the avatar for any account' do
           allow(account_example_com_a).to receive(:reset_avatar!)
           allow(account_example_com_b).to receive(:reset_avatar!)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_avatar!)
@@ -857,7 +818,7 @@ describe Mastodon::CLI::Accounts do
           allow(account_example_com_a).to receive(:reset_header!)
           allow(account_example_com_b).to receive(:reset_header!)
 
-          expect { cli.refresh(*arguments) }
+          expect { subject }
             .to output_results('OK (DRY RUN)')
 
           expect(account_example_com_a).to_not have_received(:reset_header!)
@@ -867,67 +828,70 @@ describe Mastodon::CLI::Accounts do
     end
 
     context 'with --domain option' do
-      let!(:account_example_com_a) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_com_b) { Fabricate(:account, domain: 'example.com') }
-      let!(:account_example_net)   { Fabricate(:account, domain: 'example.net') }
-      let(:domain)                 { 'example.com' }
-      let(:scope)                  { Account.remote.where(domain: domain) }
+      let(:domain) { 'example.com' }
+      let(:options) { { domain: domain } }
+
+      let(:com_a_avatar_url) { 'https://example.host/avatar/a' }
+      let(:com_a_header_url) { 'https://example.host/header/a' }
+      let(:account_example_com_a) { Fabricate(:account, domain: domain, avatar_remote_url: com_a_avatar_url, header_remote_url: com_a_header_url) }
+
+      let(:com_b_avatar_url) { 'https://example.host/avatar/b' }
+      let(:com_b_header_url) { 'https://example.host/header/b' }
+      let(:account_example_com_b) { Fabricate(:account, domain: domain, avatar_remote_url: com_b_avatar_url, header_remote_url: com_b_header_url) }
+
+      let(:net_avatar_url) { 'https://example.host/avatar/net' }
+      let(:net_header_url) { 'https://example.host/header/net' }
+      let(:account_example_net) { Fabricate(:account, domain: 'example.net', avatar_remote_url: net_avatar_url, header_remote_url: net_header_url) }
 
       before do
-        allow(cli).to receive(:parallelize_with_progress).and_yield(account_example_com_a)
-                                                         .and_yield(account_example_com_b)
-                                                         .and_return([2, nil])
-        cli.options = { domain: domain }
+        stub_parallelize_with_progress!
+
+        stub_request(:get, com_a_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_a_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_b_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, com_b_header_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, net_avatar_url)
+          .to_return request_fixture('avatar.txt')
+        stub_request(:get, net_header_url)
+          .to_return request_fixture('avatar.txt')
+
+        account_example_com_a
+          .update_column(:avatar_file_name, nil)
+        account_example_com_b
+          .update_column(:avatar_file_name, nil)
+        account_example_net
+          .update_column(:avatar_file_name, nil)
       end
 
-      it 'refreshes the avatar for all accounts on specified domain' do
-        allow(account_example_com_a).to receive(:reset_avatar!)
-        allow(account_example_com_b).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
+      it 'refreshes the avatar and header for all accounts on specified domain' do
+        expect { subject }
           .to output_results('Refreshed 2 accounts')
 
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_com_a).to have_received(:reset_avatar!).once
-        expect(account_example_com_b).to have_received(:reset_avatar!).once
-      end
+        # One request from factory creation, one more from task
+        expect(a_request(:get, com_a_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_a_header_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_b_avatar_url))
+          .to have_been_made.at_least_times(2)
+        expect(a_request(:get, com_b_header_url))
+          .to have_been_made.at_least_times(2)
 
-      it 'does not refresh the avatar for accounts outside specified domain' do
-        allow(account_example_net).to receive(:reset_avatar!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_net).to_not have_received(:reset_avatar!)
-      end
-
-      it 'refreshes the header for all accounts on specified domain' do
-        allow(account_example_com_a).to receive(:reset_header!)
-        allow(account_example_com_b).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope)
-        expect(account_example_com_a).to have_received(:reset_header!).once
-        expect(account_example_com_b).to have_received(:reset_header!).once
-      end
-
-      it 'does not refresh the header for accounts outside specified domain' do
-        allow(account_example_net).to receive(:reset_header!)
-
-        expect { cli.refresh }
-          .to output_results('Refreshed 2 accounts')
-
-        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
-        expect(account_example_net).to_not have_received(:reset_header!)
+        # One request from factory creation, none from task
+        expect(a_request(:get, net_avatar_url))
+          .to have_been_made.once
+        expect(a_request(:get, net_header_url))
+          .to have_been_made.once
       end
     end
 
     context 'when neither a list of accts nor options are provided' do
       it 'exits with an error message' do
-        expect { cli.refresh }
+        expect { subject }
           .to output_results('No account(s) given')
           .and raise_error(SystemExit)
       end

From 1ab42ad12b3bbc9e17607f6c6deea8ad722bb9fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:23:14 +0100
Subject: [PATCH 332/436] New Crowdin Translations (automated) (#28749)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/fo.json | 10 ++++++
 app/javascript/mastodon/locales/gl.json | 30 ++++++++---------
 app/javascript/mastodon/locales/ia.json |  7 ++++
 app/javascript/mastodon/locales/lt.json | 44 ++++++++++++-------------
 config/locales/an.yml                   |  2 --
 config/locales/ar.yml                   |  2 --
 config/locales/be.yml                   |  2 --
 config/locales/bg.yml                   |  8 +++--
 config/locales/br.yml                   |  5 +++
 config/locales/ca.yml                   |  8 +++--
 config/locales/ckb.yml                  |  1 -
 config/locales/co.yml                   |  1 -
 config/locales/cs.yml                   |  2 --
 config/locales/cy.yml                   | 14 +++++---
 config/locales/da.yml                   |  8 +++--
 config/locales/de.yml                   | 10 ++++--
 config/locales/devise.an.yml            |  4 ---
 config/locales/devise.ar.yml            |  4 ---
 config/locales/devise.ast.yml           |  4 ---
 config/locales/devise.be.yml            |  4 ---
 config/locales/devise.bg.yml            | 23 ++++++++-----
 config/locales/devise.bn.yml            |  2 --
 config/locales/devise.br.yml            |  4 ---
 config/locales/devise.ca.yml            | 13 +++++---
 config/locales/devise.ckb.yml           |  4 ---
 config/locales/devise.co.yml            |  4 ---
 config/locales/devise.cs.yml            |  4 ---
 config/locales/devise.cy.yml            | 13 +++++---
 config/locales/devise.da.yml            | 13 +++++---
 config/locales/devise.de.yml            | 13 +++++---
 config/locales/devise.el.yml            | 13 +++++---
 config/locales/devise.en-GB.yml         |  4 ---
 config/locales/devise.eo.yml            |  4 ---
 config/locales/devise.es-AR.yml         | 13 +++++---
 config/locales/devise.es-MX.yml         | 13 +++++---
 config/locales/devise.es.yml            | 13 +++++---
 config/locales/devise.et.yml            | 13 +++++---
 config/locales/devise.eu.yml            | 13 +++++---
 config/locales/devise.fa.yml            |  4 ---
 config/locales/devise.fi.yml            |  4 ---
 config/locales/devise.fo.yml            | 13 +++++---
 config/locales/devise.fr-CA.yml         |  9 ++---
 config/locales/devise.fr.yml            |  9 ++---
 config/locales/devise.fy.yml            | 13 +++++---
 config/locales/devise.gd.yml            |  4 ---
 config/locales/devise.gl.yml            | 13 +++++---
 config/locales/devise.he.yml            | 13 +++++---
 config/locales/devise.hu.yml            |  4 ---
 config/locales/devise.hy.yml            |  4 ---
 config/locales/devise.id.yml            |  4 ---
 config/locales/devise.ie.yml            | 11 ++++---
 config/locales/devise.io.yml            |  4 ---
 config/locales/devise.is.yml            | 13 +++++---
 config/locales/devise.it.yml            | 13 +++++---
 config/locales/devise.ja.yml            | 13 +++++---
 config/locales/devise.kab.yml           |  2 --
 config/locales/devise.kk.yml            |  2 --
 config/locales/devise.ko.yml            |  4 ---
 config/locales/devise.ku.yml            |  4 ---
 config/locales/devise.lad.yml           |  5 +--
 config/locales/devise.lt.yml            | 13 +++++---
 config/locales/devise.lv.yml            |  4 ---
 config/locales/devise.ms.yml            |  4 ---
 config/locales/devise.my.yml            |  4 ---
 config/locales/devise.nl.yml            | 13 +++++---
 config/locales/devise.nn.yml            |  4 ---
 config/locales/devise.no.yml            |  4 ---
 config/locales/devise.oc.yml            |  4 ---
 config/locales/devise.pl.yml            | 13 +++++---
 config/locales/devise.pt-BR.yml         | 11 ++++---
 config/locales/devise.pt-PT.yml         | 13 +++++---
 config/locales/devise.ro.yml            |  4 ---
 config/locales/devise.ru.yml            |  4 ---
 config/locales/devise.sc.yml            |  4 ---
 config/locales/devise.sco.yml           |  4 ---
 config/locales/devise.si.yml            |  4 ---
 config/locales/devise.sk.yml            |  6 ++--
 config/locales/devise.sl.yml            |  4 ---
 config/locales/devise.sq.yml            |  4 ---
 config/locales/devise.sr-Latn.yml       | 13 +++++---
 config/locales/devise.sr.yml            | 13 +++++---
 config/locales/devise.sv.yml            | 10 +++---
 config/locales/devise.ta.yml            |  2 --
 config/locales/devise.th.yml            |  4 ---
 config/locales/devise.tr.yml            | 13 +++++---
 config/locales/devise.uk.yml            |  4 ---
 config/locales/devise.vi.yml            | 13 +++++---
 config/locales/devise.zh-CN.yml         | 13 +++++---
 config/locales/devise.zh-HK.yml         | 13 +++++---
 config/locales/devise.zh-TW.yml         | 13 +++++---
 config/locales/el.yml                   |  8 +++--
 config/locales/en-GB.yml                |  2 --
 config/locales/eo.yml                   |  2 --
 config/locales/es-AR.yml                |  8 +++--
 config/locales/es-MX.yml                |  8 +++--
 config/locales/es.yml                   |  8 +++--
 config/locales/et.yml                   |  8 +++--
 config/locales/eu.yml                   |  8 +++--
 config/locales/fa.yml                   |  2 --
 config/locales/fi.yml                   |  2 --
 config/locales/fo.yml                   |  9 +++--
 config/locales/fr-CA.yml                |  8 +++--
 config/locales/fr.yml                   |  8 +++--
 config/locales/fy.yml                   |  8 +++--
 config/locales/gd.yml                   |  2 --
 config/locales/gl.yml                   |  8 +++--
 config/locales/he.yml                   |  8 +++--
 config/locales/hu.yml                   |  2 --
 config/locales/ia.yml                   |  2 --
 config/locales/id.yml                   |  2 --
 config/locales/ie.yml                   |  7 ++--
 config/locales/io.yml                   |  2 --
 config/locales/is.yml                   |  8 +++--
 config/locales/it.yml                   |  8 +++--
 config/locales/ja.yml                   |  8 +++--
 config/locales/ka.yml                   |  1 -
 config/locales/kab.yml                  |  2 --
 config/locales/kk.yml                   |  1 -
 config/locales/ko.yml                   |  4 +--
 config/locales/ku.yml                   |  2 --
 config/locales/lad.yml                  |  5 +--
 config/locales/lt.yml                   |  9 ++++-
 config/locales/lv.yml                   |  2 --
 config/locales/ms.yml                   |  2 --
 config/locales/my.yml                   |  2 --
 config/locales/nl.yml                   |  8 +++--
 config/locales/nn.yml                   |  2 --
 config/locales/no.yml                   |  2 --
 config/locales/oc.yml                   |  3 --
 config/locales/pl.yml                   |  8 +++--
 config/locales/pt-BR.yml                |  7 ++--
 config/locales/pt-PT.yml                |  8 +++--
 config/locales/ro.yml                   |  1 -
 config/locales/ru.yml                   |  2 --
 config/locales/sc.yml                   |  1 -
 config/locales/sco.yml                  |  2 --
 config/locales/si.yml                   |  2 --
 config/locales/sk.yml                   |  8 +++--
 config/locales/sl.yml                   |  8 +++--
 config/locales/sq.yml                   |  2 --
 config/locales/sr-Latn.yml              |  8 +++--
 config/locales/sr.yml                   |  8 +++--
 config/locales/sv.yml                   |  8 +++--
 config/locales/th.yml                   |  2 --
 config/locales/tr.yml                   |  8 +++--
 config/locales/uk.yml                   |  4 +--
 config/locales/vi.yml                   |  8 +++--
 config/locales/zh-CN.yml                |  8 +++--
 config/locales/zh-HK.yml                |  8 +++--
 config/locales/zh-TW.yml                |  8 +++--
 150 files changed, 585 insertions(+), 471 deletions(-)

diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 9259f20154..94d13e8d91 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -393,6 +393,7 @@
   "lists.search": "Leita millum fólk, sum tú fylgir",
   "lists.subheading": "Tínir listar",
   "load_pending": "{count, plural, one {# nýtt evni} other {# nýggj evni}}",
+  "loading_indicator.label": "Innlesur…",
   "media_gallery.toggle_visible": "{number, plural, one {Fjal mynd} other {Fjal myndir}}",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
   "mute_modal.duration": "Tíðarbil",
@@ -483,6 +484,15 @@
   "onboarding.follows.title": "Vælumtókt á Mastodon",
   "onboarding.profile.discoverable": "Ger tað møguligt hjá øðrum at finna vangan hjá mær",
   "onboarding.profile.discoverable_hint": "Tá tú játtar at onnur skulu kunna finna teg á Mastodon, so kann henda, at postar tínir síggjast í leitiúrslitum og rákum, og vangin hjá tær kann vera skotin upp fyri fólki við áhugamálum sum minna um tíni.",
+  "onboarding.profile.display_name": "Navn, sum skal vísast",
+  "onboarding.profile.display_name_hint": "Títt fulla navn ella títt stuttliga navn…",
+  "onboarding.profile.lead": "Tú kanst altíð gera hetta liðugt seinni í stillingunum, har enn fleiri tillagingarmøguleikar eru tøkir.",
+  "onboarding.profile.note": "Ævilýsing",
+  "onboarding.profile.note_hint": "Tú kanst @umrøða onnur fólk ella #frámerki…",
+  "onboarding.profile.save_and_continue": "Goym og halt fram",
+  "onboarding.profile.title": "Vangauppsetan",
+  "onboarding.profile.upload_avatar": "Legg vangamynd upp",
+  "onboarding.profile.upload_header": "Legg vangahøvd upp",
   "onboarding.share.lead": "Lat fólk vita, hvussu tey kunnu finna teg á Mastodon!",
   "onboarding.share.message": "Eg eri {username} á #Mastodon! Kom og fylg mær á {url}",
   "onboarding.share.next_steps": "Møgulig næstu stig:",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 48bbb6b307..e857b69554 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -20,7 +20,7 @@
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueada",
   "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
-  "account.cancel_follow_request": "Cancelar a solicitude de seguimento",
+  "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
   "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
@@ -184,7 +184,7 @@
   "confirmations.mute.explanation": "Isto agochará as súas publicacións ou as que a mencionen, mais poderá ler as túas publicacións e ser seguidora túa.",
   "confirmations.mute.message": "Tes a certeza de querer acalar a {name}?",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
-  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as comparticións e favoritas, e as respostas á publicación orixinal ficarán orfas.",
+  "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
@@ -204,7 +204,7 @@
   "disabled_account_banner.text": "Actualmente a túa conta {disabledAccount} está desactivada.",
   "dismissable_banner.community_timeline": "Estas son as publicacións máis recentes das persoas que teñen a súa conta en {domain}.",
   "dismissable_banner.dismiss": "Desbotar",
-  "dismissable_banner.explore_links": "As persoas deste servidor e da rede descentralizada están a falar destas historias agora mesmo.",
+  "dismissable_banner.explore_links": "Estas son as novas historias más compartidas hoxe na web social. Aparecen primeiro as novas compartidas por máis persoas diferentes.",
   "dismissable_banner.explore_statuses": "Estas son as publicacións da web social que hoxe están gañando popularidade. As publicacións con máis promocións e favorecemento teñen puntuación máis alta.",
   "dismissable_banner.explore_tags": "Estes cancelos están gañando popularidade entre as persoas deste servidor e noutros servidores da rede descentralizada.",
   "dismissable_banner.public_timeline": "Estas son as publicacións públicas máis recentes das persoas que as usuarias de {domain} están a seguir.",
@@ -240,7 +240,7 @@
   "empty_column.follow_requests": "Non tes peticións de seguimento. Cando recibas unha, amosarase aquí.",
   "empty_column.followed_tags": "Aínda non seguiches ningún cancelo. Cando o fagas aparecerán aquí.",
   "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
-  "empty_column.home": "A túa cronoloxía inicial está baleira! Segue a outras usuarias para enchela. {suggestions}",
+  "empty_column.home": "A túa cronoloxía inicial está baleira! Sigue a outras usuarias para enchela.",
   "empty_column.list": "Aínda non hai nada nesta listaxe. Cando as usuarias incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
@@ -346,7 +346,7 @@
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
   "keyboard_shortcuts.favourite": "Marcar como favorita",
-  "keyboard_shortcuts.favourites": "Para abrir a listaxe das favoritas",
+  "keyboard_shortcuts.favourites": "Para abrir a lista das favoritas",
   "keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
   "keyboard_shortcuts.heading": "Atallos do teclado",
   "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
@@ -383,7 +383,7 @@
   "lists.delete": "Eliminar listaxe",
   "lists.edit": "Editar listaxe",
   "lists.edit.submit": "Mudar o título",
-  "lists.exclusive": "Agocha estas publicacións no inicio",
+  "lists.exclusive": "Agocha estas publicacións no Inicio",
   "lists.new.create": "Engadir listaxe",
   "lists.new.title_placeholder": "Título da nova listaxe",
   "lists.replies_policy.followed": "Toda usuaria seguida",
@@ -480,8 +480,8 @@
   "onboarding.actions.go_to_home": "Vai á cronoloxía de inicio",
   "onboarding.compose.template": "Ola #Mastodon!",
   "onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
-  "onboarding.follows.lead": "Podes facer que a túa cronoloxía de inicio sexa como ti a queres. Canta máis xente sigas máis interesante será. Estes perfís poderían axudarche a comezar —sempre poderás deixar de seguilos despois!",
-  "onboarding.follows.title": "Popular en Mastodon",
+  "onboarding.follows.lead": "A cronoloxía de Inicio é o principal xeito de desfrutar Mastodon. Cantas máis persoas sigas mais interesante e activa será. Para comezar, aquí tes algunhas suxestións:",
+  "onboarding.follows.title": "Personaliza a cronoloxía de inicio",
   "onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
   "onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
   "onboarding.profile.display_name": "Nome público",
@@ -494,20 +494,20 @@
   "onboarding.profile.upload_avatar": "Subir imaxe do perfil",
   "onboarding.profile.upload_header": "Subir cabeceira para o perfil",
   "onboarding.share.lead": "Fai que as persoas saiban como atoparte en Mastodon!",
-  "onboarding.share.message": "Son {username} en #Mastodon! Ségueme en {url}",
+  "onboarding.share.message": "Son {username} en #Mastodon! Sígueme en {url}",
   "onboarding.share.next_steps": "Seguintes pasos:",
   "onboarding.share.title": "Comparte o teu perfil",
-  "onboarding.start.lead": "A túa nova conta en Mastodon está preparada. Mira de que xeito lle podes sacar proveito:",
+  "onboarding.start.lead": "Xa formas parte de Mastodon, unha plataforma de relacións sociais descentralizada, única, onde ti —e non un algoritmo— elixes o que les. Axudámosche cos primeiros pasos:",
   "onboarding.start.skip": "Queres omitir todo isto?",
   "onboarding.start.title": "Pois xa está!",
-  "onboarding.steps.follow_people.body": "Constrúes a túa cronoloxía. Énchea con persoas interesantes.",
-  "onboarding.steps.follow_people.title": "Segue a {count, plural, one {unha persoa} other {# persoas}}",
-  "onboarding.steps.publish_status.body": "Saúda a todo o mundo.",
+  "onboarding.steps.follow_people.body": "Mastodon consiste en seguir a persoas interesantes.",
+  "onboarding.steps.follow_people.title": "Personaliza a túa cronoloxía",
+  "onboarding.steps.publish_status.body": "Exprésate con texto, fotos, vídeos ou enquisas {emoji}",
   "onboarding.steps.publish_status.title": "Escribe a túa primeira publicación",
   "onboarding.steps.setup_profile.body": "Ao engadir información ao teu perfil é máis probable que teñas máis interaccións.",
   "onboarding.steps.setup_profile.title": "Personaliza o perfil",
   "onboarding.steps.share_profile.body": "Dille ás amizades como poden atoparte en Mastodon!",
-  "onboarding.steps.share_profile.title": "Comparte o teu perfil",
+  "onboarding.steps.share_profile.title": "Comparte o teu perfil en Mastodon",
   "onboarding.tips.2fa": "<strong>Sabes que?</strong> Podes protexer a túa conta configurando un segundo factor de autenticación nos axustes. Funciona con calquera app TOTP, non precisas un número de teléfono!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Sabes que?</strong> Como Mastodon é descentralizado, algúns perfís que atopes estarán en servidores diferentes ao teu. Pero podes interactuar igualmente con eles! O seu servidor é o que ven despois da @ no seu identificador!",
   "onboarding.tips.migration": "<strong>Sabes que?</strong> Se cres que {domain} non é o servidor axeitado para ti, podes mover a conta a outro servidor Mastodon sen perder as túas seguidoras. Incluso podes hospedar o teu propio servidor!",
@@ -573,7 +573,7 @@
   "report.reasons.dislike": "Non me gusta",
   "report.reasons.dislike_description": "Non é algo que queiras ver",
   "report.reasons.legal": "É ilegal",
-  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu servidor",
+  "report.reasons.legal_description": "Cres que atenta contra as leis do país do teu pais ou servidor",
   "report.reasons.other": "É outra cousa",
   "report.reasons.other_description": "O problema non cae dentro de outras categorías",
   "report.reasons.spam": "É spam",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e790306e9c..a660eb77ff 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -9,14 +9,20 @@
   "account.block": "Blocar @{name}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
+  "account.browse_more_on_origin_server": "Navigar plus sur le profilo original",
   "account.copy": "Copiar ligamine a profilo",
+  "account.domain_blocked": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
+  "account.enable_notifications": "Notifica me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
   "account.featured_tags.last_status_at": "Ultime message in {date}",
   "account.featured_tags.last_status_never": "Necun messages",
+  "account.featured_tags.title": "Hashtags eminente de {name}",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer etiam",
   "account.followers": "Sequitores",
+  "account.followers.empty": "Iste usator ancora non ha sequitores.",
+  "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
   "account.following": "Sequente",
   "account.go_to_profile": "Vader al profilo",
   "account.hide_reblogs": "Celar boosts de @{name}",
@@ -30,6 +36,7 @@
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiate",
   "account.no_bio": "Nulle description fornite.",
+  "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
   "account.share": "Compartir profilo de @{name}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index ec0d30363c..623ff2248f 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -9,7 +9,7 @@
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
   "about.domain_blocks.suspended.title": "Uždrausta",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
-  "about.powered_by": "Decentralizuota socialinė žiniasklaida, kurią valdo {mastodon}",
+  "about.powered_by": "Decentralizuota socialinė medija, kurią valdo {mastodon}",
   "about.rules": "Serverio taisyklės",
   "account.account_note_header": "Pastaba",
   "account.add_or_remove_from_list": "Pridėti arba ištrinti iš sąrašų",
@@ -27,24 +27,24 @@
   "account.domain_blocked": "Užblokuotas domenas",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
-  "account.endorse": "Savybė profilyje",
+  "account.endorse": "Rekomenduoti profilyje",
   "account.featured_tags.last_status_at": "Paskutinį kartą paskelbta {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
-  "account.featured_tags.title": "{name} rekomenduojamos grotažymės",
+  "account.featured_tags.title": "{name} rekomenduojami saitažodžiai",
   "account.follow": "Sekti",
   "account.follow_back": "Sekti atgal",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
   "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
-  "account.following": "Seka",
-  "account.following_counter": "{count, plural, one {{counter} Seka} few {{counter} Seka} many {{counter} Seka} other {{counter} Seka}}",
+  "account.following": "Sekama",
+  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
   "account.follows.empty": "Šis (-i) naudotojas (-a) dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
   "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
-  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}",
+  "account.link_verified_on": "Šios nuorodos nuosavybė buvo patikrinta {date}.",
   "account.locked_info": "Šios paskyros privatumo būsena nustatyta kaip užrakinta. Savininkas (-ė) rankiniu būdu peržiūri, kas gali sekti.",
   "account.media": "Medija",
   "account.mention": "Paminėti @{name}",
@@ -58,8 +58,8 @@
   "account.open_original_page": "Atidaryti originalinį puslapį",
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
-  "account.report": "Pranešti @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spausk, kad atšaukti sekimo užklausą",
+  "account.report": "Pranešti apie @{name}",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą.",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
   "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
@@ -69,28 +69,28 @@
   "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
-  "account.unmute": "Atitildyti @{name}",
-  "account.unmute_notifications_short": "Atitildyti pranešimus",
-  "account.unmute_short": "Atitildyti",
-  "account_note.placeholder": "Spausk norėdamas (-a) pridėti pastabą",
-  "admin.dashboard.daily_retention": "Vartotojų išbuvimo rodiklis pagal dieną po registracijos",
-  "admin.dashboard.monthly_retention": "Naudotojų išlaikymo rodiklis pagal mėnesį po registracijos",
+  "account.unmute": "Atšaukti nutildymą @{name}",
+  "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
+  "account.unmute_short": "Atšaukti nutildymą",
+  "account_note.placeholder": "Spustelėk norėdamas (-a) pridėti pastabą",
+  "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
+  "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
-  "admin.dashboard.retention.cohort": "Registravimo mėnuo",
+  "admin.dashboard.retention.cohort": "Registracijos mėnuo",
   "admin.dashboard.retention.cohort_size": "Nauji naudotojai",
   "admin.impact_report.instance_accounts": "Paskyrų profiliai, kuriuos tai ištrintų",
   "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
   "alert.rate_limited.message": "Pabandyk vėliau po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Spartos ribojimas",
+  "alert.rate_limited.title": "Sparta ribota",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
   "autosuggest_hashtag.per_week": "{count} per savaitę",
-  "boost_modal.combo": "Gali spausti {combo}, kad praleisti kitą kartą",
+  "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
   "bundle_column_error.error.title": "O, ne!",
@@ -104,10 +104,10 @@
   "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
   "bundle_modal_error.retry": "Bandyti dar kartą",
   "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą {domain}.",
+  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, tačiau nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
   "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
   "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
-  "closed_registrations_modal.title": "Užsiregistravimas į Mastodon",
+  "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
   "column.about": "Apie",
   "column.blocks": "Užblokuoti naudotojai",
   "column.bookmarks": "Žymės",
@@ -116,15 +116,15 @@
   "column.directory": "Naršyti profilius",
   "column.domain_blocks": "Užblokuoti domenai",
   "column.favourites": "Mėgstamiausi",
-  "column.firehose": "Tiesioginiai padavimai",
-  "column.follow_requests": "Sekti prašymus",
+  "column.firehose": "Tiesioginiai srautai",
+  "column.follow_requests": "Sekimo prašymus",
   "column.home": "Pagrindinis",
   "column.lists": "Sąrašai",
   "column.mutes": "Nutildyti naudotojai",
   "column.notifications": "Pranešimai",
   "column.pins": "Prisegti įrašai",
   "column.public": "Federacinė laiko skalė",
-  "column_back_button.label": "Atgal",
+  "column_back_button.label": "Grįžti",
   "column_header.hide_settings": "Slėpti nustatymus",
   "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
   "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
diff --git a/config/locales/an.yml b/config/locales/an.yml
index de791679b6..17077041da 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1548,7 +1548,6 @@ an:
     webauthn: Claus de seguranza
   user_mailer:
     appeal_approved:
-      action: Ir ta la tuya cuenta
       explanation: L'apelación de l'amonestación contra la tuya cuenta d'o %{strike_date} que ninviés lo %{appeal_date} estió aprebada. La tuya cuenta se troba de nuevo en buen estau.
       subject: La tuya apelación d'o %{date} ha estau aprebada
       title: Apelación aprebada
@@ -1557,7 +1556,6 @@ an:
       subject: La tuya apelación d'o %{date} ha estau refusada
       title: Apelación refusada
     backup_ready:
-      explanation: Has solicitau una copia completa d'a tuya cuenta de Mastodon. Ya ye preparada pa descargar!
       subject: Lo tuyo fichero ye preparau pa descargar
       title: Descargar fichero
     suspicious_sign_in:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c1b2677dcc..3c8c643fe7 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1871,7 +1871,6 @@ ar:
     webauthn: مفاتيح الأمان
   user_mailer:
     appeal_approved:
-      action: انتقل إلى حسابك
       explanation: تمت الموافقة على استئناف السجل ضد حسابك في %{strike_date} الذي قدمته في %{appeal_date}. حسابك مرة أخرى في حالة جيدة.
       subject: تم قبول طعنك الذي قدمته بتاريخ %{date}
       title: تم قبول طعنك
@@ -1880,7 +1879,6 @@ ar:
       subject: تم رفض طعنك الذي قدمته بتاريخ %{date}
       title: رُفض الاستئناف
     backup_ready:
-      explanation: لقد قمت بطلب نسخة كاملة لحسابك على ماستدون. إنها متوفرة الآن للتنزيل!
       subject: نسخة بيانات حسابك جاهزة للتنزيل
       title: المغادرة بأرشيف الحساب
     suspicious_sign_in:
diff --git a/config/locales/be.yml b/config/locales/be.yml
index ca9b0d2b88..c0ed043f8e 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1838,7 +1838,6 @@ be:
     webauthn: Ключы бяспекі
   user_mailer:
     appeal_approved:
-      action: Перайсці ў свой уліковы запіс
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
       subject: Вашая апеляцыя ад %{date} была ўхваленая
       title: Абскарджанне ўхвалена
@@ -1847,7 +1846,6 @@ be:
       subject: Вашая апеляцыя ад %{date} была адхіленая
       title: Абскарджанне адхілена
     backup_ready:
-      explanation: Вы запатрабавалі поўнае рэзервовае капіраванне вашага ўліковага запісу Mastodon. Цяпер яго можна спампаваць!
       subject: Ваш архіў гатовы да спампавання
       title: Ваш архіў можна спампаваць
     suspicious_sign_in:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 1865aa5fca..377babe22e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1608,6 +1608,7 @@ bg:
       unknown_browser: Неизвестен браузър
       weibo: Weibo
     current_session: Текуща сесия
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Това са уеб браузърите, от които в момента сте влезли с вашия Mastodon акаунт.
     ip: IP адрес
@@ -1774,16 +1775,19 @@ bg:
     webauthn: Ключове за сигурност
   user_mailer:
     appeal_approved:
-      action: Към акаунта ви
+      action: Настройки на акаунта
       explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е приета. Вашият акаунт е отново с добра репутация.
       subject: Вашето обжалване от %{date} е било одобрено
+      subtitle: Вашият акаунт още веднъж е в добра репутация.
       title: Одобрено обжалване
     appeal_rejected:
       explanation: Жалбата, която изпратихте на %{appeal_date}, срещу нарушението за вашия акаунт, направено на %{strike_date}, е отхвърлена.
       subject: Вашето обжалване от %{date} е било отхвърлено
+      subtitle: Обжалването ви е отхвърлено.
       title: Отхвърлено обжалване
     backup_ready:
-      explanation: Изискахте пълно резервно копиране на акаунта си в Mastodon. Вече е готово за изтегляне!
+      explanation: Изисквахте пълно резервно копие на акаунта си в Mastodon.
+      extra: Вече е готово за теглене!
       subject: Вашият архив е готов за изтегляне
       title: Сваляне на архива
     suspicious_sign_in:
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8a70a90cfe..7af72457d0 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -471,6 +471,7 @@ br:
       safari: Safari
       uc_browser: UC Browser
       weibo: Weibo
+    date: Deiziad
     description: "%{browser} war %{platform}"
     ip: IP
     platforms:
@@ -529,6 +530,10 @@ br:
     disable: Diweredekaat
     edit: Kemmañ
   user_mailer:
+    appeal_approved:
+      action: Arventennoù ar gont
+    backup_ready:
+      extra: Prest eo da vezañ pellgarget!
     warning:
       categories:
         spam: Spam
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 25f19ef25f..580c4a3ed9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1605,6 +1605,7 @@ ca:
       unknown_browser: Navegador Desconegut
       weibo: Weibo
     current_session: Sessió actual
+    date: Data
     description: "%{browser} de %{platform}"
     explanation: Aquests són els navegadors web que actualment han iniciat la sessió amb el teu compte de Mastodon.
     ip: IP
@@ -1771,16 +1772,19 @@ ca:
     webauthn: Claus de seguretat
   user_mailer:
     appeal_approved:
-      action: Ves al teu compte
+      action: Configuració del compte
       explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat aprovada. El teu compte torna a estar en bon estat.
       subject: La teva apel·lació del %{date} ha estat aprovada
+      subtitle: El vostre compte torna a estar correcte.
       title: Apel·lació aprovada
     appeal_rejected:
       explanation: L'apel·lació a l'acció contra el teu compte del %{strike_date} que has enviat el %{appeal_date} ha estat rebutjada.
       subject: La teva apel·lació del %{date} ha estat rebutjada
+      subtitle: S'ha rebutjat la vostra apel·lació.
       title: Apel·lació rebutjada
     backup_ready:
-      explanation: Has sol·licitat una copia completa del teu compte Mastodon. Ara ja està a punt per a descàrrega!
+      explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
+      extra: Ja us ho podeu baixar
       subject: L'arxiu està preparat per a descàrrega
       title: Recollida de l'arxiu
     suspicious_sign_in:
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 9a974b9ed7..7905024381 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -1015,7 +1015,6 @@ ckb:
     webauthn: کلیلەکانی پاراستن
   user_mailer:
     backup_ready:
-      explanation: ئێوە وشانێکی پاڵپشتی تەواوت لە هەژمارەکەی خۆت داوا کردووە، ئەم پاڵپشتییە ئێستا ئامادەی بارکردنە!
       subject: ئارشیڤی ئێوە ئامادەی داگرتنە
       title: وەرگرتنی ئارشیڤ
     warning:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index e613ea7606..f5b6b46d92 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -1034,7 +1034,6 @@ co:
     webauthn: Chjave di sicurità
   user_mailer:
     backup_ready:
-      explanation: Avete dumandatu un’archiviu cumpletu di u vostru contu Mastodon. Avà hè prontu per scaricà!
       subject: U vostru archiviu hè prontu à scaricà
       title: Archiviu prontu
     warning:
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e3e804172a..eafbead761 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1792,7 +1792,6 @@ cs:
     webauthn: Bezpečnostní klíče
   user_mailer:
     appeal_approved:
-      action: Přejít do vašeho účtu
       explanation: Odvolání proti prohřešku vašeho účtu ze dne %{strike_date}, které jste podali %{appeal_date}, bylo schváleno. Váš účet je opět v pořádku.
       subject: Vaše odvolání ze dne %{date} bylo schváleno
       title: Odvolání schváleno
@@ -1801,7 +1800,6 @@ cs:
       subject: Vaše odvolání z %{date} bylo zamítnuto
       title: Odvolání zamítnuto
     backup_ready:
-      explanation: Vyžádali jste si úplnou zálohu svého účtu Mastodon. Nyní je připravena ke stažení!
       subject: Váš archiv je připraven ke stažení
       title: Stažení archivu
     suspicious_sign_in:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 70b994903e..768dd3e0c8 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -21,7 +21,7 @@ cy:
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
     nothing_here: Does dim byd yma!
     pin_errors:
-      following: Rhaid i chi fod yn dilyn y person yr ydych am ei gymeradwyo yn barod
+      following: Rhaid i chi fod yn dilyn yn barod y person rydych am ei gymeradwyo
     posts:
       few: Postiadau
       many: Postiadau
@@ -74,7 +74,7 @@ cy:
       edit: Golygu
       email: E-bost
       email_status: Statws e-bost
-      enable: Dad rewi
+      enable: Dadrewi
       enable_sign_in_token_auth: Galluogi dilysu tocynnau e-bost
       enabled: Wedi ei alluogi
       enabled_msg: Wedi dadrewi cyfrif %{username} yn llwyddiannus
@@ -85,7 +85,7 @@ cy:
       invite_request_text: Rhesymau dros ymuno
       invited_by: Gwahoddwyd gan
       ip: IP
-      joined: Ymunwyd
+      joined: Wedi ymuno
       location:
         all: Popeth
         local: Lleol
@@ -1712,6 +1712,7 @@ cy:
       unknown_browser: Porwr Anhysbys
       weibo: Weibo
     current_session: Sesiwn gyfredol
+    date: Dyddiad
     description: "%{browser} ar %{platform}"
     explanation: Dyma'r porwyr gwe sydd wedi mewngofnodi i'ch cyfrif Mastodon ar hyn o bryd.
     ip: IP
@@ -1902,16 +1903,19 @@ cy:
     webauthn: Allweddi diogelwch
   user_mailer:
     appeal_approved:
-      action: Ewch i'ch cyfrif
+      action: Gosodiadau Cyfrif
       explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i chymeradwyo. Mae eich cyfrif unwaith eto yn gadarnhaol.
       subject: Mae eich apêl gan %{date} wedi'i chymeradwyo
+      subtitle: Mae eich cyfrif unwaith eto mewn sefyllfa dda.
       title: Cymeradwywyd yr apêl
     appeal_rejected:
       explanation: Mae apêl y rhybudd yn erbyn eich cyfrif ar %{strike_date} a gyflwynwyd gennych ar %{appeal_date} wedi'i gwrthod.
       subject: Mae eich apêl ar %{date} wedi'i gwrthod
+      subtitle: Mae eich apêl wedi'i gwrthod
       title: Mae'r apêl wedi'i gwrthod
     backup_ready:
-      explanation: Fe wnaethoch chi gais am gopi wrth gefn llawn o'ch cyfrif Mastodon. Mae nawr yn barod i'w lawrlwytho!
+      explanation: Rydych wedi gofyn am gopi wrth gefn llawn o'ch cyfrif Mastodon.
+      extra: Mae nawr yn barod i'w lwytho i lawr!
       subject: Mae eich archif yn barod i'w lawrlwytho
       title: Allfudo archif
     suspicious_sign_in:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 3d6850ca5e..e09a6eb2f5 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1608,6 +1608,7 @@ da:
       unknown_browser: Ukendt browser
       weibo: Weibo
     current_session: Aktuelle session
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Disse webbrowsere er pt. logget ind på din Mastodon-konto.
     ip: IP
@@ -1774,16 +1775,19 @@ da:
     webauthn: Sikkerhedsnøgler
   user_mailer:
     appeal_approved:
-      action: Gå til din konto
+      action: Kontoindstillinger
       explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet godkendt. Din kontostatus er igen god.
       subject: Din appel pr. %{date} er godkendt
+      subtitle: Dit kontoomdømme er nu igen godt.
       title: Appel godkendt
     appeal_rejected:
       explanation: Appellen af kontoadvarslen fra %{strike_date}, indsendt af dig pr. %{appeal_date}, er blevet afvist.
       subject: Din appel pr. %{date} er afvist
+      subtitle: Din appel er afvist.
       title: Appel afvist
     backup_ready:
-      explanation: Den anmodede fulde sikkerhedskopi af din Mastodon-konto er nu klar til download!
+      explanation: Der er anmodet om en fuld sikkerhedskopi af din Mastodon-konto.
+      extra: Sikkerhedskopien kan nu downloades!
       subject: Dit arkiv er klar til download
       title: Arkiv download
     suspicious_sign_in:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4542871d80..dc78b188e2 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1608,6 +1608,7 @@ de:
       unknown_browser: Unbekannter Browser
       weibo: Weibo
     current_session: Aktuelle Sitzung
+    date: Datum
     description: "%{browser} auf %{platform}"
     explanation: Dies sind die Webbrowser, die derzeit mit deinem Mastodon-Konto verbunden sind.
     ip: IP-Adresse
@@ -1774,16 +1775,19 @@ de:
     webauthn: Sicherheitsschlüssel
   user_mailer:
     appeal_approved:
-      action: Dein Konto aufrufen
-      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in gutem Zustand.
+      action: Kontoeinstellungen
+      explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde genehmigt. Dein Konto ist wieder in Ordnung.
       subject: Dein Einspruch vom %{date} wurde angenommen
+      subtitle: Dein Konto ist wieder in Ordnung.
       title: Einspruch angenommen
     appeal_rejected:
       explanation: Der Einspruch gegen deinen Verstoß vom %{strike_date}, den du am %{appeal_date} eingereicht hast, wurde abgelehnt.
       subject: Dein Einspruch vom %{date} wurde abgelehnt
+      subtitle: Dein Einspruch wurde abgelehnt.
       title: Einspruch abgelehnt
     backup_ready:
-      explanation: Du hast eine vollständige Sicherung deines Mastodon-Kontos angefordert. Die Sicherung kann jetzt heruntergeladen werden!
+      explanation: Du hast eine vollständige Datensicherung deines Mastodon-Kontos angefordert.
+      extra: Sie ist jetzt zum Herunterladen bereit!
       subject: Dein persönliches Archiv kann heruntergeladen werden
       title: Archiv-Download
     suspicious_sign_in:
diff --git a/config/locales/devise.an.yml b/config/locales/devise.an.yml
index f179f915dc..4be18845cc 100644
--- a/config/locales/devise.an.yml
+++ b/config/locales/devise.an.yml
@@ -47,11 +47,9 @@ an:
         subject: 'Mastodon: Instruccions pa reiniciar clau'
         title: Reiniciar clau
       two_factor_disabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau deshabilitada. Agora puetz connectar-te nomás usando l'adreza de correu electronico y la clau.
         subject: 'Mastodon: L''autenticación de dos factors ye deshabilitada'
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: L'autenticación de dos factors pa la tuya cuenta ha estau habilitada. Se requiere un token chenerau per l'aplicación TOTP emparellada pa ingresar.
         subject: 'Mastodon: L''autenticación de dos factors ye habilitada'
         title: 2FA activada
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ an:
           subject: 'Mastodon: Clau de seguranza eliminada'
           title: Una d'as tuyas claus de seguranza ha estau eliminada
       webauthn_disabled:
-        explanation: L'autenticación con claus de seguranza ha estau deshabilitada pa la tuya cuenta. Agora l'inicio de sesión nomás ye posible utilizando lo token chenerau per l'aplicación TOTP emparellada.
         subject: 'Mastodon: Autenticación con claus de seguranza deshabilitada'
         title: Claus de seguranza deshabilitadas
       webauthn_enabled:
-        explanation: L'autenticación con clau de seguranza ha estau habilitada pa la tuya cuenta. Agora la tuya clau de seguranza puede estar utilizada pa iniciar sesión.
         subject: 'Mastodon: Autenticación de clau de seguranza habilitada'
         title: Claus de seguranza habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index 97d1710edf..28e721e667 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -47,11 +47,9 @@ ar:
         subject: 'ماستدون: تعليمات استعادة كلمة المرور'
         title: إعادة تعيين كلمة السر
       two_factor_disabled:
-        explanation: تم تعطيل المصادقة بخطوتين لحسابك الخاص. إنّ الولوج ممكن الآن باستخدام عنوان البريد الإلكتروني وكلمة المرور فقط.
         subject: 'ماستدون: نظام المصادقة بخطوتين مُعطّل'
         title: إنّ 2FA معطّل
       two_factor_enabled:
-        explanation: تم تفعيل المصادقة بخطوتين على حسابك. سيُطلب منك رمز تم توليده بواسطة تطبيق TOTP المقترن للولوج.
         subject: 'ماستدون: تم تفعيل نظام المصادقة بخطوتين'
         title: إنّ 2FA نشِط
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ar:
           subject: 'ماستدون: تم حذف مفتاح الأمان'
           title: تم حذف أحد مفاتيح الأمان الخاصة بك
       webauthn_disabled:
-        explanation: تم تعطيل الاستيثاق مع مفاتيح الأمان لحسابك. تسجيل الدخول الآن ممكن باستخدام الرمز (token) الذي تم إنشاؤه بواسطة تطبيق TOTP المقترن.
         subject: 'ماستدون: الاستيثاق مع مفاتيح الأمان معطلة'
         title: مفاتيح الأمان معطلة
       webauthn_enabled:
-        explanation: تم تفعيل استيثاق مفتاح الأمان للحساب الخاص بك. يمكن الآن استخدام مفتاح الأمان الخاص بك لتسجيل الدخول.
         subject: 'ماستدون: تم تفعيل نظام استيثاق مفتاح الأمان'
         title: مفاتيح الأمان مفعلة
     omniauth_callbacks:
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
index a4378dee92..47372c2f07 100644
--- a/config/locales/devise.ast.yml
+++ b/config/locales/devise.ast.yml
@@ -42,11 +42,9 @@ ast:
         subject: 'Mastodon: instrucciones pa camudar la contraseña'
         title: Cambéu de la contaseña
       two_factor_disabled:
-        explanation: Desactivóse l'autenticación en dos pasos na cuenta. Agora ye posible aniciar la sesión cola direición de corréu electrónicu ya la contraseña.
         subject: 'Mastodon: desactivóse l''autenticación en dos pasos'
         title: Autenticación de dos pasos activada
       two_factor_enabled:
-        explanation: Activóse l'autenticación en dos pasos na cuenta. Agora los pases que xenere l'aplicación TOTP empareyada son obligatorios p'aniciar la sesión.
         subject: 'Mastodon: activóse l''autenticación en dos pasos'
         title: Autenticación de dos pasos desactivada
       two_factor_recovery_codes_changed:
@@ -62,11 +60,9 @@ ast:
         deleted:
           title: Desanicióse una de les to llaves de seguranza
       webauthn_disabled:
-        explanation: Desactivóse l'autenticación con llaves de seguranza na cuenta. Agora namás ye posible aniciar la sesión col pase xeneráu pola aplicación TOTP empareyada.
         subject: 'Mastodon: desactivóse l''autenticación con llaves de seguranza'
         title: Llaves de seguranza desactivaes
       webauthn_enabled:
-        explanation: Activóse l'autenticación con llaves de seguranza na cuenta. Agora pues usar la llave p'aniciar la sesión.
         subject: 'Mastodon: activóse l''autenticación con llaves de seguranza'
         title: Llaves de seguranza activaes
     passwords:
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index e5e8aea91e..8679275c20 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -47,11 +47,9 @@ be:
         subject: 'Mastodon: Інструкцыі па скіданню пароля'
         title: Скіданне пароля
       two_factor_disabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была адключана. Цяпер для ўваходу патрэбны толькі электронная пошта і пароль.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя адключана'
         title: двухэтапнае спраўджанне адключана
       two_factor_enabled:
-        explanation: Двухфактарная аўтэнтыфікацыя на вашым акаўнце была ўключана. Цяпер для ўваходу ў сістэму патрэбны токен, згенераваны даданай TOTP праграмай.
         subject: 'Mastodon: двухфактарная аўтэнтыфікацыя ўключана'
         title: двухэтапнае спраўджанне уключана
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ be:
           subject: 'Mastodon: ключ бяспекі выдалены'
           title: Адзін з вашых ключоў бяспекі быў выдалены
       webauthn_disabled:
-        explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключана для вашага ўліковага запісу. Уваход цяпер магчымы толькі з токенам, згенераваным спалучаным TOTP прыкладаннем.
         subject: 'Mastodon: Аўтэнтыфікацыя з дапамогай ключоў бяспекі адключана'
         title: Ключы бяспекі адключаны
       webauthn_enabled:
-        explanation: Аўтэнтыфікацыя праз ключ бяспекі была ўключана для вашага ўліковага запісу. Цяпер вы можаце выкарыстоўваць ваш ключ бяспекі для ўваходу.
         subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
         title: Ключы бяспекі ўключаны
     omniauth_callbacks:
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index 5046771340..f3586bcd85 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -18,7 +18,7 @@ bg:
       unconfirmed: Преди да продължите, трябва да потвърдите адреса на имейла си.
     mailer:
       confirmation_instructions:
-        action: Потвърдете адреса на имейла
+        action: Потвърждаване на адреса на имейла
         action_with_app: Потвърдете и се върнете към %{app}
         explanation: Създали сте акаунт на %{host} с този имейл адрес. Само на едно щракване разстояние сте от активирането му. Ако това не сте били вие, моля, игнорирайте този имейл.
         explanation_when_pending: Кандидатствахте за покана до %{host} с този имейл адрес. След като потвърдите своя имейл адрес, ние ще разгледаме вашето заявление. Можете да влезете, за да промените данните си или да изтриете акаунта си, но нямате достъп до повечето функции, докато акаунтът ви не бъде одобрен. Ако вашето заявление бъде отхвърлено, вашите данни ще бъдат премахнати, така че няма да се изискват допълнителни действия от вас. Ако това не сте били вие, моля, игнорирайте този имейл.
@@ -39,7 +39,7 @@ bg:
         explanation: Потвърдете новия адрес, за да промените имейла си.
         extra: Ако тази промяна не е започната от вас, то пренебрегнете този имейл. Адресът на имейла за акаунта в Mastodon няма да се промени, докато не влезете в горната връзка.
         subject: 'Mastodon: Потвърдете имейла за %{instance}'
-        title: Потвърдете своя имейл адрес
+        title: Потвърждаване на адреса на имейла
       reset_password_instructions:
         action: Промяна на паролата
         explanation: Поискахте нова парола за акаунта си.
@@ -47,16 +47,19 @@ bg:
         subject: 'Mastodon: Указания за задаване на нова парола'
         title: Нулиране на парола
       two_factor_disabled:
-        explanation: Двуфакторното удостоверяване за вашия акаунт е деактивирано. Влизането вече е възможно, като се използват само имейл адрес и парола.
+        explanation: Влизането вече е възможно, употребявайки само адрес на имейла и парола.
         subject: 'Mastodon: Двуфакторното удостоверяване е деактивирано'
+        subtitle: Двуфакторното удостоверяване за акаунта ви е изключено.
         title: Двуфакторното изключено
       two_factor_enabled:
-        explanation: За акаунта ви е включено двуфакторно удостоверяване. Отсега нататък ще ви трябва и временен код от сдвоеното приложение за удостоверяване TOTP, за да влезете.
+        explanation: Породени токени от сдвоено приложение TOTP ще се изискват за вход.
         subject: 'Mastodon: Включено двуфакторно удостоверяване'
+        subtitle: Двуфакторното удостоверяване е включено за акаунта ви.
         title: 2FA активирано
       two_factor_recovery_codes_changed:
         explanation: Предишните кодове за възстановяване са анулирани и се пораждат нови.
         subject: 'Mastodon: Породени пак са двуфакторни кодове за възстановяване'
+        subtitle: Предишните кодове за възстановяване са обезсилени и се пораждат нови.
         title: Кодове за 2 факт. удост. за възстановяване са променени
       unlock_instructions:
         subject: 'Mastodon: указания за отключване'
@@ -70,11 +73,13 @@ bg:
           subject: 'Mastodon: Ключът за сигурност е изтрит'
           title: Един от ключовете ви за сигурност е изтрит
       webauthn_disabled:
-        explanation: Удостоверяването с ключове за сигурност е изключено за акаунта ви. Влизането вече е възможно, използвайки само ключа, породен от сдвоеното приложение TOTP.
+        explanation: Удостоверяването на ключовете за сигурност е изключено за акаунта ви.
+        extra: Влизането вече е възможно, употребявайки само породени токени от сдвоено приложение TOTP.
         subject: 'Mastodon: Изключено удостоверяване с ключове за сигурност'
         title: Изключени ключове за сигурност
       webauthn_enabled:
-        explanation: Удостоверяването с ключ за сигурност е активирано за вашия акаунт. Вашият ключ за сигурност вече може да се използва за вход.
+        explanation: Удостоверяването на ключа за сигурност е включено за акаунта ви.
+        extra: Вашият ключ за сигурност вече може да се употребява за вход.
         subject: 'Mastodon: Включено удостоверяване с ключ за сигурност'
         title: Включени ключове за сигурност
     omniauth_callbacks:
@@ -82,8 +87,8 @@ bg:
       success: Успешно упълномощаване от акаунт на %{kind}.
     passwords:
       no_token: Не можете да осъществите достъп до тази страница, ако не сте я отворили чрез линк от получен имейл за възстановяване на паролата. Ако сте отворили линка за възстановяване на паролата от имейл, моля, уверете се, че сте използвали целия предоставен URL адрес.
-      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
-      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на е-пощата си до няколко минути. Проверете си папката за спам, ако не сте получили това е-писмо.
+      send_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
+      send_paranoid_instructions: Ако адресът на имейла ви съществува в базата ни данни, то ще получите връзка за възстановяване на парола на имейла си до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
       updated: Паролата ви беше променена успешно. Сега сте влезли.
       updated_not_active: Паролата ви беше променена успешно.
     registrations:
@@ -101,7 +106,7 @@ bg:
       signed_out: Успешно излизане.
     unlocks:
       send_instructions: Ще получите имейл с указания как да отключите акаунта си до няколко минути. Проверете папката си за спам, ако не сте получили такъв имейл.
-      send_paranoid_instructions: Ако вашият акаунт съществува, ще получите имейл с указания за отключването му до няколко минути. Проверете спам папката си, ако не сте получили такъв имейл.
+      send_paranoid_instructions: Ако акаунта ви съществува, то ще получите е-писмо с указания за отключването му до няколко минути. Проверете папката си за спам, ако не сте получили това е-писмо.
       unlocked: Акаунтът ви е успешно отключен. Влезте, за да продължите.
   errors:
     messages:
diff --git a/config/locales/devise.bn.yml b/config/locales/devise.bn.yml
index e0d83613e8..b046289039 100644
--- a/config/locales/devise.bn.yml
+++ b/config/locales/devise.bn.yml
@@ -47,11 +47,9 @@ bn:
         subject: 'মাস্টাডন: পাসওয়ার্ড বদলানোর নির্দেশনা'
         title: পাসওয়ার্ড বদলানো
       two_factor_disabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ অক্ষম করা হয়েছে। লগইন এখন কেবলমাত্র ইমেল ঠিকানা এবং পাসওয়ার্ড ব্যবহার করে সম্ভব।
         subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ অক্ষম'
         title: 2FA অক্ষম
       two_factor_enabled:
-        explanation: আপনার অ্যাকাউন্টের জন্য দ্বি-ফ্যাক্টর প্রমাণীকরণ সক্ষম করা হয়েছে। জোড়যুক্ত TOTP অ্যাপ্লিকেশন দ্বারা উত্পাদিত একটি টোকেন লগইনের জন্য প্রয়োজন হবে।
         subject: 'মস্তোডন: দ্বি-গুণক প্রমাণীকরণ সক্ষম হয়েছে'
         title: 2FA সক্ষম
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index 4a16157f81..205e11e797 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -47,11 +47,9 @@ br:
         subject: 'Mastodon: Adkorañ kemennoù ar ger-tremen'
         title: Adderaouekaat ar ger-tremen
       two_factor_disabled:
-        explanation: Dilesadur dre eil-elfenn a zo bet nac'het. Gallout a reer mont-tre en ur implijout nemet ur chomlec'h-postel hag ur ger-tremen.
         subject: 'Mastodon: dilesadur dre eil-elfenn nac''het'
         title: 2FA diweredekaet
       two_factor_enabled:
-        explanation: Dilesadur dre eil-elfenn a zo aotreet evit ho kont. Ret a vo implij ur jedouer krouet gant an app TOTP koublet evit mont-tre.
         subject: 'Mastodon: dilesadur dre eil-elfenn aotreet'
         title: 2FA gweredekaet
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ br:
           subject: 'Mastodon: alc''hwezioù surentez dilamet'
           title: Unan eus hoc'h alc'hwezioù surentez a zo bet dilamet
       webauthn_disabled:
-        explanation: Dilezadur dre alc'hwezioù surentel a zo bet nac'het evit ho kont. Gallout a reer mont-tre en ur implijout ar jedouer krouet gant app TOTP koublet.
         subject: 'Mastodon: dilesadur dre alc''hwezioù surentez nac''het'
         title: Alc'hwezioù surentez nac'het
       webauthn_enabled:
-        explanation: Dilesadur dre alc'hwez surentez a zo bet aotreet evit ho kont. Hoc'h alc'hwez surentez a c'hell bezañ implijet evit mont-tre.
         subject: 'Mastodon: dilesadur dre alc''hwezioù surentez aotreet'
         title: Alc'hwezioù surentez aotreet
     omniauth_callbacks:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 6ebdafb9ec..2bf741ee40 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -49,16 +49,19 @@ ca:
         subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
         title: Contrasenya restablerta
       two_factor_disabled:
-        explanation: L'autenticació de doble factor per al teu compte s'ha desactivat. Ara només pots iniciar la sessió fent servir la teva adreça de correu-e i la contrasenya.
+        explanation: Només es pot accedir amb compte de correu i contrasenya.
         subject: 'Mastodon: Autenticació de doble factor desactivada'
+        subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
         title: A2F desactivada
       two_factor_enabled:
-        explanation: L'autenticació de doble factor s'ha habilitat per al teu compte. Per a iniciar la sessió es requerirà un token generat per l'aplicació TOTP que hi hagis emparellat.
+        explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
         subject: 'Mastodon: Autenticació de doble factor activada'
+        subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
         title: A2F activada
       two_factor_recovery_codes_changed:
         explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
         subject: 'Mastodon: codis de recuperació de doble factor regenerats'
+        subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
         title: Codis de recuperació A2F canviats
       unlock_instructions:
         subject: 'Mastodon: Instruccions per a desblocar'
@@ -72,11 +75,13 @@ ca:
           subject: 'Mastodon: Clau de seguretat esborrada'
           title: Una de les teves claus de seguretat ha estat esborrada
       webauthn_disabled:
-        explanation: S'ha desactivat l'autenticació amb claus de seguretat per al teu compte. Ara només pots iniciar la sessió usant el token generat per l'aplicació TOTP.
+        explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
+        extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
         subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
         title: Claus de seguretat desactivades
       webauthn_enabled:
-        explanation: S'ha activat l'autenticació amb claus de seguretat. Ja pots usar la teva clau de seguretat per a iniciar sessió.
+        explanation: S'ha habilitat l'accés amb clau de seguretat al vostre compte.
+        extra: Ara podeu accedir amb la vostra clau de seguretat.
         subject: 'Mastodon: Autenticació amb clau de seguretat activada'
         title: Claus de seguretat activades
     omniauth_callbacks:
diff --git a/config/locales/devise.ckb.yml b/config/locales/devise.ckb.yml
index 1261ebb648..f33959d76c 100644
--- a/config/locales/devise.ckb.yml
+++ b/config/locales/devise.ckb.yml
@@ -47,11 +47,9 @@ ckb:
         subject: 'ماستۆدۆن: رێکردنەوەی رێنماییەکانی تێپەڕوشە'
         title: گەڕانەوەی تێپەڕوشە
       two_factor_disabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت کە لە کارخراوە. چوونەژوورەوە ئێستا دەکرێت تەنها ناونیشانی ئیمەیڵ و تێپەڕوشەکەت بەکاربهێنی.
         subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری ناچالاک کراوە'
         title: 2FA ناچالاک کرا
       two_factor_enabled:
-        explanation: سەلماندنی دوو-فاکتەر بۆ هەژمارەکەت چالاک کراوە. ئاماژەیەک کە لەلایەن نەرمەکالایTOTP جووتکراو دروست کراوە پێویستە بە چوونە ژوورەوە.
         subject: 'ماستۆدۆن: سەلماندنی دوو-فاکتەری چالاک کراوە'
         title: 2FA چالاک کرا
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ckb:
           subject: 'ماستۆدۆن: کلیلی پاراستن سڕایەوە'
           title: کلیلە کانی پاراستنی یەکێک لە ئێوە سڕایەوە
       webauthn_disabled:
-        explanation: سەلماندن بە کلیلەپارێزراوەکان لە کارخراوە بۆ هەژمارەکەت. چوونەژوورەوە ئێستا دەکرێت تەنها ئەو نیشانەیە بەکاربێنیت کە لەلایەن نەرمەکالایTOTP دروست کراوە.
         subject: 'ماستۆدۆن: سەلماندن لەگەڵ کلیلە پاسایشی ناچالاک کراوە'
         title: کلیلە پارستنەکان ناچالاک کراون
       webauthn_enabled:
-        explanation: سەلماندنی کلیلی ئاسایش چالاک کراوە بۆ هەژمارەکەت. ئێستا کلیلی پاراستن دەتوانرێت بۆ چوونە ژوورەوە بەکار بێت.
         subject: 'ماستۆدۆن: سەلماندنی کلیلی پاراستن چالاک کراوە'
         title: کلیلە کانی پاراستن چالاک کرا
     omniauth_callbacks:
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml
index 8409cfad9b..d661637875 100644
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@@ -47,11 +47,9 @@ co:
         subject: 'Mastodon: Cambià a chjave d’accessu'
         title: Cambià a chjave
       two_factor_disabled:
-        explanation: L'autentificazione à dui fattori per u vostru contu hè stata disattivata. A cunnessione hè avà pussibule cù l'usu solu di u vostru e-mail è di a chjave d'accessu.
         subject: 'Mastodon: Autentificazione à dui fattori disattivata'
         title: A2F disattivata
       two_factor_enabled:
-        explanation: L'autentificazione à dui fattori hè stata attivata per u vostru contu. Un codice, o fiscia, generata da l'applicazione TOTP assuciata sarà dumandata per cunnettavvi.
         subject: 'Mastodon: Autentificazione à dui fattori attivata'
         title: A2F attivata
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ co:
           subject: 'Mastodon: Chjave di sicurità sguassata'
           title: Una di e vostre chjave di sicurità hè stata sguassata
       webauthn_disabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata disattivata per u vostru contu. Avà pudete solu cunnettavi cù u codice di cunnessione generatu da l'applicazione TOTP appaghjata.
         subject: 'Mastodon: Autentificazione cù chjave di sicurità disattivata'
         title: Chjave di sicurità disattivate
       webauthn_enabled:
-        explanation: L'autentificazione cù una chjave di sicurità hè stata attivata per u vostru contu. Avà a vostra chjave pò esse utilizata per cunnettavi.
         subject: 'Mastodon: Identificazione cù chjave di sicurità attivata'
         title: Chjave di sicurità attivate
     omniauth_callbacks:
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index 32a1ed2c67..fb3893325c 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -47,11 +47,9 @@ cs:
         subject: 'Mastodon: Instrukce pro obnovení hesla'
         title: Obnovení hesla
       two_factor_disabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet vypnuto. Pro přihlášení vám nyní stačí pouze e-mailová adresa a heslo.
         subject: 'Mastodon: Dvoufázové ověření bylo vypnuto'
         title: 2FA bylo vypnuto
       two_factor_enabled:
-        explanation: Dvoufázové ověřování bylo pro váš účet zapnuto. Pro přihlášení bude vyžadován token vygenerovaný spárovanou TOTP aplikací.
         subject: 'Mastodon: Dvoufázové ověření bylo zapnuto'
         title: 2FA bylo zapnuto
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ cs:
           subject: 'Mastodon: Bezpečnostní klíč byl smazán'
           title: Jeden z vašich bezpečnostních klíčů byl smazán
       webauthn_disabled:
-        explanation: Pro váš účet bylo vypnuto ověření bezpečnostními klíči. Přihlášení je nyní možné pouze s tokenem vygenerovaným spárovanou TOTP aplikací.
         subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo vypnuto'
         title: Bezpečnostní klíče byly zakázány
       webauthn_enabled:
-        explanation: Pro váš účet bylo povoleno ověření bezpečnostními klíči. Nyní můžete svůj bezpečnostní klíč použít pro přihlášení.
         subject: 'Mastodon: Přihlašování bezpečnostními klíči bylo povoleno'
         title: Bezpečnostní klíče byly povoleny
     omniauth_callbacks:
diff --git a/config/locales/devise.cy.yml b/config/locales/devise.cy.yml
index 44c09153ff..d3eeb8eeb6 100644
--- a/config/locales/devise.cy.yml
+++ b/config/locales/devise.cy.yml
@@ -47,16 +47,19 @@ cy:
         subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
         title: Ailosod cyfrinair
       two_factor_disabled:
-        explanation: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi. Mae modd mewngofnodi nawr gan ddefnyddio cyfeiriad e-bost a chyfrinair yn unig.
+        explanation: Mae modd mewngofnodi nawr gan ddefnyddio dim ond cyfeiriad e-bost a chyfrinair.
         subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor ar gyfer eich cyfrif wedi'i analluogi.
         title: Dilysu dau ffactor yn anabl
       two_factor_enabled:
-        explanation: Mae dilysu dau ffactor wedi'i alluogi ar gyfer eich cyfrif. Bydd angen tocyn a gynhyrchir gan yr ap TOTP pâr i fewngofnodi.
+        explanation: Bydd angen tocyn wedi'i gynhyrchu gan yr ap TOTP pâr i fewngofnodi.
         subject: 'Mastodon: mae dilysu dau ffactor wedi''i alluogi'
+        subtitle: Mae dilysiad dau ffactor wedi'i alluogi ar gyfer eich cyfrif.
         title: Mae dilysu dau ffactor wedi'i alluogi
       two_factor_recovery_codes_changed:
         explanation: Mae'r codau adfer blaenorol wedi'u hannilysu a chynhyrchwyd rhai newydd.
         subject: 'Mastodon: Mae codau adfer dau ffactor wedi''u hadfywio'
+        subtitle: Mae'r codau adfer blaenorol wedi'u hannilysu a rhai newydd wedi'u cynhyrchu.
         title: Newidiodd codau adfer 2FA
       unlock_instructions:
         subject: 'Mastodon: Cyfarwyddiadau datgloi'
@@ -70,11 +73,13 @@ cy:
           subject: 'Mastodon: Allwedd ddiogelwch wedi''i dileu'
           title: Mae un o'ch allweddi diogelwch wedi'i ddileu
       webauthn_disabled:
-        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif. Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn a gynhyrchir gan yr ap TOTP pâr yn unig.
+        explanation: Mae dilysu gydag allweddi diogelwch wedi'i analluogi ar gyfer eich cyfrif.
+        extra: Mae mewngofnodi bellach yn bosibl gan ddefnyddio'r tocyn wedi'i gynhyrchu gan yr ap TOTP pâr yn unig.
         subject: 'Mastodon: Dilysiad gydag allweddi diogelwch wedi''i analluogi'
         title: Allweddi diogelwch wedi'u hanalluogi
       webauthn_enabled:
-        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif. Gellir defnyddio'ch allwedd ddiogelwch nawr ar gyfer mewngofnodi.
+        explanation: Mae dilysiad allwedd diogelwch wedi'i alluogi ar gyfer eich cyfrif.
+        extra: Mae modd defnyddio'ch allwedd ddiogelwch nawr i fewngofnodi.
         subject: 'Mastodon: Dilysiad allwedd diogelwch wedi''i alluogi'
         title: Allweddi diogelwch wedi'u galluogi
     omniauth_callbacks:
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 17593be3fd..daf802cdb7 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -47,16 +47,19 @@ da:
         subject: 'Mastodon: Instruktioner til adgangskodenulstilling'
         title: Adgangskodenulstilling
       two_factor_disabled:
-        explanation: Tofaktorgodkendelse for kontoen er blevet deaktiveret. Indlogning er nu kun mulig via email og adgangskode.
+        explanation: Indlogning er nu mulig via kun e-mailadresse og adgangskode.
         subject: 'Mastodon: Tofaktorgodkendelse deaktiveret'
+        subtitle: Tofaktorgodkendelse for kontoen er blevet deaktiveret.
         title: 2FA deaktiveret
       two_factor_enabled:
-        explanation: Tofaktorgodkendelse er blevet aktiveret for kontoen. Indlogning vil kærve et token genereret af den parrede TOTP-app.
+        explanation: Token genereret af parret TOTP-app vil være nødvendig for indlogning.
         subject: 'Mastodon: Tofaktorgodkendelse aktiveret'
+        subtitle: Tofaktorgodkendelse er blevet aktiveret for kontoen.
         title: 2FA aktiveret
       two_factor_recovery_codes_changed:
         explanation: De tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
         subject: 'Mastodan: Tofaktorgendannelseskoder genereret igen'
+        subtitle: Tidligere gendannelseskoder er ugyldiggjorte og nye er genereret.
         title: 2FA gendannelseskoder skiftet
       unlock_instructions:
         subject: 'Mastodon: Oplåsningsinstruktioner'
@@ -70,11 +73,13 @@ da:
           subject: 'Mastodon: Sikkerhedsnøgle slettet'
           title: En af dine sikkerhedsnøgler er blevet slettet
       webauthn_disabled:
-        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen. Indlogning er nu kun mulig via token genereret af den parrede TOTP-app.
+        explanation: Godkendelse med sikkerhedsnøgler er blevet deaktiveret for kontoen.
+        extra: Indlogning er nu mulig kun via tokenet genereret af parret TOTP-app.
         subject: 'Mastodon: Godkendelse med sikkerhedsnøgler deaktiveret'
         title: Sikkerhedsnøgler deaktiveret
       webauthn_enabled:
-        explanation: Sikkerhedsnøglegodkendelse er aktiveret for kontoen. Din sikkerhedsnøgle kan nu bruges til indlogning.
+        explanation: Sikkerhedsnøglegodkendelse er blevet aktiveret for kontoen.
+        extra: Sikkerhedsnøglen kan nu bruges til indlogning.
         subject: 'Mastodon: Sikkerhedsnøglegodkendelse aktiveret'
         title: Sikkerhedsnøgler aktiveret
     omniauth_callbacks:
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index a77240dabe..cf05ddc16b 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -47,16 +47,19 @@ de:
         subject: 'Mastodon: Anleitung zum Zurücksetzen deines Passworts'
         title: Passwort zurücksetzen
       two_factor_disabled:
-        explanation: Zwei-Faktor-Authentisierung (2FA) für dein Konto wurde deaktiviert. Eine Anmeldung ist jetzt nur noch mit E-Mail-Adresse und Passwort möglich.
+        explanation: Das Anmelden ist jetzt nur noch mit einer E-Mail-Adresse und einem Passwort möglich.
         subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) deaktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto deaktiviert.
         title: 2FA deaktiviert
       two_factor_enabled:
-        explanation: Die Zwei-Faktor-Authentisierung (2FA) wurde für dein Konto aktiviert. Das zeitbasierte Einmalpasswort, das von deiner TOTP-App generiert wird, muss bei jeder Anmeldung zusätzlich eingegeben werden.
+        explanation: Für das Anmelden wird ein Token benötigt, das von der hinterlegten TOTP-App generiert wird.
         subject: 'Mastodon: Zwei‐Faktor‐Authentisierung (2FA) aktiviert'
+        subtitle: Zwei-Faktor-Authentisierung wurde für dein Konto aktiviert.
         title: 2FA aktiviert
       two_factor_recovery_codes_changed:
         explanation: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
         subject: 'Mastodon: Zwei-Faktor-Wiederherstellungscodes neu erstellt'
+        subtitle: Die vorherigen Wiederherstellungscodes wurden ungültig gemacht und es wurden neue erstellt.
         title: 2FA-Wiederherstellungscodes geändert
       unlock_instructions:
         subject: 'Mastodon: Anleitung zum Entsperren deines Kontos'
@@ -70,11 +73,13 @@ de:
           subject: 'Mastodon: Sicherheitsschlüssel entfernt'
           title: Einer deiner Sicherheitsschlüssel wurde entfernt
       webauthn_disabled:
-        explanation: Das Authentisieren mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert. Die Anmeldung ist jetzt nur noch mit dem zeitbasierten Einmalpasswort möglich, das von deiner TOTP-App generiert wird.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto deaktiviert.
+        extra: Das Anmelden ist jetzt nur noch mit Token aus der TOTP-App möglich, die im Konto hinterlegt wurde.
         subject: 'Mastodon: Authentisierung mit Sicherheitsschlüsseln deaktiviert'
         title: Sicherheitsschlüssel deaktiviert
       webauthn_enabled:
-        explanation: Die Authentisierung mit Sicherheitsschlüssel wurde für dein Konto aktiviert. Dein Sicherheitsschlüssel kann nun für die Anmeldung verwendet werden.
+        explanation: Die Authentisierung mit Sicherheitsschlüsseln wurde für dein Konto aktiviert.
+        extra: Dein Sicherheitsschlüssel kann jetzt zum Anmelden verwendet werden.
         subject: 'Mastodon: Authentisierung mit Sicherheitsschlüssel aktiviert'
         title: Sicherheitsschlüssel aktiviert
     omniauth_callbacks:
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 13daa4b97a..52674dc849 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -47,16 +47,19 @@ el:
         subject: 'Mastodon: Οδηγίες επαναφοράς συνθηματικού'
         title: Επαναφορά συνθηματικού
       two_factor_disabled:
-        explanation: Η επαλήθευση 2 βημάτων (2FA) έχει απενεργοποιηθεί για το λογαριασμό σου. Η σύνδεση γίνεται απλά με το email και το συνθηματικό.
+        explanation: Η σύνδεση είναι τώρα δυνατή χρησιμοποιώντας μόνο τη διεύθυνση ηλεκτρονικού ταχυδρομείου και τον κωδικό πρόσβασης.
         subject: 'Mastodon: Απενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων για τον λογαριασμό σας έχει απενεργοποιηθεί.
         title: Επαλήθευση 2 βημάτων ανενεργή (2FA)
       two_factor_enabled:
-        explanation: Έχει ενεργοποιηθεί η πιστοποίηση 2 παραγόντων για το λογαριασμό σου (2FA). Για να συνδεθείς θα απαιτηθεί πιστοποιημένο τεκμήριο από κάποια ζευγαρωμένη εφαρμογή.
+        explanation: Ένα διακριτικό που δημιουργείται από τη συνδεδεμένη εφαρμογή TOTP θα απαιτείται για τη σύνδεση.
         subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση 2 βημάτων (2FA)'
+        subtitle: Ο έλεγχος ταυτότητας δύο παραγόντων έχει ενεργοποιηθεί για τον λογαριασμό σας.
         title: Επαλήθευση 2 βημάτων ενεργή (2FA)
       two_factor_recovery_codes_changed:
         explanation: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
         subject: 'Mastodon: Δημιουργήθηκαν νέοι κωδικοί ανάκτησης'
+        subtitle: Οι προηγούμενοι κωδικοί ανάκτησης ακυρώθηκαν και δημιουργήθηκαν νέοι.
         title: Οι κωδικοί ανάκτησης επαλήθευσης 2 βημάτων (2FA) άλλαξαν
       unlock_instructions:
         subject: 'Mastodon: Οδηγίες ξεκλειδώματος'
@@ -70,11 +73,13 @@ el:
           subject: 'Mastodon: Διαγράφηκε ένα κλειδί ασφαλείας'
           title: Ένα από τα κλειδιά ασφαλείας σου διαγράφηκε
       webauthn_disabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας. Η σύνδεση είναι τώρα εφικτή μόνο με τη χρήση κλειδιού που δημιουργημένου με την συνδεδεμένη εφαρμογή TOTP.
+        explanation: Ο έλεγχος ταυτότητας με κλειδιά ασφαλείας έχει απενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Η σύνδεση είναι πλέον δυνατή χρησιμοποιώντας μόνο το διακριτικό που δημιουργείται από την εφαρμογή TOTP.
         subject: 'Mastodon: Η αυθεντικοποίηση με χρήση κλειδιών ασφαλείας απενεργοποιήθηκε'
         title: Τα κλειδιά ασφαλείας απενεργοποιήθηκαν
       webauthn_enabled:
-        explanation: Η επαλήθευση με κλειδί ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας. Μπορείτε να το χρησιμοποιήσετε για να συνδεθείτε.
+        explanation: Ο έλεγχος ταυτότητας κλειδιού ασφαλείας έχει ενεργοποιηθεί για τον λογαριασμό σας.
+        extra: Το κλειδί ασφαλείας σας μπορεί τώρα να χρησιμοποιηθεί για τη σύνδεση.
         subject: 'Mastodon: Ενεργοποιήθηκε η επαλήθευση με κλειδί ασφαλείας'
         title: Τα κλειδιά ασφαλείας ενεργοποιήθηκαν
     omniauth_callbacks:
diff --git a/config/locales/devise.en-GB.yml b/config/locales/devise.en-GB.yml
index e7ab9462dc..8fa02bbd4a 100644
--- a/config/locales/devise.en-GB.yml
+++ b/config/locales/devise.en-GB.yml
@@ -47,11 +47,9 @@ en-GB:
         subject: 'Mastodon: Reset password instructions'
         title: Password reset
       two_factor_disabled:
-        explanation: Two-factor authentication for your account has been disabled. Login is now possible using only e-mail address and password.
         subject: 'Mastodon: Two-factor authentication disabled'
         title: 2FA disabled
       two_factor_enabled:
-        explanation: Two-factor authentication has been enabled for your account. A token generated by the paired TOTP app will be required for login.
         subject: 'Mastodon: Two-factor authentication enabled'
         title: 2FA enabled
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ en-GB:
           subject: 'Mastodon: Security key deleted'
           title: One of your security keys has been deleted
       webauthn_disabled:
-        explanation: Authentication with security keys has been disabled for your account. Login is now possible using only the token generated by the paired TOTP app.
         subject: 'Mastodon: Authentication with security keys disabled'
         title: Security keys disabled
       webauthn_enabled:
-        explanation: Security key authentication has been enabled for your account. Your security key can now be used for login.
         subject: 'Mastodon: Security key authentication enabled'
         title: Security keys enabled
     omniauth_callbacks:
diff --git a/config/locales/devise.eo.yml b/config/locales/devise.eo.yml
index 1c13490e53..af1769aa66 100644
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@@ -47,11 +47,9 @@ eo:
         subject: 'Mastodon: Instrukcioj por ŝanĝi pasvorton'
         title: Pasvorto restarigita
       two_factor_disabled:
-        explanation: Dufaktora aŭtentigo por via konto malebligis. Ensalutado nun eblas per nur retpoŝtadreso kaj pasvorto.
         subject: 'Mastodon: dufaktora aŭtentigo malebligita'
         title: 2FA estas malŝaltita
       two_factor_enabled:
-        explanation: Dufaktora aŭtentigo sukcese ebligita por via akonto. Vi bezonos ĵetonon kreitan per parigitan aplikaĵon por ensaluti.
         subject: 'Mastodon: Dufaktora aŭtentigo ebligita'
         title: 2FA aktivigita
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ eo:
           subject: 'Mastodon: sekureca ŝlosilo forigita'
           title: Unu el viaj sekurecaj ŝlosiloj estis forigita
       webauthn_disabled:
-        explanation: Aŭtentikigo per sekurecaj ŝlosiloj estis malebligita por via konto. Ensaluto nun eblas per nur la signo generita de la parigita TOTP-programo.
         subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
         title: Sekurecaj ŝlosiloj malaktivigitaj
       webauthn_enabled:
-        explanation: Sekureca ŝlosila aŭtentokontrolo estis ebligita por via konto. Via sekureca ŝlosilo nun uzeblas por ensaluti.
         subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
         title: Sekurecaj ŝlosiloj aktivigitaj
     omniauth_callbacks:
diff --git a/config/locales/devise.es-AR.yml b/config/locales/devise.es-AR.yml
index d9c922ed86..ca60ee5deb 100644
--- a/config/locales/devise.es-AR.yml
+++ b/config/locales/devise.es-AR.yml
@@ -47,16 +47,19 @@ es-AR:
         subject: 'Mastodon: instrucciones para cambiar la contraseña'
         title: Cambiar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta está deshabilitada. Ahora el inicio de sesión sólo es posible usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando sólo la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: autenticación de dos factores, deshabilitada'
+        subtitle: Se deshabilitó la autenticación de dos factores para tu cuenta.
         title: 2FA deshabilitada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta está habilitada. Se requiere una clave generada por la aplicación TOTP asociada para iniciar sesión.
+        explanation: Para iniciar sesión, se requerirá una clave numérica ("token") generada por la aplicación TOTP emparejada.
         subject: 'Mastodon: autenticación de dos factores, habilitada'
+        subtitle: Se habilitó la autenticación de dos factores para tu cuenta.
         title: 2FA habilitada
       two_factor_recovery_codes_changed:
         explanation: Los códigos anteriores de recuperación fueron invalidados y se generaron unos nuevos.
         subject: 'Mastodon: códigos de recuperación de dos factores, regenerados'
+        subtitle: Los códigos de recuperación anteriores ya no son válidos y se generaron códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: instrucciones de desbloqueo'
@@ -70,11 +73,13 @@ es-AR:
           subject: 'Mastodon: llave de seguridad eliminada'
           title: Se eliminó una de tus llaves de seguridad
       webauthn_disabled:
-        explanation: Se deshabilitó la autenticación con llaves de seguridad en tu cuenta. El inicio de sesión ahora es posible usando sólo la clave generada por la aplicación TOTP asociada.
+        explanation: Se deshabilitó la autenticación con claves de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando sólo la clave numérica ("token") generada por la aplicación TOTP emparejada.
         subject: 'Mastodon: autenticación con llaves de seguridad, deshabilitada'
         title: Llaves de seguridad deshabilitadas
       webauthn_enabled:
-        explanation: Se habilitó la autenticación de llave de seguridad en tu cuenta. Ahora tu llave de seguridad se puede usar para iniciar sesión.
+        explanation: Se habilitó la autenticación con llave de seguridad para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando tu llave de seguridad.
         subject: 'Mastodon: autenticación con llaves de seguridad, habilitada'
         title: Llaves de seguridad habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.es-MX.yml b/config/locales/devise.es-MX.yml
index 83b425d441..c4a7f319af 100644
--- a/config/locales/devise.es-MX.yml
+++ b/config/locales/devise.es-MX.yml
@@ -47,16 +47,19 @@ es-MX:
         subject: 'Mastodon: Instrucciones para reiniciar contraseña'
         title: Reiniciar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando solamente la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
         subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
         title: 2FA activada
       two_factor_recovery_codes_changed:
         explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
         subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +73,13 @@ es-MX:
           subject: 'Mastodon: Clave de seguridad eliminada'
           title: Una de sus claves de seguridad ha sido eliminada
       webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta. El inicio de sesión es ahora posible únicamente utilizando el token generado por la aplicación emparejada TOTP.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
         subject: 'Mastodon: Autenticación con claves de seguridad desactivada'
         title: Claves de seguridad desactivadas
       webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para su cuenta. Su clave de seguridad ahora puede ser usada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
         subject: 'Mastodon: Autenticación con clave de seguridad activada'
         title: Claves de seguridad activadas
     omniauth_callbacks:
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index ef6a70ee4f..642871710d 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -47,16 +47,19 @@ es:
         subject: 'Mastodon: Instrucciones para reiniciar contraseña'
         title: Reiniciar contraseña
       two_factor_disabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido deshabilitada. Ahora puedes conectarte solamente usando la dirección de correo electrónico y la contraseña.
+        explanation: Ahora es posible iniciar sesión utilizando únicamente la dirección de correo electrónico y la contraseña.
         subject: 'Mastodon: La autenticación de dos factores está deshabilitada'
+        subtitle: La autenticación de doble factor para tu cuenta ha sido deshabilitada.
         title: 2FA desactivada
       two_factor_enabled:
-        explanation: La autenticación de dos factores para tu cuenta ha sido habilitada. Se requiere un token generado por la aplicación TOTP emparejada para ingresar.
+        explanation: Se requerirá un token generado por la aplicación TOTP emparejada para iniciar sesión.
         subject: 'Mastodon: La autenticación de dos factores está habilitada'
+        subtitle: La autenticación de doble factor ha sido habilitada para tu cuenta.
         title: 2FA activada
       two_factor_recovery_codes_changed:
         explanation: Los códigos de recuperación previos han sido invalidados y se generaron códigos nuevos.
         subject: 'Mastodon: Los códigos de recuperación de dos factores fueron regenerados'
+        subtitle: Los códigos de recuperación anteriores han sido invalidados y se han generado códigos nuevos.
         title: Códigos de recuperación 2FA cambiados
       unlock_instructions:
         subject: 'Mastodon: Instrucciones para desbloquear'
@@ -70,11 +73,13 @@ es:
           subject: 'Mastodon: Clave de seguridad eliminada'
           title: Una de tus claves de seguridad ha sido eliminada
       webauthn_disabled:
-        explanation: La autenticación con claves de seguridad ha sido deshabilitada para tu cuenta. Ahora el inicio de sesión solo es posible utilizando el token generado por la aplicación TOTP emparejada.
+        explanation: La autenticación con claves de seguridad ha sido desactivada para tu cuenta.
+        extra: Ahora es posible iniciar sesión utilizando únicamente el token generado por la aplicación TOTP emparejada.
         subject: 'Mastodon: Autenticación con claves de seguridad deshabilitada'
         title: Claves de seguridad deshabilitadas
       webauthn_enabled:
-        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta. Ahora tu clave de seguridad puede ser utilizada para iniciar sesión.
+        explanation: La autenticación con clave de seguridad ha sido habilitada para tu cuenta.
+        extra: Tu clave de seguridad ahora puede usarse para iniciar sesión.
         subject: 'Mastodon: Autenticación de clave de seguridad habilitada'
         title: Claves de seguridad habilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.et.yml b/config/locales/devise.et.yml
index da1cc989d2..3e749f9a0b 100644
--- a/config/locales/devise.et.yml
+++ b/config/locales/devise.et.yml
@@ -47,16 +47,19 @@ et:
         subject: 'Mastodon: salasõna lähtestamisjuhendid'
         title: Salasõna lähtestamine
       two_factor_disabled:
-        explanation: Kontol on kaheastmeline autentimine välja lülitatud. Sisenemine on võimalik ainult kasutades e-postiaadressi ja salasõna.
+        explanation: Sisselogimine on nüüd võimalik vaid e-postiaadressi ja salasõnaga.
         subject: 'Mastodon: Kaheastmeline autentimine välja lülitatud'
+        subtitle: Kaheastmeline autoriseerimine on sinu konto jaoks nüüd välja lülitatud.
         title: 2FA keelatud
       two_factor_enabled:
-        explanation: Kontol on sisse lülitatud kaheastmeline autentimine. Sisenemiseks on vajalik ühekordne aeguv võti TOTP-rakenduse poolt.
+        explanation: Sisenemiseks on vaja seotud kaheastmelise autoriseerimise äpi genereeritud võtit.
         subject: 'Mastodon: kaheastmeline autentimine sisse lülitatud'
+        subtitle: Sinu konto jaoks on kaheastmeline autoriseerimine sisse lülitatud.
         title: 2FA lubatud
       two_factor_recovery_codes_changed:
         explanation: Eelmised taastekoodid on nüüd kehtetud ning loodud uued.
         subject: 'Mastodon: Kaheastmelise autentimise taastuskoodid taasloodud'
+        subtitle: Eelmised taastekoodid on tühistatud ja uued genereeritud.
         title: 2FA taastekoodid muudetud
       unlock_instructions:
         subject: 'Mastodon: Lahti lukustamis juhendid'
@@ -70,11 +73,13 @@ et:
           subject: 'Mastodon: turvavõti kustutatud'
           title: Üks sinu turvavõtmetest on kustutatud
       webauthn_disabled:
-        explanation: Autentimine turvavõtmetega on kontol välja lülitatud. Sisse logimine on nüüd võimalik ainult kasutades seotud TOTP rakenduse poolt genereeritud võtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks välja lülitatud.
+        extra: Sisenemine on nüüd võimalik vaid seotud kaheastmelise autoriseerimise äpi genereeritud võtmega.
         subject: 'Mastodon: autentimine turvavõtmega on välja lülitatud'
         title: Turvavõtmed on välja lülitatud
       webauthn_enabled:
-        explanation: Turvavõtmega autentimine on nüüd kontol sisse lülitatud. Nüüd saab kasutada sisse logimiseks sinu turvavõtit.
+        explanation: Turvavõtmega autoriseerimine on sinu konto jaoks nüüd sisse lülitatud.
+        extra: Nüüd saab sisselogimiseks kasutada sinu turvavõtit.
         subject: 'Mastodon: turvavõtme autentimine sisse lülitatud'
         title: Turvavõtmed on sisse lülitatud
     omniauth_callbacks:
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index eb23e06d4a..624f9ee93d 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -47,16 +47,19 @@ eu:
         subject: 'Mastodon: Pasahitza berrezartzeko argibideak'
         title: Pasahitza berrezartzea
       two_factor_disabled:
-        explanation: Bi faktoreetako autentifikazioa desgaitu da zure kontuan. Orain saioa hasi daiteke e-mail helbidea eta pasahitza bakarrik erabilita.
+        explanation: Orain posible da helbide elektronikoa eta pasahitza erabiliz saioa hastea.
         subject: 'Mastodon: Bi faktoreetako autentifikazioa desgaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa desgaitu da.
         title: 2FA desgaituta
       two_factor_enabled:
-        explanation: Bi faktoreetako autentifikazioa gaitu da zure kontuan. Token bat sortu du lotutako TOTP aplikazioak eta saioa hasteko eskatuko da.
+        explanation: Parekatutako TOTP aplikazioak sortutako tokena beharko da saioa hasteko.
         subject: 'Mastodon: Bi faktoreetako autentifikazioa gaituta'
+        subtitle: Kontuaren bi faktoreko autentifikazioa gaitu da.
         title: 2FA gaituta
       two_factor_recovery_codes_changed:
         explanation: Aurreko kodeak baliogabetu dira eta berriak sortu dira.
         subject: 'Mastodon: Bi faktoreetako berreskuratze kodeak birsortuta'
+        subtitle: Aurreko berreskuratze-kodeak baliogabetu eta berriak sortu dira.
         title: 2FA berreskuratze kodeak aldatuta
       unlock_instructions:
         subject: 'Mastodon: Desblokeatzeko argibideak'
@@ -70,11 +73,13 @@ eu:
           subject: 'Mastodon: Segurtasun gakoa ezabatu da'
           title: Zure segurtasun gakoetako bat ezabatu da
       webauthn_disabled:
-        explanation: Segurtasun gako bidezko autentifikazioa desgaitu da zure kontuan. Saioa hasteko modu bakarra parekatutako TOTP aplikazioak sortutako tokena erabiltzea da orain.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa desgaitu da.
+        extra: Parekatutako TOTP aplikazioak sortutako tokena erabiliz bakarrik has daiteke saioa orain.
         subject: 'Mastodon: Segurtasun gakoekin autentifikatzea desgaituta'
         title: Segurtasun gakoak desgaituta
       webauthn_enabled:
-        explanation: Segurtasun gako bidezko autentifikazioa gaitu da zure kontuan. Orain zure segurtasun gakoa erabil dezakezu saioa hasteko.
+        explanation: Kontuaren segurtasun-gako bidezko autentifikazioa gaitu da.
+        extra: Orain, segurtasun-gakoa erabil daiteke saioa hasteko.
         subject: 'Mastodon: Segurtasun gako bidezko autentifikazioa gaituta'
         title: Segurtasun gakoak gaituta
     omniauth_callbacks:
diff --git a/config/locales/devise.fa.yml b/config/locales/devise.fa.yml
index 07db5395da..d4198626d4 100644
--- a/config/locales/devise.fa.yml
+++ b/config/locales/devise.fa.yml
@@ -47,11 +47,9 @@ fa:
         subject: 'ماستودون: راهنمایی برای بازنشانی گذرواژه'
         title: بازنشانی گذرواژه
       two_factor_disabled:
-        explanation: ورود دومرحله‌ای برای حساب شما غیرفعال شده است. از الان می‌توانید تنها با نشانی ایمیل و گذرواژه وارد حساب خود شوید.
         subject: 'ماستودون: تأیید هویت دو مرحله‌ای از کار افتاد'
         title: ورود دومرحله‌ای غیرفعال
       two_factor_enabled:
-        explanation: ورود دومرحله‌ای برای حساب شما فعال شده است. برای ورود به کدی نیاز خواهید داشت که نرم‌افزار TOTP از پیش تنظیم شده برایتان می‌سازد.
         subject: 'ماستودون: تأیید هویت دومرحله‌ای به کار افتاد'
         title: ورود دومرحله‌ای فعال
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ fa:
           subject: 'ماستودون: کلید امنیتی حذف شد'
           title: یکی از کلیدهای امنیتیتان حذف شد
       webauthn_disabled:
-        explanation: تأیید هویت با کلیدهای امنیتی برای حسابتان از کار افتاده است. ورود اکنون فقط با ژتون ایجاد شده با کارهٔ TOTP جفت‌شده امکان‌پذیر است.
         subject: 'ماستودون: تأیید هویت با کلیدهای امنیتی از کار افتاد'
         title: کلیدهای امنیتی از کار افتادند
       webauthn_enabled:
-        explanation: تأیید هویت با کلید امنیتی برای حسابتان به کار افتاده است. اکنون کلید امنیتیتان می‌تواند برای ورود استفاده شود.
         subject: 'ماستودون: تأیید هویت با کلید امنیتی به کار افتاد'
         title: کلیدهای امنیتی به کار افتادند
     omniauth_callbacks:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 7846ebd8c2..bedf8a56f6 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -47,11 +47,9 @@ fi:
         subject: 'Mastodon: ohjeet salasanan vaihtoon'
         title: Salasanan vaihto
       two_factor_disabled:
-        explanation: Tilisi kaksivaiheinen todennus poistettiin käytöstä. Kirjautuminen onnistuu nyt pelkällä sähköpostiosoitella ja salasanalla.
         subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
         title: 2-vaiheinen todennus pois käytöstä
       two_factor_enabled:
-        explanation: Kaksivaiheinen todennus on otettu käyttöön tilillesi. Kirjautumiseen tarvitaan kaksivaiheisen todennuksen sovelluksesta saatu koodi.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
         title: 2-vaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ fi:
           subject: 'Mastodon: suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
-        explanation: Suojausavaimilla todennus on poistettu käytöstä tililtäsi. Kirjautuminen on nyt mahdollista vain paritetun TOTP-sovelluksen luomaa koodia käyttämällä.
         subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
-        explanation: Todennus suojausavaimella on otettu käyttöön tilillesi. Suojausavaintasi voidaan nyt käyttää kirjautumiseen.
         subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
diff --git a/config/locales/devise.fo.yml b/config/locales/devise.fo.yml
index 35fa0954f4..1f7708bb44 100644
--- a/config/locales/devise.fo.yml
+++ b/config/locales/devise.fo.yml
@@ -47,16 +47,19 @@ fo:
         subject: 'Mastodon: Vegleiðing at skifta loyniorð'
         title: Skift loyniorð
       two_factor_disabled:
-        explanation: Tvey-faktor samgildi (2FA) fyri tína kontu er gjørt óvirkið. Nú er møguligt at rita inn við einans at nýta teldupost og loyniorð.
+        explanation: Innritan er nú møgulig við einans at brúka teldupost og loyniorð.
         subject: 'Mastodon: Váttan í tveimum stigum er gjørd óvirkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd óvirkin fyri tína kontu.
         title: 2FA óvirkið
       two_factor_enabled:
-        explanation: Váttan í tveimum stigum er gjørd virkin fyri tína kontu. Eitt merki framleitt av paraðu TOTP appini verður framyvir kravt fyri at rita inn.
+        explanation: Eitt tekin, sum er gjørt við eini paraðari TOTP app, verður kravt fyri at rita inn.
         subject: 'Mastodon: Váttan í tveimum stigum er virkin'
+        subtitle: Váttan í tveimum stigum (2FA) er gjørd virkin fyri tína kontu.
         title: 2FA virkið
       two_factor_recovery_codes_changed:
         explanation: Undanfarnu endurskapanarkodurnar eru ógildaðar og nýggjar eru framleiddar.
         subject: 'Mastodon: Endurskapanarkodurnar til váttan í tveimum stigum eru framleiddar umaftur'
+        subtitle: Undanfarnu kodur til endurgerð eru nú óvirknar og nýggjar eru gjørdar.
         title: 2FA endurskapanarkodur eru broyttar
       unlock_instructions:
         subject: 'Mastodon: Vegleiðing í at læsa upp'
@@ -70,11 +73,13 @@ fo:
           subject: 'Mastodon: Trygdarlykilin strikaður'
           title: Ein av trygdarlyklunum hjá tær er strikaður
       webauthn_disabled:
-        explanation: Váttan við trygdarlyklum er gjørd óvirkin fyri tína kontu. Nú ber til at rita inn einans við teknum, sum eru framleidd av paraðu TOTP appini.
+        explanation: Samgildi við trygdarlyklum er gjørt óvirkið fyri tína kontu.
+        extra: Innritan er nú møgulig við einans at brúka teknið, sum er gjørt við paraðu TOTP appini.
         subject: 'Mastodon: Váttan við trygdarlyklum er gjørd óvirkin'
         title: Trygdarlyklar óvirknir
       webauthn_enabled:
-        explanation: Váttan við trygdarlyklum er gjørd virkin á tínari kontu. Nú kann tín trygdarlykil nýtast at rita inn við.
+        explanation: Trygdarlyklasamgildi er gjørt virkið fyri tína kontu.
+        extra: Trygdarlyklarnir hjá tær kunnu nú brúkast til innritan.
         subject: 'Mastodon: Váttan við trygdarlykli gjørd virkin'
         title: Trygdarlyklar gjørdir virknir
     omniauth_callbacks:
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index e9f09a6980..34104e0ac5 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -47,16 +47,19 @@ fr-CA:
         subject: 'Mastodon: Instructions pour changer votre mot de passe'
         title: Réinitialisation du mot de passe
       two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
         subject: 'Mastodon: authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
         title: A2F désactivée
       two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
         subject: 'Mastodon: authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
         title: A2F activée
       two_factor_recovery_codes_changed:
         explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
         subject: 'Mastodon: codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
         title: Codes de récupération A2F modifiés
       unlock_instructions:
         subject: 'Mastodon: Instructions pour déverrouiller votre compte'
@@ -70,11 +73,9 @@ fr-CA:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 8eb744d94c..1fc6663bfe 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -47,16 +47,19 @@ fr:
         subject: 'Mastodon : Instructions pour changer votre mot de passe'
         title: Réinitialisation du mot de passe
       two_factor_disabled:
-        explanation: L'authentification à deux facteurs pour votre compte a été désactivée. La connexion est maintenant possible en utilisant uniquement l'adresse courriel et le mot de passe.
+        explanation: La connexion est maintenant possible en n'utilisant uniquement l'adresse e-mail et le mot de passe.
         subject: 'Mastodon : authentification à deux facteurs désactivée'
+        subtitle: L'authentification à deux facteurs pour votre compte a été désactivée.
         title: 2FA désactivée
       two_factor_enabled:
-        explanation: L'authentification à deux facteurs a été activée pour votre compte. Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
+        explanation: Un jeton généré par l'application appairée TOTP sera nécessaire pour vous connecter.
         subject: 'Mastodon : authentification à deux facteurs activée'
+        subtitle: L'authentification à deux facteurs est maintenant activée pour votre compte.
         title: A2F activée
       two_factor_recovery_codes_changed:
         explanation: Les codes de récupération précédents ont été invalidés et de nouveaux ont été générés.
         subject: 'Mastodon : codes de récupération à deux facteurs régénérés'
+        subtitle: Les codes de récupération précédents ont été invalidés et de nouveaux codes ont été générés.
         title: Codes de récupération A2F modifiés
       unlock_instructions:
         subject: 'Mastodon : Instructions pour déverrouiller votre compte'
@@ -70,11 +73,9 @@ fr:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
-        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte. La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP appairée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
-        explanation: L'authentification par clé de sécurité a été activée pour votre compte. Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.fy.yml b/config/locales/devise.fy.yml
index 910d2d3094..05fd7b8071 100644
--- a/config/locales/devise.fy.yml
+++ b/config/locales/devise.fy.yml
@@ -49,16 +49,19 @@ fy:
         subject: 'Mastodon: Wachtwurd opnij ynstelle'
         title: Wachtwurd opnij ynstelle
       two_factor_disabled:
-        explanation: Twa-stapsferifikaasje foar jo account is útskeakele. Jo kinne no allinnich oanmelde mei in e-mailadres en wachtwurd.
+        explanation: Jo kinne no oanmelde mei allinnich in e-mailadres en wachtwurd.
         subject: 'Mastodon: Twa-stapsferifikaasje útskeakele'
+        subtitle: Twastapsferifikaasje foar jo account is útskeakele.
         title: Twa-stapsferifikaasje útskeakele
       two_factor_enabled:
-        explanation: Twa-stapsferifikaasje foar jo account is ynskeakele. Om oanmelde te kinnen is in troch in twa-stapsferifikaasje-app generearre tagongskoade nedich.
+        explanation: Jo hawwe in troch de autentikaasje-app genearre tagongskoade nedich om oan te melden.
         subject: 'Mastodon: Twa-stapsferifikaasje ynskeakele'
+        subtitle: Twastapsferifikaasje is foar jo account ynskeakele.
         title: Twa-stapsferifikaasje ynskeakele
       two_factor_recovery_codes_changed:
         explanation: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
         subject: 'Mastodon: Twa-staps-werstelkoaden binne opnij oanmakke'
+        subtitle: De foarige werstelkoaden binne ûnjildich makke en nije binne oanmakke.
         title: Werstelkoaden twa-stapsferifikaasje wizige
       unlock_instructions:
         subject: 'Mastodon: Ynstruksjes foar ûntskoatteljen'
@@ -72,11 +75,13 @@ fy:
           subject: 'Mastodon: Befeiligingskaai fuortsmiten'
           title: Ien fan jo befeiligingskaaien is fuortsmiten
       webauthn_disabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is útskeakele foar jo account. Oanmelden is no allinnich mooglik mei it gebrûk fan in troch in keppele TOTP-app generearre kaai.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account útskeakele.
+        extra: It is no allinnich mooglik om oan te melden mei in troch de autentikaasje-app genearre tagongskoade.
         subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is útskeakele'
         title: Befeiligingskaaien útskeakele
       webauthn_enabled:
-        explanation: Ferifikaasje mei befeiligingskaaien is ynskeakele foar jo account. Jo befeiligingskaai kin no brûkt wurde om oan te melden.
+        explanation: Ferifikaasje mei befeiligingskaaien is foar jo account ynskeakele.
+        extra: Jo befeiligingskaai kin no brûkt wurde om oan te melden.
         subject: 'Mastodon: Ferifikaasje mei befeiligingskaaien is ynskeakele'
         title: Befeiligingskaaien ynskeakele
     omniauth_callbacks:
diff --git a/config/locales/devise.gd.yml b/config/locales/devise.gd.yml
index c8a34054cf..1bf489cfbb 100644
--- a/config/locales/devise.gd.yml
+++ b/config/locales/devise.gd.yml
@@ -47,11 +47,9 @@ gd:
         subject: 'Mastodon: Stiùireadh air ath-shuidheachadh an fhacail-fhaire'
         title: Ath-shuidheachadh an fhacail-fhaire
       two_factor_disabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach le seòladh puist-d is facal-faire a-mhàin a-nis.
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach à comas'
         title: Dearbhadh dà-cheumnach à comas
       two_factor_enabled:
-        explanation: Chaidh an dearbhadh dà-cheumnach a chur an comas dhan chunntas agad. Bidh feum air tòcan a ghineas an aplacaid TOTP a chaidh a phaidhreachadh airson clàradh a-steach.
         subject: 'Mastodon: Tha an dearbhadh dà-cheumnach an comas'
         title: Dearbhadh dà-cheumnach an comas
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ gd:
           subject: 'Mastodon: Chaidh iuchair tèarainteachd a sguabadh às'
           title: Chaidh tè dhe na h-iuchraichean tèarainteachd agad a sguabadh às
       webauthn_disabled:
-        explanation: Chaidh an dearbhadh le iuchraichean tèarainteachd a chur à comas dhan chunntas agad. ’S urrainn dhut clàradh a-steach leis an tòcan a ghineas an aplacaid TOTP paidhrichte a-mhàin a-nis.
         subject: 'Mastodon: Tha dearbhadh le iuchraichean tèarainteachd à comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur à comas
       webauthn_enabled:
-        explanation: Chaidh an dearbhadh le iuchair tèarainteachd a chur an comas dhan chunntas agad. ’S urrainn dhut an iuchair tèarainteachd agad a chleachdadh airson clàradh a-steach a-nis.
         subject: 'Mastodon: Tha dearbhadh le iuchair tèarainteachd an comas'
         title: Chaidh na h-iuchraichean tèarainteachd a chur an comas
     omniauth_callbacks:
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index b392f4642c..b9f4a0a005 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -47,16 +47,19 @@ gl:
         subject: 'Mastodon: Instrucións para restabelecer o contrasinal'
         title: Restabelecer contrasinal
       two_factor_disabled:
-        explanation: A autenticación de dobre factor para a túa conta foi desactivada. É agora posíbel acceder só co teu enderezo de email e contrasinal.
+        explanation: Agora xa podes acceder usando simplemente o correo e contrasinal.
         subject: 'Mastodon: Autenticación de dobre factor desactivada'
+        subtitle: Desactivouse o segundo factor de autenticación.
         title: 2FA desactivado
       two_factor_enabled:
-        explanation: A autenticación de dobre factor foi activada para a túa conta. Un token, xerado pola aplicación TOTP emparellada, será necesario para acceder.
+        explanation: Vai ser preciso usar un código creado pola app TOTP emparellada.
         subject: 'Mastodon: Activouse a autenticación de dobre factor'
+        subtitle: Activouse o segundo factor de autenticación para a conta.
         title: 2FA activado
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperación anteriores fican anulados e os novos foron xerados.
         subject: 'Mastodon: Xerados novos códigos de recuperación de dobre factor'
+        subtitle: Os anteriores códigos de recuperación quedaron desactivados e crearonse uns novos.
         title: Códigos de recuperación 2FA mudados
       unlock_instructions:
         subject: 'Mastodon: Instrucións para desbloquear'
@@ -70,11 +73,13 @@ gl:
           subject: 'Mastodon: Chave de seguridade eliminada'
           title: Eliminouse unha das túas chaves de seguridade
       webauthn_disabled:
-        explanation: Desactivouse para a túa conta a autenticación con chaves de seguridade. Agora a conexión é posible usando só o token creado pola app TOTP emparellada.
+        explanation: Desactivouse para a conta a autenticación con chaves de seguridade.
+        extra: Agora só se pode acceder usando o código creado pola app TOTP emparellada.
         subject: 'Mastodon: Desactivouse a autenticación con chave de seguridade'
         title: Chaves de seguridade desactivadas
       webauthn_enabled:
-        explanation: Activouse para a conta a autenticación con chave de seguridade. Xa podes usar a chave de seguridade para contectar.
+        explanation: Activouse para a conta a autenticación con chave de seguridade.
+        extra: Xa podes usar a chave de seguridade para acceder.
         subject: 'Mastodon: Autenticación con chave de seguridade activada'
         title: Chaves de seguridade activas
     omniauth_callbacks:
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index e45f62b031..f2ec3a6716 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -47,16 +47,19 @@ he:
         subject: 'מסטודון: הוראות לאיפוס סיסמה'
         title: איפוס סיסמה
       two_factor_disabled:
-        explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+        explanation: החיבור כרגע אפשרי בעזרת שם משתמש וסיסמא ותו לא.
         subject: 'מסטודון: אימות דו גורמי מושבת'
+        subtitle: אימות דו-שלבי כובה לחשבון זה.
         title: אימות דו-גורמי הושעה
       two_factor_enabled:
-        explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+        explanation: כדי להתחבר דרוש קוד חד פעמי מיישומון TOTP ששידכת לחשבון זה.
         subject: 'מסטודון: אימות דו גורמי הופעל'
+        subtitle: אימות דו־שלבי הופעל לחשבונך.
         title: אימות דו־גורמי הופעל
       two_factor_recovery_codes_changed:
         explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
         subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+        subtitle: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
         title: צפני אחזור דו-גורמי השתנו
       unlock_instructions:
         subject: 'מסטודון: הוראות לביטול נעילה'
@@ -70,11 +73,13 @@ he:
           subject: 'מסטודון: מפתח האבטחה נמחק'
           title: אחד ממפתחות האבטחה שלך נמחק
       webauthn_disabled:
-        explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+        explanation: אימות במפתחות אבטחה כובה לחשבונך.
+        extra: חיבור כעת ניתן רק על ידי הקוד שיוצר על ידי יישומון TOTP ששודך.
         subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
         title: מפתחות אבטחה הושעו
       webauthn_enabled:
-        explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+        explanation: אימות מפתח בטחון הופעל בחשבונך.
+        extra: ניתן להשתמש כעת במפתח האבטחה שלך כדי להתחבר.
         subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
         title: מפתחות אבטחה אופשרו
     omniauth_callbacks:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 6eb1524ed1..522ac66ad3 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -47,11 +47,9 @@ hu:
         subject: 'Mastodon: Jelszóvisszaállítási utasítások'
         title: Jelszó visszaállítása
       two_factor_disabled:
-        explanation: A fiókod kétlépcsős hitelesítését kikapcsoltuk. A bejelentkezés mostantól csak az e-mail cím és a jelszó használatával lesz lehetséges.
         subject: Kétlépcsős azonosítás kikapcsolva
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
-        explanation: A kétlépcsős hitelesítést engedélyeztük a fiókodban. A bejelentkezéshez a párosított TOTP alkalmazás által generált tokenre lesz szükség.
         subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
         title: Kétlépcsős hitelesítés engedélyezve
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ hu:
           subject: 'Mastodon: A biztonsági kulcs törlésre került'
           title: Az egyik biztonsági kulcsodat törölték
       webauthn_disabled:
-        explanation: A biztonsági kulccsal történő hitelesítést letiltottuk a fiókodon. Bejelentkezni csak a párosított TOTP app által generált tokennel lehet.
         subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
         title: A biztonsági kulcsok letiltásra kerültek
       webauthn_enabled:
-        explanation: A biztonsági kulccsal történő hitelesítést engedélyeztük a fiókodon. A biztonsági kulcsodat mostantól használhatod bejelentkezésre.
         subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
         title: A biztonsági kulcsok engedélyezésre kerültek
     omniauth_callbacks:
diff --git a/config/locales/devise.hy.yml b/config/locales/devise.hy.yml
index 2d235c0af1..ee23163f51 100644
--- a/config/locales/devise.hy.yml
+++ b/config/locales/devise.hy.yml
@@ -47,11 +47,9 @@ hy:
         subject: Մաստոդոն․ Գաղտնաբառի վերականգնման նկարագրութիւններ
         title: Վերականգնել գաղտնաբառը
       two_factor_disabled:
-        explanation: 2FA֊ն քո հաշուի համար անջատուեց։ Մուտքն այժմ հնարաւոր է միայն էլ․ փոտի եւ գաղտնաբառի միջոցով։
         subject: Մաստոդոն․ 2FA֊ն անջատուեց
         title: 2FA անջատուած է
       two_factor_enabled:
-        explanation: 2FA֊ն քո հաշուի համար միացուած է։ TOTP ծրագրի միջոցով գեներացուած token֊ը պէտք է օգտագործես մուտք գործելու համար։
         subject: Մաստոդոն․ 2FA-ն միացուեց
         title: 2FA միացուած է
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ hy:
           subject: Մաստոդոն․ Անվտանգութեան բանալին ջնջուել է
           title: Անվտանգութեան բանալիներիցդ մեկը ջնջուել է
       webauthn_disabled:
-        explanation: Անվտանգութեան բանալիներով նոյնականացումը քո հաշուից կասեցուել է։ Մուտք գործելն այժմ հնարաւոր է՝ օգտագործելով միայն զուգաւորուած TOTP յաւելուածից գեներացուած կտրօնը։
         subject: Մաստոդոն․ Նոյնականացումն անվտանգութեան բանալիներով կասեցուած է
         title: Անվտանգութեան բանալիները կասեցուել են
       webauthn_enabled:
-        explanation: Անվտանգութեան բանալիով նոյնականացումը քո հաշուի համար միացուած է։ Քո անվտանգութեան բանալին այժմ կարող է օգտագործուել մուտք գործելու համար։
         subject: Մաստոդոն․ Անվտանգութեան բանալիով նոյնականացումը միացուած է
         title: Անվտանգութեան բանալիները միացուել են
     omniauth_callbacks:
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 2e51a69dc2..c0dede95aa 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -47,11 +47,9 @@ id:
         subject: 'Mastodon: Petunjuk mereset kata sandi'
         title: Reset kata sandi
       two_factor_disabled:
-        explanation: Otentifikasi dua-faktor untuk akun Anda dimatikan. Kini Masuk dapat dilakukan hanya dengan alamat email dan kata sandi.
         subject: 'Mastodon: Otentifikasi dua-faktor dimatikan'
         title: 2FA dimatikan
       two_factor_enabled:
-        explanation: Otentifikasi dua-faktor telah dimatikan untuk Akun Anda. Token yang dibuat menggunakan aplikasi TOTP berpasangan akan diperlukan untuk masuk.
         subject: 'Mastodon: Otentifikasi dua-faktor diaktifkan'
         title: 2FA diaktifkan
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ id:
           subject: 'Mastodon: Kunci keamanan dihapus'
           title: Salah satu dari kunci keamanan Anda telah dihapus
       webauthn_disabled:
-        explanation: Autentikasi dengan kunci keamanan telah dinonaktifkan untuk akun ini. Proses masuk akun hanya mungkin menggunakan token yang dibuat dengan aplikasi TOTP.
         subject: 'Mastodon: Autentikasi dengan kunci keamanan dinoaktifkan'
         title: Kunci keamanan dinonaktifkan
       webauthn_enabled:
-        explanation: Autentikasi kunci keamanan telah diaktifkan untuk akun Anda. Kunci keamanan Anda kini dapat dipakai untuk masuk.
         subject: 'Mastodon: Autentikasi kunci keamanan aktif'
         title: Kunci keamanan aktif
     omniauth_callbacks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 05a41147d8..97cda4e8c6 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -47,16 +47,18 @@ ie:
         subject: 'Mastodon: Instructiones por reiniciar li passa-parol'
         title: Reiniciar passa-parol
       two_factor_disabled:
-        explanation: 2-factor autentication por tui conto ha esset desactivisat. Aperter session nu es possibil solmen per email-adresse e passa-parol.
+        explanation: Aperter session es nu possibil solmen per email-adresse e passa-parol.
         subject: 'Mastodon: 2-factor autentication desactivat'
+        subtitle: 2-factor autentication por tui conto ha esset desactivisat.
         title: 2FA desvalidat
       two_factor_enabled:
-        explanation: 2-factor autentication ha esset activat por tui conto. Un gage generat per li acuplat apli TOTP va esser besonat por intrar.
         subject: 'Mastodon: 2-factor autentication activat'
+        subtitle: 2-factor autentication ha esset activisat por tui conto.
         title: 2FA permisset
       two_factor_recovery_codes_changed:
         explanation: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
         subject: 'Mastodon: 2-factor codes de recuperation regenerat'
+        subtitle: Li anteyan codes de recuperation ha esset ínvalidat, e novis generat.
         title: 2FA codes de recuperation changeat
       unlock_instructions:
         subject: 'Mastodon: Desserral instructiones'
@@ -70,11 +72,12 @@ ie:
           subject: 'Mastodon: Clave de securitá deletet'
           title: Un ex tui claves de securitá ha esset deletet
       webauthn_disabled:
-        explanation: Autentication per claves de securitá ha esset desactivat por tui conto. Ja on posse intrar solmen con li gage generat per li acuplat apli TOTP.
+        explanation: Autentication per clave de securitá ha esset desactivisat por tui conto.
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
       webauthn_enabled:
-        explanation: Autentication per clave de securitá ha esset activat por tui conto. Ja li clave de securitá posse esser usat por intrar.
+        explanation: Autentication per clave de securitá ha esset activisat por tui conto.
+        extra: Tui clave de securitá nu posse esser usat por aperter session.
         subject: 'Mastodon: Autentication per clave de securitá activat'
         title: Claves de securitá activisat
     omniauth_callbacks:
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index fb90c08c7f..6bf0b52cef 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -47,11 +47,9 @@ io:
         subject: Instrucioni por chanjar la pasvorto
         title: Richanjo di pasvorto
       two_factor_disabled:
-        explanation: 2-faktorverifiko por vua konto deaktivigesis. Eniro esas nun posible per nur retpostadreso e pasvorto.
         subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
         title: 2FA deaktivigesis
       two_factor_enabled:
-        explanation: 2-faktorverifiko aktivigesis por vua konto. Fisho quo facesis da parigita softwaro TOTP bezonesos por eniro.
         subject: 'Mastodon: 2-faktorverifiko aktivigesis'
         title: 2FA aktivigesis
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ io:
           subject: 'Mastodon: Sekurklefo efacesis'
           title: 1 de vua sekurklefi efacesis
       webauthn_disabled:
-        explanation: Verifiko per sekurklefi deaktivigesis por vua konto. Eniro nun esas posibla per nur ficho quo facesis da parita softwaro TOTP.
         subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
         title: Sekurklefi deaktivigesis
       webauthn_enabled:
-        explanation: Sekurklefverifiko aktivigesis por vua konto. Vua sekurklefo nun povas uzesar por eniro.
         subject: 'Mastodon: Sekurklefverifiko aktivigesis'
         title: Sekurklefi aktivigesis
     omniauth_callbacks:
diff --git a/config/locales/devise.is.yml b/config/locales/devise.is.yml
index 3b7cf10987..12015fa29d 100644
--- a/config/locales/devise.is.yml
+++ b/config/locales/devise.is.yml
@@ -47,16 +47,19 @@ is:
         subject: 'Mastodon: Leiðbeiningar til að endurstilla lykilorð'
         title: Endurstilling lykilorðs
       two_factor_disabled:
-        explanation: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk. Núna er einungis hægt að skrá inn með tölvupóstfangi og lykilorði.
+        explanation: Innskráning er núna möguleg með því að nota aðeins tölvupóstfang og lykilorð.
         subject: 'Mastodon: Tveggja-þátta auðkenning er óvirk'
+        subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð óvirk.
         title: 2FA tveggja-þátta auðkenning er óvirk
       two_factor_enabled:
-        explanation: Tveggja-þátta auðkenning hefur verið gerð virk fyrir aðganginn þinn. Krafist er teikns útbúnu af paraða TOTP-forritinu til að skrá inn.
+        explanation: Teikn sem útbúið hefur verið af pöruðu TOTP-forriti verður nauðsynlegt til innskráningar.
         subject: 'Mastodon: Tveggja-þátta auðkenning er virk'
+        subtitle: Tveggja-þátta auðkenning fyrir aðganginn þinn hefur verið gerð virk.
         title: 2FA tveggja-þátta auðkenning er virk
       two_factor_recovery_codes_changed:
         explanation: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
         subject: 'Mastodon: Endurheimtukóðar tveggja-þátta auðkenningar voru endurnýjaðir'
+        subtitle: Fyrri endurheimtukóðar tveggja-þátta auðkenningar voru ógiltir og nýir útbúnir í staðinn.
         title: Endurheimtukóðar tveggja-þátta auðkenningar breyttust
       unlock_instructions:
         subject: 'Mastodon: Leiðbeiningar til að aflæsa'
@@ -70,11 +73,13 @@ is:
           subject: 'Mastodon: Öryggislykli eytt'
           title: Einum af öryggilyklunum þínum hefur verið eytt
       webauthn_disabled:
-        explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn. Innskráning er núna einungis möguleg með teikni útbúnu af paraða TOTP-forritinu.
+        explanation: Auðkenning með öryggislyklum hefur verið gerð óvirk fyrir aðganginn þinn.
+        extra: Innskráning er núna möguleg með því að nota einungis teikn útbúnu af paraða TOTP-forritinu.
         subject: 'Mastodon: Auðkenning með öryggislyklum er óvirk'
         title: Öryggislyklar eru óvirkir
       webauthn_enabled:
-        explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn. Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
+        explanation: Auðkenning með öryggislykli hefur verið gerð virk fyrir aðganginn þinn.
+        extra: Nú er hægt að nota öryggislykilinn þinn til að skrá inn.
         subject: 'Mastodon: Auðkenning með öryggislykli er virk'
         title: Öryggislyklar eru virkir
     omniauth_callbacks:
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 5ea3aeac47..19bd999aad 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -47,16 +47,19 @@ it:
         subject: 'Mastodon: Istruzioni di ripristino della password'
         title: Ripristino della password
       two_factor_disabled:
-        explanation: L'autenticazione a due fattori per il tuo profilo è stata disabilitata. L'accesso è ora possibile utilizzando solo l'indirizzo email e la password.
+        explanation: Il login è ora possibile utilizzando solo un indirizzo e-mail e una password.
         subject: 'Mastodon: Autenticazione a due fattori disabilitata'
+        subtitle: L'autenticazione a due fattori per il tuo account è stata disabilitata.
         title: A2F disabilitata
       two_factor_enabled:
-        explanation: L'autenticazione a due fattori è stata abilitata per il tuo profilo. Un token, generato dall'app TOTP collegata, sarà richiesto per l'accesso.
+        explanation: Un token generato dall'app TOTP accoppiata sarà richiesto per il login.
         subject: 'Mastodon: Autenticazione a due fattori abilitata'
+        subtitle: L'autenticazione a due fattori è stata abilitata per il tuo account.
         title: A2F abilitata
       two_factor_recovery_codes_changed:
         explanation: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
         subject: 'Mastodon: Codici di recupero a due fattori rigenerati'
+        subtitle: I precedenti codici di recupero sono stati annullati e dei nuovi sono stati generati.
         title: Codici di recupero A2F cambiati
       unlock_instructions:
         subject: 'Mastodon: Istruzioni di sblocco'
@@ -70,11 +73,13 @@ it:
           subject: 'Mastodon: Chiave di sicurezza eliminata'
           title: Una delle tue chiavi di sicurezza è stata eliminata
       webauthn_disabled:
-        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo profilo. L'accesso è ora possibile utilizzando solo il token, generato dall'app TOTP associata.
+        explanation: L'autenticazione con le chiavi di sicurezza è stata disabilitata per il tuo account.
+        extra: Il login è ora possibile utilizzando solo il token generato dall'app TOTP accoppiata.
         subject: 'Mastodon: Autenticazione con chiavi di sicurezza disabilitata'
         title: Chiavi di sicurezza disabilitate
       webauthn_enabled:
-        explanation: L'autenticazione con chiavi di sicurezza è stata abilitata per il tuo profilo. La tua chiave di sicurezza è ora utilizzabile per l'accesso.
+        explanation: L'autenticazione della chiave di sicurezza è stata abilitata per il tuo account.
+        extra: La tua chiave di sicurezza può ora essere utilizzata per il login.
         subject: 'Mastodon: Autenticazione con chiavi di sicurezza abilitata'
         title: Chiavi di sicurezza abilitate
     omniauth_callbacks:
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index ca8ac05847..9a3ffd9c4d 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -47,16 +47,19 @@ ja:
         subject: 'Mastodon: パスワード再発行'
         title: パスワード再発行
       two_factor_disabled:
-        explanation: あなたのアカウントの二要素認証が無効化されました。メールとパスワードのみでログインできます。
+        explanation: メールアドレスとパスワードのみでログイン可能になりました。
         subject: 'Mastodon: 二要素認証が無効になりました'
+        subtitle: 二要素認証が無効になっています。
         title: 二要素認証が無効化されました
       two_factor_enabled:
-        explanation: あなたのアカウントの二要素認証が有効化されました。ログインするには TOTP アプリで生成されたコードが必要です。
+        explanation: ログインには設定済みのTOTPアプリが生成したトークンが必要です。
         subject: 'Mastodon: 二要素認証が有効になりました'
+        subtitle: 二要素認証が有効になりました。
         title: 二要素認証が有効化されました
       two_factor_recovery_codes_changed:
         explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
         subject: 'Mastodon: 二要素認証のリカバリーコードが再生成されました'
+        subtitle: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
         title: 二要素認証のリカバリーコードが変更されました
       unlock_instructions:
         subject: 'Mastodon: アカウントのロックの解除'
@@ -70,11 +73,13 @@ ja:
           subject: 'Mastodon: セキュリティキーが削除されました'
           title: セキュリティキーが削除されました
       webauthn_disabled:
-        explanation: アカウントのセキュリティキーによる認証が無効になりました。ペアリングされたTOTPアプリによって生成されたトークンのみを使用してログインが可能になりました。
+        explanation: セキュリティキー認証が無効になっています。
+        extra: 設定済みのTOTPアプリが生成したトークンのみでログインできるようになりました。
         subject: 'Mastodon: セキュリティキー認証が無効になりました'
         title: セキュリティキーは無効になっています
       webauthn_enabled:
-        explanation: あなたのアカウントでセキュリティキー認証が有効になりました。セキュリティキーをログインに使用できるようになりました。
+        explanation: セキュリティキー認証が有効になりました。
+        extra: ログインにセキュリティキーを使用できるようになりました。
         subject: 'Mastodon: セキュリティキー認証が有効になりました'
         title: セキュリティキーは有効になっています
     omniauth_callbacks:
diff --git a/config/locales/devise.kab.yml b/config/locales/devise.kab.yml
index eb599e55e8..2f60629fd7 100644
--- a/config/locales/devise.kab.yml
+++ b/config/locales/devise.kab.yml
@@ -47,11 +47,9 @@ kab:
         subject: 'Mastodon: Iwellihen n uwennez n wawal uffir'
         title: Aɛiwed n wawal uffir
       two_factor_disabled:
-        explanation: Asesṭeb s snat n tarayin insa i umiḍan-ik·im. Tzemreḍ ad teqnneḍ tura s imayl d wawal uffir kan.
         subject: 'Mastodon: Asesteb s snat n tarrayin yensa'
         title: Asesteb s snat n tarrayin insa
       two_factor_enabled:
-        explanation: Asesṭeb s snat n tarayin yermed i umiḍan-ik·im. anekcum isra tangalt akken ad yeddu.
         subject: 'Mastodon: Asesteb s snat n tarrayin yermed'
         title: Asesteb s snat n tarrayin irmed
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.kk.yml b/config/locales/devise.kk.yml
index 7ddeb86047..06fad30aec 100644
--- a/config/locales/devise.kk.yml
+++ b/config/locales/devise.kk.yml
@@ -47,11 +47,9 @@ kk:
         subject: 'Mastodon: Құпиясөзді қалпына келтіру нұсқаулықтары'
         title: Құпиясөзді қалпына келтіру
       two_factor_disabled:
-        explanation: Екі факторлы аутентификация сіздің аккаунтыңыз үшін жабық. Email адресіңіз және құпиясөзіңіз арқылы кіруіңізге болады.
         subject: 'Mastodon: Екі факторлы аутентификация жабық'
         title: 2FA жабық
       two_factor_enabled:
-        explanation: Екі факторлы аутентификация аккаунтыңызға қосылды. TOTP арқылы жасалған токен міндетті кіруіңіз үшін.
         subject: 'Mastodon: Екі факторлы аутентификация ашық'
         title: 2FA ашық
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 65f660f105..88865aec58 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -47,11 +47,9 @@ ko:
         subject: 'Mastodon: 암호 재설정 설명'
         title: 암호 재설정
       two_factor_disabled:
-        explanation: 당신의 계정에 설정된 이중 인증이 비활성화 되었습니다. 이제 이메일과 암호만으로 로그인이 가능합니다.
         subject: '마스토돈: 이중 인증 비활성화'
         title: 2FA 비활성화 됨
       two_factor_enabled:
-        explanation: 당신의 계정에 이중 인증이 활성화되었습니다. 로그인시 페어링된 T-OTP 앱에서 생성된 토큰이 필요합니다.
         subject: '마스토돈: 이중 인증 활성화'
         title: 2FA 활성화 됨
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ko:
           subject: '마스토돈: 보안 키 삭제'
           title: 보안 키가 삭제되었습니다
       webauthn_disabled:
-        explanation: 보안 키를 이용한 인증이 당신의 계정에 대해 비활성화 되어 있습니다. TOTP 앱의 토큰만으로 로그인 할 수 있습니다.
         subject: '마스토돈: 보안 키를 이용한 인증이 비활성화 됨'
         title: 보안 키 비활성화 됨
       webauthn_enabled:
-        explanation: 보안 키 인증이 당신의 계정에 대해 활성화 되어 있습니다. 보안 키를 통해 로그인 할 수 있습니다.
         subject: '마스토돈: 보안 키 인증 활성화 됨'
         title: 보안 키 활성화 됨
     omniauth_callbacks:
diff --git a/config/locales/devise.ku.yml b/config/locales/devise.ku.yml
index 6debd96e05..33a868a8a5 100644
--- a/config/locales/devise.ku.yml
+++ b/config/locales/devise.ku.yml
@@ -51,11 +51,9 @@ ku:
         subject: 'Mastodon: rêwerzên jê birina pêborîn'
         title: Borînpeyv ji nû ve saz bike
       two_factor_disabled:
-        explanation: Ji bo ajimêrê te piştrastkirina du-faktorî hat asteng kirin. Niha tu tenê bi navnîşana e-name û borînpeyva xwe dikarî têketinê bikî.
         subject: 'Mastodon: piştrastkirina du- faktorî neçalak bike'
         title: 2FA Neçalak e
       two_factor_enabled:
-        explanation: Piştrastkirinê du-faktorî ya ajimêrê te hat çalak kirin. Ji bo têketinê ji alî sepanê cotkirî TOTP ve hewceyî nîşanderek heye.
         subject: 'Mastodon: piştrastkirina du-faktorî hat çalak kirin'
         title: 2FA Çalak e
       two_factor_recovery_codes_changed:
@@ -74,11 +72,9 @@ ku:
           subject: 'Mastodon: Kilîta ewlehiyê hate jêbirin'
           title: Yek ji kilîta ewlehiyê yên te hate jêbirin
       webauthn_disabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn. Têketin niha gengaz e ku mirov tenê nîşana ku ji hêla sepana cotkirî ya TOTP ve hatî avakirin bi kar bîne.
         subject: 'Mastodon: Rastandin bi kilîta ewlehiyê re nehate çalakirin'
         title: Kilîta ewlehiyê neçalak e
       webauthn_enabled:
-        explanation: Rastandina kilîta ewlehiyê hate çalakkirin bo ajimêra te. kilîta te ya ewlehiyê niha bo têketinê dikarê bê karanîn.
         subject: 'Mastodon: Rastandina kilîta ewlehiyê hate çalakkirin'
         title: Kilîta ewlehiyê çalak e
     omniauth_callbacks:
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index 63933b80fc..bec76d82f9 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -47,16 +47,15 @@ lad:
         subject: 'Mastodon: Instruksyones para reinisyar kod'
         title: Reinisyar kod
       two_factor_disabled:
-        explanation: La autentifikasyon de dos pasos para tu kuento a sido inkapasitada. Agora puedes konektarte solamente uzando el adreso de posta elektronika i el kod.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
         title: Autentifikasyon 2FA inkapasitada
       two_factor_enabled:
-        explanation: La autentifikasyon de dos pasos para tu kuento a sido kapasitada. Se rekiere un token djenerado por la aplikasyon TOTP konektada para entrar.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
         title: Autentifikasyon 2FA aktivada
       two_factor_recovery_codes_changed:
         explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
         subject: 'Mastodon: Los kodiches de rekuperasyon de dos pasos fueron rejenerados'
+        subtitle: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
         title: Kodiches de rekuperasyon 2FA trokados
       unlock_instructions:
         subject: 'Mastodon: Instruksyones para dezblokar'
@@ -70,11 +69,9 @@ lad:
           subject: 'Mastodon: Yave de sigurita supremida'
           title: Una de tus yaves de sigurita tiene sido supremida
       webauthn_disabled:
-        explanation: La autentifikasyon kon yaves de sigurita a sido inkapasitada para tu kuento. Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
         subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
         title: Yaves de sigurita inkapasitadas
       webauthn_enabled:
-        explanation: La autentifikasyon kon yave de sigurita a sido kapasitada para tu kuento. Agora tu yave de sigurita puede ser utilizada para inisyar sesyon.
         subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
         title: Yaves de sigurita kapasitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.lt.yml b/config/locales/devise.lt.yml
index 5429b217d0..3fba5ed08e 100644
--- a/config/locales/devise.lt.yml
+++ b/config/locales/devise.lt.yml
@@ -47,16 +47,19 @@ lt:
         subject: 'Mastodon: slaptažodžio keitimo instrukcijos'
         title: Slaptažodžio keitimas
       two_factor_disabled:
-        explanation: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas. Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
+        explanation: Prisijungimas dabar galimas naudojant tik el. pašto adresą ir slaptažodį.
         subject: 'Mastodon: dviejų tapatybės patikrinimas išjungtas'
+        subtitle: Dviejų tapatybės patikrinimas tavo paskyrai buvo išjungtas.
         title: 2FA išjungta
       two_factor_enabled:
-        explanation: Tavo paskyrai įgalintas dvejų tapatybės patikrinimas. Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
+        explanation: Prisijungiant reikės susietos TOTP programėlės sugeneruoto priegos rakto.
         subject: 'Mastodon: dviejų tapatybės patikrinimas įgalintas'
+        subtitle: Tavo paskyrai įjungtas dviejų tapatybės patikrinimas.
         title: 2FA įgalinta
       two_factor_recovery_codes_changed:
         explanation: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
         subject: 'Mastodon: dviejų tapatybės atkūrimo kodai iš naujo sugeneruoti'
+        subtitle: Ankstesnieji atkūrimo kodai yra negaliojantys ir sugeneruojami nauji.
         title: Pakeisti 2FA atkūrimo kodai
       unlock_instructions:
         subject: 'Mastodon: atrakinimo instrukcijos'
@@ -70,11 +73,13 @@ lt:
           subject: 'Mastodon: saugumo raktas ištrintas'
           title: Vienas iš tavo saugumo raktų buvo ištrintas
       webauthn_disabled:
-        explanation: Tavo paskyrai buvo išjungtas tapatybės nustatymas naudojant saugumo raktus. Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
+        explanation: Tavo paskyrai išjungtas tapatybės nustatymas naudojant saugumo raktus.
+        extra: Prisijungimas dabar galimas naudojant tik susietos TOTP programėlės sugeneruotą prieigos raktą.
         subject: 'Mastodon: tapatybės nustatymas naudojant saugumo raktai išjungta'
         title: Saugumo raktai išjungti
       webauthn_enabled:
-        explanation: Saugumo rakto tapatybės nustatymas tavo paskyrai įgalintas. Dabar prisijungimui galima naudoti saugumo raktą.
+        explanation: Tavo paskyrai įjungtas saugumo rakto tapatybės nustatymas.
+        extra: Tavo saugumo raktą dabar galima naudoti prisijungimui.
         subject: 'Mastodon: saugumo rakto tapatybės nustatymas įgalintas'
         title: Saugumo raktai įgalinti
     omniauth_callbacks:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index e61e1b7fd9..ed4b4fb8c6 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -47,11 +47,9 @@ lv:
         subject: 'Mastodon: Norādījumi paroles atiestatīšanai'
         title: Paroles atiestatīšana
       two_factor_disabled:
-        explanation: Tavam kontam divfaktoru autentifikācija ir atspējota. Pieteikšanās tagad ir iespējama, izmantojot tikai e-pasta adresi un paroli.
         subject: 'Mastodon: Divfaktoru autentifikācija atspējota'
         title: 2FA atspējota
       two_factor_enabled:
-        explanation: Tavam kontam ir iespējota divfaktoru autentifikācija. Lai pieteiktos, būs nepieciešams kods, ko ģenerējusi pārī savienotā TOTP lietotne.
         subject: 'Mastodon: Divfaktoru autentifikācija iespējota'
         title: 2FA iespējota
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ lv:
           subject: 'Mastodon: Drošības atslēga izdzēsta'
           title: Viena no tavām drošības atslēgām tika izdzēsta
       webauthn_disabled:
-        explanation: Tavam kontam ir atspējota autentifikācija ar drošības atslēgām. Pieteikšanās tagad ir iespējama, izmantojot tikai kodu, ko ģenerējusi pārī savienotā TOTP lietotne.
         subject: 'Mastodon: Autentifikācija ar drošības atslēgām ir atspējota'
         title: Drošības atslēgas atspējotas
       webauthn_enabled:
-        explanation: Tavam kontam ir iespējota drošības atslēgas autentifikācija. Tavu drošības atslēgu tagad var izmantot, lai pieteiktos.
         subject: 'Mastodon: Drošības atslēgas autentifikācija iespējota'
         title: Drošības atslēgas iespējotas
     omniauth_callbacks:
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index 30eceb239d..da18d1896e 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -47,11 +47,9 @@ ms:
         subject: 'Mastodon: Arahan set semula kata laluan'
         title: Set semula kata laluan
       two_factor_disabled:
-        explanation: Pengesahan dwifaktor untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan alamat e-mel dan kata laluan.
         subject: 'Mastodon: Pengesahan dwifaktor dilumpuhkan'
         title: 2FA dinyahaktifkan
       two_factor_enabled:
-        explanation: Pengesahan dwifaktor untuk akaun anda telah didayakan. Satu token yang dijanakan oleh aplikasi TOTP diperlukan untuk melog masuk.
         subject: 'Mastodon: Pengesahan dwifaktor didayakan'
         title: 2FA diaktifkan
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ms:
           subject: 'Mastodon: Kunci keselamatan dihapuskan'
           title: Salah satu daripada kunci keselamatan anda telah dihapuskan
       webauthn_disabled:
-        explanation: Pengesahan dengan kunci keselamatan untuk akaun anda telah dilumpuhkan. Log masuk kini dibenarkan dengan hanya menggunakan token yang dijanakan oleh aplikasi TOTP.
         subject: 'Mastodon: Pengesahan dengan kunci keselamatan dilumpuhkan'
         title: Kunci keselamatan dilumpuhkan
       webauthn_enabled:
-        explanation: Pengesahan kunci keselamatan untuk akaun anda kini didayakan. Kunci keselamatan anda kini boleh digunakan untuk melog masuk.
         subject: 'Mastodon: Pengesahan kunci keselamatan didayakan'
         title: Kunci keselamatan didayakan
     omniauth_callbacks:
diff --git a/config/locales/devise.my.yml b/config/locales/devise.my.yml
index 04d744cf2b..126ecd7404 100644
--- a/config/locales/devise.my.yml
+++ b/config/locales/devise.my.yml
@@ -47,11 +47,9 @@ my:
         subject: 'Mastodon: စကားဝှက်ညွှန်ကြားချက် ပြန်လည်သတ်မှတ်မည်'
         title: စကားဝှက်ပြန်လည်သတ်မှတ်မည်
       two_factor_disabled:
-        explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ အီးမေးလ်လိပ်စာနှင့် စကားဝှက်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
         subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်'
         title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ပိတ်ထားသည်
       two_factor_enabled:
-        explanation: သင့်အကောင့်အတွက် နှစ်ဆင့်ခံလုံခြုံရေးစနစ်အထောက်အထားပြခြင်းကို ဖွင့်ထားသည်။ TOTP အက်ပ်မှ ထုတ်ပေးသည့် တိုကင်တစ်ခုမှာ အကောင့်ဝင်ရန်အတွက် လိုအပ်ပါသည်။
         subject: 'Mastodon: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်'
         title: နှစ်ဆင့်ခံလုံခြုံရေးစနစ်ဖွင့်ထားသည်
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ my:
           subject: 'Mastodon: လုံခြုံရေးသော့ချက် ဖျက်လိုက်ပါပြီ'
           title: လုံခြုံရေးသော့ချက်များထဲမှတစ်ခု ဖျက်လိုက်ပါပြီ
       webauthn_disabled:
-        explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီးများဖြင့် အထောက်အထားပြခြင်းကို ပိတ်ထားသည်။ TOTP အက်ပ်မှထုတ်ပေးသည့် တိုကင်ကိုသာ အသုံးပြု၍ အကောင့်ဝင်ရောက်နိုင်ပါသည်။
         subject: Mastodon - လုံခြုံရေးကီးများဖြင့် အထောက်အထားစိစစ်ခြင်းကို ပိတ်ထားသည်
         title: လုံခြုံရေးသော့ချက်များ ပိတ်ပြီးပါပြီ
       webauthn_enabled:
-        explanation: သင့်အကောင့်အတွက် လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်။ အကောင့်ဝင်ရန်အတွက် သင်၏လုံခြုံရေးကီးကို ယခုအသုံးပြုနိုင်ပါပြီ။
         subject: Mastodon - လုံခြုံရေးကီး အထောက်အထားစိစစ်ခြင်းကို ဖွင့်ထားသည်
         title: လုံခြုံရေးသော့ချက်များ ဖွင့်ပြီးပါပြီ
     omniauth_callbacks:
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 1b5081fe8c..33d777e2cc 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -47,16 +47,19 @@ nl:
         subject: 'Mastodon: Wachtwoord opnieuw instellen'
         title: Wachtwoord opnieuw instellen
       two_factor_disabled:
-        explanation: Tweestapsverificatie voor jouw account is uitgeschakeld. Je kunt nu alleen inloggen met een e-mailadres en wachtwoord.
+        explanation: Je kunt nu inloggen met alleen een e-mailadres en wachtwoord.
         subject: 'Mastodon: Tweestapsverificatie uitgeschakeld'
+        subtitle: Tweestapsverificatie voor je account is uitgeschakeld.
         title: Tweestapsverificatie uitgeschakeld
       two_factor_enabled:
-        explanation: Tweestapsverificatie voor jouw account is ingeschakeld. Om te kunnen inloggen is een door een tweestapsverificatie-app genereerde toegangscode nodig.
+        explanation: Je hebt een door de authenticatie-app gegeneerde toegangscode nodig om in te loggen.
         subject: 'Mastodon: Tweestapsverificatie ingeschakeld'
+        subtitle: Tweestapsverificatie voor je account is ingeschakeld.
         title: Tweestapsverificatie ingeschakeld
       two_factor_recovery_codes_changed:
         explanation: De vorige herstelcodes zijn ongeldig gemaakt en nieuwe zijn aangemaakt.
         subject: 'Mastodon: Tweestaps-herstelcodes zijn opnieuw aangemaakt'
+        subtitle: De vorige herstelcodes zijn ongeldig gemaakt en er zijn nieuwe gegenereerd.
         title: Herstelcodes tweestapsverificatie veranderd
       unlock_instructions:
         subject: 'Mastodon: Instructies om opschorten account ongedaan te maken'
@@ -70,11 +73,13 @@ nl:
           subject: 'Mastodon: Beveiligingssleutel verwijderd'
           title: Een van jouw beveiligingssleutels is verwijderd
       webauthn_disabled:
-        explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor jouw account. Inloggen is nu alleen mogelijk met het gebruik van een door een gepaarde TOTP-app genereerde sleutel.
+        explanation: Verificatie met beveiligingssleutels is uitgeschakeld voor je account.
+        extra: Het is nu alleen mogelijk om te te loggen met een door de authenticatie-app gegeneerde toegangscode.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is uitgeschakeld'
         title: Beveiligingssleutels uitgeschakeld
       webauthn_enabled:
-        explanation: Verificatie met beveiligingssleutels is ingeschakeld voor jouw account. Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
+        explanation: Verificatie met beveiligingssleutels is ingeschakeld voor je account.
+        extra: Jouw beveiligingssleutel kan nu gebruikt worden om in te loggen.
         subject: 'Mastodon: Verificatie met beveiligingssleutels is ingeschakeld'
         title: Beveiligingssleutels ingeschakeld
     omniauth_callbacks:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index eee9928475..acee9fdcdc 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -47,11 +47,9 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
-        explanation: To-faktor-autentisering har vorte slått av for kontoen din. Det går no an logge inn med berre e-postadresse og passord.
         subject: 'Mastodon: To-faktor-autentisering deaktivert'
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: To-faktor-autentisering har vorte slått på for kontoen din. Ein kode frå den samankopla TOTP-appen er kravd for å logge inn.
         subject: 'Mastodon: To-faktor-autentisering aktivert'
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ nn:
           subject: 'Mastodon: Sikkerheitsnøkkel sletta'
           title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
-        explanation: Du kan ikkje bruke tryggleiksnyklar til å logga inn på kontoen din. Du kan berre logga inn med koden frå tofaktor-appen som er kopla saman med brukarkontoen din.
         subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
         title: Sikkerheitsnøklar deaktivert
       webauthn_enabled:
-        explanation: Pålogging med tryggleiksnyklar er skrudd på. No kan du bruka nykelen din for å logga på.
         subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
         title: Sikkerheitsnøklar aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index a5d6cad7a1..0d824da815 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -47,11 +47,9 @@
         subject: 'Mastodon: Hvordan nullstille passord'
         title: Nullstill passord
       two_factor_disabled:
-        explanation: Tofaktorautentisering for kontoen din har blitt skrudd av. Pålogging er nå mulig ved å bruke kun e-postadresse og passord.
         subject: 'Mastodon: Tofaktorautentisering deaktivert'
         title: 2FA deaktivert
       two_factor_enabled:
-        explanation: Tofaktorautentisering er aktivert for kontoen din. Et token som er generert av appen for tidsbasert engangspassord (TOTP) som er koblet til kontoen kreves for innlogging.
         subject: 'Mastodon: Tofaktorautentisering aktivert'
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@
           subject: 'Mastodon: Sikkerhetsnøkkel slettet'
           title: En av sikkerhetsnøklene dine har blitt slettet
       webauthn_disabled:
-        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din. Innlogging er nå mulig ved hjelp av kun et token som er generert av engangspassord-appen som er koblet til kontoen.
         subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
         title: Sikkerhetsnøkler deaktivert
       webauthn_enabled:
-        explanation: Sikkerhetsnøkkel-autentisering er aktivert for din konto. Din sikkerhetsnøkkel kan nå brukes til innlogging.
         subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
         title: Sikkerhetsnøkler aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 16419cd1e3..2640777e00 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -47,11 +47,9 @@ oc:
         subject: Mastodon : consignas per reïnicializar lo senhal
         title: Reïnicializacion del senhal
       two_factor_disabled:
-        explanation: L’autentificacion dos factors per vòstre compte es estada desactivada. La connexion es ara possibla solament amb l’adreça electronica e lo senhal.
         subject: 'Mastodon : autentificacion dos factors desactivada'
         title: 2FA desactivat
       two_factor_enabled:
-        explanation: L’autentificacion dos factors es estada activada per vòstre compte. La connexion demandarà un geton generat per l’aplicacion TOTP associada.
         subject: 'Mastodon : autentificacion dos factor activada'
         title: 2FA activat
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ oc:
           subject: 'Mastodon : clau de seguretat suprimida'
           title: Una de vòstras claus de seguretats es estada suprimida
       webauthn_disabled:
-        explanation: L’autentificacion amb de claus de seguretat foguèt estada desactivada per vòstre compte. L’identificacion es ara possible en utilizan un geton generat per una aplicacion TOTP associada.
         subject: 'Mastodon : autentificacion amb claus de seguretat desactivada'
         title: Claus de seguretat desactivadas
       webauthn_enabled:
-        explanation: L’autentificacion amb de claus de seguretat foguèt estada activada per vòstre compte. Vòstra clau de seguretat pòt ara èsser utilizada per l’identificacion.
         subject: 'Mastodon : autentificacion via clau de seguretat activada'
         title: Claus de seguretat activadas
     omniauth_callbacks:
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index ff086888f3..a6d48f11ef 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -47,16 +47,19 @@ pl:
         subject: 'Mastodon: Instrukcje ustawienia nowego hasła'
         title: Przywracanie hasła
       two_factor_disabled:
-        explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało wyłączone. Możesz się teraz logować korzystając z samego adresu e-mail i hasła.
+        explanation: Logowanie teraz możliwe tylko adresem mejlowym i hasłem.
         subject: Mastodon – wyłączono uwierzytelnianie dwustopniowe
+        subtitle: Wyłączono uwierzytelnienie dwuskładnikowe dla twojego konta.
         title: Wyłączono 2FA
       two_factor_enabled:
-        explanation: Uwierzytelnianie dwuskładnikowe dla Twojego konta zostało włączone. Logując się, będziesz potrzebować tokenu z połączonej aplikacji TOTP.
+        explanation: Do zalogowanie potrzebny będzie token sparowanej aplikacji TOTP.
         subject: Mastodon – włączono uwierzytelnianie dwustopniowe
+        subtitle: Włączono uwierzytelnienie dwuskładnikowe dla twojego konta.
         title: Włączono 2FA
       two_factor_recovery_codes_changed:
         explanation: Poprzednie kody zapasowe zostały unieważnione, a nowe zostały wygenerowane.
         subject: Mastodon – wygenerowano nowe kody ratunkowe 2FA
+        subtitle: Unieważniono stare kody przywracania i wygenerowano nowe.
         title: Zmieniono kody odzyskiwania 2FA
       unlock_instructions:
         subject: 'Mastodon: Instrukcje odblokowania konta'
@@ -70,11 +73,13 @@ pl:
           subject: 'Mastodon: Klucz bezpieczeństwa usunięty'
           title: Usunięto jeden z twoich kluczy bezpieczeństwa
       webauthn_disabled:
-        explanation: Uwierzytelnianie kluczem bezpieczeństwa zostało wyłączone dla Twojego konta. Logowanie jest teraz możliwe tylko przy użyciu tokenu generowanego przez sparowaną aplikację TOTP.
+        explanation: Wyłączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+        extra: Logowanie teraz możliwe tylko tokenem wygenerowanym przez sparowaną aplikację TOTP.
         subject: 'Mastodon: Wyłączono uwierzytelnianie z kluczami bezpieczeństwa'
         title: Wyłączono klucze bezpieczeństwa
       webauthn_enabled:
-        explanation: Uwierzytelnianie klucza bezpieczeństwa zostało włączone dla Twojego konta. Klucz bezpieczeństwa może być teraz wykorzystywany do logowania.
+        explanation: Włączono autoryzację kluczami bezpieczeństwa dla twojego konta.
+        extra: Twój klucz bezpieczeństwa może być teraz użyty do logowania.
         subject: 'Mastodon: Włączono uwierzytelnianie z kluczami bezpieczeństwa'
         title: Włączono klucze bezpieczeństwa
     omniauth_callbacks:
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 6345a103b8..8b53f96514 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -47,16 +47,18 @@ pt-BR:
         subject: 'Mastodon: Instruções para alterar senha'
         title: Redefinir senha
       two_factor_disabled:
-        explanation: A autenticação de dois fatores para sua conta foi desativada. Agora é possível entrar apenas com seu endereço de e-mail e senha.
+        explanation: O ‘login’ agora é possível usando apenas o endereço de e-mail e senha.
         subject: 'Mastodon: Autenticação de dois fatores desativada'
+        subtitle: A autenticação de dois fatores foi desativada.
         title: 2FA desativada
       two_factor_enabled:
-        explanation: A autenticação de dois fatores foi ativada para sua conta. Um código gerado no aplicativo TOTP pareado será necessário para entrar.
         subject: 'Mastodon: Autenticação de dois fatores ativada'
+        subtitle: A autenticação de dois fatores foi ativada para sua conta.
         title: 2FA ativada
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos códigos foram gerados.
         subject: 'Mastodon: Novos códigos de recuperação de dois fatores'
+        subtitle: Os códigos de recuperação anteriores foram invalidados, e novos códigos foram gerados.
         title: Códigos de recuperação de dois fatores alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções de desbloqueio'
@@ -70,11 +72,12 @@ pt-BR:
           subject: 'Mastodon: Chave de segurança excluída'
           title: Uma das suas chaves de segurança foi excluída
       webauthn_disabled:
-        explanation: A autenticação por chaves de segurança foi desativada para a sua conta. Agora é possível entrar apenas com seu código gerado no aplicativo TOTP pareado.
+        explanation: A autenticação por chaves de segurança foi desativada para sua conta.
         subject: 'Mastodon: Autenticação por chaves de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: A autenticação por chave de segurança foi ativada para a sua conta. Sua chave de segurança agora pode ser usada para entrar.
+        explanation: Autenticação por chave de segurança foi ativada para sua conta.
+        extra: Sua chave de segurança agora pode ser usada para ‘login’.
         subject: 'Mastodon: Autenticação por chaves de segurança ativada'
         title: Chaves de segurança ativadas
     omniauth_callbacks:
diff --git a/config/locales/devise.pt-PT.yml b/config/locales/devise.pt-PT.yml
index 0571598ae0..c169ddeb97 100644
--- a/config/locales/devise.pt-PT.yml
+++ b/config/locales/devise.pt-PT.yml
@@ -47,16 +47,19 @@ pt-PT:
         subject: 'Mastodon: Instruções para redefinir a palavra-passe'
         title: Solicitar nova palavra-passe
       two_factor_disabled:
-        explanation: A autenticação em duas etapas para a sua conta foi desativada. É agora possível aceder apenas com o seu endereço de e-mail e palavra-passe.
+        explanation: O acesso agora é possível usando apenas o endereço de correio eletrónico e palavra-passe.
         subject: 'Mastodon: Autenticação de duas etapas desativada'
+        subtitle: A autenticação de dois fatores foi desativada para a sua conta.
         title: 2FA desativado
       two_factor_enabled:
-        explanation: A autenticação em duas etapas foi ativada para a sua conta. Um token, gerado pela aplicação TOTP emparelhada, será necessário para aceder.
+        explanation: Um token gerado pelo aplicativo TOTP emparelhado será necessário para login.
         subject: 'Mastodon: Autenticação em duas etapas ativada'
+        subtitle: A autenticação de dois fatores foi habilitada para sua conta.
         title: 2FA ativado
       two_factor_recovery_codes_changed:
         explanation: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
         subject: 'Mastodon: Gerados novos códigos de recuperação em duas etapas'
+        subtitle: Os códigos de recuperação anteriores foram invalidados e novos foram gerados.
         title: Códigos de recuperação 2FA alterados
       unlock_instructions:
         subject: 'Mastodon: Instruções para desbloquear a tua conta'
@@ -70,11 +73,13 @@ pt-PT:
           subject: 'Mastodon: Chave de segurança eliminada'
           title: Uma das suas chaves de segurança foi eliminada
       webauthn_disabled:
-        explanation: A autenticação com chave de segurança foi desativada para a sua conta. Tornou-se possível aceder à sua conta usando apenas o token gerado pela aplicação TOTP emparelhada.
+        explanation: A autenticação com chaves de segurança foi desativada para sua conta.
+        extra: O login agora é possível usando apenas o token gerado pelo aplicativo TOTP emparelhado.
         subject: 'Mastodon: Autenticação com chave de segurança desativada'
         title: Chaves de segurança desativadas
       webauthn_enabled:
-        explanation: A autenticação com chave de segurança foi ativada para sua conta. A sua chave de segurança pode agora ser utilizada para aceder à sua conta.
+        explanation: A autenticação da chave de segurança foi habilitada para sua conta.
+        extra: Sua chave de segurança agora pode ser usada para login.
         subject: 'Mastodon: Autenticação com chave de segurança ativada'
         title: Chaves de segurança ativadas
     omniauth_callbacks:
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index d25d0f6b3e..1a6a3ecd77 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -47,11 +47,9 @@ ro:
         subject: Instrucțiuni pentru resetarea parolei
         title: Resetare parolă
       two_factor_disabled:
-        explanation: Autentificarea în doi pași pentru contul tău a fost dezactivată. Autentificarea este posibilă acum folosind doar adresa de e-mail și parola.
         subject: Autentificare cu doi factori dezactivată
         title: 2FA dezactivat
       two_factor_enabled:
-        explanation: Autentificarea în doi pași a fost activată pentru contul dvs. Un token generat de aplicația TOTP împerecheată va fi necesar pentru autentificare.
         subject: Autentificare în doi pași activată
         title: 2FA activat
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ro:
           subject: 'Mastodon: Cheie de securitate ștearsă'
           title: Una dintre cheile tale de securitate a fost ștearsă
       webauthn_disabled:
-        explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul tău. Conectarea este posibilă acum folosind doar token-ul generat de aplicația TOTP.
         subject: 'Mastodon: Autentificarea cu chei de securitate dezactivată'
         title: Chei de securitate dezactivate
       webauthn_enabled:
-        explanation: Autentificarea cheii de securitate a fost activată pentru contul tău. Cheia ta de securitate poate fi acum folosită pentru conectare.
         subject: 'Mastodon: Autentificarea cheii de securitate activată'
         title: Chei de securitate activate
     omniauth_callbacks:
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index d2903ce23d..ccbd13438d 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -47,11 +47,9 @@ ru:
         subject: 'Mastodon: Инструкция по сбросу пароля'
         title: Сброс пароля
       two_factor_disabled:
-        explanation: Для вашей учётной записи была отключена двухфакторная авторизация. Выполнить вход теперь можно используя лишь e-mail и пароль.
         subject: 'Mastodon: Двухфакторная авторизация отключена'
         title: 2ФА отключена
       two_factor_enabled:
-        explanation: Для вашей учётной записи была настроена двухфакторная авторизация. Отныне для входа потребуется также временный код из приложения-аутентификатора.
         subject: 'Mastodon: Настроена двухфакторная авторизация'
         title: 2ФА включена
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ ru:
           subject: 'Мастодон: Ключ Безопасности удален'
           title: Один из ваших защитных ключей был удален
       webauthn_disabled:
-        explanation: Аутентификация с помощью ключей безопасности отключена для вашей учётной записи. Теперь вход возможен с использованием только токена, сгенерированного в приложении TOTP.
         subject: 'Мастодон: Аутентификация с ключами безопасности отключена'
         title: Ключи безопасности отключены
       webauthn_enabled:
-        explanation: Для вашей учётной записи включена аутентификация по ключу безопасности. Теперь ваш ключ безопасности может быть использован для входа.
         subject: 'Мастодон: Включена аутентификация по ключу безопасности'
         title: Ключи безопасности включены
     omniauth_callbacks:
diff --git a/config/locales/devise.sc.yml b/config/locales/devise.sc.yml
index 02bcab0d11..5486371a4c 100644
--- a/config/locales/devise.sc.yml
+++ b/config/locales/devise.sc.yml
@@ -47,11 +47,9 @@ sc:
         subject: 'Mastodon: Istrutziones pro resetare sa crae'
         title: Càmbiu de crae
       two_factor_disabled:
-        explanation: S'autenticatzione a duos fatores est istada disativada pro su contu tuo. Immoe podes intrare impreende isceti indiritzu de posta eletrònica e crae.
         subject: 'Mastodon: Autenticatzione a duos fatores disativada'
         title: 2FA disativada
       two_factor_enabled:
-        explanation: S'autenticatzione a duos fatores est istada ativada pro su contu tuo. Pro s'atzessu at èssere rechèdidu unu còdighe de autorizatzione generadu dae s'aplicatzione TOTP.
         subject: 'Mastodon: Autenticatzione a duos fatores ativada'
         title: 2FA ativada
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sc:
           subject: 'Mastodon: Crae de seguresa cantzellada'
           title: Una de is craes de seguresa tuas est istada cantzellada
       webauthn_disabled:
-        explanation: S'autenticatzione cun craes de seguresa est istada disabilitada pro su contu tuo. S'intrada immoe est possìbile impreende isceti su getone ingendradu dae s'aplicatzione TOTP ligada.
         subject: 'Mastodon: Autenticatzione cun craes de seguresa disabilitada'
         title: Craes de seguresa disabilitadas
       webauthn_enabled:
-        explanation: S'autenticatzione cun crae de seguresa est istada abilitada pro su contu tuo. Sa crae de seguresa tua immoe si podet impreare pro intrare.
         subject: 'Mastodon: Autenticatzione cun sa crae de seguresa ativada'
         title: Craes de seguresa abilitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.sco.yml b/config/locales/devise.sco.yml
index 8563b4ee24..1db6bbe303 100644
--- a/config/locales/devise.sco.yml
+++ b/config/locales/devise.sco.yml
@@ -47,11 +47,9 @@ sco:
         subject: 'Mastodon: Reset passwird instructions'
         title: Passwird reset
       two_factor_disabled:
-        explanation: Twa factor authentication fir yer accoont haes been turnt aff. Login is noo possible uisin ainly a email address an passwird.
         subject: 'Mastodon: Twa-factor authentication turnt aff'
         title: 2FA turnt aff
       two_factor_enabled:
-        explanation: Twa-factor authentication haes been turnt on fir yer accoont. A token gien bi the pairt TOTP app wull be needit fir login.
         subject: 'Mastodon: Twa-factor authentication turnt on'
         title: 2FA turnt on
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sco:
           subject: 'Mastodon: Security key deletit'
           title: Ane o yer security keys haes been deletit
       webauthn_disabled:
-        explanation: Authentication wi security keys haes been turnt aff on yer accoont. Login is noo possible uisin ainly the token generatit bi the pairt TOTP app.
         subject: 'Mastodon: Authentication wi security keys turnt aff'
         title: Security keys turnt aff
       webauthn_enabled:
-        explanation: Security key authentication haes been turnt on fir yer accoont. Yer security key kin noo be uised fir login.
         subject: 'Mastodon: Security key authentication turnt on'
         title: Security keys turnt on
     omniauth_callbacks:
diff --git a/config/locales/devise.si.yml b/config/locales/devise.si.yml
index 362f97b8a9..d0bfa719bc 100644
--- a/config/locales/devise.si.yml
+++ b/config/locales/devise.si.yml
@@ -44,10 +44,8 @@ si:
         subject: 'මාස්ටඩන්: මුරපදය යළි සැකසීමේ උපදෙස්'
         title: මුරපදය යළි සැකසීම
       two_factor_disabled:
-        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය අබල කර ඇත. විද්‍යුත් තැපැල් ලිපිනය සහ මුරපදය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
         title: ද්විපියවර අබලයි
       two_factor_enabled:
-        explanation: ඔබගේ ගිණුම සඳහා ද්වි-සාධක සත්‍යාපනය සක්‍රීය කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනයක් පුරනය වීමට අවශ්‍ය වනු ඇත.
         title: ද්විපියවර සබලයි
       two_factor_recovery_codes_changed:
         explanation: පෙර ප්‍රතිසාධන කේත අවලංගු කර නව ඒවා උත්පාදනය කර ඇත.
@@ -65,10 +63,8 @@ si:
           subject: 'මාස්ටඩන්: ආරක්‍ෂණ යතුර මකා ඇත'
           title: ඔබගේ ආරක්ෂක යතුරු වලින් එකක් මකා ඇත
       webauthn_disabled:
-        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සමඟ සත්‍යාපනය අබල කර ඇත. යුගල කළ TOTP යෙදුම මගින් ජනනය කරන ලද ටෝකනය පමණක් භාවිතයෙන් දැන් පුරනය විය හැක.
         title: ආරක්‍ෂණ යතුරු අබල කර ඇත
       webauthn_enabled:
-        explanation: ඔබගේ ගිණුම සඳහා ආරක්ෂක යතුරු සත්‍යාපනය සක්‍රීය කර ඇත. ඔබගේ ආරක්ෂක යතුර දැන් පුරනය වීම සඳහා භාවිතා කළ හැක.
         title: ආරක්‍ෂණ යතුරු සබල කර ඇත
     omniauth_callbacks:
       failure: '"%{reason}" නිසා %{kind} සිට ඔබව සත්‍යාපනය කළ නොහැක.'
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index e11c7f1db3..3eb4b5304c 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -47,11 +47,11 @@ sk:
         subject: 'Mastodon: Pokyny pre obnovu hesla'
         title: Nastav nové heslo
       two_factor_disabled:
-        explanation: Dvojfázové overovanie tvojho účtu bolo vypnuté. Teraz sa môžeš prihlásiť len pomocou emailu a hesla.
+        explanation: Prihlásenie je teraz možné iba pomocou emailu a hesla.
         subject: 'Mastodon: Dvojfázové overovanie vypnuté'
+        subtitle: Dvoj-faktorové overenie bolo pre tvoj účet vypnuté.
         title: Dvoj-faktorové overovanie vypnuté
       two_factor_enabled:
-        explanation: Dvojfázové overovanie bolo zapnuté pre tvoj účet. Pre prihlásenie budeš potrebovať token vygenerovaný pre TOTP aplikáciu, ktorá je spárovaná.
         subject: 'Mastodon: Dvojfázové overovanie zapnuté'
         title: Dvoj-faktorové overovanie zapnuté
       two_factor_recovery_codes_changed:
@@ -70,11 +70,9 @@ sk:
           subject: 'Mastodon: Bezpečnostný kľúč odstránený'
           title: Jeden z vašich bezpečnostných kľúčov bol odstránený
       webauthn_disabled:
-        explanation: Overovanie pomocou bezpečnostných kľúčov bolo pre vaše konto vypnuté. Prihlásenie je teraz možné len pomocou tokenu vygenerovaného spárovanou aplikáciou TOTP.
         subject: 'Mastodon: Overovanie s vypnutými bezpečnostnými kľúčmi'
         title: Bezpečnostné kľúče sú vypnuté
       webauthn_enabled:
-        explanation: Pre vaše konto bolo povolené overovanie bezpečnostným kľúčom. Váš bezpečnostný kľúč teraz môžete použiť na prihlásenie.
         subject: 'Mastodon: Povolené overovanie bezpečnostného kľúča'
         title: Povolené bezpečnostné kľúče
     omniauth_callbacks:
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index be0f98ae11..72269e4826 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -47,11 +47,9 @@ sl:
         subject: 'Mastodon: navodila za ponastavitev gesla'
         title: Ponastavitev gesla
       two_factor_disabled:
-        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun onemogočeno. Prijava je zdaj možna le z e-poštnim naslovom in geslom.
         subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
         title: 2FA onemogočeno
       two_factor_enabled:
-        explanation: Dvojno oz. dvofazno preverjanje pristnosti je za vaš račun omogočeno. Žeton, izdelan z aplikacijo TOTP, bo zahtevan zs prijavo.
         subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
         title: 2FA omogočeno
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sl:
           subject: 'Mastodon: varnostna koda izbrisana'
           title: Ena od vaših varnostnih kod je bila izbrisana
       webauthn_disabled:
-        explanation: Overjanje pristnosti z varnostnimi kodami je za vaš račun onemogočeno. Prijava je zdaj možna le z uporabo žetona, ki ga izdela oparjena aplikacija TOTP.
         subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
         title: Varnostne kode onemogočene
       webauthn_enabled:
-        explanation: Overjanje z varnostno kodo je za vaš račun omogočeno. Svojo varnostno kodo lahko zdaj uporabite za prijavo.
         subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
         title: Varnostne kode omogočene
     omniauth_callbacks:
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 6e2f1b4113..7cea2f8e2e 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -47,11 +47,9 @@ sq:
         subject: 'Mastodon: Udhëzime ricaktimi fjalëkalimi'
         title: Ricaktim fjalëkalimi
       two_factor_disabled:
-        explanation: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar. Hyrja tanimë është e mundur vetëm duke përdorur adresën email dhe fjalëkalimin.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi dyfaktorësh'
         title: 2FA u çaktivizua
       two_factor_enabled:
-        explanation: Mirëfilltësimi dyfaktorësh është aktivizuar për llogarinë tuaj. Për hyrje, do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U aktivizua mirëfilltësimi dyfaktorësh'
         title: 2FA u aktivizua
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ sq:
           subject: 'Mastodon: Fshirje kyçi sigurie'
           title: Një nga kyçet tuaj të sigurisë është fshirë
       webauthn_disabled:
-        explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj. Hyrja tani është e mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi me kyçe sigurie'
         title: U çaktivizuan kyçe sigurie
       webauthn_enabled:
-        explanation: Mirëfilltësimi përmes kyçesh sigurie është aktivizuar për llogarinë tuaj. Tani, për hyrje mund të përdoren kyçet tuaj të sigurisë.
         subject: 'Mastodon: U aktivizua mirëfilltësim me kyçe sigurie'
         title: U aktivizuan kyçe sigurie
     omniauth_callbacks:
diff --git a/config/locales/devise.sr-Latn.yml b/config/locales/devise.sr-Latn.yml
index 40f3d51c30..c48ed87dca 100644
--- a/config/locales/devise.sr-Latn.yml
+++ b/config/locales/devise.sr-Latn.yml
@@ -47,16 +47,19 @@ sr-Latn:
         subject: 'Mastodont: Uputstvo za resetovanje lozinke'
         title: Lozinka resetovana
       two_factor_disabled:
-        explanation: Dvofaktorska autentifikacija za vaš nalog je onemogućena. Prijava je sada moguća samo pomoću imejla i lozinke.
+        explanation: Prijavljivanje je sada moguće koristeći samo adresu e-pošte i lozinku.
         subject: 'Mastodon: Dvofaktorska autentifikacija je onemogućena'
+        subtitle: Dvofaktorska autentifikacija za vaš nalog je onemogućena.
         title: 2FA isključena
       two_factor_enabled:
-        explanation: Dvofaktorska autentifikacija je omogućena za vaš nalog. Za prijavu će biti potreban token koji generiše uparena TOTP aplikacija.
+        explanation: Za prijavljivanje će biti potreban token koji generiše uparena aplikacija TOTP.
         subject: 'Mastodon: Dvofaktorska autentifikacija je omogućena'
+        subtitle: Dvofaktorska autentifikacija je omogućena za vaš nalog.
         title: 2FA uključena
       two_factor_recovery_codes_changed:
         explanation: Prethodni kodovi za oporavak su poništeni i generisani su novi.
         subject: 'Mastodon: Ponovo su generisani kodovi za oporavak'
+        subtitle: Prethodni kodovi za oporavak su poništeni i generisani su novi.
         title: 2FA kodovi oporavka promenjeni
       unlock_instructions:
         subject: 'Mastodont: Uputstvo za otključavanje korisničkog naloga'
@@ -70,11 +73,13 @@ sr-Latn:
           subject: 'Mastodon: Sigurnosni ključ je izbrisan'
           title: Jedan od vaših bezbednosnih ključeva je izbrisan
       webauthn_disabled:
-        explanation: Autentifikacija pomoću bezbednosnih ključeva je onemogućena za vaš nalog. Prijava je sada moguća samo pomoću tokena koji generiše uparena TOTP aplikacija.
+        explanation: Potvrda identiteta pomoću bezbednosnih ključeva je onemogućena za vaš nalog.
+        extra: Prijavljivanje je sada moguće koristeći samo token koji generiše uparena aplikacija TOTP.
         subject: 'Mastodon: Autentifikacija sa sigurnosnim ključevima onemogućena'
         title: Sigurnosni ključevi su onemogućeni
       webauthn_enabled:
-        explanation: Autentifikacija sa bezbednosnim ključem je omogućena za vaš nalog. Vaš sigurnosni ključ se sada može koristiti za prijavljivanje.
+        explanation: Autentifikacija pomoću bezbednosnog ključa je omogućena za vaš nalog.
+        extra: Vaš bezbednosni ključ se sada može koristiti za prijavljivanje.
         subject: 'Mastodon: Omogućena autentifikacija sa bezbednim ključem'
         title: Sigurnosni ključevi su omogućeni
     omniauth_callbacks:
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index f61431de60..3e49cf97ee 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -47,16 +47,19 @@ sr:
         subject: 'Mastodon: Упутство за ресетовање лозинке'
         title: Лозинка ресетована
       two_factor_disabled:
-        explanation: Двофакторска аутентификација за ваш налог је онемогућена. Пријава је сада могућа само помоћу имејла и лозинке.
+        explanation: Пријављивање је сада могуће користећи само адресу е-поште и лозинку.
         subject: 'Mastodon: Двофакторска аутентификација је онемогућена'
+        subtitle: Двофакторска аутентификација за ваш налог је онемогућена.
         title: 2FA искључена
       two_factor_enabled:
-        explanation: Двофакторска аутентификација је омогућена за ваш налог. За пријаву ће бити потребан токен који генерише упарена ТОТП апликација.
+        explanation: За пријављивање ће бити потребан токен који генерише упарена апликација TOTP.
         subject: 'Mastodon: Двофакторска аутентификација је омогућена'
+        subtitle: Двофакторска аутентификација је омогућена за ваш налог.
         title: 2FA укључена
       two_factor_recovery_codes_changed:
         explanation: Претходни кодови за опоравак су поништени и генерисани су нови.
         subject: 'Mastodon: Поново су генерисани кодови за опоравак'
+        subtitle: Претходни кодови за опоравак су поништени и генерисани су нови.
         title: 2FA кодови опоравка промењени
       unlock_instructions:
         subject: 'Mastodon: Упутство за откључавање корисничког налога'
@@ -70,11 +73,13 @@ sr:
           subject: 'Mastodon: Сигурносни кључ је избрисан'
           title: Један од ваших безбедносних кључева је избрисан
       webauthn_disabled:
-        explanation: Аутентификација помоћу безбедносних кључева је онемогућена за ваш налог. Пријава је сада могућа само помоћу токена који генерише упарена ТОТП апликација.
+        explanation: Потврда идентитета помоћу безбедносних кључева је онемогућена за ваш налог.
+        extra: Пријављивање је сада могуће користећи само токен који генерише упарена апликација TOTP.
         subject: 'Mastodon: Аутентификација са сигурносним кључевима онемогућена'
         title: Сигурносни кључеви су онемогућени
       webauthn_enabled:
-        explanation: Аутентификација са безбедносним кључем је омогућена за ваш налог. Ваш сигурносни кључ се сада може користити за пријављивање.
+        explanation: Аутентификација помоћу безбедносног кључа је омогућена за ваш налог.
+        extra: Ваш безбедносни кључ се сада може користити за пријављивање.
         subject: 'Mastodon: Омогућена аутентификација са безбедним кључем'
         title: Сигурносни кључеви су омогућени
     omniauth_callbacks:
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index e02983ad5f..b089f21427 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -47,16 +47,19 @@ sv:
         subject: 'Mastodon: Instruktioner för återställning av lösenord'
         title: Lösenordsåterställning
       two_factor_disabled:
-        explanation: Tvåfaktorsautentisering för ditt konto har inaktiverats. Det är nu möjligt att logga in med enbart e-postadress och lösenord.
+        explanation: Inloggning är nu möjlig med endast e-postadress och lösenord.
         subject: 'Mastodon: Tvåfaktorsautentisering inaktiverad'
+        subtitle: Tvåfaktorsautentisering för ditt konto har inaktiverats.
         title: 2FA inaktiverad
       two_factor_enabled:
-        explanation: Tvåfaktorsautentisering har aktiverats för ditt konto. En token som genereras av en kopplad TOTP-app kommer att krävas vid inloggning.
+        explanation: En token skapad av den parkopplade TOTP-appen kommer att krävas för inloggning.
         subject: 'Mastodon: Tvåfaktorsautentisering aktiverad'
+        subtitle: Tvåfaktorsautentisering har aktiverats för ditt konto.
         title: 2FA aktiverad
       two_factor_recovery_codes_changed:
         explanation: De tidigare återställningskoderna har ogiltigförklarats och nya har genererats.
         subject: Mastodon Tvåfaktors-återställningskoder genererades på nytt
+        subtitle: De tidigare återhämtningskoderna har ogiltigförklarats och nya har skapats.
         title: 2FA-återställningskoder ändrades
       unlock_instructions:
         subject: 'Mastodon: Lås upp instruktioner'
@@ -70,11 +73,10 @@ sv:
           subject: 'Mastodon: Säkerhetsnyckeln borttagen'
           title: En av dina säkerhetsnycklar har raderats
       webauthn_disabled:
-        explanation: Autentisering med säkerhetsnycklar till ditt konto har inaktiverats. Inloggning är nu endast möjligt med den token som genereras av den sammankopplade TOTP-appen.
+        explanation: Autentisering med säkerhetsnycklar har inaktiverats för ditt konto.
         subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
         title: Säkerhetsnycklar inaktiverade
       webauthn_enabled:
-        explanation: Autentisering med säkerhetsnyckel till ditt konto har aktiverats. Din säkerhetsnyckel kan nu användas för inloggning.
         subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
         title: Säkerhetsnycklar aktiverade
     omniauth_callbacks:
diff --git a/config/locales/devise.ta.yml b/config/locales/devise.ta.yml
index d4b4eeefc6..a0e6187ec4 100644
--- a/config/locales/devise.ta.yml
+++ b/config/locales/devise.ta.yml
@@ -47,11 +47,9 @@ ta:
         subject: 'மாஸ்டோடான்: கடவுச்சொல்லை மீட்டமைப்பதற்கான வழிமுறைகள்'
         title: கடவுச்சொல் மீட்டமைப்பு
       two_factor_disabled:
-        explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது. உங்கள் மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல் மூலமாக மட்டுமே தற்பொழுது உள்நுழைய முடியும்.
         subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு முடக்கப்பட்டுள்ளது'
         title: 2FA உபயோகத்தில் இல்லை
       two_factor_enabled:
-        explanation: உங்களுடைய கணக்கிற்கான இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது. இணைக்கப்படும் TOTP செயலியில் ஒரு குறியீடு தோன்றும். உங்கள் கணக்கிற்குள் நுழைய அந்தக் குறியீடு தேவைப்படும்.
         subject: 'மாஸ்டடான்: இரண்டு கட்டப் பாதுகாப்பு செயல்படுத்தப்பட்டுள்ளது'
         title: 2FA செயல்படுத்தப்பட்டுள்ளது
       two_factor_recovery_codes_changed:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index dce498525f..13fdea3fef 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -47,11 +47,9 @@ th:
         subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
         title: การตั้งรหัสผ่านใหม่
       two_factor_disabled:
-        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้ที่อยู่อีเมลและรหัสผ่านเท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
         title: ปิดใช้งาน 2FA แล้ว
       two_factor_enabled:
-        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
         title: เปิดใช้งาน 2FA แล้ว
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ th:
           subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
           title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
       webauthn_disabled:
-        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
       webauthn_enabled:
-        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
     omniauth_callbacks:
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
index 86b1c951f7..66ca9b2816 100644
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@@ -47,16 +47,19 @@ tr:
         subject: 'Mastodon: Parola sıfırlama talimatları'
         title: Parola sıfırlama
       two_factor_disabled:
-        explanation: Hesabınız için iki-adımlı kimlik doğrulama devre dışı bırakıldı. Şimdi sadece e-posta adresi ve parola kullanarak giriş yapabilirsiniz.
+        explanation: Oturum açma şimdi sadece e-posta adresi ve parola ile mümkün.
         subject: 'Mastodon: İki-adımlı kimlik doğrulama devre dışı bırakıldı'
+        subtitle: Hesabınız için iki aşamalı kimlik doğrulama devre dışı bırakılmıştır.
         title: 2FA devre dışı bırakıldı
       two_factor_enabled:
-        explanation: Hesabınız için iki-adımlı kimlik doğrulama etkinleştirildi. Giriş yapmak için eşleştirilmiş TOTP uygulaması tarafından oluşturulan bir belirteç gereklidir.
+        explanation: Oturum açmanız için eşlenmiş TOTP uygulaması tarafından oluşturulmuş bir tokene ihtiyaç var.
         subject: 'Mastodon: İki adımlı kimlik doğrulama etkinleştirildi'
+        subtitle: Hesabınız için iki aşamalı kimlik doğrulama etkinleştirilmiştir.
         title: 2FA etkinleştirildi
       two_factor_recovery_codes_changed:
         explanation: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
         subject: 'Mastodon: İki adımlı kurtarma kodları yeniden oluşturuldu'
+        subtitle: Önceki kurtarma kodları geçersiz kılındı ve yenileri oluşturuldu.
         title: 2FA kurtarma kodları değiştirildi
       unlock_instructions:
         subject: 'Mastodon: Kilit açma talimatları'
@@ -70,11 +73,13 @@ tr:
           subject: 'Mastodon: Güvenlik anahtarı silindi'
           title: Güvenlik anahtarlarınızdan biri silindi
       webauthn_disabled:
-        explanation: Hesabınız için güvenlik anahtarlarıyla kimlik doğrulama devre dışı bırakıldı. Artık yalnızca eşleştirilmiş TOTP uygulaması tarafından oluşturulan kodu kullanarak giriş yapmak mümkündür.
+        explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama devre dışı bırakılmıştır.
+        extra: Oturum açma şimdi sadece eşlenmiş TOTP uygulaması tarafından oluşturulmuş token ile mümkündür.
         subject: 'Mastodon: Güvenlik anahtarlarıyla kimlik doğrulama devre dışı'
         title: Güvenlik anahtarları devre dışı
       webauthn_enabled:
-        explanation: Hesabınız için güvenlik anahtarı doğrulaması etkinleştirildi. Güvenlik anahtarınız artık giriş yapmak için kullanılabilir.
+        explanation: Hesabınız için güvenlik anahtarıyla kimlik doğrulama etkinleştirilmiştir.
+        extra: Güvenlik anahtarınız şimdi oturum açma için kullanılabilir.
         subject: 'Mastodon: Güvenlik anahtarı doğrulaması etkinleştirildi'
         title: Güvenlik anahtarları etkin
     omniauth_callbacks:
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index bb81a2a1b8..55429b3c76 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -47,11 +47,9 @@ uk:
         subject: 'Mastodon: Інструкції для скидання паролю'
         title: Скидання пароля
       two_factor_disabled:
-        explanation: Двофакторну аутентифікацію для вашого облікового запису відключено. Тепер ви можете увійти за допомогою лише адреси електронної пошти та пароля.
         subject: 'Mastodon: двофакторну авторизацію вимкнено'
         title: Двофакторна автентифікація вимкнена
       two_factor_enabled:
-        explanation: Двофакторну аутентифікацію для вашого облікового запису було увімкнено. Для входу до системи буде потрібний токен, згенерований спареним застосунком TOTP.
         subject: 'Mastodon: двофакторну авторизацію увімкнено'
         title: Двофакторна автентифікація увімкнена
       two_factor_recovery_codes_changed:
@@ -70,11 +68,9 @@ uk:
           subject: 'Mastodon: Ключ безпеки видалено'
           title: Один з ваших ключів безпеки було видалено
       webauthn_disabled:
-        explanation: Авторизацію з ключами безпеки було відключено для вашого облікового запису. Вхід тепер можливий лише через токен, згенерований додатком TOTP.
         subject: 'Mastodon: Аутентифікація за допомогою ключів безпеки вимкнена'
         title: Ключі безпеки вимкнуто
       webauthn_enabled:
-        explanation: Авторизація ключа безпеки була увімкнена для вашого облікового запису. Ваш ключ безпеки тепер можна використовувати для входу.
         subject: 'Mastodon: Авторизація ключа безпеки увімкнена'
         title: Ключі безпеки увімкнено
     omniauth_callbacks:
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 904cc51fe9..190f7282c4 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -47,16 +47,19 @@ vi:
         subject: 'Mastodon: Hướng dẫn đổi lại mật khẩu'
         title: Đổi lại mật khẩu
       two_factor_disabled:
-        explanation: Đã vô hiệu hóa xác minh 2 bước cho tài khoản của bạn. Bây giờ chỉ có thể đăng nhập bằng địa chỉ email và mật khẩu.
+        explanation: Đăng nhập bây giờ chỉ có thể sử dụng địa chỉ email và mật khẩu.
         subject: 'Mastodon: Xác minh 2 bước đã bị vô hiệu hóa'
+        subtitle: Xác minh hai bước cho tài khoản của bạn đã bị vô hiệu hóa.
         title: Vô hiệu hóa xác minh 2 bước
       two_factor_enabled:
-        explanation: Tài khoản của bạn đã kích hoạt xác minh 2 bước. Lần đăng nhập tới sẽ cần thêm mã đăng nhập được tạo bởi ứng dụng TOTP.
+        explanation: Cần có mã token được tạo bởi ứng dụng TOTP được ghép nối để đăng nhập.
         subject: 'Mastodon: Kích hoạt xác minh 2 bước'
+        subtitle: Xác minh hai bước đã được bật cho tài khoản của bạn.
         title: Kích hoạt xác minh 2 bước
       two_factor_recovery_codes_changed:
         explanation: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         subject: 'Mastodon: Mã khôi phục xác thực hai yếu tố đã được tạo lại'
+        subtitle: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         title: Mã khôi phục xác thực hai yếu tố đã thay đổi
       unlock_instructions:
         subject: 'Mastodon: Hướng dẫn mở khóa'
@@ -70,11 +73,13 @@ vi:
           subject: 'Mastodon: Xóa khóa bảo mật'
           title: Một trong những khóa bảo mật của bạn vừa bị xóa
       webauthn_disabled:
-        explanation: Bạn vừa vô hiệu hóa xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, bạn sẽ dùng ứng dụng TOTP để tạo token đăng nhập.
+        explanation: Xác minh bằng khóa bảo mật đã bị vô hiệu hóa đối với tài khoản của bạn.
+        extra: Hiện tại, bạn chỉ có thể đăng nhập bằng cách sử dụng mã token được tạo bởi ứng dụng TOTP được ghép nối.
         subject: 'Mastodon: Vô hiệu hóa xác thực bằng khóa bảo mật'
         title: Đã vô hiệu hóa khóa bảo mật
       webauthn_enabled:
-        explanation: Bạn vừa kích hoạt xác thực tài khoản bằng khóa bảo mật. Từ bây giờ, khóa bảo mật của bạn sẽ được dùng để đăng nhập.
+        explanation: Khóa bảo mật đã được bật cho tài khoản của bạn.
+        extra: Hiện bạn đã có thể dùng khóa bảo mật để đăng nhập.
         subject: 'Mastodon: Kích hoạt xác minh bằng khóa bảo mật'
         title: Đã kích hoạt khóa bảo mật
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml
index e46c433530..9b4b3ae203 100644
--- a/config/locales/devise.zh-CN.yml
+++ b/config/locales/devise.zh-CN.yml
@@ -47,16 +47,19 @@ zh-CN:
         subject: Mastodon：重置密码说明
         title: 重置密码
       two_factor_disabled:
-        explanation: 账号的双因素认证已禁用。现在仅使用邮箱和密码即可登录。
+        explanation: 目前只能通过电子邮件地址和密码登录。
         subject: Mastodon：双因素认证已禁用
+        subtitle: 您账户的双因素认证已被停用。
         title: 双因素认证已停用
       two_factor_enabled:
-        explanation: 账号双因素认证已启用。登录时将需要来自已配对的 TOTP 应用生成的验证码。
+        explanation: 登录时需要输入先前配对好的TOTP应用生成的令牌。
         subject: Mastodon：双因素认证已启用
+        subtitle: 您账户的双因素认证已被启用。
         title: 双因素认证已启用
       two_factor_recovery_codes_changed:
         explanation: 新恢复码已生成，同时旧恢复码已失效。
         subject: Mastodon：双因素认证恢复码已重新生成
+        subtitle: 新恢复码已生成，同时旧恢复码已失效。
         title: 双因素认证恢复码已更改
       unlock_instructions:
         subject: Mastodon：账户解锁信息
@@ -70,11 +73,13 @@ zh-CN:
           subject: Mastodon：安全密钥已删除
           title: 你的安全密钥之一已被删除
       webauthn_disabled:
-        explanation: 你的帐户已禁用安全密钥认证。现在只能使用配对的 TOTP 应用程序生成的令牌登录。
+        explanation: 您账户的安全密钥身份认证已被停用。
+        extra: 目前只能用先前配对的TOTP应用生成的令牌登录。
         subject: Mastodon：安全密钥认证已禁用
         title: 安全密钥已禁用
       webauthn_enabled:
-        explanation: 你的账户已启用安全密钥身份验证。你的安全密钥现在可以用于登录。
+        explanation: 您账户的安全密钥身份认证已被启用。
+        extra: 您的安全密钥现在可用于登录。
         subject: Mastodon：安全密钥认证已启用
         title: 已启用安全密钥
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index 2d9e8ddead..7f728bf0ad 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -47,16 +47,19 @@ zh-HK:
         subject: 'Mastodon: 重設密碼'
         title: 重設密碼
       two_factor_disabled:
-        explanation: 帳號的雙重認證已被停用。現在只需使用電郵地址和密碼，即可登入。
+        explanation: 現在只需使用電郵地址和密碼即可登入。
         subject: Mastodon：已關閉雙重認證
+        subtitle: 你帳號的雙重認證已被停用。
         title: 已關閉雙重認證
       two_factor_enabled:
-        explanation: 賬號的雙重認證已被啟用。登錄時，將需要已配對 TOTP 應用程式生成的驗證碼。
+        explanation: 登入時將需要由配對的一次性密碼應用程式生成的憑證。
         subject: Mastodon：已啟用雙重認證
+        subtitle: 你的帳號已啟用雙重認證。
         title: 已啟用雙重認證
       two_factor_recovery_codes_changed:
         explanation: 之前的恢復碼失效了，新的已生成。
         subject: Mastodon：已產生新的雙重認證恢復碼
+        subtitle: 先前的恢復碼已經無效，並且已生成新的恢復碼。
         title: 雙重認證恢復碼已更改
       unlock_instructions:
         subject: 'Mastodon: 解除帳號鎖定'
@@ -70,11 +73,13 @@ zh-HK:
           subject: 'Mastodon: 安全鑰匙已移除'
           title: 你其中的一個安全鑰匙已經被移除了
       webauthn_disabled:
-        explanation: 你的帳號的安全鑰匙身份驗證已經停用。你只可以用過去已經配對好的基於時間一次性密碼程式生成的密碼來登錄。
+        explanation: 你的帳號已停用安全密鑰認證。
+        extra: 現在只能使用配對的一次性密碼應用程式生成的憑證登入。
         subject: 'Mastodon: 安全鑰匙身份驗證已經停用'
         title: 已停用安全鑰匙
       webauthn_enabled:
-        explanation: 安全鑰匙身份驗證已啟用。你的安全鑰匙現在可以用來登錄。
+        explanation: 你的帳號已啟用安全密鑰認證。
+        extra: 你現在可以使用安全密鑰來登入。
         subject: 'Mastodon: 安全鑰匙身份驗證已啟用'
         title: 已啟用安全鑰匙
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index de977426f2..762c8eba84 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -47,16 +47,19 @@ zh-TW:
         subject: Mastodon：重設密碼指引
         title: 重設密碼
       two_factor_disabled:
-        explanation: 您帳號的兩階段驗證已停用。現在只使用電子郵件及密碼登入。
+        explanation: 現在僅可使用電子郵件地址與密碼登入。
         subject: Mastodon：已停用兩階段驗證
+        subtitle: 您帳號的兩步驟驗證已停用。
         title: 已停用兩階段驗證
       two_factor_enabled:
-        explanation: 已對您的帳號啟用兩階段驗證。登入時將需要已配對的 TOTP 應用程式所產生之 Token。
+        explanation: 登入時需要配對的 TOTP 應用程式產生的權杖。
         subject: Mastodon：已啟用兩階段驗證
+        subtitle: 您的帳號已啟用兩步驟驗證。
         title: 已啟用兩階段驗證
       two_factor_recovery_codes_changed:
         explanation: 之前的備用驗證碼已經失效，且已產生新的。
         subject: Mastodon：兩階段驗證備用驗證碼已經重新產生
+        subtitle: 之前的備用驗證碼已經失效，且已產生新的。
         title: 兩階段驗證備用驗證碼已變更
       unlock_instructions:
         subject: Mastodon：解鎖指引
@@ -70,11 +73,13 @@ zh-TW:
           subject: Mastodon：安全密鑰已移除
           title: 您的一支安全密鑰已經被移除
       webauthn_disabled:
-        explanation: 您的帳號已停用安全密鑰認證。只能透過已配對的 TOTP 應用程式所產生之 Token 登入。
+        explanation: 您的帳號已停用安全金鑰身份驗證。
+        extra: 現在僅可使用配對的 TOTP 應用程式產生的權杖登入。
         subject: Mastodon：安全密鑰認證方式已停用
         title: 已停用安全密鑰
       webauthn_enabled:
-        explanation: 您的帳號已啟用安全密鑰認證。您可以使用安全密鑰登入了。
+        explanation: 您的帳號已啟用安全金鑰驗證。
+        extra: 您的安全金鑰現在可用於登入。
         subject: Mastodon：已啟用安全密鑰認證
         title: 已啟用安全密鑰
     omniauth_callbacks:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 4c31bfdde0..8b632a358b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1475,6 +1475,7 @@ el:
       unknown_browser: Άγνωστος φυλλομετρητής
       weibo: Weibo
     current_session: Τρέχουσα συνεδρία
+    date: Ημερομηνία
     description: "%{browser} σε %{platform}"
     explanation: Αυτοί είναι οι φυλλομετρητές που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
     ip: IP
@@ -1636,16 +1637,19 @@ el:
     webauthn: Κλειδιά ασφαλείας
   user_mailer:
     appeal_approved:
-      action: Μετάβαση στον λογαριασμό σου
+      action: Ρυθμίσεις Λογαριασμού
       explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει εγκριθεί. Ο λογαριασμός σου είναι και πάλι σε καλή κατάσταση.
       subject: Η έφεση σου από τις %{date} έχει εγκριθεί
+      subtitle: Ο λογαριασμός σας είναι για άλλη μια φορά σε καλή κατάσταση.
       title: Έφεση εγκρίθηκε
     appeal_rejected:
       explanation: Η έφεση του παραπτώματος εναντίον του λογαριασμού σου στις %{strike_date}, που υπέβαλες στις %{appeal_date} έχει απορριφθεί.
       subject: Η έφεση σου από τις %{date} έχει απορριφθεί
+      subtitle: Η έφεση σου απορρίφθηκε.
       title: Έφεση απορρίφθηκε
     backup_ready:
-      explanation: Είχες ζητήσει εφεδρικό αντίγραφο του λογαριασμού σου στο Mastodon. Είναι έτοιμο για λήψη!
+      explanation: Ζητήσατε ένα πλήρες αντίγραφο ασφαλείας του λογαριασμού σας Mastodon.
+      extra: Είναι τώρα έτοιμο για λήψη!
       subject: Το αρχείο σου είναι έτοιμο για λήψη
       title: Λήψη εφεδρικού αρχείου
     suspicious_sign_in:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a6e74c4836..b11c6de11f 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1773,7 +1773,6 @@ en-GB:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Go to your account
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
       subject: Your appeal from %{date} has been approved
       title: Appeal approved
@@ -1782,7 +1781,6 @@ en-GB:
       subject: Your appeal from %{date} has been rejected
       title: Appeal rejected
     backup_ready:
-      explanation: You requested a full backup of your Mastodon account. It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
     suspicious_sign_in:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8a0033ee6a..1bcf36700b 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1693,7 +1693,6 @@ eo:
     webauthn: Sekurecaj ŝlosiloj
   user_mailer:
     appeal_approved:
-      action: Iri al via konto
       explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
       subject: Via apelacio de %{date} aprobitas
       title: Apelacio estis aprobita
@@ -1702,7 +1701,6 @@ eo:
       subject: Via apelacio de %{date} estis malaprobita
       title: Apelacio estis malaprobita
     backup_ready:
-      explanation: Vi petis kompletan arkivon de via Mastodon-konto. Ĝi nun pretas por elŝutado!
       subject: Via arkivo estas preta por elŝutado
       title: Arkiva elŝuto
     suspicious_sign_in:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index f214c92d2a..26c18b5feb 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1608,6 +1608,7 @@ es-AR:
       unknown_browser: "[Navegador web desconocido]"
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web en los que actualmente iniciaste sesión en tu cuenta de Mastodon.
     ip: Dirección IP
@@ -1774,16 +1775,19 @@ es-AR:
     webauthn: Llaves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Configuración de la cuenta
       explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} fue aprobada
+      subtitle: Tu cuenta está, de nuevo, en perfecto estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación del incumplimiento contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} fue rechazada
+      subtitle: Se rechazó tu apelación.
       title: Apelación rechazada
     backup_ready:
-      explanation: Solicitaste un resguardo completo de tu cuenta de Mastodon. ¡Ya está listo para descargar!
+      explanation: Solicitaste una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está lista para descargar!"
       subject: Tu archivo historial está listo para descargar
       title: Descargar archivo historial
     suspicious_sign_in:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 7f5b282873..32178d0b04 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1608,6 +1608,7 @@ es-MX:
       unknown_browser: Navegador desconocido
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
     ip: IP
@@ -1774,16 +1775,19 @@ es-MX:
     webauthn: Claves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Ajustes de la cuenta
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} ha sido aprobada
+      subtitle: Tu cuenta se encuentra de nuevo en buen estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} ha sido rechazada
+      subtitle: Tu apelación ha sido rechazada.
       title: Apelación rechazada
     backup_ready:
-      explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+      explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
     suspicious_sign_in:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a1e9401f5a..9235b985fb 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1608,6 +1608,7 @@ es:
       unknown_browser: Navegador Desconocido
       weibo: Weibo
     current_session: Sesión actual
+    date: Fecha
     description: "%{browser} en %{platform}"
     explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
     ip: IP
@@ -1774,16 +1775,19 @@ es:
     webauthn: Claves de seguridad
   user_mailer:
     appeal_approved:
-      action: Ir a tu cuenta
+      action: Ajustes de la cuenta
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue aprobada. Tu cuenta se encuentra de nuevo en buen estado.
       subject: Tu apelación del %{date} ha sido aprobada
+      subtitle: Tu cuenta se encuentra de nuevo en perfecto estado.
       title: Apelación aprobada
     appeal_rejected:
       explanation: La apelación de la amonestación contra tu cuenta del %{strike_date} que enviaste el %{appeal_date} fue rechazada.
       subject: Tu apelación del %{date} ha sido rechazada
+      subtitle: Tu apelación ha sido rechazada.
       title: Apelación rechazada
     backup_ready:
-      explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar!
+      explanation: Has solicitado una copia de seguridad completa de tu cuenta de Mastodon.
+      extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
     suspicious_sign_in:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 806238431d..71f49e1abb 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1608,6 +1608,7 @@ et:
       unknown_browser: Tundmatu veebilehitseja
       weibo: Weibo
     current_session: Praegune seanss
+    date: Kuupäev
     description: "%{browser} platvormil %{platform}"
     explanation: Need veebilehitsejad on praegu su Mastodoni kontole sisse loginud.
     ip: IP
@@ -1776,16 +1777,19 @@ et:
     webauthn: Turvavõtmed
   user_mailer:
     appeal_approved:
-      action: Oma kontole
+      action: Konto seaded
       explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on rahuldatud. Konto on ennistatud."
       subject: "%{date} esitatud vaidlustus on rahuldatud"
+      subtitle: Sinu konto on jälle heas seisukorras.
       title: Vaidlustus rahuldatud
     appeal_rejected:
       explanation: "%{appeal_date} esitatud vaidlustus %{strike_date} otsuse kohta on tagasi lükatud."
       subject: "%{date} esitatud vaidlustus on tagasi lükatud"
+      subtitle: Sinu vaidlustus lükati tagasi.
       title: Vaidlustus tagasi lükatud
     backup_ready:
-      explanation: Taotlesid oma Mastodoni konto varukoopiat. See on nüüd valmis allalaadimiseks!
+      explanation: Taotlesid oma Mastodoni konto täisvarundust.
+      extra: See on nüüd allalaadimiseks valmis!
       subject: Arhiiv on allalaadimiseks valmis
       title: Arhiivi väljavõte
     suspicious_sign_in:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 9174b83b43..4b91f7a524 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1612,6 +1612,7 @@ eu:
       unknown_browser: Nabigatzaile ezezaguna
       weibo: Weibo
     current_session: Uneko saioa
+    date: Data
     description: "%{browser} - %{platform}"
     explanation: Zure Mastodon kontuan saioa hasita duten nabigatzaileak daude.
     ip: IP-a
@@ -1778,16 +1779,19 @@ eu:
     webauthn: Segurtasun gakoak
   user_mailer:
     appeal_approved:
-      action: Joan zure kontura
+      action: Kontuaren ezarpenak
       explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa onartu da. Zure kontua egoera onean dago berriro."
       subject: "%{date}(e)ko zure apelazioa onartu da"
+      subtitle: Zure kontua egoera onean dago berriro.
       title: Apelazioa onartuta
     appeal_rejected:
       explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa baztertu da."
       subject: "%{date}(e)ko zure apelazioa baztertu da"
+      subtitle: Zure apelazioa baztertu da.
       title: Apelazioa baztertuta
     backup_ready:
-      explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
+      explanation: Mastodon kontuaren babeskopia osoa eskatu duzu.
+      extra: Deskargatzeko prest!
       subject: Zure artxiboa deskargatzeko prest dago
       title: Artxiboa jasotzea
     suspicious_sign_in:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f93aac6031..0514772c1d 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1540,7 +1540,6 @@ fa:
     webauthn: کلیدهای امنیتی
   user_mailer:
     appeal_approved:
-      action: به حساب خودتان بروید
       explanation: درخواست تجدیدنظر اخطار علیه حساب شما در %{strike_date} که در %{appeal_date} ارسال کرده‌اید، پذیرفته شده است. حساب شما بار دیگر در وضعیت خوبی قرار دارد.
       subject: درخواست تجدیدنظر شما در %{date} پذیرفته شد
       title: درخواست تجدیدنظر پذیرفته شد
@@ -1549,7 +1548,6 @@ fa:
       subject: درخواست تجدیدنظر شما در %{date} رد شده است
       title: درخواست تجدیدنظر رد شد
     backup_ready:
-      explanation: شما یک نسخهٔ پشتیبان کامل از حساب خود را درخواست کردید. این پشتیبان الان آمادهٔ بارگیری است!
       subject: بایگانی شما آمادهٔ دریافت است
       title: گرفتن بایگانی
     suspicious_sign_in:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 75052c949d..a719f3496f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1774,7 +1774,6 @@ fi:
     webauthn: Suojausavaimet
   user_mailer:
     appeal_approved:
-      action: Siirry tilillesi
       explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
       subject: Valituksesi %{date} on hyväksytty
       title: Valitus hyväksytty
@@ -1783,7 +1782,6 @@ fi:
       subject: Valituksesi %{date} on hylätty
       title: Valitus hylätty
     backup_ready:
-      explanation: Pyysit täydellistä varmuuskopiota Mastodon-tilistäsi. Voit nyt ladata sen!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
     suspicious_sign_in:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 00fb9c5560..03a525fa5d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -612,6 +612,7 @@ fo:
       created_at: Meldað
       delete_and_resolve: Strika postar
       forwarded: Víðarisent
+      forwarded_replies_explanation: Hendan fráboðanin er frá einum fjarbrúkara og er viðvíkjandi tilfari á einum fjarum ambætara. Tað er sent til tín, tí fráboðaða innihaldið er í svari til ein av tínum brúkarum.
       forwarded_to: Víðarisent til %{domain}
       mark_as_resolved: Marka sum loyst
       mark_as_sensitive: Merkt sum viðkvæmt
@@ -1607,6 +1608,7 @@ fo:
       unknown_browser: Ókendur kagi
       weibo: Weibo
     current_session: Verandi seta
+    date: Dagfesting
     description: "%{browser} á %{platform}"
     explanation: Hetta eru vevkagarnir, sum í løtuni eru ritaðir inn á tína Mastodon kontu.
     ip: IP
@@ -1773,16 +1775,19 @@ fo:
     webauthn: Trygdarlyklar
   user_mailer:
     appeal_approved:
-      action: Far til kontu tína
+      action: Kontustillingar
       explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er góðkend. Konta tín er aftur tignarlig.
       subject: Kæra tín frá %{date} er góðkend
+      subtitle: Kontan hjá tær er aftur í góðari støðu.
       title: Kæra góðkend
     appeal_rejected:
       explanation: Kæran um atsóknina móti kontu tínari %{strike_date}, sum tú sendi inn %{appeal_date}, er vrakað.
       subject: Kæra tín frá %{date} er vrakað
+      subtitle: Kæra tín er vrakað.
       title: Kæra vrakað
     backup_ready:
-      explanation: Tú bað um eitt fult trygdaravrit av tíni Mastodon kontu. Tað er nú klárt at taka niður!
+      explanation: Tú hevur biðið um eitt fult trygdaravrit av Mastodon-kontuni hjá tær.
+      extra: Tað er nú klárt at taka niður!
       subject: Savnið hjá tær er tøkt at taka niður
       title: Tak savn niður
     suspicious_sign_in:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index c43fa013c7..dbdff5f52c 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1608,6 +1608,7 @@ fr-CA:
       unknown_browser: Navigateur inconnu
       weibo: Weibo
     current_session: Session courante
+    date: Date
     description: "%{browser} sur %{platform}"
     explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
     ip: Adresse IP
@@ -1774,16 +1775,19 @@ fr-CA:
     webauthn: Clés de sécurité
   user_mailer:
     appeal_approved:
-      action: Aller à votre compte
+      action: Paramètres du compte
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
       subject: Votre appel du %{date} a été approuvé
+      subtitle: Votre compte est de nouveau en règle.
       title: Appel approuvé
     appeal_rejected:
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
       subject: Votre appel du %{date} a été rejeté
+      subtitle: Votre appel a été rejeté.
       title: Appel rejeté
     backup_ready:
-      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+      extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
     suspicious_sign_in:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5c6166ddc3..fe1a219a31 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1608,6 +1608,7 @@ fr:
       unknown_browser: Navigateur inconnu
       weibo: Weibo
     current_session: Session courante
+    date: Date
     description: "%{browser} sur %{platform}"
     explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
     ip: Adresse IP
@@ -1774,16 +1775,19 @@ fr:
     webauthn: Clés de sécurité
   user_mailer:
     appeal_approved:
-      action: Aller à votre compte
+      action: Paramètres du compte
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été approuvé. Votre compte est de nouveau en règle.
       subject: Votre appel du %{date} a été approuvé
+      subtitle: Votre compte est de nouveau en règle.
       title: Appel approuvé
     appeal_rejected:
       explanation: L'appel de la sanction contre votre compte mise en place le %{strike_date} que vous avez soumis le %{appeal_date} a été rejeté.
       subject: Votre appel du %{date} a été rejeté
+      subtitle: Votre appel a été rejeté.
       title: Appel rejeté
     backup_ready:
-      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon. Elle est maintenant prête à être téléchargée !
+      explanation: Vous avez demandé une sauvegarde complète de votre compte Mastodon.
+      extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
     suspicious_sign_in:
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 9471c03b92..1d648f4790 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1608,6 +1608,7 @@ fy:
       unknown_browser: Unbekende browser
       weibo: Weibo
     current_session: Aktuele sesje
+    date: Datum
     description: "%{browser} op %{platform}"
     explanation: Dit binne de webbrowsers dy’t op dit stuit mei jo Mastodon-account oanmeld binne.
     ip: IP
@@ -1774,16 +1775,19 @@ fy:
     webauthn: Befeiligingskaaien
   user_mailer:
     appeal_approved:
-      action: Gean nei jo account
+      action: Accountynstellingen
       explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is goedkard. De earder fêststelde skeining is hjirby net langer jildich.
       subject: Jo beswier fan %{date} is goedkard
+      subtitle: Jo account hat wer in goede reputaasje.
       title: Beswier goedkard
     appeal_rejected:
       explanation: It beswier tsjin in troch in moderator fêststelde skeining fan jo op %{strike_date}, yntsjinne op %{appeal_date}, is ôfwêzen. De fêststelde skeining bliuwt wurdt dêrom net wizige.
       subject: Jo beswier fan %{date} is ôfwêzen
+      subtitle: Jo beswier is ôfwêzen.
       title: Beswier ôfwêzen
     backup_ready:
-      explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account opfrege. It stiet no klear om download te wurden!
+      explanation: Jo hawwe in folsleine reservekopy fan jo Mastodon-account oanfrege.
+      extra: It stiet no klear om download te wurden!
       subject: Jo argyf stiet klear om download te wurden
       title: Argyf ophelje
     suspicious_sign_in:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 965447d4f9..521f4fd60d 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1827,7 +1827,6 @@ gd:
     webauthn: Iuchraichean tèarainteachd
   user_mailer:
     appeal_approved:
-      action: Tadhail air a’ chunntas agad
       explanation: Chaidh aontachadh ris an ath-thagradh agad air an rabhadh o %{strike_date} a chuir thu a-null %{appeal_date}. Tha deagh chliù air a’ chunntas agad a-rithist.
       subject: Chaidh aontachadh ris an ath-thagradh agad o %{date}
       title: Chaidh aontachadh ri ath-thagradh
@@ -1836,7 +1835,6 @@ gd:
       subject: Chaidh an t-ath-thagradh agad o %{date} a dhiùltadh
       title: Chaidh ath-thagradh a dhiùltadh
     backup_ready:
-      explanation: Dh’iarr thu lethbhreac-glèidhidh slàn dhen chunntas Mastodon agad. Tha e deis ri luchdadh a-nuas a-nis!
       subject: Tha an tasg-lann agad deis ri luchdadh a-nuas
       title: Tasg-lann dhut
     suspicious_sign_in:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index cff9427c66..1398f6ad0b 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1608,6 +1608,7 @@ gl:
       unknown_browser: Navegador descoñecido
       weibo: Weibo
     current_session: Sesión actual
+    date: Data
     description: "%{browser} en %{platform}"
     explanation: Estos son os navegadores web nos que actualmente tes sesión iniciada.
     ip: IP
@@ -1774,16 +1775,19 @@ gl:
     webauthn: Chaves de seguridade
   user_mailer:
     appeal_approved:
-      action: Vai á túa conta
+      action: Axustes da conta
       explanation: A apelación da acción contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi aprobada. A túa conta volve ao estado normal de uso.
       subject: O recurso presentado o %{date} foi aprobado
+      subtitle: A túa conta volve a estar en boa forma.
       title: Apelación aprobada
     appeal_rejected:
       explanation: A apelación contra a acción tomada contra a túa conta o %{strike_date} que enviaches o %{appeal_date} foi rexeitada.
       subject: A túa apelación do %{date} foi rexeitada
+      subtitle: A apelación foi rexeitada.
       title: Apelación rexeitada
     backup_ready:
-      explanation: Solicitaches os datos completos da túa conta de Mastodon. Xa está preparados para descargar!
+      explanation: Solicitaches unha copia completa da túa conta Mastodon.
+      extra: Está preparada para descargala!
       subject: O teu ficheiro xa está preparado para descargar
       title: Leve o ficheiro
     suspicious_sign_in:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 23a4e0c3a6..2969cf33e8 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1660,6 +1660,7 @@ he:
       unknown_browser: דפדפן לא מזוהה
       weibo: Weibo
     current_session: חיבור נוכחי
+    date: תאריך
     description: "%{browser} על %{platform}"
     explanation: אלה הם הדפדפנים המחוברים כרגע לחשבון המסטודון שלך.
     ip: IP
@@ -1838,16 +1839,19 @@ he:
     webauthn: מפתחות אבטחה
   user_mailer:
     appeal_approved:
-      action: מעבר לחשבונך
+      action: הגדרות חשבון
       explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} התקבל. חשבונך חזר להיות נקי מכל רבב.
       subject: ערעורך מתאריך %{date} התקבל
+      subtitle: חשבונך חזר למצב מאושר.
       title: הערעור התקבל
     appeal_rejected:
       explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} נדחה.
       subject: ערעורך מתאריך %{date} נדחה
+      subtitle: ערעורך נדחה.
       title: הערעור נדחה
     backup_ready:
-      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך. הוא מוכן להורדה!
+      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך.
+      extra: הגיבוי מוכן להורדה!
       subject: הארכיון שלך מוכן להורדה
       title: הוצאת ארכיון
     suspicious_sign_in:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5c8d1cf9a4..536af8b6b5 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1774,7 +1774,6 @@ hu:
     webauthn: Biztonsági kulcsok
   user_mailer:
     appeal_approved:
-      action: Ugrás a fiókodhoz
       explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
       subject: A %{date}-i fellebbezésedet jóváhagyták
       title: Fellebbezés jóváhagyva
@@ -1783,7 +1782,6 @@ hu:
       subject: A %{date}-i fellebbezésedet visszautasították
       title: Fellebbezés visszautasítva
     backup_ready:
-      explanation: A Mastodon-fiókod teljes mentését kérted. A mentés elkészült, és letölthető.
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
     suspicious_sign_in:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c4f236881d..48a802a2cd 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -114,8 +114,6 @@ ia:
     add: Adder
     disable: Disactivar 2FA
   user_mailer:
-    appeal_approved:
-      action: Vader a tu conto
     welcome:
       subject: Benvenite in Mastodon
   webauthn_credentials:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index c231fea576..ec8cf9e031 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1508,7 +1508,6 @@ id:
     webauthn: Kunci keamanan
   user_mailer:
     appeal_approved:
-      action: Ke akun Anda
       explanation: Banding peringatan terhadap akun Anda pada %{strike_date} yang Anda kirim pada %{appeal_date} telah disetujui. Akun Anda akan kembali ditandai sebagai akun bagus.
       subject: Banding Anda dari %{date} telah disetujui
       title: Banding disetujui
@@ -1517,7 +1516,6 @@ id:
       subject: Banding Anda dari %{date} telah ditolak
       title: Banding ditolak
     backup_ready:
-      explanation: Cadangan penuh akun Mastodon Anda sudah dapat diunduh!
       subject: Arsip Anda sudah siap diunduh
       title: Ambil arsip
     suspicious_sign_in:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c85e97b51d..c8cd5d5f8d 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1608,6 +1608,7 @@ ie:
       unknown_browser: Ínconosset navigator
       weibo: Weibo
     current_session: Actual session
+    date: Date
     description: "%{browser} in %{platform}"
     explanation: Tis-ci es li navigatores queles actualmen ha initiat sessiones a tui Mastodon-conto.
     ip: IP
@@ -1774,16 +1775,18 @@ ie:
     webauthn: Claves de securitá
   user_mailer:
     appeal_approved:
-      action: Ear a tui conto
+      action: Parametres del Conto
       explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset aprobat. Tui conto retorna a esser in bon statu.
       subject: Tui apelle de %{date} ha esset aprobat
+      subtitle: Tui conto denov es in bon statu.
       title: Apelle aprobat
     appeal_rejected:
       explanation: Li apelle del admoniment contra tui conto ye %{strike_date} quel tu fat ye %{appeal_date} ha esset rejectet.
       subject: Tui apelle de %{date} ha esset rejectet
+      subtitle: Tui apelle ha esset rejectet.
       title: Apelle rejectet
     backup_ready:
-      explanation: Tu solicitat un complet archive de tui Mastodon-conto. Nu it es pret por descargar!
+      extra: It es ja pret a descargar!
       subject: Tui archive es pret por descargar
       title: Descargar archive
     suspicious_sign_in:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index eb5fcc709d..341477852f 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1747,7 +1747,6 @@ io:
     webauthn: Sekuresklefi
   user_mailer:
     appeal_approved:
-      action: Irez a vua konto
       explanation: Apelo di streko kontre vua konto en %{strike_date} quale vu sendis en %{appeal_date} aprobesis. Vua konto itere standas bone.
       subject: Vua apelo de %{date} aprobesis
       title: Apelo aprobesis
@@ -1756,7 +1755,6 @@ io:
       subject: Vua apelo de %{date} refuzesis
       title: Apelo refuzesis
     backup_ready:
-      explanation: Vu demandis kompleta kopiur di vua konto di Mastodon. Ol esas nun pronte deschargebla!
       subject: Vua arkivo pronte deschargebla
       title: Arkivekpreno
     suspicious_sign_in:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 7083a226dd..9f8d5d42dc 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1612,6 +1612,7 @@ is:
       unknown_browser: Óþekktur vafri
       weibo: Weibo
     current_session: Núverandi seta
+    date: Dagsetning
     description: "%{browser} á %{platform}"
     explanation: Þetta eru vafrarnir sem núna eru skráðir inn á Mastodon-aðganginn þinn.
     ip: IP-vistfang
@@ -1778,16 +1779,19 @@ is:
     webauthn: Öryggislyklar
   user_mailer:
     appeal_approved:
-      action: Farðu inn á notandaaðganginn þinn
+      action: Stillingar notandaaðgangs
       explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið samþykkt. Notandaaðgangurinn þinn er aftur í góðu lagi.
       subject: Áfrýjun þín frá %{date} hefur verið samþykkt
+      subtitle: Notandaaðgangurinn þinn er í góðu lagi.
       title: Áfrýjun samþykkt
     appeal_rejected:
       explanation: Áfrýjun refsingarinnar gagnvart aðgangnum þínum þann %{strike_date} sem þú sendir inn þann %{appeal_date} hefur verið hafnað.
       subject: Áfrýjun þinni frá %{date} hefur verið hafnað
+      subtitle: Áfrýjun þinni hefur verið hafnað.
       title: Áfrýjun hafnað
     backup_ready:
-      explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum. Það er núna tilbúið til niðurhals!
+      explanation: Þú baðst um fullt öryggisafrit af Mastodon notandaaðgangnum þínum.
+      extra: Það er núna tilbúið til niðurhals!
       subject: Safnskráin þín er tilbúin til niðurhals
       title: Taka út í safnskrá
     suspicious_sign_in:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 16b327f3e1..a17fae4804 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1610,6 +1610,7 @@ it:
       unknown_browser: Browser sconosciuto
       weibo: Weibo
     current_session: Sessione corrente
+    date: Data
     description: "%{browser} su %{platform}"
     explanation: Questi sono i browser da cui attualmente è avvenuto l'accesso al tuo account Mastodon.
     ip: IP
@@ -1776,16 +1777,19 @@ it:
     webauthn: Chiavi di sicurezza
   user_mailer:
     appeal_approved:
-      action: Vai al tuo account
+      action: Impostazioni account
       explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato approvato. Il tuo account ha riottenuto la buona reputazione.
       subject: Il tuo appello del %{date} è stato approvato
+      subtitle: Il tuo account è ancora una volta in buona posizione.
       title: Appello approvato
     appeal_rejected:
       explanation: L'appello della sanzione contro il tuo account del %{strike_date} che hai inviato il %{appeal_date} è stato respinto.
       subject: Il tuo appello del %{date} è stato respinto
+      subtitle: Il tuo appello è stato respinto.
       title: Appello respinto
     backup_ready:
-      explanation: Hai richiesto un backup completo del tuo account Mastodon. È pronto per essere scaricato!
+      explanation: Hai richiesto un backup completo del tuo account Mastodon.
+      extra: Ora è pronto per il download!
       subject: Il tuo archivio è pronto per essere scaricato
       title: Esportazione archivio
     suspicious_sign_in:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 97ec886112..a68426cb53 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1582,6 +1582,7 @@ ja:
       unknown_browser: 不明なブラウザ
       weibo: Weibo
     current_session: 現在のセッション
+    date: 日時
     description: "%{platform}上の%{browser}"
     explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
     ip: IP
@@ -1742,16 +1743,19 @@ ja:
     webauthn: セキュリティキー
   user_mailer:
     appeal_approved:
-      action: アカウントへ
+      action: アカウント設定
       explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては承認されました。アカウントは正常な状態に戻りました。"
       subject: "%{date}の申し立てが承認されました"
+      subtitle: あなたのアカウントは正常な状態に戻りました。
       title: 申し立てが承認されました。
     appeal_rejected:
       explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては却下されました。"
       subject: "%{date}の申し立てが拒否されました"
+      subtitle: 申し立ては拒否されました。
       title: 却下された抗議
     backup_ready:
-      explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます！
+      explanation: Mastodonアカウントの完全バックアップをリクエストしました。
+      extra: ダウンロードの準備ができました！
       subject: アーカイブの準備ができました
       title: アーカイブの取り出し
     suspicious_sign_in:
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index d67f432688..926922154f 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -467,7 +467,6 @@ ka:
     recovery_instructions_html: თუ როდესმე დაკარგავთ წვდომას თქვენს ტელეფონთან, შეგიძლიათ ქვემოთ მოცემული აღდგენის კოდები გამოიყენოთ, რათა მოიპოვოთ ხელმეორე წვდომა თქვენი ანგარიშისადმი. <strong>იქონიეთ აღდგენის კოდები დაცულად</strong>. მაგალითისთვის, შეგიძლიათ ამობეჭდოთ და შეინახოთ სხვა საბუთებთან ერთად.
   user_mailer:
     backup_ready:
-      explanation: თქვენ მოითხოვეთ თქვენი მასტოდონის ანგარიშის სრული რეზერვაცია. ის ახლა უკვე მზადაა გადმოსაწერად!
       subject: თქვენი არქივი გადმოსაწერად მზადაა
       title: არქივის მიღება
     welcome:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index eeb8f16ae4..66aeafde60 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -745,8 +745,6 @@ kab:
     otp: Asnas n usesteb
     webauthn: Tisura n teɣlist
   user_mailer:
-    appeal_approved:
-      action: Ddu ɣer umiḍan-ik·im
     warning:
       categories:
         spam: Aspam
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 98fe37f296..27c76b4378 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -705,7 +705,6 @@ kk:
     recovery_instructions_html: Егер сіз телефонға кіруді жоғалтсаңыз, тіркелгіңізге кіру үшін төмендегі қалпына келтіру кодтарының бірін пайдалануға болады. <strong>Қалпына келтіру кодтарын қауіпсіз ұстаңыз </strong>. Мысалы, оларды басып шығарып, оларды басқа маңызды құжаттармен сақтауға болады.
   user_mailer:
     backup_ready:
-      explanation: Сіз Mastodon аккаунтыңыздың толық мұрағатын сұрадыңыз. Қазір жүктеуге дайын!
       subject: Мұрағатыңыз түсіріп алуға дайын
       title: Мұрағатты алу
     warning:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 76bb3bd9f1..b0eadc0504 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1687,7 +1687,7 @@ ko:
     keep_pinned: 고정된 게시물 유지
     keep_pinned_hint: 고정 게시물을 삭제하지 않습니다
     keep_polls: 설문 유지
-    keep_polls_hint: 설문을 삭제하지 않았음
+    keep_polls_hint: 설문을 삭제하지 않습니다
     keep_self_bookmark: 북마크한 게시물 유지
     keep_self_bookmark_hint: 북마크한 본인의 게시물을 삭제하지 않습니다
     keep_self_fav: 내가 좋아요한 게시물 유지
@@ -1744,7 +1744,6 @@ ko:
     webauthn: 보안 키
   user_mailer:
     appeal_approved:
-      action: 내 계정으로 가기
       explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
       subject: 귀하가 %{date}에 작성한 소명이 승낙되었습니다
       title: 소명이 받아들여짐
@@ -1753,7 +1752,6 @@ ko:
       subject: "%{date}에 작성한 소명이 반려되었습니다."
       title: 이의 제기가 거절되었습니다
     backup_ready:
-      explanation: 마스토돈 계정의 전체 백업을 요청하셨지요. 이제 다운로드할 수 있습니다!
       subject: 아카이브를 다운로드할 수 있습니다
       title: 아카이브 테이크아웃
     suspicious_sign_in:
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index b9cc5fe77e..e78e7ecfbb 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1542,7 +1542,6 @@ ku:
     webauthn: Kilîdên ewlehiyê
   user_mailer:
     appeal_approved:
-      action: Biçe ajimêra xwe
       explanation: Îtîraza binpêkirinê ya li dijî ajimêrê te ya %{strike_date} ku te di %{appeal_date} de şandibû hate pejirandin. Ajimêrê te careke din di rewşek baş de ye.
       subject: Îtîraza te ji %{date} hate pejirandin
       title: Îtîraz hate pejirandin
@@ -1551,7 +1550,6 @@ ku:
       subject: Îtîraza te ji %{date} nehate pejirandin
       title: Îtîraz nehate pejirandin
     backup_ready:
-      explanation: Te yedekîya tijê ya ajimêrê xwe Mastodonê xwest. Niha ji daxistinê re amade ye!
       subject: Arşîva te amede ye bo daxistinê
       title: Pakêtkirina arşîvan
     suspicious_sign_in:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 550036b340..d1247fc781 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1542,6 +1542,7 @@ lad:
       unknown_browser: Navigador deskonosido
       weibo: Weibo
     current_session: Sesyon aktuala
+    date: Data
     description: "%{browser} en %{platform}"
     explanation: Estos son los navigadores internetikos konektados aktualmente kon tu kuento de Mastodon.
     ip: IP
@@ -1707,16 +1708,16 @@ lad:
     webauthn: Yaves de sigurita
   user_mailer:
     appeal_approved:
-      action: Va a tu kuento
+      action: Preferensyas de kuento
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
       subject: Tu apelasyon del %{date} fue achetada
       title: Apelasyon achetada
     appeal_rejected:
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
       subject: Tu apelasyon del %{date} fue refuzada
+      subtitle: Tu apelasyon fue refuzada.
       title: Apelasyon refuzada
     backup_ready:
-      explanation: Tienes solisitado una kopia kompleta de tu kuento de Mastodon. Ya esta pronta para abashar!
       subject: Tu dosya esta pronta para abashar
       title: Abasha dosya
     suspicious_sign_in:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 8de969f646..f3715fd2ee 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -490,6 +490,7 @@ lt:
     browsers:
       generic: Nežinoma naršyklė
     current_session: Dabartinė sesija
+    date: Data
     description: "%{browser} ant %{platform}"
     explanation: Čia rodomos web naršyklės prijungtos prie Jūsų Mastodon paskyros.
     revoke: Atšaukti
@@ -548,8 +549,14 @@ lt:
     recovery_codes_regenerated: Atkūrimo kodai sėkmingai sugeneruoti
     recovery_instructions_html: Jeigu prarandate prieiga prie telefono, jūs galite naudoti atkūrimo kodus esančius žemiau, kad atgautumėte priega prie savo paskyros.<strong>Laikykite atkūrimo kodus saugiai</strong> Pavyzdžiui, galite norėti juos išspausdinti, ir laikyti kartu su kitais svarbiais dokumentais.
   user_mailer:
+    appeal_approved:
+      action: Paskyros nustatymai
+      subtitle: Tavo paskyros būklė vėl yra gera.
+    appeal_rejected:
+      subtitle: Tavo apeliacija buvo atmesta.
     backup_ready:
-      explanation: Jūs prašėte pilnos Mastodon paskyros atsarginės kopijos. Ji paruošta parsisiuntimui!
+      explanation: Prašai sukurti pilną Mastodon paskyros atsarginę kopiją.
+      extra: Jį jau galima atsisiųsti!
       subject: Jūsų archyvas paruoštas parsisiuntimui
       title: Archyvas išimtas
     warning:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c532b84e27..fcf478cf93 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1803,7 +1803,6 @@ lv:
     webauthn: Drošības atslēgas
   user_mailer:
     appeal_approved:
-      action: Dodies uz savu kontu
       explanation: Apelācija par brīdinājumu jūsu kontam %{strike_date}, ko iesniedzāt %{appeal_date}, ir apstiprināta. Jūsu konts atkal ir labā stāvoklī.
       subject: Jūsu %{date} apelācija ir apstiprināta
       title: Apelācija apstiprināta
@@ -1812,7 +1811,6 @@ lv:
       subject: Jūsu %{date} apelācija ir noraidīta
       title: Apelācija noraidīta
     backup_ready:
-      explanation: Tu pieprasīji pilnu sava Mastodon konta dublējumu. Tagad tas ir gatavs lejupielādei!
       subject: Tavs arhīvs ir gatavs lejupielādei
       title: Arhīva līdzņemšana
     suspicious_sign_in:
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 74acf87552..6625a13b3b 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1720,7 +1720,6 @@ ms:
     webauthn: Kunci keselamatan
   user_mailer:
     appeal_approved:
-      action: Pergi ke akaun anda
       explanation: Rayuan pelanggaran yang dikemukakan pada %{appeal_date} terhadap akaun anda pada %{strike_date} telah diluluskan. Akaun anda kini dalam kedudukan yang baik.
       subject: Rayuan anda dari %{date} telah diluluskan
       title: Rayuan diluluskan
@@ -1729,7 +1728,6 @@ ms:
       subject: Rayuan anda dari %{date} telah ditolak
       title: Rayuan ditolak
     backup_ready:
-      explanation: Anda meminta sandaran penuh akaun Mastodon anda. Ia kini sedia untuk dimuat turun!
       subject: Arkib anda sedia untuk dimuat turun
       title: Arkibkan bawa pulang
     suspicious_sign_in:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4ba4fcfad3..094f581eb9 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1719,7 +1719,6 @@ my:
     webauthn: လုံခြုံရေးကီးများ
   user_mailer:
     appeal_approved:
-      action: သင့်အကောင့်သို့ သွားပါ
       explanation: "%{appeal_date} တွင် သင်တင်သွင်းခဲ့သည့် %{strike_date} တွင် သင့်အကောင့်ကို ဆန့်ကျင်သည့် တိုင်ချက်၏ အယူခံဝင်မှုကို အတည်ပြုပြီးဖြစ်သည်။ သင့်အကောင့်သည် ကောင်းမွန်သောအနေအထားတွင် ရှိနေပြန်သည်။"
       subject: "%{date} တွင် သင့်အယူခံဝင်ချက်ကို အတည်ပြုပြီးပါပြီ"
       title: အယူခံဝင်သည်
@@ -1728,7 +1727,6 @@ my:
       subject: "%{date} တွင် သင့်တင်ပြချက်ကို ပယ်ချခဲ့သည်"
       title: အယူခံကို ပယ်ချခဲ့သည်
     backup_ready:
-      explanation: သင့် Mastodon အကောင့် အရန်ကူးယူရန် တောင်းဆိုပြီးဖြစ်သည်။ ယခု ဒေါင်းလုဒ်လုပ်နိုင်ပါပြီ။
       subject: သင့်မှတ်တမ်း ဒေါင်းလုဒ်ဆွဲရန် အသင့်ဖြစ်ပါပြီ
       title: မှတ်တမ်းသိမ်းရန်
     suspicious_sign_in:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 3429ab0e82..9235b99fed 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1608,6 +1608,7 @@ nl:
       unknown_browser: Onbekende browser
       weibo: Weibo
     current_session: Huidige sessie
+    date: Datum
     description: "%{browser} op %{platform}"
     explanation: Dit zijn de webbrowsers die momenteel met jouw Mastodonaccount zijn ingelogd.
     ip: IP
@@ -1774,16 +1775,19 @@ nl:
     webauthn: Beveiligingssleutels
   user_mailer:
     appeal_approved:
-      action: Ga naar je account
+      action: Accountinstellingen
       explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is goedgekeurd. De eerder vastgestelde overtreding is hierbij niet langer geldig.
       subject: Jouw bezwaar van %{date} is goedgekeurd
+      subtitle: Jouw account heeft weer een goede reputatie.
       title: Bezwaar goedgekeurd
     appeal_rejected:
       explanation: Het bezwaar tegen een door een moderator vastgestelde overtreding van jou op %{strike_date}, ingediend op %{appeal_date}, is afgewezen. De vastgestelde overtreding blijft daarom ongewijzigd.
       subject: Jouw bezwaar van %{date} is afgewezen
+      subtitle: Jouw bezwaar is afgewezen.
       title: Bezwaar afgewezen
     backup_ready:
-      explanation: Je hebt een volledige back-up van jouw Mastodon-account opgevraagd. Het staat nu klaar om te worden gedownload!
+      explanation: Je hebt een volledige back-up van je Mastodon-account aangevraagd.
+      extra: Het staat nu klaar om te worden gedownload!
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
     suspicious_sign_in:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index de23096ed1..914ee7fb04 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1774,7 +1774,6 @@ nn:
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      action: Gå til din konto
       explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
       subject: Din klage fra %{date} er godkjent
       title: Anke godkjend
@@ -1783,7 +1782,6 @@ nn:
       subject: Din klage fra %{date} er avvist
       title: Anke avvist
     backup_ready:
-      explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
     suspicious_sign_in:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 54f82550b7..61cc89181e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1774,7 +1774,6 @@
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      action: Gå til kontoen din
       explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
       subject: Din klage fra %{date} er godkjent
       title: Klage godkjent
@@ -1783,7 +1782,6 @@
       subject: Din klage fra %{date} er avvist
       title: Klage avvist
     backup_ready:
-      explanation: Du ba om en fullstendig sikkerhetskopi av Mastodon-kontoen din. Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
     suspicious_sign_in:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 83c2638b51..2887fc98b3 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -948,10 +948,7 @@ oc:
     recovery_instructions_html: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. <strong>Gardatz los còdis en seguretat</strong>, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
     webauthn: Claus de seguretat
   user_mailer:
-    appeal_approved:
-      action: Anatz al vòstre compte
     backup_ready:
-      explanation: Avètz demandat una salvagarda complèta de vòstre compte Mastodon. Es prèsta per telecargament !
       subject: Vòstre archiu es prèst per telecargament
       title: Archiu per emportar
     warning:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 15aefe5f74..8a973b71c7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1660,6 +1660,7 @@ pl:
       unknown_browser: Nieznana Przeglądarka
       weibo: Weibo
     current_session: Obecna sesja
+    date: Data
     description: "%{browser} na %{platform}"
     explanation: Przeglądarki z aktywną sesją Twojego konta.
     ip: Adres IP
@@ -1838,16 +1839,19 @@ pl:
     webauthn: Klucze bezpieczeństwa
   user_mailer:
     appeal_approved:
-      action: Przejdź do swojego konta
+      action: Ustawienia Konta
       explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało zatwierdzone. Twoje konto jest ponownie w dobrej kondycji.
       subject: Twoje odwołanie z dnia %{date} zostało zatwierdzone
+      subtitle: Reputacja twojego konta została przywrócona.
       title: Odwołanie zatwierdzone
     appeal_rejected:
       explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało odrzucone.
       subject: Twoje odwołanie z dnia %{date} zostało odrzucone
+      subtitle: Twoje odwołanie zostało odrzucone.
       title: Odwołanie odrzucone
     backup_ready:
-      explanation: Zażądałeś pełnej kopii zapasowej konta na Mastodonie. Jest ona dostępna do pobrania!
+      explanation: Zamówiono pełną kopię zapasową twojego konta Mastodon.
+      extra: Gotowe do pobrania!
       subject: Twoje archiwum jest gotowe do pobrania
       title: Odbiór archiwum
     suspicious_sign_in:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2c485283b1..47ad0ac448 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1608,6 +1608,7 @@ pt-BR:
       unknown_browser: Navegador desconhecido
       weibo: Weibo
     current_session: Sessão atual
+    date: Data
     description: "%{browser} em %{platform}"
     explanation: Estes são os navegadores que estão conectados com a sua conta Mastodon.
     ip: IP
@@ -1774,16 +1775,18 @@ pt-BR:
     webauthn: Chaves de segurança
   user_mailer:
     appeal_approved:
-      action: Acessar perfil
+      action: Configurações da conta
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi aprovada. Sua conta está novamente em situação regular.
       subject: Sua revisão de %{date} foi aprovada
       title: Revisão aprovada
     appeal_rejected:
       explanation: A revisão da punição na sua conta em %{strike_date} que você enviou em %{appeal_date} foi rejeitada.
       subject: Sua revisão de %{date} foi rejeitada
+      subtitle: Sua revisão foi rejeitada.
       title: Revisão rejeitada
     backup_ready:
-      explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
+      explanation: Você solicitou um ‘backup’ completo da sua conta Mastodon.
+      extra: Agora está pronto para baixar!
       subject: Seu arquivo está pronto para ser baixado
       title: Baixar arquivo
     suspicious_sign_in:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 111f0fa8ee..fc1e3e6367 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1608,6 +1608,7 @@ pt-PT:
       unknown_browser: Navegador Desconhecido
       weibo: Weibo
     current_session: Sessão atual
+    date: Data
     description: "%{browser} em %{platform}"
     explanation: Estes são os navegadores que estão conectados com a tua conta do Mastodon.
     ip: IP
@@ -1774,16 +1775,19 @@ pt-PT:
     webauthn: Chaves de segurança
   user_mailer:
     appeal_approved:
-      action: Ir para a sua conta
+      action: Configurações de Conta
       explanation: O recurso à reprimenda contra a sua conta de %{strike_date}, enviado a %{appeal_date}, foi deferido. A sua conta encontra-se novamente em situação regular.
       subject: O seu recurso de %{date} foi deferido
+      subtitle: A sua conta está em situação regular novamente.
       title: Recurso deferido
     appeal_rejected:
       explanation: O recurso à punição contra a sua conta de %{strike_date}, submetido em %{appeal_date}, foi indeferido.
       subject: O seu recurso de %{date} foi indeferido
+      subtitle: O seu recurso foi rejeitado.
       title: Recurso indeferido
     backup_ready:
-      explanation: Pediu uma cópia integral de salvaguarda da sua conta Mastodon. Já está pronta para descarregar!
+      explanation: Pediu uma cópia completa da sua conta Mastodon.
+      extra: Está pronta para transferir!
       subject: O seu arquivo está pronto para descarregar
       title: Arquivo de ficheiros
     suspicious_sign_in:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 12c06505b8..1bdc4e8ca5 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -693,7 +693,6 @@ ro:
     recovery_instructions_html: Dacă îți pierzi vreodată accesul la telefon, poți folosi unul dintre codurile de recuperare de mai jos pentru a recâștiga accesul la contul tău. <strong>Păstrați codurile de recuperare în condiții de siguranță</strong>. De exemplu, le puteți tipări și stoca cu alte documente importante.
   user_mailer:
     backup_ready:
-      explanation: Ai solicitat o copie de rezervă completă a contului tău. Acum este gata pentru descărcare!
       subject: Arhiva ta este gata pentru descărcare
       title: Preluare arhivă
     warning:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b1c86494c7..2644275c37 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1837,7 +1837,6 @@ ru:
     webauthn: Ключи безопасности
   user_mailer:
     appeal_approved:
-      action: Перейти к своему профилю
       explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
       subject: Ваше обжалование от %{date} была одобрено
       title: Обжалование одобрено
@@ -1846,7 +1845,6 @@ ru:
       subject: Ваше обжалование от %{date} отклонено
       title: Обжалование отклонено
     backup_ready:
-      explanation: Вы запросили архив всех данных вашей учётной записи Mastodon. Что ж, он готов к скачиванию.
       subject: Ваш архив готов к загрузке
       title: Архив ваших данных готов
     suspicious_sign_in:
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index d92b64783a..273ef9d2d9 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1077,7 +1077,6 @@ sc:
     webauthn: Craes de seguresa
   user_mailer:
     backup_ready:
-      explanation: As pedidu una còpia de seguresa totale de su contu de Mastodon tuo. Immoe est pronta pro s'iscarrigamentu!
       subject: S'archìviu tuo est prontu pro èssere iscarrigadu
       title: Collida dae s'archìviu
     warning:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index f77c4c7978..a1071197f1 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1532,7 +1532,6 @@ sco:
     webauthn: Security keys
   user_mailer:
     appeal_approved:
-      action: Gang tae yer accoont
       explanation: The appeal o the strike agin yer accoont on %{strike_date} thit ye submittit on %{appeal_date} haes been approved. Yer accoont is ance again in guid staunnin.
       subject: Yer appeal fae %{date} haes been approved
       title: Appeal approved
@@ -1541,7 +1540,6 @@ sco:
       subject: Yer appeal fae %{date} haes been rejectit
       title: Appeal rejectit
     backup_ready:
-      explanation: Ye wantit a ful backup o yer Mastodon accoont. It's riddy fir tae doonload noo!
       subject: Yer archive is riddy fir doonload
       title: Archive takoot
     suspicious_sign_in:
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 70aefafc11..660fd3ba31 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1389,7 +1389,6 @@ si:
     webauthn: ආරක්‍ෂණ යතුරු
   user_mailer:
     appeal_approved:
-      action: ඔබගේ ගිණුමට යන්න
       explanation: ඔබ %{appeal_date} දින ඉදිරිපත් කළ %{strike_date} හි ඔබේ ගිණුමට එරෙහි වර්ජනයේ අභියාචනය අනුමත කර ඇත. ඔබගේ ගිණුම නැවත වරක් හොඳ තත්වයක පවතී.
       subject: "%{date} සිට ඔබගේ අභියාචනය අනුමත කර ඇත"
       title: අභියාචනය අනුමත කර ඇත
@@ -1398,7 +1397,6 @@ si:
       subject: "%{date} සිට ඔබගේ අභියාචනය ප්‍රතික්ෂේප කර ඇත"
       title: අභියාචනය ප්‍රතික්ෂේප විය
     backup_ready:
-      explanation: ඔබගේ මාස්ටඩන් ගිණුමේ පූර්ණ උපස්ථයක් ඉල්ලා ඇත. එය දැන් බාගැනීමට හැකිය!
       subject: ඔබගේ සංරක්ෂිතය බාගැනීමට සූදානම්ය
       title: සංරක්ෂිත රැගෙන යාම
     suspicious_sign_in:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9390a713bc..fdd64b5bb7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1138,6 +1138,7 @@ sk:
       unknown_browser: Neznámy prehliadač
       weibo: Sina/Tencent Weibo
     current_session: Aktuálna sezóna
+    date: Dátum
     description: "%{browser} na %{platform}"
     explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
     ip: IP adresa
@@ -1245,9 +1246,12 @@ sk:
     recovery_instructions_html: Keď hocikedy stratíš prístup k svojmu telefónu, môžeš použiť jeden z prístupových kódov nižšie pre obnovenie prístupu k svojmu účtu. <strong>Skladuj tieto prístupové kódy na bezpečnom mieste</strong>. Napríklad ich môžeš vytlačiť a uložiť ich spolu s inými dôležitými dokumentami.
   user_mailer:
     appeal_approved:
-      action: Choď na svoj účet
+      action: Nastavenia účtu
+    appeal_rejected:
+      subtitle: Tvoje odvolanie bolo zamietnuté.
     backup_ready:
-      explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu. Táto záloha je teraz pripravená na stiahnutie!
+      explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu.
+      extra: Teraz je pripravená na stiahnutie!
       subject: Tvoj archív je pripravený na stiahnutie
       title: Odber archívu
     warning:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 83d52ae0e7..1a0afe034f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1660,6 +1660,7 @@ sl:
       unknown_browser: Neznan brskalnik
       weibo: Weibo
     current_session: Trenutna seja
+    date: Datum
     description: "%{browser} na %{platform}"
     explanation: To so spletni brskalniki, ki so trenutno prijavljeni v vaš Mastodon račun.
     ip: IP
@@ -1838,16 +1839,19 @@ sl:
     webauthn: Varnostni ključi
   user_mailer:
     appeal_approved:
-      action: Pojdite na svoj račun
+      action: Nastavitve računa
       explanation: Pritožbi na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bilo ugodeno. Vaš račun je znova nesporen.
       subject: Vaši pritožbi z dne %{date} je bilo ugodeno
+      subtitle: Vaš račun je znova na dobrem glasu.
       title: Pritožbi ugodeno
     appeal_rejected:
       explanation: Pritožba na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bila zavrnjena.
       subject: Vaša pritožba z dne %{date} je bila zavrnjena
+      subtitle: Vaša pritožba je bila zavržena.
       title: Pritožba zavrnjena
     backup_ready:
-      explanation: Zahtevali ste popolno varnostno kopijo računa Mastodon. Zdaj je pripravljen za prenos!
+      explanation: Zahtevali ste polno varnostno kopijo svojega računa Mastodon.
+      extra: Zdaj je na voljo za prenos!
       subject: Vaš arhiv je pripravljen za prenos
       title: Prevzem arhiva
     suspicious_sign_in:
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 9ab6e85361..1693db7f31 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1770,7 +1770,6 @@ sq:
     webauthn: Kyçe sigurie
   user_mailer:
     appeal_approved:
-      action: Kaloni te llogaria juaj
       explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
       subject: Apelimi juaj i datës %{date} u miratua
       title: Apelimi u miratua
@@ -1779,7 +1778,6 @@ sq:
       subject: Apelimi juaj prej %{date} është hedhur poshtë
       title: Apelimi u hodh poshtë
     backup_ready:
-      explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon. E keni gati për shkarkim!
       subject: Arkivi juaj është gati për shkarkim
       title: Marrje arkivi me vete
     suspicious_sign_in:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 02f63ede71..fc1239bedf 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1634,6 +1634,7 @@ sr-Latn:
       unknown_browser: Nepoznati pregledač
       weibo: Veibo
     current_session: Trenutna sesija
+    date: Datum
     description: "%{browser} sa %{platform}"
     explanation: Ovo su veb pretraživači koji su trenutno prijavljeni na vaš Mastodon nalog.
     ip: IP
@@ -1806,16 +1807,19 @@ sr-Latn:
     webauthn: Sigurnosni ključevi
   user_mailer:
     appeal_approved:
-      action: Idite na svoj nalog
+      action: Podešavanja naloga
       explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je uvažena. Vaš nalog je ponovo u povoljnom položaju.
       subject: Vaša žalba podneta %{date} je uvažena
+      subtitle: Vaš nalog je ponovo na dobrom glasu.
       title: Žalba uvažena
     appeal_rejected:
       explanation: Žalba podneta datuma %{appeal_date} na upisan prestup na Vaše ime datuma %{strike_date} je odbijena.
       subject: Vaša žalba podneta %{date} je odbijena
+      subtitle: Vaša žalba je odbijena.
       title: Žalba odbijena
     backup_ready:
-      explanation: Tražili ste potpunu rezervnu kopiju vašeg Mastodon naloga. Spremna je za preuzimanje!
+      explanation: Zahtevali ste punu rezervnu kopiju Mastodon naloga.
+      extra: Sada je spremno za preuzimanje!
       subject: Vaša arhiva je spremna za preuzimanje
       title: Izvoz arhive
     suspicious_sign_in:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 51613940bc..4e5e58c859 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1634,6 +1634,7 @@ sr:
       unknown_browser: Непознати прегледач
       weibo: Веибо
     current_session: Тренутна сесија
+    date: Датум
     description: "%{browser} са %{platform}"
     explanation: Ово су веб претраживачи који су тренутно пријављени на ваш Mastodon налог.
     ip: IP
@@ -1806,16 +1807,19 @@ sr:
     webauthn: Сигурносни кључеви
   user_mailer:
     appeal_approved:
-      action: Идите на свој налог
+      action: Подешавања налога
       explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је уважена. Ваш налог је поново у повољном положају.
       subject: Ваша жалба поднета %{date} је уважена
+      subtitle: Ваш налог је поново на добром гласу.
       title: Жалба уважена
     appeal_rejected:
       explanation: Жалба поднета датума %{appeal_date} на уписан преступ на Ваше име датума %{strike_date} је одбијена.
       subject: Ваша жалба поднета %{date} је одбијена
+      subtitle: Ваша жалба је одбијена.
       title: Жалба одбијена
     backup_ready:
-      explanation: Тражили сте потпуну резервну копију вашег Mastodon налога. Спремна је за преузимање!
+      explanation: Захтевали сте пуну резервну копију Mastodon налога.
+      extra: Сада је спремно за преузимање!
       subject: Ваша архива је спремна за преузимање
       title: Извоз архиве
     suspicious_sign_in:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9a2bedbdfe..d4657e9743 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1607,6 +1607,7 @@ sv:
       unknown_browser: Okänd browser
       weibo: Weibo
     current_session: Nuvarande session
+    date: Datum
     description: "%{browser} på %{platform}"
     explanation: Detta är inloggade webbläsare på Mastodon just nu.
     ip: IP
@@ -1773,16 +1774,19 @@ sv:
     webauthn: Säkerhetsnycklar
   user_mailer:
     appeal_approved:
-      action: Gå till ditt konto
+      action: Kontoinställningar
       explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har godkänts. Ditt konto har återigen bra anseende.
       subject: Din överklagan den %{date} har godkänts
+      subtitle: Ditt konto är återigen i gott skick.
       title: Överklagan godkänd
     appeal_rejected:
       explanation: Överklagandet du skickade in den %{appeal_date} för pricken på ditt konto den %{strike_date} har avslagits.
       subject: Din överklagan den %{date} har avslagits
+      subtitle: Din överklagan har avvisats.
       title: Överklagan avslagen
     backup_ready:
-      explanation: Du begärde en fullständig säkerhetskopiering av ditt Mastodon-konto. Det är nu klart för nedladdning!
+      explanation: Du begärde en fullständig säkerhetskopia av ditt Mastodon-konto.
+      extra: Nu redo för nedladdning!
       subject: Ditt arkiv är klart för nedladdning
       title: Arkivuttagning
     suspicious_sign_in:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f553f6a41c..7bea8f9de8 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1742,7 +1742,6 @@ th:
     webauthn: กุญแจความปลอดภัย
   user_mailer:
     appeal_approved:
-      action: ไปยังบัญชีของคุณ
       explanation: อนุมัติการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
       subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
       title: อนุมัติการอุทธรณ์แล้ว
@@ -1751,7 +1750,6 @@ th:
       subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
       title: ปฏิเสธการอุทธรณ์แล้ว
     backup_ready:
-      explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
       subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
       title: การส่งออกการเก็บถาวร
     suspicious_sign_in:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index da8935f6ca..99b5e782ce 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1608,6 +1608,7 @@ tr:
       unknown_browser: Bilinmeyen Tarayıcı
       weibo: Weibo
     current_session: Geçerli oturum
+    date: Tarih
     description: "%{platform} - %{browser}"
     explanation: Bunlar, Mastodon hesabınızda şu anda oturum açmış web tarayıcılarıdır.
     ip: IP
@@ -1774,16 +1775,19 @@ tr:
     webauthn: Güvenlik anahtarları
   user_mailer:
     appeal_approved:
-      action: Hesabınıza gidin
+      action: Hesap Ayarları
       explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız onaylandı. Hesabınız artık tekrar iyi durumda."
       subject: "%{date} tarihli itirazınız kabul edildi"
+      subtitle: Hesabınız yeniden iyi bir halde.
       title: İtiraz onaylandı
     appeal_rejected:
       explanation: "%{appeal_date} tarihinde gönderdiğiniz, hesabınıza yönelik %{strike_date} tarihli eyleme itirazınız reddedildi."
       subject: "%{date} tarihli itirazınız reddedildi"
+      subtitle: İtirazınız reddedildi.
       title: İtiraz reddedildi
     backup_ready:
-      explanation: Mastodon hesabınızın tam yedeğini istemiştiniz. Şimdi indirilebilir durumda!
+      explanation: Mastodon hesabınız tam bir yedeğini istediniz.
+      extra: Şimdi indirebilirsiniz!
       subject: Arşiviniz indirilmeye hazır
       title: Arşiv paketlemesi
     suspicious_sign_in:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 7a1957eba7..a80fbf1404 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1660,6 +1660,7 @@ uk:
       unknown_browser: Невідомий браузер
       weibo: Weibo
     current_session: Поточний сеанс
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Це веб-браузери, авторизовані у вашому обліковому записі Mastodon.
     ip: IP
@@ -1838,7 +1839,7 @@ uk:
     webauthn: Ключі безпеки
   user_mailer:
     appeal_approved:
-      action: Перейти у ваш обліковий запис
+      action: Налаштування облікового запису
       explanation: Оскарження попередження вашому обліковому запису %{strike_date}, яке ви надіслали %{appeal_date} було схвалено. Ваш обліковий запис знову вважається добропорядним.
       subject: Вашу апеляцію від %{date} було схвалено
       title: Апеляцію схвалено
@@ -1847,7 +1848,6 @@ uk:
       subject: Вашу апеляцію від %{date} було відхилено
       title: Апеляцію відхилено
     backup_ready:
-      explanation: Ви робили запит повної резервної копії вашого облікового запису Mastodon. Вона вже готова для завантаження!
       subject: Ваш архів готовий до завантаження
       title: Винесення архіву
     suspicious_sign_in:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index f37132b6eb..dabb73a475 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1582,6 +1582,7 @@ vi:
       unknown_browser: Trình duyệt khác
       weibo: Weibo
     current_session: Phiên hiện tại
+    date: Thời gian
     description: "%{browser} trên %{platform}"
     explanation: Đây là các ứng dụng đã từng đăng nhập vào tài khoản Mastodon của bạn.
     ip: IP
@@ -1742,16 +1743,19 @@ vi:
     webauthn: Khóa bảo mật
   user_mailer:
     appeal_approved:
-      action: Đến trang hồ sơ của bạn
+      action: Cài đặt tài khoản
       explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã được chấp nhận. Tài khoản của bạn đã có thể sử dụng bình thường.
       subject: Khiếu nại của bạn từ %{date} đã được chấp nhận
+      subtitle: Tài khoản của bạn có thể hoạt động lại bình thường.
       title: Khiếu nại đã được chấp nhận
     appeal_rejected:
       explanation: Khiếu nại về tài khoản của bạn vào %{strike_date}, được gửi lúc %{appeal_date} đã bị từ chối.
       subject: Khiếu nại của bạn từ %{date} đã bị từ chối
+      subtitle: Khiếu nại của bạn bị từ chối.
       title: Khiếu nại bị từ chối
     backup_ready:
-      explanation: Bạn đã yêu cầu sao lưu toàn bộ tài khoản Mastodon của mình. Bây giờ có thể tải về!
+      explanation: Bạn đã yêu cầu bản sao tài khoản Mastodon của mình.
+      extra: Hiện nó đã sẵn sàng tải xuống!
       subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
       title: Nhận dữ liệu cá nhân
     suspicious_sign_in:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index a573c8f99b..6611510b7d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1582,6 +1582,7 @@ zh-CN:
       unknown_browser: 未知浏览器
       weibo: 新浪微博
     current_session: 当前会话
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 你的 Mastodon 账户目前已在这些浏览器上登录。
     ip: IP 地址
@@ -1742,16 +1743,19 @@ zh-CN:
     webauthn: 安全密钥
   user_mailer:
     appeal_approved:
-      action: 前往你的账号
+      action: 账户设置
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被批准，你的账号已回到正常状态。
       subject: 你于 %{date} 提出的申诉已被批准
+      subtitle: 您的账户已再次回到良好状态。
       title: 申诉已批准
     appeal_rejected:
       explanation: 你于 %{appeal_date} 对 %{strike_date} 在你账号上做出的处罚提出的申诉已被驳回。
       subject: 你于 %{date} 提出的申诉已被驳回
+      subtitle: 您的申诉已被驳回。
       title: 申诉已驳回
     backup_ready:
-      explanation: 你请求了一份 Mastodon 账户的完整备份。现在你可以下载了！
+      explanation: 您之前请求为您的 Mastodon 账户创建一份完整的备份。
+      extra: 现在它可以下载了！
       subject: 你的存档已经准备完毕
       title: 存档导出
     suspicious_sign_in:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 61355a4c53..4b682f9358 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1582,6 +1582,7 @@ zh-HK:
       unknown_browser: 未知的瀏覽器
       weibo: 新浪微博
     current_session: 目前的作業階段
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 這些是現在正登入於你的 Mastodon 帳號的瀏覽器。
     ip: IP 位址
@@ -1742,16 +1743,19 @@ zh-HK:
     webauthn: 安全密鑰
   user_mailer:
     appeal_approved:
-      action: 前往你的帳號
+      action: 帳號設定
       explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已獲得批准。你的帳號再次回到良好狀態。
       subject: 你在 %{date} 提出的申訴已獲批准
+      subtitle: 你的帳號再次恢復正常。
       title: 申訴已批准
     appeal_rejected:
       explanation: 你在 %{appeal_date} 提交針對你帳號於 %{strike_date} 被警告的申訴已被駁回。
       subject: 你在 %{date} 提出的申訴已被駁回
+      subtitle: 你的申訴已被駁回.
       title: 申訴被駁回
     backup_ready:
-      explanation: 你要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載。
+      explanation: 你要求完整備份你的 Mastodon 帳號。
+      extra: 現在可以下載了！
       subject: 你的備份檔已可供下載
       title: 檔案匯出
     suspicious_sign_in:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 3f3057cc05..dd17de7ef1 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1584,6 +1584,7 @@ zh-TW:
       unknown_browser: 未知的瀏覽器
       weibo: 新浪微博
     current_session: 目前的 session
+    date: 日期
     description: "%{platform} 上的 %{browser}"
     explanation: 這些是現在正登入於您 Mastodon 帳號的瀏覽器。
     ip: IP 位址
@@ -1744,16 +1745,19 @@ zh-TW:
     webauthn: 安全金鑰
   user_mailer:
     appeal_approved:
-      action: 前往您的帳號
+      action: 帳號設定
       explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已獲批准。您的帳號再次享有良好的信譽。
       subject: 您於 %{date} 提出之申訴已獲批准
+      subtitle: 您的帳號再次保持良好信譽。
       title: 申訴已批准
     appeal_rejected:
       explanation: 您於 %{appeal_date} 遞交的針對您帳號的 %{strike_date} 警示之申訴已被駁回。
       subject: 您於 %{date} 提出之申訴已被駁回
+      subtitle: 您的申訴已被駁回。
       title: 申訴被駁回
     backup_ready:
-      explanation: 您要求的 Mastodon 帳號完整備份檔案現已就緒，可供下載！
+      explanation: 您要求完整備份您的 Mastodon 帳號。
+      extra: 準備好下載了！
       subject: 您的備份檔已可供下載
       title: 檔案匯出
     suspicious_sign_in:

From 6fab50ba9eee74ce0647130a43632bea20b01767 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 09:35:55 -0500
Subject: [PATCH 333/436] Use bundler version 2.5.4 (#28765)

---
 Gemfile.lock |   2 +-
 bin/bundle   | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 736a829f07..6cf0504b51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -955,4 +955,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.20
+   2.5.4
diff --git a/bin/bundle b/bin/bundle
index f19acf5b5c..50da5fdf9e 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,109 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-load Gem.bin_path('bundler', 'bundle')
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

From 1a3859d8e22c4b5a99f7ce09237ac859e4e760be Mon Sep 17 00:00:00 2001
From: HTeuMeuLeu <remi@hteumeuleu.fr>
Date: Wed, 17 Jan 2024 15:37:04 +0100
Subject: [PATCH 334/436] Update follow and follow_request emails (#28755)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/accounts_helper.rb                | 10 ++-
 app/javascript/styles/mailer.scss             | 87 +++++++++++++++++++
 .../application/mailer/_account.html.haml     | 30 +++++++
 .../notification_mailer/follow.html.haml      |  8 +-
 .../follow_request.html.haml                  |  8 +-
 5 files changed, 136 insertions(+), 7 deletions(-)
 create mode 100644 app/views/application/mailer/_account.html.haml

diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 6301919a9e..158a0815e1 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -27,20 +27,24 @@ module AccountsHelper
     end
   end
 
+  def account_formatted_stat(value)
+    number_to_human(value, precision: 3, strip_insignificant_zeros: true)
+  end
+
   def account_description(account)
     prepend_str = [
       [
-        number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.statuses_count),
         I18n.t('accounts.posts', count: account.statuses_count),
       ].join(' '),
 
       [
-        number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.following_count),
         I18n.t('accounts.following', count: account.following_count),
       ].join(' '),
 
       [
-        number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.followers_count),
         I18n.t('accounts.followers', count: account.followers_count),
       ].join(' '),
     ].join(', ')
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index 6d0168969e..bd220bb1a8 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -88,6 +88,85 @@ table + p {
   padding: 24px;
 }
 
+// Account
+.email-account-banner-table {
+  background-color: #f3f2f5;
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+}
+
+.email-account-banner-td {
+  border-top-left-radius: 12px;
+  border-top-right-radius: 12px;
+  height: 140px;
+  vertical-align: bottom;
+  background-color: #f3f2f5;
+  background-position: center;
+  background-size: cover;
+}
+
+.email-account-banner-inner-td {
+  padding: 24px 24px 0;
+  mso-padding-alt: 24px;
+}
+
+.email-account-banner-overlap-div {
+  max-height: 42px;
+}
+
+.email-account-banner-icon-table {
+  width: auto;
+  margin: 0;
+  overflow: hidden;
+  border-radius: 8px;
+  border-collapse: separate;
+  background-color: #fff;
+  border: 2px solid #fff;
+
+  img {
+    display: block;
+    max-width: 100%;
+    border: none;
+    border-radius: 6px;
+  }
+}
+
+.email-account-body-td {
+  padding: 56px 24px 24px;
+  mso-padding-alt: 24px;
+}
+
+.email-account-name {
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  color: #17063b;
+}
+
+.email-account-handle {
+  font-size: 14px;
+  line-height: 20px;
+  color: #746a89;
+}
+
+.email-account-stats-table {
+  td {
+    padding-right: 16px;
+    font-size: 14px;
+    line-height: 20px;
+    color: #746a89;
+  }
+
+  b {
+    font-weight: 600;
+    color: #17063b;
+  }
+
+  span {
+    white-space: nowrap;
+  }
+}
+
 // Utility classes
 .email-w-full {
   width: 100%;
@@ -122,6 +201,14 @@ table + p {
   padding-top: 24px;
 }
 
+.email-padding-top-16 {
+  padding-top: 16px;
+}
+
+.email-padding-top-0 {
+  padding-top: 0;
+}
+
 .email-border-top {
   border-top: 1px solid #dfdee3;
 }
diff --git a/app/views/application/mailer/_account.html.haml b/app/views/application/mailer/_account.html.haml
new file mode 100644
index 0000000000..27493f770d
--- /dev/null
+++ b/app/views/application/mailer/_account.html.haml
@@ -0,0 +1,30 @@
+%table.email-w-full.email-account-banner-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-banner-td{ height: 140, background: full_asset_url(account.header.url) }
+      %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-account-banner-inner-td
+            .email-account-banner-overlap-div
+              %table.email-account-banner-icon-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+                %tr
+                  %td
+                    %img{ src: full_asset_url(account.avatar.url), width: 80, height: 80, alt: '' }
+%table.email-w-full.email-account-body-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-account-body-td
+      %p.email-account-name= display_name(account)
+      %p.email-account-handle= acct(account)
+      %table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-padding-top-16
+            %table.email-w-full.email-account-stats-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td
+                  %b= account_formatted_stat(account.statuses_count)
+                  %span= t('accounts.posts', count: account.statuses_count)
+                %td
+                  %b= account_formatted_stat(account.following_count)
+                  %span= t('accounts.following')
+                %td
+                  %b= account_formatted_stat(account.followers_count)
+                  %span= t('accounts.followers', count: account.followers_count)
diff --git a/app/views/notification_mailer/follow.html.haml b/app/views/notification_mailer/follow.html.haml
index 607cdb3666..8247aa5b44 100644
--- a/app/views/notification_mailer/follow.html.haml
+++ b/app/views/notification_mailer/follow.html.haml
@@ -5,5 +5,9 @@
     %td.email-body-padding-td
       %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
         %tr
-          %td.email-inner-card-td
-            = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-padding-24.email-padding-top-0
+                  = render 'application/mailer/button', text: t('application_mailer.view_profile'), url: web_url("@#{@account.pretty_acct}")
diff --git a/app/views/notification_mailer/follow_request.html.haml b/app/views/notification_mailer/follow_request.html.haml
index 12e3e2ee33..9344ef7eb3 100644
--- a/app/views/notification_mailer/follow_request.html.haml
+++ b/app/views/notification_mailer/follow_request.html.haml
@@ -5,5 +5,9 @@
     %td.email-body-padding-td
       %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
         %tr
-          %td.email-inner-card-td
-            = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')
+          %td.email-inner-card-td-without-padding
+            = render 'application/mailer/account', account: @account
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-padding-24.email-padding-top-0
+                  = render 'application/mailer/button', text: t('notification_mailer.follow_request.action'), url: web_url('follow_requests')

From e817fe4c35a3657b121eeb7fbc22e1d8774b8976 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 17 Jan 2024 16:32:56 +0100
Subject: [PATCH 335/436] =?UTF-8?q?Change=20media=20=E2=80=9CALT=E2=80=9D?=
 =?UTF-8?q?=20label=20to=20a=20specific=20class=20(#28777)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/media_gallery.jsx | 2 +-
 app/javascript/styles/mastodon/components.scss       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index e5200371ae..91459a1285 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -103,7 +103,7 @@ class Item extends PureComponent {
     }
 
     if (attachment.get('description')?.length > 0) {
-      badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
+      badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
     }
 
     const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index ab8939e131..5c35567264 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6097,6 +6097,7 @@ a.status-card {
   gap: 2px;
 }
 
+.media-gallery__alt__label,
 .media-gallery__gifv__label {
   display: flex;
   align-items: center;

From 09f76c5c8d261dc5043864e8215323019a7b8263 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 10:42:13 -0500
Subject: [PATCH 336/436] Regenerate rubocop todo, removes last
 `Layout/LineLength` violation (#28778)

---
 .rubocop_todo.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2c2366c9cf..12bab088e3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,13 +13,6 @@ Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/models/account.rb'
-
 Lint/NonLocalExitFromIterator:
   Exclude:
     - 'app/helpers/jsonld_helper.rb'

From 30b193b8562eccce9e1f16a895517116400e4a3a Mon Sep 17 00:00:00 2001
From: Santiago Kozak <kozaksantiago@gmail.com>
Date: Wed, 17 Jan 2024 13:32:30 -0300
Subject: [PATCH 337/436] Improve display of lock icon in account headers
 (#28780)

---
 app/javascript/styles/mastodon/components.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5c35567264..93cea5f76c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -7420,6 +7420,13 @@ noscript {
           span {
             user-select: all;
           }
+
+          .icon-lock {
+            height: 16px;
+            width: 16px;
+            position: relative;
+            top: 3px;
+          }
         }
       }
     }

From 127503eb2cdd67126974bee304dde0f183300b84 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 17 Jan 2024 11:33:17 -0500
Subject: [PATCH 338/436] Fix `Rails/RakeEnvironment` cop (#28782)

---
 .rubocop.yml      | 10 ++++++++++
 .rubocop_todo.yml | 12 ------------
 lib/tasks/db.rake |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index fcdc4e06cb..64021b4cec 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -109,6 +109,16 @@ Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/auth/*'
 
+# Reason: These tasks are doing local work which do not need full env loaded
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
+Rails/RakeEnvironment:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/emojis.rake'
+    - 'lib/tasks/mastodon.rake'
+    - 'lib/tasks/repo.rake'
+    - 'lib/tasks/statistics.rake'
+
 # Reason: There are appropriate times to use these features
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
 Rails/SkipsModelValidations:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 12bab088e3..b962fbdddf 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -61,18 +61,6 @@ Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-    - 'lib/tasks/db.rake'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-    - 'lib/tasks/repo.rake'
-    - 'lib/tasks/statistics.rake'
-
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index e8a64b8fb2..3bc526bd21 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -15,7 +15,7 @@ namespace :db do
     end
   end
 
-  task :pre_migration_check do
+  task pre_migration_check: :environment do
     version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
     abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
   end

From 83a90f20d78120098b413fdff0e7dc1943598ffc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:31:59 +0100
Subject: [PATCH 339/436] Update dependency async-mutex to v0.4.1 (#28797)

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

diff --git a/yarn.lock b/yarn.lock
index 953147fe4c..2be132476d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4613,11 +4613,11 @@ __metadata:
   linkType: hard
 
 "async-mutex@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "async-mutex@npm:0.4.0"
+  version: 0.4.1
+  resolution: "async-mutex@npm:0.4.1"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 6541695f80c1d6c5acbf3f7f04e8ff0733b3e029312c48d77bb95243fbe21fc5319f45ac3d72ce08551e6df83dc32440285ce9a3ac17bfc5d385ff0cc8ccd62a
+  checksum: 3c412736c0bc4a9a2cfd948276a8caab8686aa615866a5bd20986e616f8945320acb310058a17afa1b31b8de6f634a78b7ec2217a33d7559b38f68bb85a95854
   languageName: node
   linkType: hard
 

From 4c23297c04240ae3f4780f1614047be83a909c59 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 09:33:21 +0000
Subject: [PATCH 340/436] Update dependency autoprefixer to v10.4.17 (#28794)

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

diff --git a/yarn.lock b/yarn.lock
index 2be132476d..6f8381db0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4670,12 +4670,12 @@ __metadata:
   linkType: hard
 
 "autoprefixer@npm:^10.4.14":
-  version: 10.4.16
-  resolution: "autoprefixer@npm:10.4.16"
+  version: 10.4.17
+  resolution: "autoprefixer@npm:10.4.17"
   dependencies:
-    browserslist: "npm:^4.21.10"
-    caniuse-lite: "npm:^1.0.30001538"
-    fraction.js: "npm:^4.3.6"
+    browserslist: "npm:^4.22.2"
+    caniuse-lite: "npm:^1.0.30001578"
+    fraction.js: "npm:^4.3.7"
     normalize-range: "npm:^0.1.2"
     picocolors: "npm:^1.0.0"
     postcss-value-parser: "npm:^4.2.0"
@@ -4683,7 +4683,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: e00256e754d481a026d928bca729b25954074dd142dbec022f0a7db0d3bbc0dc2e2dc7542e94fec22eff81e21fe140e6856448e2d9a002660cb1e2ad434daee0
+  checksum: 1d21cc8edb7bf993682094ceed03a32c18f5293f071182a64c2c6defb44bbe91d576ad775d2347469a81997b80cea0bbc4ad3eeb5b12710f9feacf2e6c04bb51
   languageName: node
   linkType: hard
 
@@ -5230,7 +5230,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.22.2":
   version: 4.22.2
   resolution: "browserslist@npm:4.22.2"
   dependencies:
@@ -5456,10 +5456,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
-  version: 1.0.30001568
-  resolution: "caniuse-lite@npm:1.0.30001568"
-  checksum: 13f01e5a2481134bd61cf565ce9fecbd8e107902927a0dcf534230a92191a81f1715792170f5f39719c767c3a96aa6df9917a8d5601f15bbd5e4041a8cfecc99
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001565, caniuse-lite@npm:^1.0.30001578":
+  version: 1.0.30001578
+  resolution: "caniuse-lite@npm:1.0.30001578"
+  checksum: c3bd9c08a945cee4f0cc284a217ebe9c2613e04d5aef4b48f1871a779b1875c34286469eb8d7d94bd028b5a354613e676ad503b6bf8db20a2f154574bd5fde48
   languageName: node
   linkType: hard
 
@@ -8274,10 +8274,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fraction.js@npm:^4.3.6":
-  version: 4.3.6
-  resolution: "fraction.js@npm:4.3.6"
-  checksum: d224bf62e350c4dbe66c6ac5ad9c4ec6d3c8e64c13323686dbebe7c8cc118491c297dca4961d3c93f847670794cb05e6d8b706f0e870846ab66a9c4491d0e914
+"fraction.js@npm:^4.3.7":
+  version: 4.3.7
+  resolution: "fraction.js@npm:4.3.7"
+  checksum: df291391beea9ab4c263487ffd9d17fed162dbb736982dee1379b2a8cc94e4e24e46ed508c6d278aded9080ba51872f1bc5f3a5fd8d7c74e5f105b508ac28711
   languageName: node
   linkType: hard
 

From 89c9a4502d2463d2146de3bf5b32f728cdeb3e1c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 04:36:16 -0500
Subject: [PATCH 341/436] Fix `Rails/WhereExists` cop in account/interactions
 concern (#28789)

---
 .rubocop_todo.yml                           |  1 -
 app/models/concerns/account/interactions.rb | 26 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b962fbdddf..73ad0cac05 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -82,7 +82,6 @@ Rails/WhereExists:
     - 'app/lib/feed_manager.rb'
     - 'app/lib/status_cache_hydrator.rb'
     - 'app/lib/suspicious_sign_in_detector.rb'
-    - 'app/models/concerns/account/interactions.rb'
     - 'app/models/featured_tag.rb'
     - 'app/models/poll.rb'
     - 'app/models/session_activation.rb'
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 351530c2f0..5b05c31e03 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -183,7 +183,7 @@ module Account::Interactions
   end
 
   def following?(other_account)
-    active_relationships.where(target_account: other_account).exists?
+    active_relationships.exists?(target_account: other_account)
   end
 
   def following_anyone?
@@ -199,51 +199,51 @@ module Account::Interactions
   end
 
   def blocking?(other_account)
-    block_relationships.where(target_account: other_account).exists?
+    block_relationships.exists?(target_account: other_account)
   end
 
   def domain_blocking?(other_domain)
-    domain_blocks.where(domain: other_domain).exists?
+    domain_blocks.exists?(domain: other_domain)
   end
 
   def muting?(other_account)
-    mute_relationships.where(target_account: other_account).exists?
+    mute_relationships.exists?(target_account: other_account)
   end
 
   def muting_conversation?(conversation)
-    conversation_mutes.where(conversation: conversation).exists?
+    conversation_mutes.exists?(conversation: conversation)
   end
 
   def muting_notifications?(other_account)
-    mute_relationships.where(target_account: other_account, hide_notifications: true).exists?
+    mute_relationships.exists?(target_account: other_account, hide_notifications: true)
   end
 
   def muting_reblogs?(other_account)
-    active_relationships.where(target_account: other_account, show_reblogs: false).exists?
+    active_relationships.exists?(target_account: other_account, show_reblogs: false)
   end
 
   def requested?(other_account)
-    follow_requests.where(target_account: other_account).exists?
+    follow_requests.exists?(target_account: other_account)
   end
 
   def favourited?(status)
-    status.proper.favourites.where(account: self).exists?
+    status.proper.favourites.exists?(account: self)
   end
 
   def bookmarked?(status)
-    status.proper.bookmarks.where(account: self).exists?
+    status.proper.bookmarks.exists?(account: self)
   end
 
   def reblogged?(status)
-    status.proper.reblogs.where(account: self).exists?
+    status.proper.reblogs.exists?(account: self)
   end
 
   def pinned?(status)
-    status_pins.where(status: status).exists?
+    status_pins.exists?(status: status)
   end
 
   def endorsed?(account)
-    account_pins.where(target_account: account).exists?
+    account_pins.exists?(target_account: account)
   end
 
   def status_matches_filters(status)

From 07e10e37477bdaa1bea30fbf2bebb05cf9ae793d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 04:36:59 -0500
Subject: [PATCH 342/436] Combine assertions about same setup in
 `Account#suspend!` spec (#28787)

---
 spec/models/account_spec.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index ab74579624..d360d934d6 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -9,14 +9,10 @@ RSpec.describe Account do
     let(:bob) { Fabricate(:account, username: 'bob') }
 
     describe '#suspend!' do
-      it 'marks the account as suspended' do
-        subject.suspend!
-        expect(subject.suspended?).to be true
-      end
-
-      it 'creates a deletion request' do
-        subject.suspend!
-        expect(AccountDeletionRequest.where(account: subject).exists?).to be true
+      it 'marks the account as suspended and creates a deletion request' do
+        expect { subject.suspend! }
+          .to change(subject, :suspended?).from(false).to(true)
+          .and(change { AccountDeletionRequest.exists?(account: subject) }.from(false).to(true))
       end
 
       context 'when the account is of a local user' do

From 6c5a2d51bc30e0a0d46160952295f743c6fa4b2d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 05:07:49 -0500
Subject: [PATCH 343/436] Reduced repeated setup in `PurgeDomainService` spec
 (#28786)

---
 spec/services/purge_domain_service_spec.rb | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/spec/services/purge_domain_service_spec.rb b/spec/services/purge_domain_service_spec.rb
index e96618310b..6d8af14deb 100644
--- a/spec/services/purge_domain_service_spec.rb
+++ b/spec/services/purge_domain_service_spec.rb
@@ -5,25 +5,25 @@ require 'rails_helper'
 RSpec.describe PurgeDomainService, type: :service do
   subject { described_class.new }
 
-  let!(:old_account) { Fabricate(:account, domain: 'obsolete.org') }
-  let!(:old_status_plain) { Fabricate(:status, account: old_account) }
-  let!(:old_status_with_attachment) { Fabricate(:status, account: old_account) }
-  let!(:old_attachment) { Fabricate(:media_attachment, account: old_account, status: old_status_with_attachment, file: attachment_fixture('attachment.jpg')) }
+  let(:domain) { 'obsolete.org' }
+  let!(:account) { Fabricate(:account, domain: domain) }
+  let!(:status_plain) { Fabricate(:status, account: account) }
+  let!(:status_with_attachment) { Fabricate(:status, account: account) }
+  let!(:attachment) { Fabricate(:media_attachment, account: account, status: status_with_attachment, file: attachment_fixture('attachment.jpg')) }
 
   describe 'for a suspension' do
-    before do
-      subject.call('obsolete.org')
+    it 'refreshes instance view and removes associated records' do
+      expect { subject.call(domain) }
+        .to change { domain_instance_exists }.from(true).to(false)
+
+      expect { account.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+      expect { attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
     end
 
-    it 'removes the remote accounts\'s statuses and media attachments' do
-      expect { old_account.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_status_plain.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_status_with_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
-      expect { old_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
-    end
-
-    it 'refreshes instances view' do
-      expect(Instance.where(domain: 'obsolete.org').exists?).to be false
+    def domain_instance_exists
+      Instance.exists?(domain: domain)
     end
   end
 end

From 3d82040b26846c5431eaff1b997b17a55a6256da Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 05:11:10 -0500
Subject: [PATCH 344/436] Reduced repeated setup in `UnallowDomainService` spec
 (#28785)

---
 spec/services/unallow_domain_service_spec.rb | 53 +++++++++-----------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index 6ac6bc4016..383977d352 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -5,12 +5,13 @@ require 'rails_helper'
 RSpec.describe UnallowDomainService, type: :service do
   subject { described_class.new }
 
-  let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
+  let(:bad_domain) { 'evil.org' }
+  let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: bad_domain) }
   let!(:bad_status_harassment) { Fabricate(:status, account: bad_account, text: 'You suck') }
   let!(:bad_status_mean) { Fabricate(:status, account: bad_account, text: 'Hahaha') }
   let!(:bad_attachment) { Fabricate(:media_attachment, account: bad_account, status: bad_status_mean, file: attachment_fixture('attachment.jpg')) }
-  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: 'evil.org', suspended: true, silenced: true) }
-  let!(:domain_allow) { Fabricate(:domain_allow, domain: 'evil.org') }
+  let!(:already_banned_account) { Fabricate(:account, username: 'badguy', domain: bad_domain, suspended: true, silenced: true) }
+  let!(:domain_allow) { Fabricate(:domain_allow, domain: bad_domain) }
 
   context 'with limited federation mode', :sidekiq_inline do
     before do
@@ -18,23 +19,15 @@ RSpec.describe UnallowDomainService, type: :service do
     end
 
     describe '#call' do
-      before do
-        subject.call(domain_allow)
-      end
+      it 'makes the domain not allowed and removes accounts from that domain' do
+        expect { subject.call(domain_allow) }
+          .to change { bad_domain_allowed }.from(true).to(false)
+          .and change { bad_domain_account_exists }.from(true).to(false)
 
-      it 'removes the allowed domain' do
-        expect(DomainAllow.allowed?('evil.org')).to be false
-      end
-
-      it 'removes remote accounts from that domain' do
         expect { already_banned_account.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        expect(Account.where(domain: 'evil.org').exists?).to be false
-      end
-
-      it 'removes the remote accounts\'s statuses and media attachments' do
-        expect { bad_status_harassment.reload }.to raise_exception ActiveRecord::RecordNotFound
-        expect { bad_status_mean.reload }.to raise_exception ActiveRecord::RecordNotFound
-        expect { bad_attachment.reload }.to raise_exception ActiveRecord::RecordNotFound
+        expect { bad_status_harassment.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { bad_status_mean.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        expect { bad_attachment.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
@@ -45,23 +38,23 @@ RSpec.describe UnallowDomainService, type: :service do
     end
 
     describe '#call' do
-      before do
-        subject.call(domain_allow)
-      end
+      it 'makes the domain not allowed but preserves accounts from the domain' do
+        expect { subject.call(domain_allow) }
+          .to change { bad_domain_allowed }.from(true).to(false)
+          .and not_change { bad_domain_account_exists }.from(true)
 
-      it 'removes the allowed domain' do
-        expect(DomainAllow.allowed?('evil.org')).to be false
-      end
-
-      it 'does not remove accounts from that domain' do
-        expect(Account.where(domain: 'evil.org').exists?).to be true
-      end
-
-      it 'removes the remote accounts\'s statuses and media attachments' do
         expect { bad_status_harassment.reload }.to_not raise_error
         expect { bad_status_mean.reload }.to_not raise_error
         expect { bad_attachment.reload }.to_not raise_error
       end
     end
   end
+
+  def bad_domain_allowed
+    DomainAllow.allowed?(bad_domain)
+  end
+
+  def bad_domain_account_exists
+    Account.exists?(domain: bad_domain)
+  end
 end

From da31792ac7768299d32419764bdc118adf7e1ea5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 07:22:12 -0500
Subject: [PATCH 345/436] Fix `Rails/WhereExists` cop in FeaturedTag model
 (#28791)

---
 .rubocop_todo.yml          | 1 -
 app/models/featured_tag.rb | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 73ad0cac05..eaa86ad15a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -82,7 +82,6 @@ Rails/WhereExists:
     - 'app/lib/feed_manager.rb'
     - 'app/lib/status_cache_hydrator.rb'
     - 'app/lib/suspicious_sign_in_detector.rb'
-    - 'app/models/featured_tag.rb'
     - 'app/models/poll.rb'
     - 'app/models/session_activation.rb'
     - 'app/models/status.rb'
diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index 7c36aa8b0b..63cd674765 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -66,6 +66,10 @@ class FeaturedTag < ApplicationRecord
   end
 
   def validate_tag_uniqueness
-    errors.add(:name, :taken) if FeaturedTag.by_name(name).where(account_id: account_id).exists?
+    errors.add(:name, :taken) if tag_already_featured_for_account?
+  end
+
+  def tag_already_featured_for_account?
+    FeaturedTag.by_name(name).exists?(account_id: account_id)
   end
 end

From aaa6f2e9302252b70d1e430ed5b4e6689b827d78 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 07:29:41 -0500
Subject: [PATCH 346/436] Group common `class_name` options in associations
 (#28779)

---
 app/models/appeal.rb             | 7 +++++--
 app/models/email_domain_block.rb | 6 ++++--
 app/models/poll.rb               | 7 +++++--
 app/models/report.rb             | 9 ++++++---
 app/models/status.rb             | 6 ++++--
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/models/appeal.rb b/app/models/appeal.rb
index f1290ad01a..395056b76f 100644
--- a/app/models/appeal.rb
+++ b/app/models/appeal.rb
@@ -20,8 +20,11 @@ class Appeal < ApplicationRecord
 
   belongs_to :account
   belongs_to :strike, class_name: 'AccountWarning', foreign_key: 'account_warning_id', inverse_of: :appeal
-  belongs_to :approved_by_account, class_name: 'Account', optional: true
-  belongs_to :rejected_by_account, class_name: 'Account', optional: true
+
+  with_options class_name: 'Account', optional: true do
+    belongs_to :approved_by_account
+    belongs_to :rejected_by_account
+  end
 
   validates :text, presence: true, length: { maximum: 2_000 }
   validates :account_warning_id, uniqueness: true
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index f1b14c8b08..40be59420a 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -21,8 +21,10 @@ class EmailDomainBlock < ApplicationRecord
   include DomainNormalizable
   include Paginable
 
-  belongs_to :parent, class_name: 'EmailDomainBlock', optional: true
-  has_many :children, class_name: 'EmailDomainBlock', foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  with_options class_name: 'EmailDomainBlock' do
+    belongs_to :parent, optional: true
+    has_many :children, foreign_key: :parent_id, inverse_of: :parent, dependent: :destroy
+  end
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 72f04f00a7..37149c3d86 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -27,8 +27,11 @@ class Poll < ApplicationRecord
   belongs_to :status
 
   has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :delete_all
-  has_many :voters, -> { group('accounts.id') }, through: :votes, class_name: 'Account', source: :account
-  has_many :local_voters, -> { group('accounts.id').merge(Account.local) }, through: :votes, class_name: 'Account', source: :account
+
+  with_options class_name: 'Account', source: :account, through: :votes do
+    has_many :voters, -> { group('accounts.id') }
+    has_many :local_voters, -> { group('accounts.id').merge(Account.local) }
+  end
 
   has_many :notifications, as: :activity, dependent: :destroy
 
diff --git a/app/models/report.rb b/app/models/report.rb
index c565362cc6..126701b3d6 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -29,9 +29,12 @@ class Report < ApplicationRecord
   rate_limit by: :account, family: :reports
 
   belongs_to :account
-  belongs_to :target_account, class_name: 'Account'
-  belongs_to :action_taken_by_account, class_name: 'Account', optional: true
-  belongs_to :assigned_account, class_name: 'Account', optional: true
+
+  with_options class_name: 'Account' do
+    belongs_to :target_account
+    belongs_to :action_taken_by_account, optional: true
+    belongs_to :assigned_account, optional: true
+  end
 
   has_many :notes, class_name: 'ReportNote', inverse_of: :report, dependent: :destroy
   has_many :notifications, as: :activity, dependent: :destroy
diff --git a/app/models/status.rb b/app/models/status.rb
index a498da288a..9a2169f995 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -59,8 +59,10 @@ class Status < ApplicationRecord
   belongs_to :conversation, optional: true
   belongs_to :preloadable_poll, class_name: 'Poll', foreign_key: 'poll_id', optional: true, inverse_of: false
 
-  belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies, optional: true
-  belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, optional: true
+  with_options class_name: 'Status', optional: true do
+    belongs_to :thread, foreign_key: 'in_reply_to_id', inverse_of: :replies
+    belongs_to :reblog, foreign_key: 'reblog_of_id', inverse_of: :reblogs
+  end
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy

From 81e4e65610932841750bdbef8d96961165b8eb0c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 07:29:54 -0500
Subject: [PATCH 347/436] Update links to upstream migration helpers, remove
 unused methods (#28781)

---
 lib/mastodon/migration_helpers.rb | 161 ++----------------------------
 1 file changed, 9 insertions(+), 152 deletions(-)

diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 1a2ce6420f..a713f42d41 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -8,15 +8,15 @@
 # shorten temporary column names.
 
 # Documentation on using these functions (and why one might do so):
-# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/what_requires_downtime.md
+# https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/doc/development/database/avoiding_downtime_in_migrations.md
 
-# The file itself:
-# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/database/migration_helpers.rb
+# The original file (since updated):
+# https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/gitlab/database/migration_helpers.rb
 
 # It is licensed as follows:
 
-# Copyright (c) 2011-2017 GitLab B.V.
-
+# Copyright (c) 2011-present GitLab B.V.
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
@@ -24,16 +24,16 @@
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 # This is bad form, but there are enough differences that it's impractical to do
 # otherwise:
@@ -77,37 +77,12 @@ module Mastodon
       end
     end
 
-    BACKGROUND_MIGRATION_BATCH_SIZE = 1000 # Number of rows to process per job
-    BACKGROUND_MIGRATION_JOB_BUFFER_SIZE = 1000 # Number of jobs to bulk queue at a time
-
     # Gets an estimated number of rows for a table
     def estimate_rows_in_table(table_name)
       exec_query('SELECT reltuples FROM pg_class WHERE relname = ' +
         "'#{table_name}'").to_a.first['reltuples']
     end
 
-    # Adds `created_at` and `updated_at` columns with timezone information.
-    #
-    # This method is an improved version of Rails' built-in method `add_timestamps`.
-    #
-    # Available options are:
-    # default - The default value for the column.
-    # null - When set to `true` the column will allow NULL values.
-    #        The default is to not allow NULL values.
-    def add_timestamps_with_timezone(table_name, **options)
-      options[:null] = false if options[:null].nil?
-
-      [:created_at, :updated_at].each do |column_name|
-        if options[:default] && transaction_open?
-          raise '`add_timestamps_with_timezone` with default value cannot be run inside a transaction. ' \
-            'You can disable transactions by calling `disable_ddl_transaction!` ' \
-            'in the body of your migration class'
-        end
-
-        add_column(table_name, column_name, :datetime_with_timezone, **options)
-      end
-    end
-
     # Creates a new index, concurrently when supported
     #
     # On PostgreSQL this method creates an index concurrently, on MySQL this
@@ -746,39 +721,6 @@ module Mastodon
       rename_index table_name, "#{index_name}_new", index_name
     end
 
-    # This will replace the first occurrence of a string in a column with
-    # the replacement
-    # On postgresql we can use `regexp_replace` for that.
-    # On mysql we find the location of the pattern, and overwrite it
-    # with the replacement
-    def replace_sql(column, pattern, replacement)
-      quoted_pattern = Arel::Nodes::Quoted.new(pattern.to_s)
-      quoted_replacement = Arel::Nodes::Quoted.new(replacement.to_s)
-
-      replace = Arel::Nodes::NamedFunction
-        .new("regexp_replace", [column, quoted_pattern, quoted_replacement])
-      Arel::Nodes::SqlLiteral.new(replace.to_sql)
-    end
-
-    def remove_foreign_key_without_error(*args)
-      remove_foreign_key(*args)
-    rescue ArgumentError
-    end
-
-    def sidekiq_queue_migrate(queue_from, to:)
-      while sidekiq_queue_length(queue_from) > 0
-        Sidekiq.redis do |conn|
-          conn.rpoplpush "queue:#{queue_from}", "queue:#{to}"
-        end
-      end
-    end
-
-    def sidekiq_queue_length(queue_name)
-      Sidekiq.redis do |conn|
-        conn.llen("queue:#{queue_name}")
-      end
-    end
-
     def check_trigger_permissions!(table)
       unless Grant.create_and_execute_trigger?(table)
         dbname = ActiveRecord::Base.configurations[Rails.env]['database']
@@ -799,91 +741,6 @@ into similar problems in the future (e.g. when new tables are created).
       end
     end
 
-    # Bulk queues background migration jobs for an entire table, batched by ID range.
-    # "Bulk" meaning many jobs will be pushed at a time for efficiency.
-    # If you need a delay interval per job, then use `queue_background_migration_jobs_by_range_at_intervals`.
-    #
-    # model_class - The table being iterated over
-    # job_class_name - The background migration job class as a string
-    # batch_size - The maximum number of rows per job
-    #
-    # Example:
-    #
-    #     class Route < ActiveRecord::Base
-    #       include EachBatch
-    #       self.table_name = 'routes'
-    #     end
-    #
-    #     bulk_queue_background_migration_jobs_by_range(Route, 'ProcessRoutes')
-    #
-    # Where the model_class includes EachBatch, and the background migration exists:
-    #
-    #     class Gitlab::BackgroundMigration::ProcessRoutes
-    #       def perform(start_id, end_id)
-    #         # do something
-    #       end
-    #     end
-    def bulk_queue_background_migration_jobs_by_range(model_class, job_class_name, batch_size: BACKGROUND_MIGRATION_BATCH_SIZE)
-      raise "#{model_class} does not have an ID to use for batch ranges" unless model_class.column_names.include?('id')
-
-      jobs = []
-
-      model_class.each_batch(of: batch_size) do |relation|
-        start_id, end_id = relation.pluck('MIN(id), MAX(id)').first
-
-        if jobs.length >= BACKGROUND_MIGRATION_JOB_BUFFER_SIZE
-          # Note: This code path generally only helps with many millions of rows
-          # We push multiple jobs at a time to reduce the time spent in
-          # Sidekiq/Redis operations. We're using this buffer based approach so we
-          # don't need to run additional queries for every range.
-          BackgroundMigrationWorker.perform_bulk(jobs)
-          jobs.clear
-        end
-
-        jobs << [job_class_name, [start_id, end_id]]
-      end
-
-      BackgroundMigrationWorker.perform_bulk(jobs) unless jobs.empty?
-    end
-
-    # Queues background migration jobs for an entire table, batched by ID range.
-    # Each job is scheduled with a `delay_interval` in between.
-    # If you use a small interval, then some jobs may run at the same time.
-    #
-    # model_class - The table being iterated over
-    # job_class_name - The background migration job class as a string
-    # delay_interval - The duration between each job's scheduled time (must respond to `to_f`)
-    # batch_size - The maximum number of rows per job
-    #
-    # Example:
-    #
-    #     class Route < ActiveRecord::Base
-    #       include EachBatch
-    #       self.table_name = 'routes'
-    #     end
-    #
-    #     queue_background_migration_jobs_by_range_at_intervals(Route, 'ProcessRoutes', 1.minute)
-    #
-    # Where the model_class includes EachBatch, and the background migration exists:
-    #
-    #     class Gitlab::BackgroundMigration::ProcessRoutes
-    #       def perform(start_id, end_id)
-    #         # do something
-    #       end
-    #     end
-    def queue_background_migration_jobs_by_range_at_intervals(model_class, job_class_name, delay_interval, batch_size: BACKGROUND_MIGRATION_BATCH_SIZE)
-      raise "#{model_class} does not have an ID to use for batch ranges" unless model_class.column_names.include?('id')
-
-      model_class.each_batch(of: batch_size) do |relation, index|
-        start_id, end_id = relation.pluck('MIN(id), MAX(id)').first
-
-        # `BackgroundMigrationWorker.bulk_perform_in` schedules all jobs for
-        # the same time, which is not helpful in most cases where we wish to
-        # spread the work over time.
-        BackgroundMigrationWorker.perform_in(delay_interval * index, job_class_name, [start_id, end_id])
-      end
-    end
-
     private
 
     # https://github.com/rails/rails/blob/v5.2.0/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb#L678-L684

From 9fb9ef418a58dbeeb568050a72e697f17c85afc3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 08:55:44 -0500
Subject: [PATCH 348/436] Fix `Rails/WhereExists` cop in User model (#28792)

---
 .rubocop_todo.yml  | 1 -
 app/models/user.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index eaa86ad15a..87120daef2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -85,7 +85,6 @@ Rails/WhereExists:
     - 'app/models/poll.rb'
     - 'app/models/session_activation.rb'
     - 'app/models/status.rb'
-    - 'app/models/user.rb'
     - 'app/policies/status_policy.rb'
     - 'app/serializers/rest/announcement_serializer.rb'
     - 'app/serializers/rest/tag_serializer.rb'
diff --git a/app/models/user.rb b/app/models/user.rb
index 5c90af56d2..70c24336f3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -434,7 +434,7 @@ class User < ApplicationRecord
   end
 
   def sign_up_from_ip_requires_approval?
-    !sign_up_ip.nil? && IpBlock.where(severity: :sign_up_requires_approval).where('ip >>= ?', sign_up_ip.to_s).exists?
+    sign_up_ip.present? && IpBlock.sign_up_requires_approval.exists?(['ip >>= ?', sign_up_ip.to_s])
   end
 
   def sign_up_email_requires_approval?

From 2115bc52e47e66a4a15fe3073df9d39da0bf6e3e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 09:53:29 -0500
Subject: [PATCH 349/436] Order by sql in `CLI::Maintenance` task (#28289)

---
 lib/mastodon/cli/maintenance.rb | 44 ++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index f37662aa06..e2ea866152 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -223,7 +223,7 @@ module Mastodon::CLI
       say 'Deduplicating accounts… for local accounts, you will be asked to chose which account to keep unchanged.'
 
       find_duplicate_accounts.each do |row|
-        accounts = Account.where(id: row['ids'].split(',')).to_a
+        accounts = Account.where(id: row['ids'].split(','))
 
         if accounts.first.local?
           deduplicate_local_accounts!(accounts)
@@ -275,7 +275,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_email
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
         say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -289,7 +289,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_confirmation_token
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
+        users = User.where(id: row['ids'].split(',')).order(created_at: :desc).to_a.drop(1)
         say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -301,7 +301,7 @@ module Mastodon::CLI
     def deduplicate_users_process_remember_token
       if migrator_version < 2022_01_18_183010
         ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
-          users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+          users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
           say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
           users.each do |user|
@@ -313,7 +313,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_password_token
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
         say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -341,7 +341,7 @@ module Mastodon::CLI
 
       say 'Removing duplicate account identity proofs…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
-        AccountIdentityProof.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        AccountIdentityProof.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring account identity proofs indexes…'
@@ -355,7 +355,7 @@ module Mastodon::CLI
 
       say 'Removing duplicate announcement reactions…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
-        AnnouncementReaction.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        AnnouncementReaction.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring announcement_reactions indexes…'
@@ -367,7 +367,7 @@ module Mastodon::CLI
 
       say 'Deduplicating conversations…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
-        conversations = Conversation.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+        conversations = Conversation.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_conversation = conversations.shift
 
@@ -390,7 +390,7 @@ module Mastodon::CLI
 
       say 'Deduplicating custom_emojis…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
-        emojis = CustomEmoji.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+        emojis = CustomEmoji.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_emoji = emojis.shift
 
@@ -409,7 +409,7 @@ module Mastodon::CLI
 
       say 'Deduplicating custom_emoji_categories…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
-        categories = CustomEmojiCategory.where(id: row['ids'].split(',')).sort_by(&:id).reverse
+        categories = CustomEmojiCategory.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_category = categories.shift
 
@@ -428,7 +428,7 @@ module Mastodon::CLI
 
       say 'Deduplicating domain_allows…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
-        DomainAllow.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        DomainAllow.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring domain_allows indexes…'
@@ -466,7 +466,7 @@ module Mastodon::CLI
 
       say 'Deduplicating unavailable_domains…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
-        UnavailableDomain.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        UnavailableDomain.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring unavailable_domains indexes…'
@@ -478,7 +478,7 @@ module Mastodon::CLI
 
       say 'Deduplicating email_domain_blocks…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
-        domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).sort_by { |b| b.parent.nil? ? 1 : 0 }.to_a
+        domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).order(EmailDomainBlock.arel_table[:parent_id].asc.nulls_first).to_a
         domain_blocks.drop(1).each(&:destroy)
       end
 
@@ -507,7 +507,7 @@ module Mastodon::CLI
 
       say 'Deduplicating preview_cards…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
-        PreviewCard.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        PreviewCard.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring preview_cards indexes…'
@@ -519,7 +519,7 @@ module Mastodon::CLI
 
       say 'Deduplicating statuses…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
-        statuses = Status.where(id: row['ids'].split(',')).sort_by(&:id)
+        statuses = Status.where(id: row['ids'].split(',')).order(id: :asc).to_a
         ref_status = statuses.shift
         statuses.each do |status|
           merge_statuses!(ref_status, status) if status.account_id == ref_status.account_id
@@ -541,7 +541,7 @@ module Mastodon::CLI
 
       say 'Deduplicating tags…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
-        tags = Tag.where(id: row['ids'].split(',')).sort_by { |t| [t.usable?, t.trendable?, t.listable?].count(false) }
+        tags = Tag.where(id: row['ids'].split(',')).order(Arel.sql('(usable::int + trendable::int + listable::int) desc')).to_a
         ref_tag = tags.shift
         tags.each do |tag|
           merge_tags!(ref_tag, tag)
@@ -564,7 +564,7 @@ module Mastodon::CLI
 
       say 'Deduplicating webauthn_credentials…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
-        WebauthnCredential.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        WebauthnCredential.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring webauthn_credentials indexes…'
@@ -578,7 +578,7 @@ module Mastodon::CLI
 
       say 'Deduplicating webhooks…'
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
-        Webhook.where(id: row['ids'].split(',')).sort_by(&:id).reverse.drop(1).each(&:destroy)
+        Webhook.where(id: row['ids'].split(',')).order(id: :desc).drop(1).each(&:destroy)
       end
 
       say 'Restoring webhooks indexes…'
@@ -590,8 +590,8 @@ module Mastodon::CLI
       SoftwareUpdate.delete_all
     end
 
-    def deduplicate_local_accounts!(accounts)
-      accounts = accounts.sort_by(&:id).reverse
+    def deduplicate_local_accounts!(scope)
+      accounts = scope.order(id: :desc).to_a
 
       say "Multiple local accounts were found for username '#{accounts.first.username}'.", :yellow
       say 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.', :yellow
@@ -629,8 +629,8 @@ module Mastodon::CLI
       end
     end
 
-    def deduplicate_remote_accounts!(accounts)
-      accounts = accounts.sort_by(&:updated_at).reverse
+    def deduplicate_remote_accounts!(scope)
+      accounts = scope.order(updated_at: :desc).to_a
 
       reference_account = accounts.shift
 

From 0b853678a45df06f5b9453217a9bf72f23ee322d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 10:57:10 -0500
Subject: [PATCH 350/436] Add coverage for `api/v1/peers/search` endpoint and
 extract controller query to Instance scope (#28796)

---
 .../api/v1/peers/search_controller.rb         | 15 +++--
 app/models/instance.rb                        |  1 +
 spec/requests/api/v1/peers/search_spec.rb     | 59 +++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 spec/requests/api/v1/peers/search_spec.rb

diff --git a/app/controllers/api/v1/peers/search_controller.rb b/app/controllers/api/v1/peers/search_controller.rb
index 0c503d9bc5..1780554c5d 100644
--- a/app/controllers/api/v1/peers/search_controller.rb
+++ b/app/controllers/api/v1/peers/search_controller.rb
@@ -27,7 +27,7 @@ class Api::V1::Peers::SearchController < Api::BaseController
       @domains = InstancesIndex.query(function_score: {
         query: {
           prefix: {
-            domain: TagManager.instance.normalize_domain(params[:q].strip),
+            domain: normalized_domain,
           },
         },
 
@@ -37,11 +37,18 @@ class Api::V1::Peers::SearchController < Api::BaseController
         },
       }).limit(10).pluck(:domain)
     else
-      domain = params[:q].strip
-      domain = TagManager.instance.normalize_domain(domain)
-      @domains = Instance.searchable.where(Instance.arel_table[:domain].matches("#{Instance.sanitize_sql_like(domain)}%", false, true)).limit(10).pluck(:domain)
+      domain = normalized_domain
+      @domains = Instance.searchable.domain_starts_with(domain).limit(10).pluck(:domain)
     end
   rescue Addressable::URI::InvalidURIError
     @domains = []
   end
+
+  def normalized_domain
+    TagManager.instance.normalize_domain(query_value)
+  end
+
+  def query_value
+    params[:q].strip
+  end
 end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 17ee0cbb1e..8f8d87c62a 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -23,6 +23,7 @@ class Instance < ApplicationRecord
 
   scope :searchable, -> { where.not(domain: DomainBlock.select(:domain)) }
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
+  scope :domain_starts_with, ->(value) { where(arel_table[:domain].matches("#{sanitize_sql_like(value)}%", false, true)) }
   scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
 
   def self.refresh
diff --git a/spec/requests/api/v1/peers/search_spec.rb b/spec/requests/api/v1/peers/search_spec.rb
new file mode 100644
index 0000000000..dcdea387a5
--- /dev/null
+++ b/spec/requests/api/v1/peers/search_spec.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'API Peers Search' do
+  describe 'GET /api/v1/peers/search' do
+    context 'when peers api is disabled' do
+      before do
+        Setting.peers_api_enabled = false
+      end
+
+      it 'returns http not found response' do
+        get '/api/v1/peers/search'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'with no search param' do
+      it 'returns http success and empty response' do
+        get '/api/v1/peers/search'
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to be_blank
+      end
+    end
+
+    context 'with invalid search param' do
+      it 'returns http success and empty response' do
+        get '/api/v1/peers/search', params: { q: 'ftp://Invalid-Host!!.valüe' }
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json)
+          .to be_blank
+      end
+    end
+
+    context 'with search param' do
+      let!(:account) { Fabricate(:account, domain: 'host.example') }
+
+      before { Instance.refresh }
+
+      it 'returns http success and json with known domains' do
+        get '/api/v1/peers/search', params: { q: 'host.example' }
+
+        expect(response)
+          .to have_http_status(200)
+        expect(body_as_json.size)
+          .to eq(1)
+        expect(body_as_json.first)
+          .to eq(account.domain)
+      end
+    end
+  end
+end

From d0b3bc23d739e38ca7b7ac9a7f20f1f2a751563b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 11:11:04 -0500
Subject: [PATCH 351/436] Remove unused `matches_domain` scopes on Account,
 DomainAllow, DomainBlock (#28803)

---
 app/models/account.rb            |  1 -
 app/models/domain_allow.rb       |  2 --
 app/models/domain_block.rb       |  1 -
 spec/models/domain_allow_spec.rb | 20 +++++++++++---------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 0fca7ce4bd..c17de682e3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -125,7 +125,6 @@ class Account < ApplicationRecord
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
   scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
   scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
   scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index ce9597b4d1..47ada7ac23 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -17,8 +17,6 @@ class DomainAllow < ApplicationRecord
 
   validates :domain, presence: true, uniqueness: true, domain: true
 
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
-
   def to_log_human_identifier
     domain
   end
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 8da099256a..a05db099a8 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -28,7 +28,6 @@ class DomainBlock < ApplicationRecord
   has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false, dependent: nil
   delegate :count, to: :accounts, prefix: true
 
-  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
   scope :with_user_facing_limitations, -> { where(severity: [:silence, :suspend]) }
   scope :with_limitations, -> { where(severity: [:silence, :suspend]).or(where(reject_media: true)) }
   scope :by_severity, -> { in_order_of(:severity, %w(noop silence suspend)).order(:domain) }
diff --git a/spec/models/domain_allow_spec.rb b/spec/models/domain_allow_spec.rb
index 49e16376ea..12504211a1 100644
--- a/spec/models/domain_allow_spec.rb
+++ b/spec/models/domain_allow_spec.rb
@@ -3,16 +3,18 @@
 require 'rails_helper'
 
 describe DomainAllow do
-  describe 'scopes' do
-    describe 'matches_domain' do
-      let(:domain) { Fabricate(:domain_allow, domain: 'example.com') }
-      let(:other_domain) { Fabricate(:domain_allow, domain: 'example.biz') }
+  describe 'Validations' do
+    it 'is invalid without a domain' do
+      domain_allow = Fabricate.build(:domain_allow, domain: nil)
+      domain_allow.valid?
+      expect(domain_allow).to model_have_error_on_field(:domain)
+    end
 
-      it 'returns the correct records' do
-        results = described_class.matches_domain('example.com')
-
-        expect(results).to eq([domain])
-      end
+    it 'is invalid if the same normalized domain already exists' do
+      _domain_allow = Fabricate(:domain_allow, domain: 'にゃん')
+      domain_allow_with_normalized_value = Fabricate.build(:domain_allow, domain: 'xn--r9j5b5b')
+      domain_allow_with_normalized_value.valid?
+      expect(domain_allow_with_normalized_value).to model_have_error_on_field(:domain)
     end
   end
 end

From f0b93ab02fdae64fcf3e89508ad3e5919a861264 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 11:11:50 -0500
Subject: [PATCH 352/436] Use AR `database_version` in PG version checks in
 migrations (#28804)

---
 db/migrate/20180812173710_copy_status_stats.rb                 | 3 +--
 db/migrate/20181116173541_copy_account_stats.rb                | 3 +--
 ...0230803082451_add_unique_index_on_preview_cards_statuses.rb | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/db/migrate/20180812173710_copy_status_stats.rb b/db/migrate/20180812173710_copy_status_stats.rb
index 52ab43b762..087b1290db 100644
--- a/db/migrate/20180812173710_copy_status_stats.rb
+++ b/db/migrate/20180812173710_copy_status_stats.rb
@@ -20,8 +20,7 @@ class CopyStatusStats < ActiveRecord::Migration[5.2]
   private
 
   def supports_upsert?
-    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    version >= 90_500
+    ActiveRecord::Base.connection.database_version >= 90_500
   end
 
   def up_fast
diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb
index 9070200fee..e5faee0cb5 100644
--- a/db/migrate/20181116173541_copy_account_stats.rb
+++ b/db/migrate/20181116173541_copy_account_stats.rb
@@ -24,8 +24,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2]
   private
 
   def supports_upsert?
-    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    version >= 90_500
+    ActiveRecord::Base.connection.database_version >= 90_500
   end
 
   def up_fast
diff --git a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
index d29d7847c5..4271f8c08a 100644
--- a/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
+++ b/db/post_migrate/20230803082451_add_unique_index_on_preview_cards_statuses.rb
@@ -17,8 +17,7 @@ class AddUniqueIndexOnPreviewCardsStatuses < ActiveRecord::Migration[6.1]
 
   def supports_concurrent_reindex?
     @supports_concurrent_reindex ||= begin
-      version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-      version >= 120_000
+      ActiveRecord::Base.connection.database_version >= 120_000
     end
   end
 

From f866413e724c2e7f8329fbc6e96f56f0b186c62a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 11:14:15 -0500
Subject: [PATCH 353/436] Extract shared tagged statuses method in
 `FeaturedTag` (#28805)

---
 app/models/featured_tag.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index 63cd674765..ea8aa4787c 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -45,7 +45,7 @@ class FeaturedTag < ApplicationRecord
   end
 
   def decrement(deleted_status_id)
-    update(statuses_count: [0, statuses_count - 1].max, last_status_at: account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).where.not(id: deleted_status_id).select(:created_at).first&.created_at)
+    update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).select(:created_at).first&.created_at)
   end
 
   private
@@ -55,8 +55,8 @@ class FeaturedTag < ApplicationRecord
   end
 
   def reset_data
-    self.statuses_count = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).count
-    self.last_status_at = account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag).select(:created_at).first&.created_at
+    self.statuses_count = visible_tagged_account_statuses.count
+    self.last_status_at = visible_tagged_account_statuses.select(:created_at).first&.created_at
   end
 
   def validate_featured_tags_limit
@@ -72,4 +72,8 @@ class FeaturedTag < ApplicationRecord
   def tag_already_featured_for_account?
     FeaturedTag.by_name(name).exists?(account_id: account_id)
   end
+
+  def visible_tagged_account_statuses
+    account.statuses.where(visibility: %i(public unlisted)).tagged_with(tag)
+  end
 end

From 1335083bedd1dd563cfa9c54e69abc189ba3ec7b Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:40:25 +0100
Subject: [PATCH 354/436] Streaming: replace npmlog with pino & pino-http
 (#27828)

---
 streaming/.eslintrc.js |  11 ++
 streaming/index.js     | 334 ++++++++++++++++++++----------------
 streaming/logging.js   | 119 +++++++++++++
 streaming/package.json |   5 +-
 yarn.lock              | 376 +++++++++++++++++++++++++++++------------
 5 files changed, 593 insertions(+), 252 deletions(-)
 create mode 100644 streaming/logging.js

diff --git a/streaming/.eslintrc.js b/streaming/.eslintrc.js
index 5e2d233c68..188ebb512d 100644
--- a/streaming/.eslintrc.js
+++ b/streaming/.eslintrc.js
@@ -15,7 +15,18 @@ module.exports = defineConfig({
     ecmaVersion: 2021,
   },
   rules: {
+    // In the streaming server we need to delete some variables to ensure
+    // garbage collection takes place on the values referenced by those objects;
+    // The alternative is to declare the variable as nullable, but then we need
+    // to assert it's in existence before every use, which becomes much harder
+    // to maintain.
+    'no-delete-var': 'off',
+
+    // The streaming server is written in commonjs, not ESM for now:
     'import/no-commonjs': 'off',
+
+    // This overrides the base configuration for this rule to pick up
+    // dependencies for the streaming server from the correct package.json file.
     'import/no-extraneous-dependencies': [
       'error',
       {
diff --git a/streaming/index.js b/streaming/index.js
index c8124fcc0f..aa75a08b7f 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -10,12 +10,11 @@ const dotenv = require('dotenv');
 const express = require('express');
 const Redis = require('ioredis');
 const { JSDOM } = require('jsdom');
-const log = require('npmlog');
 const pg = require('pg');
 const dbUrlToConfig = require('pg-connection-string').parse;
-const uuid = require('uuid');
 const WebSocket = require('ws');
 
+const { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } = require('./logging');
 const { setupMetrics } = require('./metrics');
 const { isTruthy } = require("./utils");
 
@@ -28,15 +27,30 @@ dotenv.config({
   path: path.resolve(__dirname, path.join('..', dotenvFile))
 });
 
-log.level = process.env.LOG_LEVEL || 'verbose';
+initializeLogLevel(process.env, environment);
+
+/**
+ * Declares the result type for accountFromToken / accountFromRequest.
+ *
+ * Note: This is here because jsdoc doesn't like importing types that
+ * are nested in functions
+ * @typedef ResolvedAccount
+ * @property {string} accessTokenId
+ * @property {string[]} scopes
+ * @property {string} accountId
+ * @property {string[]} chosenLanguages
+ * @property {string} deviceId
+ */
 
 /**
  * @param {Object.<string, any>} config
  */
 const createRedisClient = async (config) => {
   const { redisParams, redisUrl } = config;
+  // @ts-ignore
   const client = new Redis(redisUrl, redisParams);
-  client.on('error', (err) => log.error('Redis Client Error!', err));
+  // @ts-ignore
+  client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
 
   return client;
 };
@@ -61,12 +75,12 @@ const parseJSON = (json, req) => {
      */
     if (req) {
       if (req.accountId) {
-        log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+        req.log.error({ err }, `Error parsing message from user ${req.accountId}`);
       } else {
-        log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+        req.log.error({ err }, `Error parsing message from ${req.remoteAddress}`);
       }
     } else {
-      log.warn(`Error parsing message from redis: ${err}`);
+      logger.error({ err }, `Error parsing message from redis`);
     }
     return null;
   }
@@ -105,6 +119,7 @@ const pgConfigFromEnv = (env) => {
       baseConfig.password = env.DB_PASS;
     }
   } else {
+    // @ts-ignore
     baseConfig = pgConfigs[environment];
 
     if (env.DB_SSLMODE) {
@@ -149,6 +164,7 @@ const redisConfigFromEnv = (env) => {
 
   // redisParams.path takes precedence over host and port.
   if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
+    // @ts-ignore
     redisParams.path = env.REDIS_URL.slice(7);
   }
 
@@ -195,6 +211,7 @@ const startServer = async () => {
 
   app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');
 
+  app.use(httpLogger);
   app.use(cors());
 
   // Handle eventsource & other http requests:
@@ -202,32 +219,37 @@ const startServer = async () => {
 
   // Handle upgrade requests:
   server.on('upgrade', async function handleUpgrade(request, socket, head) {
+    // Setup the HTTP logger, since websocket upgrades don't get the usual http
+    // logger. This decorates the `request` object.
+    attachWebsocketHttpLogger(request);
+
+    request.log.info("HTTP Upgrade Requested");
+
     /** @param {Error} err */
     const onSocketError = (err) => {
-      log.error(`Error with websocket upgrade: ${err}`);
+      request.log.error({ error: err }, err.message);
     };
 
     socket.on('error', onSocketError);
 
-    // Authenticate:
-    try {
-      await accountFromRequest(request);
-    } catch (err) {
-      log.error(`Error authenticating request: ${err}`);
+    /** @type {ResolvedAccount} */
+    let resolvedAccount;
 
+    try {
+      resolvedAccount = await accountFromRequest(request);
+    } catch (err) {
       // Unfortunately for using the on('upgrade') setup, we need to manually
       // write a HTTP Response to the Socket to close the connection upgrade
       // attempt, so the following code is to handle all of that.
       const statusCode = err.status ?? 401;
 
-      /** @type {Record<string, string | number>} */
+      /** @type {Record<string, string | number | import('pino-http').ReqId>} */
       const headers = {
         'Connection': 'close',
         'Content-Type': 'text/plain',
         'Content-Length': 0,
         'X-Request-Id': request.id,
-        // TODO: Send the error message via header so it can be debugged in
-        // developer tools
+        'X-Error-Message': err.status ? err.toString() : 'An unexpected error occurred'
       };
 
       // Ensure the socket is closed once we've finished writing to it:
@@ -238,15 +260,28 @@ const startServer = async () => {
       // Write the HTTP response manually:
       socket.end(`HTTP/1.1 ${statusCode} ${http.STATUS_CODES[statusCode]}\r\n${Object.keys(headers).map((key) => `${key}: ${headers[key]}`).join('\r\n')}\r\n\r\n`);
 
+      // Finally, log the error:
+      request.log.error({
+        err,
+        res: {
+          statusCode,
+          headers
+        }
+      }, err.toString());
+
       return;
     }
 
+    // Remove the error handler, wss.handleUpgrade has its own:
+    socket.removeListener('error', onSocketError);
+
     wss.handleUpgrade(request, socket, head, function done(ws) {
-      // Remove the error handler:
-      socket.removeListener('error', onSocketError);
+      request.log.info("Authenticated request & upgraded to WebSocket connection");
+
+      const wsLogger = createWebsocketLogger(request, resolvedAccount);
 
       // Start the connection:
-      wss.emit('connection', ws, request);
+      wss.emit('connection', ws, request, wsLogger);
     });
   });
 
@@ -273,9 +308,9 @@ const startServer = async () => {
   // When checking metrics in the browser, the favicon is requested this
   // prevents the request from falling through to the API Router, which would
   // error for this endpoint:
-  app.get('/favicon.ico', (req, res) => res.status(404).end());
+  app.get('/favicon.ico', (_req, res) => res.status(404).end());
 
-  app.get('/api/v1/streaming/health', (req, res) => {
+  app.get('/api/v1/streaming/health', (_req, res) => {
     res.writeHead(200, { 'Content-Type': 'text/plain' });
     res.end('OK');
   });
@@ -285,7 +320,7 @@ const startServer = async () => {
       res.set('Content-Type', metrics.register.contentType);
       res.end(await metrics.register.metrics());
     } catch (ex) {
-      log.error(ex);
+      req.log.error(ex);
       res.status(500).end();
     }
   });
@@ -319,7 +354,7 @@ const startServer = async () => {
 
     const callbacks = subs[channel];
 
-    log.silly(`New message on channel ${redisPrefix}${channel}`);
+    logger.debug(`New message on channel ${redisPrefix}${channel}`);
 
     if (!callbacks) {
       return;
@@ -343,17 +378,16 @@ const startServer = async () => {
    * @param {SubscriptionListener} callback
    */
   const subscribe = (channel, callback) => {
-    log.silly(`Adding listener for ${channel}`);
+    logger.debug(`Adding listener for ${channel}`);
 
     subs[channel] = subs[channel] || [];
 
     if (subs[channel].length === 0) {
-      log.verbose(`Subscribe ${channel}`);
+      logger.debug(`Subscribe ${channel}`);
       redisSubscribeClient.subscribe(channel, (err, count) => {
         if (err) {
-          log.error(`Error subscribing to ${channel}`);
-        }
-        else {
+          logger.error(`Error subscribing to ${channel}`);
+        } else if (typeof count === 'number') {
           redisSubscriptions.set(count);
         }
       });
@@ -367,7 +401,7 @@ const startServer = async () => {
    * @param {SubscriptionListener} callback
    */
   const unsubscribe = (channel, callback) => {
-    log.silly(`Removing listener for ${channel}`);
+    logger.debug(`Removing listener for ${channel}`);
 
     if (!subs[channel]) {
       return;
@@ -376,12 +410,11 @@ const startServer = async () => {
     subs[channel] = subs[channel].filter(item => item !== callback);
 
     if (subs[channel].length === 0) {
-      log.verbose(`Unsubscribe ${channel}`);
+      logger.debug(`Unsubscribe ${channel}`);
       redisSubscribeClient.unsubscribe(channel, (err, count) => {
         if (err) {
-          log.error(`Error unsubscribing to ${channel}`);
-        }
-        else {
+          logger.error(`Error unsubscribing to ${channel}`);
+        } else if (typeof count === 'number') {
           redisSubscriptions.set(count);
         }
       });
@@ -390,45 +423,13 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} req
-   * @param {any} res
-   * @param {function(Error=): void} next
-   */
-  const setRequestId = (req, res, next) => {
-    req.requestId = uuid.v4();
-    res.header('X-Request-Id', req.requestId);
-
-    next();
-  };
-
-  /**
-   * @param {any} req
-   * @param {any} res
-   * @param {function(Error=): void} next
-   */
-  const setRemoteAddress = (req, res, next) => {
-    req.remoteAddress = req.connection.remoteAddress;
-
-    next();
-  };
-
-  /**
-   * @param {any} req
+   * @param {http.IncomingMessage & ResolvedAccount} req
    * @param {string[]} necessaryScopes
    * @returns {boolean}
    */
   const isInScope = (req, necessaryScopes) =>
     req.scopes.some(scope => necessaryScopes.includes(scope));
 
-  /**
-   * @typedef ResolvedAccount
-   * @property {string} accessTokenId
-   * @property {string[]} scopes
-   * @property {string} accountId
-   * @property {string[]} chosenLanguages
-   * @property {string} deviceId
-   */
-
   /**
    * @param {string} token
    * @param {any} req
@@ -441,6 +442,7 @@ const startServer = async () => {
         return;
       }
 
+      // @ts-ignore
       client.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes, devices.device_id FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id LEFT OUTER JOIN devices ON oauth_access_tokens.id = devices.access_token_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
         done();
 
@@ -451,6 +453,7 @@ const startServer = async () => {
 
         if (result.rows.length === 0) {
           err = new Error('Invalid access token');
+          // @ts-ignore
           err.status = 401;
 
           reject(err);
@@ -485,6 +488,7 @@ const startServer = async () => {
 
     if (!authorization && !accessToken) {
       const err = new Error('Missing access token');
+      // @ts-ignore
       err.status = 401;
 
       reject(err);
@@ -529,15 +533,16 @@ const startServer = async () => {
   };
 
   /**
-   * @param {any} req
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} logger
    * @param {string|undefined} channelName
    * @returns {Promise.<void>}
    */
-  const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
-    log.silly(req.requestId, `Checking OAuth scopes for ${channelName}`);
+  const checkScopes = (req, logger, channelName) => new Promise((resolve, reject) => {
+    logger.debug(`Checking OAuth scopes for ${channelName}`);
 
     // When accessing public channels, no scopes are needed
-    if (PUBLIC_CHANNELS.includes(channelName)) {
+    if (channelName && PUBLIC_CHANNELS.includes(channelName)) {
       resolve();
       return;
     }
@@ -564,6 +569,7 @@ const startServer = async () => {
     }
 
     const err = new Error('Access token does not cover required scopes');
+    // @ts-ignore
     err.status = 401;
 
     reject(err);
@@ -577,38 +583,40 @@ const startServer = async () => {
   /**
    * @param {any} req
    * @param {SystemMessageHandlers} eventHandlers
-   * @returns {function(object): void}
+   * @returns {SubscriptionListener}
    */
   const createSystemMessageListener = (req, eventHandlers) => {
     return message => {
+      if (!message?.event) {
+        return;
+      }
+
       const { event } = message;
 
-      log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
+      req.log.debug(`System message for ${req.accountId}: ${event}`);
 
       if (event === 'kill') {
-        log.verbose(req.requestId, `Closing connection for ${req.accountId} due to expired access token`);
+        req.log.debug(`Closing connection for ${req.accountId} due to expired access token`);
         eventHandlers.onKill();
       } else if (event === 'filters_changed') {
-        log.verbose(req.requestId, `Invalidating filters cache for ${req.accountId}`);
+        req.log.debug(`Invalidating filters cache for ${req.accountId}`);
         req.cachedFilters = null;
       }
     };
   };
 
   /**
-   * @param {any} req
-   * @param {any} res
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {http.OutgoingMessage} res
    */
   const subscribeHttpToSystemChannel = (req, res) => {
     const accessTokenChannelId = `timeline:access_token:${req.accessTokenId}`;
     const systemChannelId = `timeline:system:${req.accountId}`;
 
     const listener = createSystemMessageListener(req, {
-
       onKill() {
         res.end();
       },
-
     });
 
     res.on('close', () => {
@@ -641,13 +649,14 @@ const startServer = async () => {
     // the connection, as there's nothing to stream back
     if (!channelName) {
       const err = new Error('Unknown channel requested');
+      // @ts-ignore
       err.status = 400;
 
       next(err);
       return;
     }
 
-    accountFromRequest(req).then(() => checkScopes(req, channelName)).then(() => {
+    accountFromRequest(req).then(() => checkScopes(req, req.log, channelName)).then(() => {
       subscribeHttpToSystemChannel(req, res);
     }).then(() => {
       next();
@@ -663,22 +672,28 @@ const startServer = async () => {
    * @param {function(Error=): void} next
    */
   const errorMiddleware = (err, req, res, next) => {
-    log.error(req.requestId, err.toString());
+    req.log.error({ err }, err.toString());
 
     if (res.headersSent) {
       next(err);
       return;
     }
 
-    res.writeHead(err.status || 500, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: err.status ? err.toString() : 'An unexpected error occurred' }));
+    const hasStatusCode = Object.hasOwnProperty.call(err, 'status');
+    // @ts-ignore
+    const statusCode = hasStatusCode ? err.status : 500;
+    const errorMessage = hasStatusCode ? err.toString() : 'An unexpected error occurred';
+
+    res.writeHead(statusCode, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: errorMessage }));
   };
 
   /**
-   * @param {array} arr
+   * @param {any[]} arr
    * @param {number=} shift
    * @returns {string}
    */
+  // @ts-ignore
   const placeholders = (arr, shift = 0) => arr.map((_, i) => `$${i + 1 + shift}`).join(', ');
 
   /**
@@ -695,6 +710,7 @@ const startServer = async () => {
         return;
       }
 
+      // @ts-ignore
       client.query('SELECT id, account_id FROM lists WHERE id = $1 LIMIT 1', [listId], (err, result) => {
         done();
 
@@ -709,34 +725,43 @@ const startServer = async () => {
   });
 
   /**
-   * @param {string[]} ids
-   * @param {any} req
+   * @param {string[]} channelIds
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} log
    * @param {function(string, string): void} output
    * @param {undefined | function(string[], SubscriptionListener): void} attachCloseHandler
    * @param {'websocket' | 'eventsource'} destinationType
    * @param {boolean=} needsFiltering
    * @returns {SubscriptionListener}
    */
-  const streamFrom = (ids, req, output, attachCloseHandler, destinationType, needsFiltering = false) => {
-    const accountId = req.accountId || req.remoteAddress;
-
-    log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
+  const streamFrom = (channelIds, req, log, output, attachCloseHandler, destinationType, needsFiltering = false) => {
+    log.info({ channelIds }, `Starting stream`);
 
+    /**
+     * @param {string} event
+     * @param {object|string} payload
+     */
     const transmit = (event, payload) => {
       // TODO: Replace "string"-based delete payloads with object payloads:
       const encodedPayload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
 
       messagesSent.labels({ type: destinationType }).inc(1);
 
-      log.silly(req.requestId, `Transmitting for ${accountId}: ${event} ${encodedPayload}`);
+      log.debug({ event, payload }, `Transmitting ${event} to ${req.accountId}`);
+
       output(event, encodedPayload);
     };
 
     // The listener used to process each message off the redis subscription,
     // message here is an object with an `event` and `payload` property. Some
     // events also include a queued_at value, but this is being removed shortly.
+
     /** @type {SubscriptionListener} */
     const listener = message => {
+      if (!message?.event || !message?.payload) {
+        return;
+      }
+
       const { event, payload } = message;
 
       // Streaming only needs to apply filtering to some channels and only to
@@ -759,7 +784,7 @@ const startServer = async () => {
 
       // Filter based on language:
       if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) {
-        log.silly(req.requestId, `Message ${payload.id} filtered by language (${payload.language})`);
+        log.debug(`Message ${payload.id} filtered by language (${payload.language})`);
         return;
       }
 
@@ -770,6 +795,7 @@ const startServer = async () => {
       }
 
       // Filter based on domain blocks, blocks, mutes, or custom filters:
+      // @ts-ignore
       const targetAccountIds = [payload.account.id].concat(payload.mentions.map(item => item.id));
       const accountDomain = payload.account.acct.split('@')[1];
 
@@ -781,6 +807,7 @@ const startServer = async () => {
         }
 
         const queries = [
+          // @ts-ignore
           client.query(`SELECT 1
                         FROM blocks
                         WHERE (account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 2)}))
@@ -793,10 +820,13 @@ const startServer = async () => {
         ];
 
         if (accountDomain) {
+          // @ts-ignore
           queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
         }
 
+        // @ts-ignore
         if (!payload.filtered && !req.cachedFilters) {
+          // @ts-ignore
           queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId]));
         }
 
@@ -819,9 +849,11 @@ const startServer = async () => {
 
           // Handling for constructing the custom filters and caching them on the request
           // TODO: Move this logic out of the message handling lifecycle
+          // @ts-ignore
           if (!req.cachedFilters) {
             const filterRows = values[accountDomain ? 2 : 1].rows;
 
+            // @ts-ignore
             req.cachedFilters = filterRows.reduce((cache, filter) => {
               if (cache[filter.id]) {
                 cache[filter.id].keywords.push([filter.keyword, filter.whole_word]);
@@ -851,7 +883,9 @@ const startServer = async () => {
             // needs to be done in a separate loop as the database returns one
             // filterRow per keyword, so we need all the keywords before
             // constructing the regular expression
+            // @ts-ignore
             Object.keys(req.cachedFilters).forEach((key) => {
+              // @ts-ignore
               req.cachedFilters[key].regexp = new RegExp(req.cachedFilters[key].keywords.map(([keyword, whole_word]) => {
                 let expr = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
@@ -872,13 +906,16 @@ const startServer = async () => {
 
           // Apply cachedFilters against the payload, constructing a
           // `filter_results` array of FilterResult entities
+          // @ts-ignore
           if (req.cachedFilters) {
             const status = payload;
             // TODO: Calculate searchableContent in Ruby on Rails:
+            // @ts-ignore
             const searchableContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
             const searchableTextContent = JSDOM.fragment(searchableContent).textContent;
 
             const now = new Date();
+            // @ts-ignore
             const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => {
               // Check the filter hasn't expired before applying:
               if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) {
@@ -926,12 +963,12 @@ const startServer = async () => {
       });
     };
 
-    ids.forEach(id => {
+    channelIds.forEach(id => {
       subscribe(`${redisPrefix}${id}`, listener);
     });
 
     if (typeof attachCloseHandler === 'function') {
-      attachCloseHandler(ids.map(id => `${redisPrefix}${id}`), listener);
+      attachCloseHandler(channelIds.map(id => `${redisPrefix}${id}`), listener);
     }
 
     return listener;
@@ -943,8 +980,6 @@ const startServer = async () => {
    * @returns {function(string, string): void}
    */
   const streamToHttp = (req, res) => {
-    const accountId = req.accountId || req.remoteAddress;
-
     const channelName = channelNameFromPath(req);
 
     connectedClients.labels({ type: 'eventsource' }).inc();
@@ -963,7 +998,8 @@ const startServer = async () => {
     const heartbeat = setInterval(() => res.write(':thump\n'), 15000);
 
     req.on('close', () => {
-      log.verbose(req.requestId, `Ending stream for ${accountId}`);
+      req.log.info({ accountId: req.accountId }, `Ending stream`);
+
       // We decrement these counters here instead of in streamHttpEnd as in that
       // method we don't have knowledge of the channel names
       connectedClients.labels({ type: 'eventsource' }).dec();
@@ -1007,15 +1043,15 @@ const startServer = async () => {
    */
   const streamToWs = (req, ws, streamName) => (event, payload) => {
     if (ws.readyState !== ws.OPEN) {
-      log.error(req.requestId, 'Tried writing to closed socket');
+      req.log.error('Tried writing to closed socket');
       return;
     }
 
     const message = JSON.stringify({ stream: streamName, event, payload });
 
-    ws.send(message, (/** @type {Error} */ err) => {
+    ws.send(message, (/** @type {Error|undefined} */ err) => {
       if (err) {
-        log.error(req.requestId, `Failed to send to websocket: ${err}`);
+        req.log.error({err}, `Failed to send to websocket`);
       }
     });
   };
@@ -1032,20 +1068,19 @@ const startServer = async () => {
 
   app.use(api);
 
-  api.use(setRequestId);
-  api.use(setRemoteAddress);
-
   api.use(authenticationMiddleware);
   api.use(errorMiddleware);
 
   api.get('/api/v1/streaming/*', (req, res) => {
+    // @ts-ignore
     channelNameToIds(req, channelNameFromPath(req), req.query).then(({ channelIds, options }) => {
       const onSend = streamToHttp(req, res);
       const onEnd = streamHttpEnd(req, subscriptionHeartbeat(channelIds));
 
-      streamFrom(channelIds, req, onSend, onEnd, 'eventsource', options.needsFiltering);
+      // @ts-ignore
+      streamFrom(channelIds, req, req.log, onSend, onEnd, 'eventsource', options.needsFiltering);
     }).catch(err => {
-      log.verbose(req.requestId, 'Subscription error:', err.toString());
+      res.log.info({ err }, 'Subscription error:', err.toString());
       httpNotFound(res);
     });
   });
@@ -1197,6 +1232,7 @@ const startServer = async () => {
 
       break;
     case 'list':
+      // @ts-ignore
       authorizeListAccess(params.list, req).then(() => {
         resolve({
           channelIds: [`timeline:list:${params.list}`],
@@ -1218,9 +1254,9 @@ const startServer = async () => {
    * @returns {string[]}
    */
   const streamNameFromChannelName = (channelName, params) => {
-    if (channelName === 'list') {
+    if (channelName === 'list' && params.list) {
       return [channelName, params.list];
-    } else if (['hashtag', 'hashtag:local'].includes(channelName)) {
+    } else if (['hashtag', 'hashtag:local'].includes(channelName) && params.tag) {
       return [channelName, params.tag];
     } else {
       return [channelName];
@@ -1229,8 +1265,9 @@ const startServer = async () => {
 
   /**
    * @typedef WebSocketSession
-   * @property {WebSocket} websocket
-   * @property {http.IncomingMessage} request
+   * @property {WebSocket & { isAlive: boolean}} websocket
+   * @property {http.IncomingMessage & ResolvedAccount} request
+   * @property {import('pino').Logger} logger
    * @property {Object.<string, { channelName: string, listener: SubscriptionListener, stopHeartbeat: function(): void }>} subscriptions
    */
 
@@ -1240,8 +1277,8 @@ const startServer = async () => {
    * @param {StreamParams} params
    * @returns {void}
    */
-  const subscribeWebsocketToChannel = ({ socket, request, subscriptions }, channelName, params) => {
-    checkScopes(request, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
+  const subscribeWebsocketToChannel = ({ websocket, request, logger, subscriptions }, channelName, params) => {
+    checkScopes(request, logger, channelName).then(() => channelNameToIds(request, channelName, params)).then(({
       channelIds,
       options,
     }) => {
@@ -1249,9 +1286,9 @@ const startServer = async () => {
         return;
       }
 
-      const onSend = streamToWs(request, socket, streamNameFromChannelName(channelName, params));
+      const onSend = streamToWs(request, websocket, streamNameFromChannelName(channelName, params));
       const stopHeartbeat = subscriptionHeartbeat(channelIds);
-      const listener = streamFrom(channelIds, request, onSend, undefined, 'websocket', options.needsFiltering);
+      const listener = streamFrom(channelIds, request, logger, onSend, undefined, 'websocket', options.needsFiltering);
 
       connectedChannels.labels({ type: 'websocket', channel: channelName }).inc();
 
@@ -1261,14 +1298,17 @@ const startServer = async () => {
         stopHeartbeat,
       };
     }).catch(err => {
-      log.verbose(request.requestId, 'Subscription error:', err.toString());
-      socket.send(JSON.stringify({ error: err.toString() }));
+      logger.error({ err }, 'Subscription error');
+      websocket.send(JSON.stringify({ error: err.toString() }));
     });
   };
 
-
-  const removeSubscription = (subscriptions, channelIds, request) => {
-    log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
+  /**
+   * @param {WebSocketSession} session
+   * @param {string[]} channelIds
+   */
+  const removeSubscription = ({ request, logger, subscriptions }, channelIds) => {
+    logger.info({ channelIds, accountId: request.accountId }, `Ending stream`);
 
     const subscription = subscriptions[channelIds.join(';')];
 
@@ -1292,16 +1332,17 @@ const startServer = async () => {
    * @param {StreamParams} params
    * @returns {void}
    */
-  const unsubscribeWebsocketFromChannel = ({ socket, request, subscriptions }, channelName, params) => {
+  const unsubscribeWebsocketFromChannel = (session, channelName, params) => {
+    const { websocket, request, logger } = session;
+
     channelNameToIds(request, channelName, params).then(({ channelIds }) => {
-      removeSubscription(subscriptions, channelIds, request);
+      removeSubscription(session, channelIds);
     }).catch(err => {
-      log.verbose(request.requestId, 'Unsubscribe error:', err);
+      logger.error({err}, 'Unsubscribe error');
 
       // If we have a socket that is alive and open still, send the error back to the client:
-      // FIXME: In other parts of the code ws === socket
-      if (socket.isAlive && socket.readyState === socket.OPEN) {
-        socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
+      if (websocket.isAlive && websocket.readyState === websocket.OPEN) {
+        websocket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
       }
     });
   };
@@ -1309,16 +1350,14 @@ const startServer = async () => {
   /**
    * @param {WebSocketSession} session
    */
-  const subscribeWebsocketToSystemChannel = ({ socket, request, subscriptions }) => {
+  const subscribeWebsocketToSystemChannel = ({ websocket, request, subscriptions }) => {
     const accessTokenChannelId = `timeline:access_token:${request.accessTokenId}`;
     const systemChannelId = `timeline:system:${request.accountId}`;
 
     const listener = createSystemMessageListener(request, {
-
       onKill() {
-        socket.close();
+        websocket.close();
       },
-
     });
 
     subscribe(`${redisPrefix}${accessTokenChannelId}`, listener);
@@ -1355,18 +1394,15 @@ const startServer = async () => {
 
   /**
    * @param {WebSocket & { isAlive: boolean }} ws
-   * @param {http.IncomingMessage} req
+   * @param {http.IncomingMessage & ResolvedAccount} req
+   * @param {import('pino').Logger} log
    */
-  function onConnection(ws, req) {
+  function onConnection(ws, req, log) {
     // Note: url.parse could throw, which would terminate the connection, so we
     // increment the connected clients metric straight away when we establish
     // the connection, without waiting:
     connectedClients.labels({ type: 'websocket' }).inc();
 
-    // Setup request properties:
-    req.requestId = uuid.v4();
-    req.remoteAddress = ws._socket.remoteAddress;
-
     // Setup connection keep-alive state:
     ws.isAlive = true;
     ws.on('pong', () => {
@@ -1377,8 +1413,9 @@ const startServer = async () => {
      * @type {WebSocketSession}
      */
     const session = {
-      socket: ws,
+      websocket: ws,
       request: req,
+      logger: log,
       subscriptions: {},
     };
 
@@ -1386,27 +1423,30 @@ const startServer = async () => {
       const subscriptions = Object.keys(session.subscriptions);
 
       subscriptions.forEach(channelIds => {
-        removeSubscription(session.subscriptions, channelIds.split(';'), req);
+        removeSubscription(session, channelIds.split(';'));
       });
 
       // Decrement the metrics for connected clients:
       connectedClients.labels({ type: 'websocket' }).dec();
 
-      // ensure garbage collection:
-      session.socket = null;
-      session.request = null;
-      session.subscriptions = {};
+      // We need to delete the session object as to ensure it correctly gets
+      // garbage collected, without doing this we could accidentally hold on to
+      // references to the websocket, the request, and the logger, causing
+      // memory leaks.
+      //
+      // @ts-ignore
+      delete session;
     });
 
     // Note: immediately after the `error` event is emitted, the `close` event
     // is emitted. As such, all we need to do is log the error here.
-    ws.on('error', (err) => {
-      log.error('websocket', err.toString());
+    ws.on('error', (/** @type {Error} */ err) => {
+      log.error(err);
     });
 
     ws.on('message', (data, isBinary) => {
       if (isBinary) {
-        log.warn('websocket', 'Received binary data, closing connection');
+        log.warn('Received binary data, closing connection');
         ws.close(1003, 'The mastodon streaming server does not support binary messages');
         return;
       }
@@ -1441,18 +1481,20 @@ const startServer = async () => {
 
   setInterval(() => {
     wss.clients.forEach(ws => {
+      // @ts-ignore
       if (ws.isAlive === false) {
         ws.terminate();
         return;
       }
 
+      // @ts-ignore
       ws.isAlive = false;
       ws.ping('', false);
     });
   }, 30000);
 
   attachServerWithConfig(server, address => {
-    log.warn(`Streaming API now listening on ${address}`);
+    logger.info(`Streaming API now listening on ${address}`);
   });
 
   const onExit = () => {
@@ -1460,8 +1502,10 @@ const startServer = async () => {
     process.exit(0);
   };
 
+  /** @param {Error} err */
   const onError = (err) => {
-    log.error(err);
+    logger.error(err);
+
     server.close();
     process.exit(0);
   };
@@ -1485,7 +1529,7 @@ const attachServerWithConfig = (server, onSuccess) => {
       }
     });
   } else {
-    server.listen(+process.env.PORT || 4000, process.env.BIND || '127.0.0.1', () => {
+    server.listen(+(process.env.PORT || 4000), process.env.BIND || '127.0.0.1', () => {
       if (onSuccess) {
         onSuccess(`${server.address().address}:${server.address().port}`);
       }
diff --git a/streaming/logging.js b/streaming/logging.js
new file mode 100644
index 0000000000..64ee474875
--- /dev/null
+++ b/streaming/logging.js
@@ -0,0 +1,119 @@
+const { pino } = require('pino');
+const { pinoHttp, stdSerializers: pinoHttpSerializers } = require('pino-http');
+const uuid = require('uuid');
+
+/**
+ * Generates the Request ID for logging and setting on responses
+ * @param {http.IncomingMessage} req
+ * @param {http.ServerResponse} [res]
+ * @returns {import("pino-http").ReqId}
+ */
+function generateRequestId(req, res) {
+  if (req.id) {
+    return req.id;
+  }
+
+  req.id = uuid.v4();
+
+  // Allow for usage with WebSockets:
+  if (res) {
+    res.setHeader('X-Request-Id', req.id);
+  }
+
+  return req.id;
+}
+
+/**
+ * Request log sanitizer to prevent logging access tokens in URLs
+ * @param {http.IncomingMessage} req
+ */
+function sanitizeRequestLog(req) {
+  const log = pinoHttpSerializers.req(req);
+  if (typeof log.url === 'string' && log.url.includes('access_token')) {
+    // Doorkeeper uses SecureRandom.urlsafe_base64 per RFC 6749 / RFC 6750
+    log.url = log.url.replace(/(access_token)=([a-zA-Z0-9\-_]+)/gi, '$1=[Redacted]');
+  }
+  return log;
+}
+
+const logger = pino({
+  name: "streaming",
+  // Reformat the log level to a string:
+  formatters: {
+    level: (label) => {
+      return {
+        level: label
+      };
+    },
+  },
+  redact: {
+    paths: [
+      'req.headers["sec-websocket-key"]',
+      // Note: we currently pass the AccessToken via the websocket subprotocol
+      // field, an anti-pattern, but this ensures it doesn't end up in logs.
+      'req.headers["sec-websocket-protocol"]',
+      'req.headers.authorization',
+      'req.headers.cookie',
+      'req.query.access_token'
+    ]
+  }
+});
+
+const httpLogger = pinoHttp({
+  logger,
+  genReqId: generateRequestId,
+  serializers: {
+    req: sanitizeRequestLog
+  }
+});
+
+/**
+ * Attaches a logger to the request object received by http upgrade handlers
+ * @param {http.IncomingMessage} request
+ */
+function attachWebsocketHttpLogger(request) {
+  generateRequestId(request);
+
+  request.log = logger.child({
+    req: sanitizeRequestLog(request),
+  });
+}
+
+/**
+ * Creates a logger instance for the Websocket connection to use.
+ * @param {http.IncomingMessage} request
+ * @param {import('./index.js').ResolvedAccount} resolvedAccount
+ */
+function createWebsocketLogger(request, resolvedAccount) {
+  // ensure the request.id is always present.
+  generateRequestId(request);
+
+  return logger.child({
+    req: {
+      id: request.id
+    },
+    account: {
+      id: resolvedAccount.accountId ?? null
+    }
+  });
+}
+
+exports.logger = logger;
+exports.httpLogger = httpLogger;
+exports.attachWebsocketHttpLogger = attachWebsocketHttpLogger;
+exports.createWebsocketLogger = createWebsocketLogger;
+
+/**
+ * Initializes the log level based on the environment
+ * @param {Object<string, any>} env
+ * @param {string} environment
+ */
+exports.initializeLogLevel = function initializeLogLevel(env, environment) {
+  if (env.LOG_LEVEL && Object.keys(logger.levels.values).includes(env.LOG_LEVEL)) {
+    logger.level = env.LOG_LEVEL;
+  } else if (environment === 'development') {
+    logger.level = 'debug';
+  } else {
+    logger.level = 'info';
+  }
+};
diff --git a/streaming/package.json b/streaming/package.json
index 149055ca1b..52a9979702 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -21,9 +21,10 @@
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
     "jsdom": "^23.0.0",
-    "npmlog": "^7.0.1",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
+    "pino": "^8.17.2",
+    "pino-http": "^9.0.0",
     "prom-client": "^15.0.0",
     "uuid": "^9.0.0",
     "ws": "^8.12.1"
@@ -31,11 +32,11 @@
   "devDependencies": {
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
-    "@types/npmlog": "^7.0.0",
     "@types/pg": "^8.6.6",
     "@types/uuid": "^9.0.0",
     "@types/ws": "^8.5.9",
     "eslint-define-config": "^2.0.0",
+    "pino-pretty": "^10.3.1",
     "typescript": "^5.0.4"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 6f8381db0e..75586ac497 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2536,7 +2536,6 @@ __metadata:
   dependencies:
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
-    "@types/npmlog": "npm:^7.0.0"
     "@types/pg": "npm:^8.6.6"
     "@types/uuid": "npm:^9.0.0"
     "@types/ws": "npm:^8.5.9"
@@ -2547,9 +2546,11 @@ __metadata:
     express: "npm:^4.18.2"
     ioredis: "npm:^5.3.2"
     jsdom: "npm:^23.0.0"
-    npmlog: "npm:^7.0.1"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
+    pino: "npm:^8.17.2"
+    pino-http: "npm:^9.0.0"
+    pino-pretty: "npm:^10.3.1"
     prom-client: "npm:^15.0.0"
     typescript: "npm:^5.0.4"
     utf-8-validate: "npm:^6.0.3"
@@ -3338,15 +3339,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/npmlog@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "@types/npmlog@npm:7.0.0"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: e94cb1d7dc6b1251d58d0a3cbf0c5b9e9b7c7649774cf816b9277fc10e1a09e65f2854357c4972d04d477f8beca3c8accb5e8546d594776e59e35ddfee79aff2
-  languageName: node
-  linkType: hard
-
 "@types/object-assign@npm:^4.0.30":
   version: 4.0.33
   resolution: "@types/object-assign@npm:4.0.33"
@@ -3791,6 +3783,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:6.9.1":
+  version: 6.9.1
+  resolution: "@typescript-eslint/scope-manager@npm:6.9.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.9.1"
+    "@typescript-eslint/visitor-keys": "npm:6.9.1"
+  checksum: 53fa7c3813d22b119e464f9b6d7d23407dfe103ee8ad2dcacf9ad6d656fda20e2bb3346df39e62b0e6b6ce71572ce5838071c5d2cca6daa4e0ce117ff22eafe5
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/type-utils@npm:6.19.0"
@@ -3815,6 +3817,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:6.9.1":
+  version: 6.9.1
+  resolution: "@typescript-eslint/types@npm:6.9.1"
+  checksum: 4ba21ba18e256da210a4caedfbc5d4927cf8cb4f2c4d74f8ccc865576f3659b974e79119d3c94db2b68a4cec9cd687e43971d355450b7082d6d1736a5dd6db85
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
@@ -3834,7 +3843,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.19.0, @typescript-eslint/utils@npm:^6.5.0":
+"@typescript-eslint/typescript-estree@npm:6.9.1":
+  version: 6.9.1
+  resolution: "@typescript-eslint/typescript-estree@npm:6.9.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.9.1"
+    "@typescript-eslint/visitor-keys": "npm:6.9.1"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 850b1865a90107879186c3f2969968a2c08fc6fcc56d146483c297cf5be376e33d505ac81533ba8e8103ca4d2edfea7d21b178de9e52217f7ee2922f51a445fa
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/utils@npm:6.19.0"
   dependencies:
@@ -3851,6 +3878,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:^6.5.0":
+  version: 6.9.1
+  resolution: "@typescript-eslint/utils@npm:6.9.1"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.12"
+    "@types/semver": "npm:^7.5.0"
+    "@typescript-eslint/scope-manager": "npm:6.9.1"
+    "@typescript-eslint/types": "npm:6.9.1"
+    "@typescript-eslint/typescript-estree": "npm:6.9.1"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 3d329d54c3d155ed29e2b456a602aef76bda1b88dfcf847145849362e4ddefabe5c95de236de750d08d5da9bedcfb2131bdfd784ce4eb87cf82728f0b6662033
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
@@ -3861,6 +3905,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:6.9.1":
+  version: 6.9.1
+  resolution: "@typescript-eslint/visitor-keys@npm:6.9.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:6.9.1"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: ac5f375a177add30489e5b63cafa8d82a196b33624bb36418422ebe0d7973b3ba550dc7e0dda36ea75a94cf9b200b4fb5f5fb4d77c027fd801201c1a269d343b
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -4324,13 +4378,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5
-  languageName: node
-  linkType: hard
-
 "are-docs-informative@npm:^0.0.2":
   version: 0.0.2
   resolution: "are-docs-informative@npm:0.0.2"
@@ -4338,16 +4385,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "are-we-there-yet@npm:4.0.0"
-  dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^4.1.0"
-  checksum: 760008e32948e9f738c5a288792d187e235fee0f170e042850bc7ff242f2a499f3f2874d6dd43ac06f5d9f5306137bc51bbdd4ae0bb11379c58b01678e0f684d
-  languageName: node
-  linkType: hard
-
 "argparse@npm:^1.0.7":
   version: 1.0.10
   resolution: "argparse@npm:1.0.10"
@@ -4669,6 +4706,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"atomic-sleep@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "atomic-sleep@npm:1.0.0"
+  checksum: e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+  languageName: node
+  linkType: hard
+
 "autoprefixer@npm:^10.4.14":
   version: 10.4.17
   resolution: "autoprefixer@npm:10.4.17"
@@ -5763,15 +5807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-support@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "color-support@npm:1.1.3"
-  bin:
-    color-support: bin.js
-  checksum: 8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6
-  languageName: node
-  linkType: hard
-
 "colord@npm:^2.9.1, colord@npm:^2.9.3":
   version: 2.9.3
   resolution: "colord@npm:2.9.3"
@@ -5779,7 +5814,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.20":
+"colorette@npm:^2.0.20, colorette@npm:^2.0.7":
   version: 2.0.20
   resolution: "colorette@npm:2.0.20"
   checksum: e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
@@ -5911,13 +5946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50
-  languageName: node
-  linkType: hard
-
 "constants-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
@@ -6445,6 +6473,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dateformat@npm:^4.6.3":
+  version: 4.6.3
+  resolution: "dateformat@npm:4.6.3"
+  checksum: e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+  languageName: node
+  linkType: hard
+
 "debounce@npm:^1.2.1":
   version: 1.2.1
   resolution: "debounce@npm:1.2.1"
@@ -6680,13 +6715,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"delegates@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "delegates@npm:1.0.0"
-  checksum: ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5
-  languageName: node
-  linkType: hard
-
 "denque@npm:^2.1.0":
   version: 2.1.0
   resolution: "denque@npm:2.1.0"
@@ -7952,6 +7980,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-copy@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "fast-copy@npm:3.0.1"
+  checksum: a8310dbcc4c94ed001dc3e0bbc3c3f0491bb04e6c17163abe441a54997ba06cdf1eb532c2f05e54777c6f072c84548c23ef0ecd54665cd611be1d42f37eca258
+  languageName: node
+  linkType: hard
+
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -7993,6 +8028,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-redact@npm:^3.1.1":
+  version: 3.3.0
+  resolution: "fast-redact@npm:3.3.0"
+  checksum: d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
+  languageName: node
+  linkType: hard
+
+"fast-safe-stringify@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "fast-safe-stringify@npm:2.1.1"
+  checksum: d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+  languageName: node
+  linkType: hard
+
 "fastest-levenshtein@npm:^1.0.16":
   version: 1.0.16
   resolution: "fastest-levenshtein@npm:1.0.16"
@@ -8407,22 +8456,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "gauge@npm:5.0.1"
-  dependencies:
-    aproba: "npm:^1.0.3 || ^2.0.0"
-    color-support: "npm:^1.1.3"
-    console-control-strings: "npm:^1.1.0"
-    has-unicode: "npm:^2.0.1"
-    signal-exit: "npm:^4.0.1"
-    string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    wide-align: "npm:^1.1.5"
-  checksum: 845f9a2534356cd0e9c1ae590ed471bbe8d74c318915b92a34e8813b8d3441ca8e0eb0fa87a48081e70b63b84d398c5e66a13b8e8040181c10b9d77e9fe3287f
-  languageName: node
-  linkType: hard
-
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
@@ -8771,13 +8804,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c
-  languageName: node
-  linkType: hard
-
 "has-value@npm:^0.3.1":
   version: 0.3.1
   resolution: "has-value@npm:0.3.1"
@@ -8854,6 +8880,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"help-me@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "help-me@npm:5.0.0"
+  checksum: 054c0e2e9ae2231c85ab5e04f75109b9d068ffcc54e58fb22079822a5ace8ff3d02c66fd45379c902ad5ab825e5d2e1451fcc2f7eab1eb49e7d488133ba4cacb
+  languageName: node
+  linkType: hard
+
 "history@npm:^4.10.1, history@npm:^4.9.0":
   version: 4.10.1
   resolution: "history@npm:4.10.1"
@@ -9320,7 +9353,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
+"intl-messageformat@npm:10.5.10":
   version: 10.5.10
   resolution: "intl-messageformat@npm:10.5.10"
   dependencies:
@@ -9332,6 +9365,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"intl-messageformat@npm:^10.3.5":
+  version: 10.5.8
+  resolution: "intl-messageformat@npm:10.5.8"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:1.18.0"
+    "@formatjs/fast-memoize": "npm:2.2.0"
+    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
+    tslib: "npm:^2.4.0"
+  checksum: 1d2854aae8471ec48165ca265760d6c5b1814eca831c88db698eb29b5ed20bee21ca8533090c9d28d9c6f1d844dda210b0bc58a2e036446158fae0845e5eed4f
+  languageName: node
+  linkType: hard
+
 "invariant@npm:^2.2.2, invariant@npm:^2.2.4":
   version: 2.2.4
   resolution: "invariant@npm:2.2.4"
@@ -10570,6 +10615,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"joycon@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "joycon@npm:3.1.1"
+  checksum: 131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae
+  languageName: node
+  linkType: hard
+
 "jpeg-autorotate@npm:^7.1.1":
   version: 7.1.1
   resolution: "jpeg-autorotate@npm:7.1.1"
@@ -11966,18 +12018,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "npmlog@npm:7.0.1"
-  dependencies:
-    are-we-there-yet: "npm:^4.0.0"
-    console-control-strings: "npm:^1.1.0"
-    gauge: "npm:^5.0.0"
-    set-blocking: "npm:^2.0.0"
-  checksum: d4e6a2aaa7b5b5d2e2ed8f8ac3770789ca0691a49f3576b6a8c97d560a4c3305d2c233a9173d62be737e6e4506bf9e89debd6120a3843c1d37315c34f90fef71
-  languageName: node
-  linkType: hard
-
 "nth-check@npm:^1.0.2":
   version: 1.0.2
   resolution: "nth-check@npm:1.0.2"
@@ -12150,6 +12190,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"on-exit-leak-free@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "on-exit-leak-free@npm:2.1.2"
+  checksum: faea2e1c9d696ecee919026c32be8d6a633a7ac1240b3b87e944a380e8a11dc9c95c4a1f8fb0568de7ab8db3823e790f12bda45296b1d111e341aad3922a0570
+  languageName: node
+  linkType: hard
+
 "on-finished@npm:2.4.1":
   version: 2.4.1
   resolution: "on-finished@npm:2.4.1"
@@ -12717,6 +12764,80 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pino-abstract-transport@npm:^1.0.0, pino-abstract-transport@npm:v1.1.0":
+  version: 1.1.0
+  resolution: "pino-abstract-transport@npm:1.1.0"
+  dependencies:
+    readable-stream: "npm:^4.0.0"
+    split2: "npm:^4.0.0"
+  checksum: 6e9b9d5a2c0a37f91ecaf224d335daae1ae682b1c79a05b06ef9e0f0a5d289f8e597992217efc857796dae6f1067e9b4882f95c6228ff433ddc153532cae8aca
+  languageName: node
+  linkType: hard
+
+"pino-http@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "pino-http@npm:9.0.0"
+  dependencies:
+    get-caller-file: "npm:^2.0.5"
+    pino: "npm:^8.17.1"
+    pino-std-serializers: "npm:^6.2.2"
+    process-warning: "npm:^3.0.0"
+  checksum: 05496cb76cc9908658e50c4620fbdf7b0b5d99fb529493d601c3e4635b0bf7ce12b8a8eed7b5b520089f643b099233d61dd71f7cdfad8b66e59b9b81d79b6512
+  languageName: node
+  linkType: hard
+
+"pino-pretty@npm:^10.3.1":
+  version: 10.3.1
+  resolution: "pino-pretty@npm:10.3.1"
+  dependencies:
+    colorette: "npm:^2.0.7"
+    dateformat: "npm:^4.6.3"
+    fast-copy: "npm:^3.0.0"
+    fast-safe-stringify: "npm:^2.1.1"
+    help-me: "npm:^5.0.0"
+    joycon: "npm:^3.1.1"
+    minimist: "npm:^1.2.6"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^1.0.0"
+    pump: "npm:^3.0.0"
+    readable-stream: "npm:^4.0.0"
+    secure-json-parse: "npm:^2.4.0"
+    sonic-boom: "npm:^3.0.0"
+    strip-json-comments: "npm:^3.1.1"
+  bin:
+    pino-pretty: bin.js
+  checksum: 6964fba5acc7a9f112e4c6738d602e123daf16cb5f6ddc56ab4b6bb05059f28876d51da8f72358cf1172e95fa12496b70465431a0836df693c462986d050686b
+  languageName: node
+  linkType: hard
+
+"pino-std-serializers@npm:^6.0.0, pino-std-serializers@npm:^6.2.2":
+  version: 6.2.2
+  resolution: "pino-std-serializers@npm:6.2.2"
+  checksum: 8f1c7f0f0d8f91e6c6b5b2a6bfb48f06441abeb85f1c2288319f736f9c6d814fbeebe928d2314efc2ba6018fa7db9357a105eca9fc99fc1f28945a8a8b28d3d5
+  languageName: node
+  linkType: hard
+
+"pino@npm:^8.17.1, pino@npm:^8.17.2":
+  version: 8.17.2
+  resolution: "pino@npm:8.17.2"
+  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:v1.1.0"
+    pino-std-serializers: "npm:^6.0.0"
+    process-warning: "npm:^3.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    real-require: "npm:^0.2.0"
+    safe-stable-stringify: "npm:^2.3.1"
+    sonic-boom: "npm:^3.7.0"
+    thread-stream: "npm:^2.0.0"
+  bin:
+    pino: bin.js
+  checksum: 9e55af6cd9d1833a4dbe64924fc73163295acd3c988a9c7db88926669f2574ab7ec607e8487b6dd71dbdad2d7c1c1aac439f37e59233f37220b1a9d88fa2ce01
+  languageName: node
+  linkType: hard
+
 "pirates@npm:^4.0.4":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -13319,6 +13440,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 60f3c8ddee586f0706c1e6cb5aa9c86df05774b9330d792d7c8851cf0031afd759d665404d07037e0b4901b55c44a423f07bdc465c63de07d8d23196bb403622
+  languageName: node
+  linkType: hard
+
 "process@npm:^0.11.10":
   version: 0.11.10
   resolution: "process@npm:0.11.10"
@@ -13496,6 +13624,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"quick-format-unescaped@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "quick-format-unescaped@npm:4.0.4"
+  checksum: fe5acc6f775b172ca5b4373df26f7e4fd347975578199e7d74b2ae4077f0af05baa27d231de1e80e8f72d88275ccc6028568a7a8c9ee5e7368ace0e18eff93a4
+  languageName: node
+  linkType: hard
+
 "raf@npm:^3.1.0":
   version: 3.4.1
   resolution: "raf@npm:3.4.1"
@@ -13991,15 +14126,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^4.1.0":
-  version: 4.4.0
-  resolution: "readable-stream@npm:4.4.0"
+"readable-stream@npm:^4.0.0":
+  version: 4.4.2
+  resolution: "readable-stream@npm:4.4.2"
   dependencies:
     abort-controller: "npm:^3.0.0"
     buffer: "npm:^6.0.3"
     events: "npm:^3.3.0"
     process: "npm:^0.11.10"
-  checksum: 83f5a11285e5ebefb7b22a43ea77a2275075639325b4932a328a1fb0ee2475b83b9cc94326724d71c6aa3b60fa87e2b16623530b1cac34f3825dcea0996fdbe4
+    string_decoder: "npm:^1.3.0"
+  checksum: cf7cc8daa2b57872d120945a20a1458c13dcb6c6f352505421115827b18ac4df0e483ac1fe195cb1f5cd226e1073fc55b92b569269d8299e8530840bcdbba40c
   languageName: node
   linkType: hard
 
@@ -14023,6 +14159,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"real-require@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "real-require@npm:0.2.0"
+  checksum: 23eea5623642f0477412ef8b91acd3969015a1501ed34992ada0e3af521d3c865bb2fe4cdbfec5fe4b505f6d1ef6a03e5c3652520837a8c3b53decff7e74b6a0
+  languageName: node
+  linkType: hard
+
 "redent@npm:^3.0.0":
   version: 3.0.0
   resolution: "redent@npm:3.0.0"
@@ -14568,6 +14711,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-stable-stringify@npm:^2.3.1":
+  version: 2.4.3
+  resolution: "safe-stable-stringify@npm:2.4.3"
+  checksum: 81dede06b8f2ae794efd868b1e281e3c9000e57b39801c6c162267eb9efda17bd7a9eafa7379e1f1cacd528d4ced7c80d7460ad26f62ada7c9e01dec61b2e768
+  languageName: node
+  linkType: hard
+
 "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
@@ -14681,6 +14831,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"secure-json-parse@npm:^2.4.0":
+  version: 2.7.0
+  resolution: "secure-json-parse@npm:2.7.0"
+  checksum: f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
+  languageName: node
+  linkType: hard
+
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
@@ -15084,6 +15241,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sonic-boom@npm:^3.0.0, sonic-boom@npm:^3.7.0":
+  version: 3.7.0
+  resolution: "sonic-boom@npm:3.7.0"
+  dependencies:
+    atomic-sleep: "npm:^1.0.0"
+  checksum: 57a3d560efb77f4576db111168ee2649c99e7869fda6ce0ec2a4e5458832d290ba58d74b073ddb5827d9a30f96d23cff79157993d919e1a6d5f28d8b6391c7f0
+  languageName: node
+  linkType: hard
+
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
@@ -15242,7 +15408,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split2@npm:^4.1.0":
+"split2@npm:^4.0.0, split2@npm:^4.1.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
   checksum: b292beb8ce9215f8c642bb68be6249c5a4c7f332fc8ecadae7be5cbdf1ea95addc95f0459ef2e7ad9d45fd1064698a097e4eb211c83e772b49bc0ee423e91534
@@ -15407,7 +15573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -15500,7 +15666,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -16046,6 +16212,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"thread-stream@npm:^2.0.0":
+  version: 2.4.1
+  resolution: "thread-stream@npm:2.4.1"
+  dependencies:
+    real-require: "npm:^0.2.0"
+  checksum: ce29265810b9550ce896726301ff006ebfe96b90292728f07cfa4c379740585583046e2a8018afc53aca66b18fed12b33a84f3883e7ebc317185f6682898b8f8
+  languageName: node
+  linkType: hard
+
 "thunky@npm:^1.0.2":
   version: 1.1.0
   resolution: "thunky@npm:1.1.0"
@@ -17283,15 +17458,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: 1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95
-  languageName: node
-  linkType: hard
-
 "wildcard@npm:^2.0.0":
   version: 2.0.1
   resolution: "wildcard@npm:2.0.1"

From 244182ad63f93a9617011a197095078322215a74 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:42:07 +0100
Subject: [PATCH 355/436] Update dependency rdf-normalize to v0.7.0 (#26769)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 6cf0504b51..c8042fcb8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -600,8 +600,8 @@ GEM
     rdf (3.3.1)
       bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-normalize (0.6.1)
-      rdf (~> 3.2)
+    rdf-normalize (0.7.0)
+      rdf (~> 3.3)
     rdoc (6.6.2)
       psych (>= 4.0.0)
     redcarpet (3.6.0)

From 5ae3bae586d5344b406cf63c91247d94489f2e22 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:43:03 +0100
Subject: [PATCH 356/436] Update dependency sass to v1.70.0 (#28799)

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

diff --git a/yarn.lock b/yarn.lock
index 75586ac497..b2afdc049f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14751,15 +14751,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.69.7
-  resolution: "sass@npm:1.69.7"
+  version: 1.70.0
+  resolution: "sass@npm:1.70.0"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 773d0938e7d4ff3972d3fda3132f34fe98a2f712e028a58e28fecd615434795eff3266eddc38d5e13f03b90c0d6360d0e737b30bff2949a47280c64a18e0fb18
+  checksum: 7c309ee1c096d591746d122da9f1ebd65b4c4b3a60c2cc0ec720fd98fe1205fa8b44c9f563d113b9fdfeb25af1e32ec9b3e048bd4b8e05d267f020953bd7baf0
   languageName: node
   linkType: hard
 

From 1480573c83f580a3a7eb5fef61ddbba69242032f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jan 2024 20:39:30 -0500
Subject: [PATCH 357/436] Add `Account.auditable` scope, fix N+1 in
 admin/action_logs#index (#28812)

---
 .../admin/action_logs_controller.rb           |  2 +-
 app/models/account.rb                         |  1 +
 app/models/admin/action_log_filter.rb         |  2 +-
 spec/models/account_spec.rb                   | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index 37a00ad225..8b8e83fde7 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -6,7 +6,7 @@ module Admin
 
     def index
       authorize :audit_log, :index?
-      @auditable_accounts = Account.where(id: Admin::ActionLog.select('distinct account_id')).select(:id, :username)
+      @auditable_accounts = Account.auditable.select(:id, :username)
     end
 
     private
diff --git a/app/models/account.rb b/app/models/account.rb
index c17de682e3..2fdfc2d514 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -126,6 +126,7 @@ class Account < ApplicationRecord
   scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
   scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
+  scope :auditable, -> { where(id: Admin::ActionLog.select(:account_id).distinct) }
   scope :searchable, -> { without_unapproved.without_suspended.where(moved_to_account_id: nil) }
   scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat) }
   scope :by_recent_status, -> { includes(:account_stat).merge(AccountStat.order('last_status_at DESC NULLS LAST')).references(:account_stat) }
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index d413cb386d..f581af74e8 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -72,7 +72,7 @@ class Admin::ActionLogFilter
   end
 
   def results
-    scope = latest_action_logs.includes(:target)
+    scope = latest_action_logs.includes(:target, :account)
 
     params.each do |key, value|
       next if key.to_s == 'page'
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index d360d934d6..8488ccea45 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -835,6 +835,25 @@ RSpec.describe Account do
   end
 
   describe 'scopes' do
+    describe 'auditable' do
+      let!(:alice) { Fabricate :account }
+      let!(:bob) { Fabricate :account }
+
+      before do
+        2.times { Fabricate :action_log, account: alice }
+      end
+
+      it 'returns distinct accounts with action log records' do
+        results = described_class.auditable
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(alice)
+          .and not_include(bob)
+      end
+    end
+
     describe 'alphabetic' do
       it 'sorts by alphabetic order of domain and username' do
         matches = [

From de09176ab9f04ac64b3ea5f877fa0895bf55e2eb Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathandejong02@gmail.com>
Date: Fri, 19 Jan 2024 10:18:21 +0100
Subject: [PATCH 358/436] Retry 401 errors on replies fetching (#28788)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/jsonld_helper.rb                      | 12 ++++++------
 app/services/activitypub/fetch_replies_service.rb | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index ce3ff094f6..b3d0d032c4 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -155,7 +155,7 @@ module JsonLdHelper
     end
   end
 
-  def fetch_resource(uri, id, on_behalf_of = nil)
+  def fetch_resource(uri, id, on_behalf_of = nil, request_options: {})
     unless id
       json = fetch_resource_without_id_validation(uri, on_behalf_of)
 
@@ -164,14 +164,14 @@ module JsonLdHelper
       uri = json['id']
     end
 
-    json = fetch_resource_without_id_validation(uri, on_behalf_of)
+    json = fetch_resource_without_id_validation(uri, on_behalf_of, request_options: request_options)
     json.present? && json['id'] == uri ? json : nil
   end
 
-  def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false)
+  def fetch_resource_without_id_validation(uri, on_behalf_of = nil, raise_on_temporary_error = false, request_options: {})
     on_behalf_of ||= Account.representative
 
-    build_request(uri, on_behalf_of).perform do |response|
+    build_request(uri, on_behalf_of, options: request_options).perform do |response|
       raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response) || !raise_on_temporary_error
 
       body_to_json(response.body_with_limit) if response.code == 200
@@ -204,8 +204,8 @@ module JsonLdHelper
     response.code == 501 || ((400...500).cover?(response.code) && ![401, 408, 429].include?(response.code))
   end
 
-  def build_request(uri, on_behalf_of = nil)
-    Request.new(:get, uri).tap do |request|
+  def build_request(uri, on_behalf_of = nil, options: {})
+    Request.new(:get, uri, **options).tap do |request|
       request.on_behalf_of(on_behalf_of) if on_behalf_of
       request.add_headers('Accept' => 'application/activity+json, application/ld+json')
     end
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index b5c7759ec5..a9dd327e96 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -37,7 +37,20 @@ class ActivityPub::FetchRepliesService < BaseService
     return unless @allow_synchronous_requests
     return if non_matching_uri_hosts?(@account.uri, collection_or_uri)
 
-    fetch_resource_without_id_validation(collection_or_uri, nil, true)
+    # NOTE: For backward compatibility reasons, Mastodon signs outgoing
+    # queries incorrectly by default.
+    #
+    # While this is relevant for all URLs with query strings, this is
+    # the only code path where this happens in practice.
+    #
+    # Therefore, retry with correct signatures if this fails.
+    begin
+      fetch_resource_without_id_validation(collection_or_uri, nil, true)
+    rescue Mastodon::UnexpectedResponseError => e
+      raise unless e.response && e.response.code == 401 && Addressable::URI.parse(collection_or_uri).query.present?
+
+      fetch_resource_without_id_validation(collection_or_uri, nil, true, request_options: { with_query_string: true })
+    end
   end
 
   def filtered_replies

From fd64817fbe658514e2753c2e03e13624719f4e41 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jan 2024 04:19:48 -0500
Subject: [PATCH 359/436] Fix `Rails/WhereExists` cop in
 app/lib/status_cache_hydrator (#28808)

---
 .rubocop_todo.yml                |  1 -
 app/lib/status_cache_hydrator.rb | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 87120daef2..31cefa0320 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -80,7 +80,6 @@ Rails/WhereExists:
     - 'app/lib/activitypub/activity/create.rb'
     - 'app/lib/delivery_failure_tracker.rb'
     - 'app/lib/feed_manager.rb'
-    - 'app/lib/status_cache_hydrator.rb'
     - 'app/lib/suspicious_sign_in_detector.rb'
     - 'app/models/poll.rb'
     - 'app/models/session_activation.rb'
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index 45b50cb379..34f6199ec0 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -26,11 +26,11 @@ class StatusCacheHydrator
 
   def hydrate_non_reblog_payload(empty_payload, account_id)
     empty_payload.tap do |payload|
-      payload[:favourited] = Favourite.where(account_id: account_id, status_id: @status.id).exists?
-      payload[:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.id).exists?
-      payload[:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.conversation_id).exists?
-      payload[:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.id).exists?
-      payload[:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.id).exists? if @status.account_id == account_id
+      payload[:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.id)
+      payload[:reblogged]  = Status.exists?(account_id: account_id, reblog_of_id: @status.id)
+      payload[:muted]      = ConversationMute.exists?(account_id: account_id, conversation_id: @status.conversation_id)
+      payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.id)
+      payload[:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.id) if @status.account_id == account_id
       payload[:filtered]   = mapped_applied_custom_filter(account_id, @status)
 
       if payload[:poll]
@@ -51,11 +51,11 @@ class StatusCacheHydrator
       # used to create the status, we need to hydrate it here too
       payload[:reblog][:application] = payload_reblog_application if payload[:reblog][:application].nil? && @status.reblog.account_id == account_id
 
-      payload[:reblog][:favourited] = Favourite.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
-      payload[:reblog][:reblogged]  = Status.where(account_id: account_id, reblog_of_id: @status.reblog_of_id).exists?
-      payload[:reblog][:muted]      = ConversationMute.where(account_id: account_id, conversation_id: @status.reblog.conversation_id).exists?
-      payload[:reblog][:bookmarked] = Bookmark.where(account_id: account_id, status_id: @status.reblog_of_id).exists?
-      payload[:reblog][:pinned]     = StatusPin.where(account_id: account_id, status_id: @status.reblog_of_id).exists? if @status.reblog.account_id == account_id
+      payload[:reblog][:favourited] = Favourite.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+      payload[:reblog][:reblogged]  = Status.exists?(account_id: account_id, reblog_of_id: @status.reblog_of_id)
+      payload[:reblog][:muted]      = ConversationMute.exists?(account_id: account_id, conversation_id: @status.reblog.conversation_id)
+      payload[:reblog][:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: @status.reblog_of_id)
+      payload[:reblog][:pinned]     = StatusPin.exists?(account_id: account_id, status_id: @status.reblog_of_id) if @status.reblog.account_id == account_id
       payload[:reblog][:filtered]   = payload[:filtered]
 
       if payload[:reblog][:poll]

From 6dc97321a3b780226f50098e31cf96cbbd7a3156 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 09:20:16 +0000
Subject: [PATCH 360/436] Update dependency intl-messageformat to v10.5.10
 (#28809)

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

diff --git a/yarn.lock b/yarn.lock
index b2afdc049f..8b55377235 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3783,16 +3783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/scope-manager@npm:6.9.1"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
-  checksum: 53fa7c3813d22b119e464f9b6d7d23407dfe103ee8ad2dcacf9ad6d656fda20e2bb3346df39e62b0e6b6ce71572ce5838071c5d2cca6daa4e0ce117ff22eafe5
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/type-utils@npm:6.19.0"
@@ -3817,13 +3807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/types@npm:6.9.1"
-  checksum: 4ba21ba18e256da210a4caedfbc5d4927cf8cb4f2c4d74f8ccc865576f3659b974e79119d3c94db2b68a4cec9cd687e43971d355450b7082d6d1736a5dd6db85
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
@@ -3843,25 +3826,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/typescript-estree@npm:6.9.1"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/visitor-keys": "npm:6.9.1"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 850b1865a90107879186c3f2969968a2c08fc6fcc56d146483c297cf5be376e33d505ac81533ba8e8103ca4d2edfea7d21b178de9e52217f7ee2922f51a445fa
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:6.19.0":
+"@typescript-eslint/utils@npm:6.19.0, @typescript-eslint/utils@npm:^6.5.0":
   version: 6.19.0
   resolution: "@typescript-eslint/utils@npm:6.19.0"
   dependencies:
@@ -3878,23 +3843,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:^6.5.0":
-  version: 6.9.1
-  resolution: "@typescript-eslint/utils@npm:6.9.1"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.12"
-    "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.9.1"
-    "@typescript-eslint/types": "npm:6.9.1"
-    "@typescript-eslint/typescript-estree": "npm:6.9.1"
-    semver: "npm:^7.5.4"
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: 3d329d54c3d155ed29e2b456a602aef76bda1b88dfcf847145849362e4ddefabe5c95de236de750d08d5da9bedcfb2131bdfd784ce4eb87cf82728f0b6662033
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:6.19.0":
   version: 6.19.0
   resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
@@ -3905,16 +3853,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.9.1":
-  version: 6.9.1
-  resolution: "@typescript-eslint/visitor-keys@npm:6.9.1"
-  dependencies:
-    "@typescript-eslint/types": "npm:6.9.1"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: ac5f375a177add30489e5b63cafa8d82a196b33624bb36418422ebe0d7973b3ba550dc7e0dda36ea75a94cf9b200b4fb5f5fb4d77c027fd801201c1a269d343b
-  languageName: node
-  linkType: hard
-
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -9353,7 +9291,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.10":
+"intl-messageformat@npm:10.5.10, intl-messageformat@npm:^10.3.5":
   version: 10.5.10
   resolution: "intl-messageformat@npm:10.5.10"
   dependencies:
@@ -9365,18 +9303,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:^10.3.5":
-  version: 10.5.8
-  resolution: "intl-messageformat@npm:10.5.8"
-  dependencies:
-    "@formatjs/ecma402-abstract": "npm:1.18.0"
-    "@formatjs/fast-memoize": "npm:2.2.0"
-    "@formatjs/icu-messageformat-parser": "npm:2.7.3"
-    tslib: "npm:^2.4.0"
-  checksum: 1d2854aae8471ec48165ca265760d6c5b1814eca831c88db698eb29b5ed20bee21ca8533090c9d28d9c6f1d844dda210b0bc58a2e036446158fae0845e5eed4f
-  languageName: node
-  linkType: hard
-
 "invariant@npm:^2.2.2, invariant@npm:^2.2.4":
   version: 2.2.4
   resolution: "invariant@npm:2.2.4"

From 6a1c9987220b0e6537e4c31fd2e812f498d93858 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:21:07 +0100
Subject: [PATCH 361/436] Update dependency kt-paperclip to v7.2.2 (#28813)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c8042fcb8d..93931d8724 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.6)
     bindata (2.4.15)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -398,12 +398,12 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kt-paperclip (7.2.1)
+    kt-paperclip (7.2.2)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       marcel (~> 1.0.1)
       mime-types
-      terrapin (~> 0.6.0)
+      terrapin (>= 0.6.0, < 2.0)
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)

From 86cc88c21627bef221f461749189c91d446f3902 Mon Sep 17 00:00:00 2001
From: HTeuMeuLeu <remi@hteumeuleu.fr>
Date: Fri, 19 Jan 2024 10:23:59 +0100
Subject: [PATCH 362/436] Fix banner image not showing in follow emails
 (#28814)

---
 app/javascript/styles/mailer.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index bd220bb1a8..a2cbb494b4 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -100,9 +100,8 @@ table + p {
   border-top-right-radius: 12px;
   height: 140px;
   vertical-align: bottom;
-  background-color: #f3f2f5;
-  background-position: center;
-  background-size: cover;
+  background-position: center !important;
+  background-size: cover !important;
 }
 
 .email-account-banner-inner-td {

From 329911b0a31016c313b433c1068308236736598f Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jan 2024 04:32:41 -0500
Subject: [PATCH 363/436] Migrate controller->request spec for api/v1/follow* 
 (#28811)

---
 .../accounts/follower_accounts_controller.rb  |  2 +-
 .../accounts/following_accounts_controller.rb |  2 +-
 .../v1/accounts/follower_accounts_spec.rb}    | 19 +++++++++----------
 .../v1/accounts/following_accounts_spec.rb}   | 19 +++++++++----------
 4 files changed, 20 insertions(+), 22 deletions(-)
 rename spec/{controllers/api/v1/accounts/follower_accounts_controller_spec.rb => requests/api/v1/accounts/follower_accounts_spec.rb} (69%)
 rename spec/{controllers/api/v1/accounts/following_accounts_controller_spec.rb => requests/api/v1/accounts/following_accounts_spec.rb} (69%)

diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 21b1095f18..d6a5a7176d 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
     return [] if hide_results?
 
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? || current_account.id == @account.id
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil? || current_account.id == @account.id
     scope.merge(paginated_follows).to_a
   end
 
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 1db521f79c..b8578ef539 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
     return [] if hide_results?
 
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil? || current_account.id == @account.id
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil? || current_account.id == @account.id
     scope.merge(paginated_follows).to_a
   end
 
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/follower_accounts_spec.rb
index 510a47566b..7ff92d6a48 100644
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/follower_accounts_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::FollowerAccountsController do
-  render_views
-
+describe 'API V1 Accounts FollowerAccounts' do
   let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
   let(:bob)     { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowerAccountsController do
   before do
     alice.follow!(account)
     bob.follow!(account)
-    allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/:acount_id/followers' do
     it 'returns accounts following the given account', :aggregate_failures do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
 
     it 'does not return blocked users', :aggregate_failures do
       user.account.block!(bob)
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
       end
 
       it 'hides results' do
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
         expect(body_as_json.size).to eq 0
       end
     end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowerAccountsController do
 
       it 'returns all accounts, including muted accounts' do
         account.mute!(bob)
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/followers", params: { limit: 2 }, headers: headers
 
         expect(body_as_json.size).to eq 2
         expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/requests/api/v1/accounts/following_accounts_spec.rb
similarity index 69%
rename from spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
rename to spec/requests/api/v1/accounts/following_accounts_spec.rb
index a7d07a6bec..b343a48654 100644
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/accounts/following_accounts_spec.rb
@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-describe Api::V1::Accounts::FollowingAccountsController do
-  render_views
-
+describe 'API V1 Accounts FollowingAccounts' do
   let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)   { 'read:accounts' }
+  let(:headers)  { { 'Authorization' => "Bearer #{token.token}" } }
   let(:account) { Fabricate(:account) }
   let(:alice)   { Fabricate(:account) }
   let(:bob)     { Fabricate(:account) }
@@ -14,12 +14,11 @@ describe Api::V1::Accounts::FollowingAccountsController do
   before do
     account.follow!(alice)
     account.follow!(bob)
-    allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
+  describe 'GET /api/v1/accounts/:account_id/following' do
     it 'returns accounts followed by the given account', :aggregate_failures do
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 2
@@ -28,7 +27,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
 
     it 'does not return blocked users', :aggregate_failures do
       user.account.block!(bob)
-      get :index, params: { account_id: account.id, limit: 2 }
+      get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
       expect(response).to have_http_status(200)
       expect(body_as_json.size).to eq 1
@@ -41,7 +40,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
       end
 
       it 'hides results' do
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
         expect(body_as_json.size).to eq 0
       end
     end
@@ -51,7 +50,7 @@ describe Api::V1::Accounts::FollowingAccountsController do
 
       it 'returns all accounts, including muted accounts' do
         account.mute!(bob)
-        get :index, params: { account_id: account.id, limit: 2 }
+        get "/api/v1/accounts/#{account.id}/following", params: { limit: 2 }, headers: headers
 
         expect(body_as_json.size).to eq 2
         expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)

From 4ec7d7d98911f5047e9da9004748ea5900f975d7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jan 2024 04:35:58 -0500
Subject: [PATCH 364/436] Fix `Rails/WhereExists` cop in REST::TagSerializer
 model (#28790)

---
 .rubocop_todo.yml                      | 1 -
 app/serializers/rest/tag_serializer.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 31cefa0320..0cebf37b57 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -86,7 +86,6 @@ Rails/WhereExists:
     - 'app/models/status.rb'
     - 'app/policies/status_policy.rb'
     - 'app/serializers/rest/announcement_serializer.rb'
-    - 'app/serializers/rest/tag_serializer.rb'
     - 'app/services/activitypub/fetch_remote_status_service.rb'
     - 'app/services/vote_service.rb'
     - 'app/validators/reaction_validator.rb'
diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb
index 7801e77d1f..017b572718 100644
--- a/app/serializers/rest/tag_serializer.rb
+++ b/app/serializers/rest/tag_serializer.rb
@@ -19,7 +19,7 @@ class REST::TagSerializer < ActiveModel::Serializer
     if instance_options && instance_options[:relationships]
       instance_options[:relationships].following_map[object.id] || false
     else
-      TagFollow.where(tag_id: object.id, account_id: current_user.account_id).exists?
+      TagFollow.exists?(tag_id: object.id, account_id: current_user.account_id)
     end
   end
 

From 163db814c2b3cf544b78e427e7f7bbd99b94a025 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:41:03 +0100
Subject: [PATCH 365/436] Update dependency react-redux to v9.1.0 (#28717)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 app/javascript/mastodon/store/typed_functions.ts | 5 ++---
 yarn.lock                                        | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 46a10b8b47..4859b82651 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,12 +1,11 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
-import type { TypedUseSelectorHook } from 'react-redux';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
 import type { AppDispatch, RootState } from './store';
 
-export const useAppDispatch: () => AppDispatch = useDispatch;
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+export const useAppDispatch = useDispatch.withTypes<AppDispatch>();
+export const useAppSelector = useSelector.withTypes<RootState>();
 
 export const createAppAsyncThunk = createAsyncThunk.withTypes<{
   state: RootState;
diff --git a/yarn.lock b/yarn.lock
index 8b55377235..35abcf80b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13799,8 +13799,8 @@ __metadata:
   linkType: hard
 
 "react-redux@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "react-redux@npm:9.0.4"
+  version: 9.1.0
+  resolution: "react-redux@npm:9.1.0"
   dependencies:
     "@types/use-sync-external-store": "npm:^0.0.3"
     use-sync-external-store: "npm:^1.0.0"
@@ -13816,7 +13816,7 @@ __metadata:
       optional: true
     redux:
       optional: true
-  checksum: 23af10014b129aeb051de729bde01de21175170b860deefb7ad83483feab5816253f770a4cea93333fc22a53ac9ac699b27f5c3705c388dab53dbcb2906a571a
+  checksum: 53161b5dc4d109020fbc42d26906ace92fed9ba1d7ab6274af60e9c0684583d20d1c8ec6d58601ac7b833c6468a652bbf3d4a102149d1793cb8a28b05b042f73
   languageName: node
   linkType: hard
 

From 9cd17020bc6aa966bdf26787a6ce4c9d2204c5e0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 09:41:57 +0000
Subject: [PATCH 366/436] New Crowdin Translations (automated) (#28798)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/vi.json | 2 +-
 config/locales/devise.fi.yml            | 9 +++++++++
 config/locales/devise.hu.yml            | 9 +++++++++
 config/locales/devise.ko.yml            | 9 +++++++++
 config/locales/fi.yml                   | 6 ++++++
 config/locales/hu.yml                   | 6 ++++++
 config/locales/ko.yml                   | 6 ++++++
 config/locales/sk.yml                   | 2 ++
 8 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 9de043bb20..c623caa3fb 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -358,7 +358,7 @@
   "keyboard_shortcuts.my_profile": "mở hồ sơ của bạn",
   "keyboard_shortcuts.notifications": "mở thông báo",
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
-  "keyboard_shortcuts.pinned": "mở những tút đã ghim",
+  "keyboard_shortcuts.pinned": "Open pinned posts list",
   "keyboard_shortcuts.profile": "mở trang của người đăng tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index bedf8a56f6..ac7a57c6f8 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -47,14 +47,19 @@ fi:
         subject: 'Mastodon: ohjeet salasanan vaihtoon'
         title: Salasanan vaihto
       two_factor_disabled:
+        explanation: Olet nyt mahdollistanut sisäänkirjautumisen pelkästään sähköpostiosoitteella ja salasanalla.
         subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
+        subtitle: Kaksivaiheinen tunnistautuminen käyttäjätilillesi on poistettu käytöstä.
         title: 2-vaiheinen todennus pois käytöstä
       two_factor_enabled:
+        explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
+        subtitle: Kaksivaiheinen kirjautuminen tilillesi on määritetty käyttöön.
         title: 2-vaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
         explanation: Uudet palautuskoodit on nyt luotu ja vanhat on mitätöity.
         subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
+        subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
         subject: 'Mastodon: lukituksen poistamisen ohjeet'
@@ -68,9 +73,13 @@ fi:
           subject: 'Mastodon: suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
+        explanation: Turva-avaimin kirjautuminen tilillesi on kytketty pois käytöstä.
+        extra: Olet nyt mahdollistanut sisäänkirjautumisen käyttäjätilillesi pelkästään palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
         subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
+        explanation: Turva-avainkirjautuminen käyttäjätilillesi on otettu käyttöön.
+        extra: Voit nyt kirjautua sisään käyttäen turva-avaintasi.
         subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 522ac66ad3..fea56ab24a 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -47,14 +47,19 @@ hu:
         subject: 'Mastodon: Jelszóvisszaállítási utasítások'
         title: Jelszó visszaállítása
       two_factor_disabled:
+        explanation: A bejelentkezés most már csupán email címmel és jelszóval lehetséges.
         subject: Kétlépcsős azonosítás kikapcsolva
+        subtitle: A kétlépcsős hitelesítés a fiókodhoz ki lett kapcsolva.
         title: Kétlépcsős hitelesítés kikapcsolva
       two_factor_enabled:
+        explanation: Egy párosított TOTP appal generált tokenre lesz szükség a bejelentkezéshez.
         subject: 'Mastodon: Kétlépcsős azonosítás engedélyezve'
+        subtitle: A kétlépcsős hitelesítés a fiókodhoz aktiválva lett.
         title: Kétlépcsős hitelesítés engedélyezve
       two_factor_recovery_codes_changed:
         explanation: A korábbi helyreállítási kódok letiltásra és újragenerálásra kerültek.
         subject: 'Mastodon: Kétlépcsős helyreállítási kódok újból előállítva'
+        subtitle: A korábbi helyreállítási kódokat letiltottuk, és újakat generáltunk.
         title: A kétlépcsős kódok megváltoztak
       unlock_instructions:
         subject: 'Mastodon: Feloldási utasítások'
@@ -68,9 +73,13 @@ hu:
           subject: 'Mastodon: A biztonsági kulcs törlésre került'
           title: Az egyik biztonsági kulcsodat törölték
       webauthn_disabled:
+        explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz ki lett kapcsolva.
+        extra: A bejelentkezés most már csak TOTP app által generált tokennel lehetséges.
         subject: 'Mastodon: A biztonsági kulccsal történő hitelesítés letiltásra került'
         title: A biztonsági kulcsok letiltásra kerültek
       webauthn_enabled:
+        explanation: A biztonsági kulcsokkal történő hitelesítés a fiókodhoz aktiválva lett.
+        extra: A biztonsági kulcsodat mostantól lehet bejelentkezésre használni.
         subject: 'Mastodon: A biztonsági kulcsos hitelesítés engedélyezésre került'
         title: A biztonsági kulcsok engedélyezésre kerültek
     omniauth_callbacks:
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 88865aec58..0c848e4bac 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -47,14 +47,19 @@ ko:
         subject: 'Mastodon: 암호 재설정 설명'
         title: 암호 재설정
       two_factor_disabled:
+        explanation: 이제 이메일과 암호만 이용해서 로그인이 가능합니다.
         subject: '마스토돈: 이중 인증 비활성화'
+        subtitle: 계정에 대한 2단계 인증이 비활성화되었습니다.
         title: 2FA 비활성화 됨
       two_factor_enabled:
+        explanation: 로그인 하기 위해서는 짝이 되는 TOTP 앱에서 생성한 토큰이 필요합니다.
         subject: '마스토돈: 이중 인증 활성화'
+        subtitle: 계정에 대한 2단계 인증이 활성화되었습니다.
         title: 2FA 활성화 됨
       two_factor_recovery_codes_changed:
         explanation: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다
         subject: '마스토돈: 이중 인증 복구 코드 재생성 됨'
+        subtitle: 이전 복구 코드가 무효화되고 새 코드가 생성되었습니다.
         title: 2FA 복구 코드 변경됨
       unlock_instructions:
         subject: '마스토돈: 잠금 해제 방법'
@@ -68,9 +73,13 @@ ko:
           subject: '마스토돈: 보안 키 삭제'
           title: 보안 키가 삭제되었습니다
       webauthn_disabled:
+        explanation: 계정의 보안 키 인증이 비활성화되었습니다
+        extra: 이제 TOTP 앱에서 생성한 토큰을 통해서만 로그인 가능합니다.
         subject: '마스토돈: 보안 키를 이용한 인증이 비활성화 됨'
         title: 보안 키 비활성화 됨
       webauthn_enabled:
+        explanation: 계정에 대한 보안키 인증이 활성화되었습니다.
+        extra: 로그인시 보안키가 사용됩니다.
         subject: '마스토돈: 보안 키 인증 활성화 됨'
         title: 보안 키 활성화 됨
     omniauth_callbacks:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a719f3496f..26fe6b7f02 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1608,6 +1608,7 @@ fi:
       unknown_browser: Tuntematon selain
       weibo: Weibo
     current_session: Nykyinen istunto
+    date: Päiväys
     description: "%{browser} alustalla %{platform}"
     explanation: Nämä verkkoselaimet ovat tällä hetkellä kirjautuneena Mastodon-tilillesi.
     ip: IP-osoite
@@ -1774,14 +1775,19 @@ fi:
     webauthn: Suojausavaimet
   user_mailer:
     appeal_approved:
+      action: Tilin asetukset
       explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hyväksytty. Tilisi on jälleen hyvässä kunnossa.
       subject: Valituksesi %{date} on hyväksytty
+      subtitle: Tilisi on jälleen normaalissa tilassa.
       title: Valitus hyväksytty
     appeal_rejected:
       explanation: Valitus tiliäsi koskevasta varoituksesta %{strike_date} jonka lähetit %{appeal_date} on hylätty.
       subject: Valituksesi %{date} on hylätty
+      subtitle: Vetoomuksesi on hylätty.
       title: Valitus hylätty
     backup_ready:
+      explanation: Olet pyytänyt täysvarmuuskopion Mastodon-tilistäsi.
+      extra: Se on nyt valmis ladattavaksi!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
     suspicious_sign_in:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 536af8b6b5..7cfd7d80e2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1608,6 +1608,7 @@ hu:
       unknown_browser: Ismeretlen böngésző
       weibo: Weibo
     current_session: Jelenlegi munkamenet
+    date: Dátum
     description: "%{browser} az alábbi platformon: %{platform}"
     explanation: Jelenleg az alábbi böngészőkkel vagy bejelentkezve a fiókodba.
     ip: IP
@@ -1774,14 +1775,19 @@ hu:
     webauthn: Biztonsági kulcsok
   user_mailer:
     appeal_approved:
+      action: Fiók Beállításai
       explanation: A fiókod %{appeal_date}-i fellebbezése, mely a %{strike_date}-i vétségeddel kapcsolatos, jóváhagyásra került. A fiókod megint makulátlan.
       subject: A %{date}-i fellebbezésedet jóváhagyták
+      subtitle: A fiókod ismét használható állapotban van.
       title: Fellebbezés jóváhagyva
     appeal_rejected:
       explanation: A %{appeal_date}-i fellebbezésed, amely a fiókod %{strike_date}-i vétségével kapcsolatos, elutasításra került.
       subject: A %{date}-i fellebbezésedet visszautasították
+      subtitle: A fellebbezésedet visszautasították.
       title: Fellebbezés visszautasítva
     backup_ready:
+      explanation: A Mastodon fiókod teljes biztonsági mentését kérted.
+      extra: Már letöltésre kész!
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
     suspicious_sign_in:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b0eadc0504..b85b9b5861 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1584,6 +1584,7 @@ ko:
       unknown_browser: 알 수 없는 브라우저
       weibo: 웨이보
     current_session: 현재 세션
+    date: 날짜
     description: "%{platform}의 %{browser}"
     explanation: 내 마스토돈 계정에 로그인되어 있는 웹 브라우저 목록입니다.
     ip: IP
@@ -1744,14 +1745,19 @@ ko:
     webauthn: 보안 키
   user_mailer:
     appeal_approved:
+      action: 계정 설정
       explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했으며 승낙되었습니다. 당신의 계정은 정상적인 상태로 돌아왔습니다."
       subject: 귀하가 %{date}에 작성한 소명이 승낙되었습니다
+      subtitle: 계정이 다시 정상적인 상태입니다.
       title: 소명이 받아들여짐
     appeal_rejected:
       explanation: "%{strike_date}에 일어난 중재결정에 대한 소명을 %{appeal_date}에 작성했지만 반려되었습니다."
       subject: "%{date}에 작성한 소명이 반려되었습니다."
+      subtitle: 소명이 기각되었습니다.
       title: 이의 제기가 거절되었습니다
     backup_ready:
+      explanation: 마스토돈 계정에 대한 전체 백업을 요청했습니다
+      extra: 다운로드 할 준비가 되었습니다!
       subject: 아카이브를 다운로드할 수 있습니다
       title: 아카이브 테이크아웃
     suspicious_sign_in:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index fdd64b5bb7..89f456a205 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -633,6 +633,7 @@ sk:
       documentation_link: Zisti viac
       release_notes: Poznámky k vydaniu
       title: Dostupné aktualizácie
+      type: Druh
       types:
         major: Hlavné vydanie
         patch: Opravné vydanie - opravy a jednoducho uplatniteľné zmeny
@@ -641,6 +642,7 @@ sk:
       account: Autor
       application: Aplikácia
       back_to_account: Späť na účet
+      back_to_report: Späť na stránku hlásenia
       batch:
         remove_from_report: Vymaž z hlásenia
         report: Hlásenie

From 6a5d70e146c0bc15e965b802f3711f3b7c145169 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jan 2024 06:20:20 -0500
Subject: [PATCH 367/436] Update pre_migration_check postgres version
 requirement (#28800)

---
 lib/tasks/db.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 3bc526bd21..4208c2ae4b 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -16,8 +16,8 @@ namespace :db do
   end
 
   task pre_migration_check: :environment do
-    version = ActiveRecord::Base.connection.select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
-    abort 'This version of Mastodon requires PostgreSQL 9.5 or newer. Please update PostgreSQL before updating Mastodon' if version < 90_500
+    version = ActiveRecord::Base.connection.database_version
+    abort 'This version of Mastodon requires PostgreSQL 12.0 or newer. Please update PostgreSQL before updating Mastodon.' if version < 120_000
   end
 
   Rake::Task['db:migrate'].enhance(['db:pre_migration_check'])

From 5fc4ae7c5f9667b335e63f97cacaa1efe5f7a6d5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 19 Jan 2024 06:22:23 -0500
Subject: [PATCH 368/436] Move privacy policy into markdown file (#28699)

---
 .rubocop_todo.yml                  |   1 -
 app/models/privacy_policy.rb       |  61 +-------------
 config/templates/privacy-policy.md | 128 +++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 61 deletions(-)
 create mode 100644 config/templates/privacy-policy.md

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0cebf37b57..a2ee32d284 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -135,7 +135,6 @@ Style/FetchEnvVar:
 # AllowedMethods: redirect
 Style/FormatStringToken:
   Exclude:
-    - 'app/models/privacy_policy.rb'
     - 'config/initializers/devise.rb'
     - 'lib/paperclip/color_extractor.rb'
 
diff --git a/app/models/privacy_policy.rb b/app/models/privacy_policy.rb
index 36cbf18822..c0d6e1b76d 100644
--- a/app/models/privacy_policy.rb
+++ b/app/models/privacy_policy.rb
@@ -1,66 +1,7 @@
 # frozen_string_literal: true
 
 class PrivacyPolicy < ActiveModelSerializers::Model
-  DEFAULT_PRIVACY_POLICY = <<~TXT
-    This privacy policy describes how %{domain} ("%{domain}", "we", "us") collects, protects and uses the personally identifiable information you may provide through the %{domain} website or its API. The policy also describes the choices available to you regarding our use of your personal information and how you can access and update this information. This policy does not apply to the practices of companies that %{domain} does not own or control, or to individuals that %{domain} does not employ or manage.
-
-    # What information do we collect?
-
-    - **Basic account information**: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.
-    - **Posts, following and other public information**: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
-    - **Direct and followers-only posts**: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. **Please keep in mind that the operators of the server and any receiving server may view such messages**, and that recipients may screenshot, copy or otherwise re-share them. **Do not share any sensitive information over Mastodon.**
-    - **IPs and other metadata**: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
-
-    # What do we use your information for?
-
-    Any of the information we collect from you may be used in the following ways:
-
-    - To provide the core functionality of Mastodon. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
-    - To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
-    - The email address you provide may be used to send you information, notifications about other people interacting with your content or sending you messages, and to respond to inquiries, and/or other requests or questions.
-
-    # How do we protect your information?
-
-    We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL, and your password is hashed using a strong one-way algorithm. You may enable two-factor authentication to further secure access to your account.
-
-    # What is our data retention policy?
-
-    We will make a good faith effort to:
-
-    - Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.
-    - Retain the IP addresses associated with registered users no more than 12 months.
-
-    You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.
-
-    You may irreversibly delete your account at any time.
-
-    # Do we use cookies?
-
-    Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
-
-    We use cookies to understand and save your preferences for future visits.
-
-    # Do we disclose any information to outside parties?
-
-    We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety.
-
-    Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.
-
-    When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.
-
-    # Site usage by children
-
-    If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (General Data Protection Regulation) do not use this site.
-
-    If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.
-
-    Law requirements can be different if this server is in another jurisdiction.
-
-    ___
-
-    This document is CC-BY-SA. Originally adapted from the [Discourse privacy policy](https://github.com/discourse/discourse).
-  TXT
-
+  DEFAULT_PRIVACY_POLICY = Rails.root.join('config', 'templates', 'privacy-policy.md').read
   DEFAULT_UPDATED_AT = DateTime.new(2022, 10, 7).freeze
 
   attributes :updated_at, :text
diff --git a/config/templates/privacy-policy.md b/config/templates/privacy-policy.md
new file mode 100644
index 0000000000..9e042af80a
--- /dev/null
+++ b/config/templates/privacy-policy.md
@@ -0,0 +1,128 @@
+This privacy policy describes how %{domain}s ("%{domain}s", "we", "us")
+collects, protects and uses the personally identifiable information you may
+provide through the %{domain}s website or its API. The policy also
+describes the choices available to you regarding our use of your personal
+information and how you can access and update this information. This policy
+does not apply to the practices of companies that %{domain}s does not own
+or control, or to individuals that %{domain}s does not employ or manage.
+
+# What information do we collect?
+
+- **Basic account information**: If you register on this server, you may be
+  asked to enter a username, an e-mail address and a password. You may also
+  enter additional profile information such as a display name and biography, and
+  upload a profile picture and header image. The username, display name,
+  biography, profile picture and header image are always listed publicly.
+- **Posts, following and other public information**: The list of people you
+  follow is listed publicly, the same is true for your followers. When you
+  submit a message, the date and time is stored as well as the application you
+  submitted the message from. Messages may contain media attachments, such as
+  pictures and videos. Public and unlisted posts are available publicly. When
+  you feature a post on your profile, that is also publicly available
+  information. Your posts are delivered to your followers, in some cases it
+  means they are delivered to different servers and copies are stored there.
+  When you delete posts, this is likewise delivered to your followers. The
+  action of reblogging or favouriting another post is always public.
+- **Direct and followers-only posts**: All posts are stored and processed on the
+  server. Followers-only posts are delivered to your followers and users who are
+  mentioned in them, and direct posts are delivered only to users mentioned in
+  them. In some cases it means they are delivered to different servers and
+  copies are stored there. We make a good faith effort to limit the access to
+  those posts only to authorized persons, but other servers may fail to do so.
+  Therefore it's important to review servers your followers belong to. You may
+  toggle an option to approve and reject new followers manually in the settings.
+  **Please keep in mind that the operators of the server and any receiving
+  server may view such messages**, and that recipients may screenshot, copy or
+  otherwise re-share them. **Do not share any sensitive information over
+  Mastodon.**
+- **IPs and other metadata**: When you log in, we record the IP address you log
+  in from, as well as the name of your browser application. All the logged in
+  sessions are available for your review and revocation in the settings. The
+  latest IP address used is stored for up to 12 months. We also may retain
+  server logs which include the IP address of every request to our server.
+
+# What do we use your information for?
+
+Any of the information we collect from you may be used in the following ways:
+
+- To provide the core functionality of Mastodon. You can only interact with
+  other people's content and post your own content when you are logged in. For
+  example, you may follow other people to view their combined posts in your own
+  personalized home timeline.
+- To aid moderation of the community, for example comparing your IP address with
+  other known ones to determine ban evasion or other violations.
+- The email address you provide may be used to send you information,
+  notifications about other people interacting with your content or sending you
+  messages, and to respond to inquiries, and/or other requests or questions.
+
+# How do we protect your information?
+
+We implement a variety of security measures to maintain the safety of your
+personal information when you enter, submit, or access your personal
+information. Among other things, your browser session, as well as the traffic
+between your applications and the API, are secured with SSL, and your password
+is hashed using a strong one-way algorithm. You may enable two-factor
+authentication to further secure access to your account.
+
+# What is our data retention policy?
+
+We will make a good faith effort to:
+
+- Retain server logs containing the IP address of all requests to this server,
+  in so far as such logs are kept, no more than 90 days.
+- Retain the IP addresses associated with registered users no more than 12
+  months.
+
+You can request and download an archive of your content, including your posts,
+media attachments, profile picture, and header image.
+
+You may irreversibly delete your account at any time.
+
+# Do we use cookies?
+
+Yes. Cookies are small files that a site or its service provider transfers to
+your computer's hard drive through your Web browser (if you allow). These
+cookies enable the site to recognize your browser and, if you have a registered
+account, associate it with your registered account.
+
+We use cookies to understand and save your preferences for future visits.
+
+# Do we disclose any information to outside parties?
+
+We do not sell, trade, or otherwise transfer to outside parties your personally
+identifiable information. This does not include trusted third parties who assist
+us in operating our site, conducting our business, or servicing you, so long as
+those parties agree to keep this information confidential. We may also release
+your information when we believe release is appropriate to comply with the law,
+enforce our site policies, or protect ours or others rights, property, or
+safety.
+
+Your public content may be downloaded by other servers in the network. Your
+public and followers-only posts are delivered to the servers where your
+followers reside, and direct messages are delivered to the servers of the
+recipients, in so far as those followers or recipients reside on a different
+server than this.
+
+When you authorize an application to use your account, depending on the scope of
+permissions you approve, it may access your public profile information, your
+following list, your followers, your lists, all your posts, and your favourites.
+Applications can never access your e-mail address or password.
+
+# Site usage by children
+
+If this server is in the EU or the EEA: Our site, products and services are all
+directed to people who are at least 16 years old. If you are under the age of
+16, per the requirements of the GDPR (General Data Protection Regulation) do not
+use this site.
+
+If this server is in the USA: Our site, products and services are all directed
+to people who are at least 13 years old. If you are under the age of 13, per the
+requirements of COPPA (Children's Online Privacy Protection Act) do not use this
+site.
+
+Law requirements can be different if this server is in another jurisdiction.
+
+---
+
+This document is CC-BY-SA. Originally adapted from the [Discourse privacy
+policy](https://github.com/discourse/discourse).

From 3593ee2e36284de71be8dc74c1772de7a7e1a7e3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jan 2024 13:19:49 +0100
Subject: [PATCH 369/436] Add rate-limit of TOTP authentication attempts at
 controller level (#28801)

---
 app/controllers/auth/sessions_controller.rb   | 22 +++++++++++++++++++
 .../auth/two_factor_authentication_concern.rb |  5 +++++
 config/locales/en.yml                         |  1 +
 .../auth/sessions_controller_spec.rb          | 20 +++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 148ad53755..6bc48a7804 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Auth::SessionsController < Devise::SessionsController
+  include Redisable
+
+  MAX_2FA_ATTEMPTS_PER_HOUR = 10
+
   layout 'auth'
 
   skip_before_action :check_self_destruct!
@@ -130,9 +134,23 @@ class Auth::SessionsController < Devise::SessionsController
     session.delete(:attempt_user_updated_at)
   end
 
+  def clear_2fa_attempt_from_user(user)
+    redis.del(second_factor_attempts_key(user))
+  end
+
+  def check_second_factor_rate_limits(user)
+    attempts, = redis.multi do |multi|
+      multi.incr(second_factor_attempts_key(user))
+      multi.expire(second_factor_attempts_key(user), 1.hour)
+    end
+
+    attempts >= MAX_2FA_ATTEMPTS_PER_HOUR
+  end
+
   def on_authentication_success(user, security_measure)
     @on_authentication_success_called = true
 
+    clear_2fa_attempt_from_user(user)
     clear_attempt_from_session
 
     user.update_sign_in!(new_sign_in: true)
@@ -164,4 +182,8 @@ class Auth::SessionsController < Devise::SessionsController
       user_agent: request.user_agent
     )
   end
+
+  def second_factor_attempts_key(user)
+    "2fa_auth_attempts:#{user.id}:#{Time.now.utc.hour}"
+  end
 end
diff --git a/app/controllers/concerns/auth/two_factor_authentication_concern.rb b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
index effdb8d21c..404164751a 100644
--- a/app/controllers/concerns/auth/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/auth/two_factor_authentication_concern.rb
@@ -66,6 +66,11 @@ module Auth::TwoFactorAuthenticationConcern
   end
 
   def authenticate_with_two_factor_via_otp(user)
+    if check_second_factor_rate_limits(user)
+      flash.now[:alert] = I18n.t('users.rate_limited')
+      return prompt_for_two_factor(user)
+    end
+
     if valid_otp_attempt?(user)
       on_authentication_success(user, :otp)
     else
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 78820c3b59..89ca0ad72c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1844,6 +1844,7 @@ en:
     go_to_sso_account_settings: Go to your identity provider's account settings
     invalid_otp_token: Invalid two-factor code
     otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
+    rate_limited: Too many authentication attempts, try again later.
     seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
     signed_in_as: 'Signed in as:'
   verification:
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index e3f2b278bd..d238626c9d 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -262,6 +262,26 @@ RSpec.describe Auth::SessionsController do
           end
         end
 
+        context 'when repeatedly using an invalid TOTP code before using a valid code' do
+          before do
+            stub_const('Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR', 2)
+          end
+
+          it 'does not log the user in' do
+            # Travel to the beginning of an hour to avoid crossing rate-limit buckets
+            travel_to '2023-12-20T10:00:00Z'
+
+            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+              expect(controller.current_user).to be_nil
+            end
+
+            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+            expect(controller.current_user).to be_nil
+            expect(flash[:alert]).to match I18n.t('users.rate_limited')
+          end
+        end
+
         context 'when using a valid OTP' do
           before do
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }

From cf2a2ed71c63cf113bd3569c237e8cebe00162bb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jan 2024 13:43:10 +0100
Subject: [PATCH 370/436] Fix processing of compacted single-item JSON-LD
 collections (#28816)

---
 .../fetch_featured_collection_service.rb      |  4 +--
 .../activitypub/fetch_replies_service.rb      |  4 +--
 .../synchronize_followers_service.rb          |  4 +--
 app/services/keys/query_service.rb            |  2 +-
 .../fetch_featured_collection_service_spec.rb | 34 +++++++++++++++++--
 .../activitypub/fetch_replies_service_spec.rb | 12 +++++++
 6 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/app/services/activitypub/fetch_featured_collection_service.rb b/app/services/activitypub/fetch_featured_collection_service.rb
index d2bae08a0e..89c3a1b6c0 100644
--- a/app/services/activitypub/fetch_featured_collection_service.rb
+++ b/app/services/activitypub/fetch_featured_collection_service.rb
@@ -23,9 +23,9 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index a9dd327e96..e2ecdef165 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -26,9 +26,9 @@ class ActivityPub::FetchRepliesService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
index 7ccc917309..f51d671a00 100644
--- a/app/services/activitypub/synchronize_followers_service.rb
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -59,9 +59,9 @@ class ActivityPub::SynchronizeFollowersService < BaseService
 
     case collection['type']
     when 'Collection', 'CollectionPage'
-      collection['items']
+      as_array(collection['items'])
     when 'OrderedCollection', 'OrderedCollectionPage'
-      collection['orderedItems']
+      as_array(collection['orderedItems'])
     end
   end
 
diff --git a/app/services/keys/query_service.rb b/app/services/keys/query_service.rb
index 14c9d9205b..33e13293f3 100644
--- a/app/services/keys/query_service.rb
+++ b/app/services/keys/query_service.rb
@@ -69,7 +69,7 @@ class Keys::QueryService < BaseService
 
     return if json['items'].blank?
 
-    @devices = json['items'].map do |device|
+    @devices = as_array(json['items']).map do |device|
       Device.new(device_id: device['id'], name: device['name'], identity_key: device.dig('identityKey', 'publicKeyBase64'), fingerprint_key: device.dig('fingerprintKey', 'publicKeyBase64'), claim_url: device['claim'])
     end
   rescue HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error => e
diff --git a/spec/services/activitypub/fetch_featured_collection_service_spec.rb b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
index a98108cea3..b9e95b825f 100644
--- a/spec/services/activitypub/fetch_featured_collection_service_spec.rb
+++ b/spec/services/activitypub/fetch_featured_collection_service_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
     }
   end
 
-  let(:status_json_pinned_unknown_unreachable) do
+  let(:status_json_pinned_unknown_reachable) do
     {
       '@context': 'https://www.w3.org/ns/activitystreams',
       type: 'Note',
@@ -75,7 +75,7 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
       stub_request(:get, 'https://example.com/account/pinned/known').to_return(status: 200, body: Oj.dump(status_json_pinned_known))
       stub_request(:get, 'https://example.com/account/pinned/unknown-inlined').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_inlined))
       stub_request(:get, 'https://example.com/account/pinned/unknown-unreachable').to_return(status: 404)
-      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_unreachable))
+      stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
       stub_request(:get, 'https://example.com/account/collections/featured').to_return(status: 200, body: Oj.dump(featured_with_null))
 
       subject.call(actor, note: true, hashtag: false)
@@ -115,6 +115,21 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
       end
 
       it_behaves_like 'sets pinned posts'
+
+      context 'when there is a single item, with the array compacted away' do
+        let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+        before do
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+          subject.call(actor, note: true, hashtag: false)
+        end
+
+        it 'sets expected posts as pinned posts' do
+          expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+            'https://example.com/account/pinned/unknown-reachable'
+          )
+        end
+      end
     end
 
     context 'when the endpoint is a paginated Collection' do
@@ -136,6 +151,21 @@ RSpec.describe ActivityPub::FetchFeaturedCollectionService, type: :service do
       end
 
       it_behaves_like 'sets pinned posts'
+
+      context 'when there is a single item, with the array compacted away' do
+        let(:items) { 'https://example.com/account/pinned/unknown-reachable' }
+
+        before do
+          stub_request(:get, 'https://example.com/account/pinned/unknown-reachable').to_return(status: 200, body: Oj.dump(status_json_pinned_unknown_reachable))
+          subject.call(actor, note: true, hashtag: false)
+        end
+
+        it 'sets expected posts as pinned posts' do
+          expect(actor.pinned_statuses.pluck(:uri)).to contain_exactly(
+            'https://example.com/account/pinned/unknown-reachable'
+          )
+        end
+      end
     end
   end
 end
diff --git a/spec/services/activitypub/fetch_replies_service_spec.rb b/spec/services/activitypub/fetch_replies_service_spec.rb
index d7716dd4ef..a76b996c20 100644
--- a/spec/services/activitypub/fetch_replies_service_spec.rb
+++ b/spec/services/activitypub/fetch_replies_service_spec.rb
@@ -34,6 +34,18 @@ RSpec.describe ActivityPub::FetchRepliesService, type: :service do
 
   describe '#call' do
     context 'when the payload is a Collection with inlined replies' do
+      context 'when there is a single reply, with the array compacted away' do
+        let(:items) { 'http://example.com/self-reply-1' }
+
+        it 'queues the expected worker' do
+          allow(FetchReplyWorker).to receive(:push_bulk)
+
+          subject.call(status, payload)
+
+          expect(FetchReplyWorker).to have_received(:push_bulk).with(['http://example.com/self-reply-1'])
+        end
+      end
+
       context 'when passing the collection itself' do
         it 'spawns workers for up to 5 replies on the same server' do
           allow(FetchReplyWorker).to receive(:push_bulk)

From 93957daa500502520ba4d7c8fc9d7918c99d1cdb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Jan 2024 19:52:59 +0100
Subject: [PATCH 371/436] Fix error when processing remote files with unusually
 long names (#28823)

---
 lib/paperclip/response_with_limit_adapter.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index deb89717a4..ff7a938abb 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -16,7 +16,7 @@ module Paperclip
     private
 
     def cache_current_values
-      @original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+      @original_filename = truncated_filename
       @tempfile = copy_to_tempfile(@target)
       @content_type = ContentTypeDetector.new(@tempfile.path).detect
       @size = File.size(@tempfile)
@@ -43,6 +43,13 @@ module Paperclip
       source.response.connection.close
     end
 
+    def truncated_filename
+      filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
+      extension = File.extname(filename)
+      basename = File.basename(filename, extension)
+      [basename[...20], extension[..4]].compact_blank.join
+    end
+
     def filename_from_content_disposition
       disposition = @target.response.headers['content-disposition']
       disposition&.match(/filename="([^"]*)"/)&.captures&.first

From 9f8e3cca9a6764018ccef2bc48b5d9a867e3a4e3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 21 Jan 2024 08:44:46 +0100
Subject: [PATCH 372/436] Fix duplicate and missing keys in search popout
 component in web UI (#28834)

---
 app/javascript/mastodon/actions/search.js     |  7 +++++-
 .../features/compose/components/search.jsx    | 22 ++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/actions/search.js b/app/javascript/mastodon/actions/search.js
index 38a089b486..a34a490e76 100644
--- a/app/javascript/mastodon/actions/search.js
+++ b/app/javascript/mastodon/actions/search.js
@@ -179,6 +179,11 @@ export const openURL = (value, history, onFailure) => (dispatch, getState) => {
 
 export const clickSearchResult = (q, type) => (dispatch, getState) => {
   const previous = getState().getIn(['search', 'recent']);
+
+  if (previous.some(x => x.get('q') === q && x.get('type') === type)) {
+    return;
+  }
+
   const me = getState().getIn(['meta', 'me']);
   const current = previous.add(fromJS({ type, q })).takeLast(4);
 
@@ -207,4 +212,4 @@ export const hydrateSearch = () => (dispatch, getState) => {
   if (history !== null) {
     dispatch(updateSearchHistory(history));
   }
-};
\ No newline at end of file
+};
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index 0bcc41b929..ca02c23fc4 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -62,14 +62,14 @@ class Search extends PureComponent {
   };
 
   defaultOptions = [
-    { label: <><mark>has:</mark> <FormattedList type='disjunction' value={['media', 'poll', 'embed']} /></>, action: e => { e.preventDefault(); this._insertText('has:'); } },
-    { label: <><mark>is:</mark> <FormattedList type='disjunction' value={['reply', 'sensitive']} /></>, action: e => { e.preventDefault(); this._insertText('is:'); } },
-    { label: <><mark>language:</mark> <FormattedMessage id='search_popout.language_code' defaultMessage='ISO language code' /></>, action: e => { e.preventDefault(); this._insertText('language:'); } },
-    { label: <><mark>from:</mark> <FormattedMessage id='search_popout.user' defaultMessage='user' /></>, action: e => { e.preventDefault(); this._insertText('from:'); } },
-    { label: <><mark>before:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('before:'); } },
-    { label: <><mark>during:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('during:'); } },
-    { label: <><mark>after:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('after:'); } },
-    { label: <><mark>in:</mark> <FormattedList type='disjunction' value={['all', 'library', 'public']} /></>, action: e => { e.preventDefault(); this._insertText('in:'); } }
+    { key: 'prompt-has', label: <><mark>has:</mark> <FormattedList type='disjunction' value={['media', 'poll', 'embed']} /></>, action: e => { e.preventDefault(); this._insertText('has:'); } },
+    { key: 'prompt-is', label: <><mark>is:</mark> <FormattedList type='disjunction' value={['reply', 'sensitive']} /></>, action: e => { e.preventDefault(); this._insertText('is:'); } },
+    { key: 'prompt-language', label: <><mark>language:</mark> <FormattedMessage id='search_popout.language_code' defaultMessage='ISO language code' /></>, action: e => { e.preventDefault(); this._insertText('language:'); } },
+    { key: 'prompt-from', label: <><mark>from:</mark> <FormattedMessage id='search_popout.user' defaultMessage='user' /></>, action: e => { e.preventDefault(); this._insertText('from:'); } },
+    { key: 'prompt-before', label: <><mark>before:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('before:'); } },
+    { key: 'prompt-during', label: <><mark>during:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('during:'); } },
+    { key: 'prompt-after', label: <><mark>after:</mark> <FormattedMessage id='search_popout.specific_date' defaultMessage='specific date' /></>, action: e => { e.preventDefault(); this._insertText('after:'); } },
+    { key: 'prompt-in', label: <><mark>in:</mark> <FormattedList type='disjunction' value={['all', 'library', 'public']} /></>, action: e => { e.preventDefault(); this._insertText('in:'); } }
   ];
 
   setRef = c => {
@@ -262,6 +262,8 @@ class Search extends PureComponent {
     const { recent } = this.props;
 
     return recent.toArray().map(search => ({
+      key: `${search.get('type')}/${search.get('q')}`,
+
       label: labelForRecentSearch(search),
 
       action: () => this.handleRecentSearchClick(search),
@@ -346,8 +348,8 @@ class Search extends PureComponent {
               <h4><FormattedMessage id='search_popout.recent' defaultMessage='Recent searches' /></h4>
 
               <div className='search__popout__menu'>
-                {recent.size > 0 ? this._getOptions().map(({ label, action, forget }, i) => (
-                  <button key={label} onMouseDown={action} className={classNames('search__popout__menu__item search__popout__menu__item--flex', { selected: selectedOption === i })}>
+                {recent.size > 0 ? this._getOptions().map(({ label, key, action, forget }, i) => (
+                  <button key={key} onMouseDown={action} className={classNames('search__popout__menu__item search__popout__menu__item--flex', { selected: selectedOption === i })}>
                     <span>{label}</span>
                     <button className='icon-button' onMouseDown={forget}><Icon id='times' icon={CloseIcon} /></button>
                   </button>

From 3fbf01918f8dfe166c15032bdb782ee6a2d339d1 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:02:26 +0100
Subject: [PATCH 373/436] Streaming: Move more methods to the utils from the
 main file (#28825)

---
 streaming/index.js | 42 +----------------------------------------
 streaming/utils.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index aa75a08b7f..78b049723f 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -16,7 +16,7 @@ const WebSocket = require('ws');
 
 const { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } = require('./logging');
 const { setupMetrics } = require('./metrics');
-const { isTruthy } = require("./utils");
+const { isTruthy, normalizeHashtag, firstParam } = require("./utils");
 
 const environment = process.env.NODE_ENV || 'development';
 
@@ -1110,34 +1110,6 @@ const startServer = async () => {
     return arr;
   };
 
-  /**
-   * See app/lib/ascii_folder.rb for the canon definitions
-   * of these constants
-   */
-  const NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
-  const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
-
-  /**
-   * @param {string} str
-   * @returns {string}
-   */
-  const foldToASCII = str => {
-    const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
-
-    return str.replace(regex, match => {
-      const index = NON_ASCII_CHARS.indexOf(match);
-      return EQUIVALENT_ASCII_CHARS[index];
-    });
-  };
-
-  /**
-   * @param {string} str
-   * @returns {string}
-   */
-  const normalizeHashtag = str => {
-    return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
-  };
-
   /**
    * @param {any} req
    * @param {string} name
@@ -1380,18 +1352,6 @@ const startServer = async () => {
     connectedChannels.labels({ type: 'websocket', channel: 'system' }).inc(2);
   };
 
-  /**
-   * @param {string|string[]} arrayOrString
-   * @returns {string}
-   */
-  const firstParam = arrayOrString => {
-    if (Array.isArray(arrayOrString)) {
-      return arrayOrString[0];
-    } else {
-      return arrayOrString;
-    }
-  };
-
   /**
    * @param {WebSocket & { isAlive: boolean }} ws
    * @param {http.IncomingMessage & ResolvedAccount} req
diff --git a/streaming/utils.js b/streaming/utils.js
index ad8dd4889f..7b87a1d14c 100644
--- a/streaming/utils.js
+++ b/streaming/utils.js
@@ -20,3 +20,50 @@ const isTruthy = value =>
   value && !FALSE_VALUES.includes(value);
 
 exports.isTruthy = isTruthy;
+
+
+/**
+ * See app/lib/ascii_folder.rb for the canon definitions
+ * of these constants
+ */
+const NON_ASCII_CHARS        = 'ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž';
+const EQUIVALENT_ASCII_CHARS = 'AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz';
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+function foldToASCII(str) {
+  const regex = new RegExp(NON_ASCII_CHARS.split('').join('|'), 'g');
+
+  return str.replace(regex, function(match) {
+    const index = NON_ASCII_CHARS.indexOf(match);
+    return EQUIVALENT_ASCII_CHARS[index];
+  });
+}
+
+exports.foldToASCII = foldToASCII;
+
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+function normalizeHashtag(str) {
+  return foldToASCII(str.normalize('NFKC').toLowerCase()).replace(/[^\p{L}\p{N}_\u00b7\u200c]/gu, '');
+}
+
+exports.normalizeHashtag = normalizeHashtag;
+
+/**
+ * @param {string|string[]} arrayOrString
+ * @returns {string}
+ */
+function firstParam(arrayOrString) {
+  if (Array.isArray(arrayOrString)) {
+    return arrayOrString[0];
+  } else {
+    return arrayOrString;
+  }
+}
+
+exports.firstParam = firstParam;

From 62001b5a311fb98d41f546d36faffaaf8e82c4f7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:04:28 +0100
Subject: [PATCH 374/436] Update dependency jsdom to v24 (#28836)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 streaming/package.json |  2 +-
 yarn.lock              | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/streaming/package.json b/streaming/package.json
index 52a9979702..3f76e25786 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -20,7 +20,7 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
-    "jsdom": "^23.0.0",
+    "jsdom": "^24.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^8.17.2",
diff --git a/yarn.lock b/yarn.lock
index 35abcf80b0..34e0d526e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,17 +42,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asamuzakjp/dom-selector@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@asamuzakjp/dom-selector@npm:2.0.1"
-  dependencies:
-    bidi-js: "npm:^1.0.3"
-    css-tree: "npm:^2.3.1"
-    is-potential-custom-element-name: "npm:^1.0.1"
-  checksum: 232895f16f2f9dfc637764df2529084d16e1c122057766a79b16e1d40808e09fffae28c0f0cc8376f8a1564a85dba9d4b2f140a9a0b65f4f95c960192b797037
-  languageName: node
-  linkType: hard
-
 "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/code-frame@npm:7.23.5"
@@ -2545,7 +2534,7 @@ __metadata:
     eslint-define-config: "npm:^2.0.0"
     express: "npm:^4.18.2"
     ioredis: "npm:^5.3.2"
-    jsdom: "npm:^23.0.0"
+    jsdom: "npm:^24.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^8.17.2"
@@ -4948,15 +4937,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bidi-js@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "bidi-js@npm:1.0.3"
-  dependencies:
-    require-from-string: "npm:^2.0.2"
-  checksum: fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
-  languageName: node
-  linkType: hard
-
 "big-integer@npm:^1.6.44":
   version: 1.6.51
   resolution: "big-integer@npm:1.6.51"
@@ -10646,11 +10626,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^23.0.0":
-  version: 23.2.0
-  resolution: "jsdom@npm:23.2.0"
+"jsdom@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "jsdom@npm:24.0.0"
   dependencies:
-    "@asamuzakjp/dom-selector": "npm:^2.0.1"
     cssstyle: "npm:^4.0.1"
     data-urls: "npm:^5.0.0"
     decimal.js: "npm:^10.4.3"
@@ -10659,6 +10638,7 @@ __metadata:
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.2"
     is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.7"
     parse5: "npm:^7.1.2"
     rrweb-cssom: "npm:^0.6.0"
     saxes: "npm:^6.0.0"
@@ -10676,7 +10656,7 @@ __metadata:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: b062af50f7be59d914ba75236b7817c848ef3cd007aea1d6b8020a41eb263b7d5bd2652298106e9756b56892f773d990598778d02adab7d0d0d8e58726fc41d3
+  checksum: 7b35043d7af39ad6dcaef0fa5679d8c8a94c6c9b6cc4a79222b7c9987d57ab7150c50856684ae56b473ab28c7d82aec0fb7ca19dcbd4c3f46683c807d717a3af
   languageName: node
   linkType: hard
 
@@ -11962,7 +11942,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2":
+"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.7":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
   checksum: 44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db

From 9ff9849381e1c28b23920b72112d97994bb73ac1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:07:44 +0100
Subject: [PATCH 375/436] Update dependency core-js to v3.35.1 (#28831)

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

diff --git a/yarn.lock b/yarn.lock
index 34e0d526e2..67c03e104f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5939,9 +5939,9 @@ __metadata:
   linkType: hard
 
 "core-js@npm:^3.30.2":
-  version: 3.35.0
-  resolution: "core-js@npm:3.35.0"
-  checksum: 1d545ff4406f2afa5e681f44b45ed5f7f119d158b380234d5aa7787ce7e47fc7a635b98b74c28c766ba8191e3db8c2316ad6ab4ff1ddecbc3fd618413a52c29c
+  version: 3.35.1
+  resolution: "core-js@npm:3.35.1"
+  checksum: ebc8e22c36d13bcf2140cbc1d8ad65d1b08192bff4c43ade70c72eac103cb4dcfbc521f2b1ad1c74881b0a4353e64986537893ae4f07888e49228340efa13ae6
   languageName: node
   linkType: hard
 

From a83aeccac9583528f50e24166ef9d42b147fb26d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:08:06 +0000
Subject: [PATCH 376/436] Update dependency dotenv to v16.3.2 (#28824)

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

diff --git a/yarn.lock b/yarn.lock
index 67c03e104f..5272d4167f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6901,9 +6901,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.3.1
-  resolution: "dotenv@npm:16.3.1"
-  checksum: b95ff1bbe624ead85a3cd70dbd827e8e06d5f05f716f2d0cbc476532d54c7c9469c3bc4dd93ea519f6ad711cb522c00ac9a62b6eb340d5affae8008facc3fbd7
+  version: 16.3.2
+  resolution: "dotenv@npm:16.3.2"
+  checksum: a87d62cef0810b670cb477db1a24a42a093b6b428c9e65c185ce1d6368ad7175234b13547718ba08da18df43faae4f814180cc0366e11be1ded2277abc4dd22e
   languageName: node
   linkType: hard
 

From e078d0048cd84a3bb33be569628cfbcf18999e2b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:08:22 +0100
Subject: [PATCH 377/436] Update dependency @types/react to v18.2.48 (#28839)

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

diff --git a/yarn.lock b/yarn.lock
index 5272d4167f..aca2278f9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3533,13 +3533,13 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.2.47
-  resolution: "@types/react@npm:18.2.47"
+  version: 18.2.48
+  resolution: "@types/react@npm:18.2.48"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: e98ea1827fe60636d0f7ce206397159a29fc30613fae43e349e32c10ad3c0b7e0ed2ded2f3239e07bd5a3cba8736b6114ba196acccc39905ca4a06f56a8d2841
+  checksum: 7e89f18ea2928b1638f564b156d692894dcb9352a7e0a807873c97e858abe1f23dbd165a25dd088a991344e973fdeef88ba5724bfb64504b74072cbc9c220c3a
   languageName: node
   linkType: hard
 

From 9620b21259f4bb91862e954e16b90d566991670a Mon Sep 17 00:00:00 2001
From: Andy Piper <andypiper@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:11:47 +0000
Subject: [PATCH 378/436] docs: update FEDERATION.md to more closely follow FEP
 conventions. (#28838)

---
 FEDERATION.md | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/FEDERATION.md b/FEDERATION.md
index e3721d7241..2819fa935a 100644
--- a/FEDERATION.md
+++ b/FEDERATION.md
@@ -1,19 +1,35 @@
-## ActivityPub federation in Mastodon
+# Federation
+
+## Supported federation protocols and standards
+
+- [ActivityPub](https://www.w3.org/TR/activitypub/) (Server-to-Server)
+- [WebFinger](https://webfinger.net/)
+- [Http Signatures](https://datatracker.ietf.org/doc/html/draft-cavage-http-signatures)
+- [NodeInfo](https://nodeinfo.diaspora.software/)
+
+## Supported FEPs
+
+- [FEP-67ff: FEDERATION.md](https://codeberg.org/fediverse/fep/src/branch/main/fep/67ff/fep-67ff.md)
+- [FEP-f1d5: NodeInfo in Fediverse Software](https://codeberg.org/fediverse/fep/src/branch/main/fep/f1d5/fep-f1d5.md)
+- [FEP-8fcf: Followers collection synchronization across servers](https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md)
+- [FEP-5feb: Search indexing consent for actors](https://codeberg.org/fediverse/fep/src/branch/main/fep/5feb/fep-5feb.md)
+
+## ActivityPub in Mastodon
 
 Mastodon largely follows the ActivityPub server-to-server specification but it makes uses of some non-standard extensions, some of which are required for interacting with Mastodon at all.
 
-Supported vocabulary: https://docs.joinmastodon.org/spec/activitypub/
+- [Supported ActivityPub vocabulary](https://docs.joinmastodon.org/spec/activitypub/)
 
 ### Required extensions
 
-#### Webfinger
+#### WebFinger
 
 In Mastodon, users are identified by a `username` and `domain` pair (e.g., `Gargron@mastodon.social`).
 This is used both for discovery and for unambiguously mentioning users across the fediverse. Furthermore, this is part of Mastodon's database design from its very beginnings.
 
 As a result, Mastodon requires that each ActivityPub actor uniquely maps back to an `acct:` URI that can be resolved via WebFinger.
 
-More information and examples are available at: https://docs.joinmastodon.org/spec/webfinger/
+- [WebFinger information and examples](https://docs.joinmastodon.org/spec/webfinger/)
 
 #### HTTP Signatures
 
@@ -21,11 +37,13 @@ In order to authenticate activities, Mastodon relies on HTTP Signatures, signing
 
 Mastodon requires all `POST` requests to be signed, and MAY require `GET` requests to be signed, depending on the configuration of the Mastodon server.
 
-More information on HTTP Signatures, as well as examples, can be found here: https://docs.joinmastodon.org/spec/security/#http
+- [HTTP Signatures information and examples](https://docs.joinmastodon.org/spec/security/#http)
 
 ### Optional extensions
 
-- Linked-Data Signatures: https://docs.joinmastodon.org/spec/security/#ld
-- Bearcaps: https://docs.joinmastodon.org/spec/bearcaps/
-- Followers collection synchronization: https://codeberg.org/fediverse/fep/src/branch/main/fep/8fcf/fep-8fcf.md
-- Search indexing consent for actors: https://codeberg.org/fediverse/fep/src/branch/main/fep/5feb/fep-5feb.md
+- [Linked-Data Signatures](https://docs.joinmastodon.org/spec/security/#ld)
+- [Bearcaps](https://docs.joinmastodon.org/spec/bearcaps/)
+
+### Additional documentation
+
+- [Mastodon documentation](https://docs.joinmastodon.org/)

From 76e383ea1e416d2a034d4327ed711eb01d106634 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:52:26 +0100
Subject: [PATCH 379/436] New Crowdin Translations (automated) (#28827)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ast.json | 10 ++--
 app/javascript/mastodon/locales/ko.json  |  2 +-
 app/javascript/mastodon/locales/lad.json |  4 ++
 app/javascript/mastodon/locales/th.json  |  2 +-
 config/locales/ast.yml                   |  1 +
 config/locales/bg.yml                    |  1 +
 config/locales/ca.yml                    |  1 +
 config/locales/da.yml                    |  1 +
 config/locales/de.yml                    |  1 +
 config/locales/devise.fi.yml             | 16 +++---
 config/locales/devise.ie.yml             |  2 +
 config/locales/devise.ja.yml             |  6 +--
 config/locales/devise.lad.yml            |  8 +++
 config/locales/devise.nn.yml             |  9 ++++
 config/locales/devise.no.yml             |  9 ++++
 config/locales/devise.sl.yml             |  9 ++++
 config/locales/devise.th.yml             | 11 +++-
 config/locales/doorkeeper.ia.yml         |  9 ++++
 config/locales/eo.yml                    | 19 +++++++
 config/locales/es-AR.yml                 |  1 +
 config/locales/es-MX.yml                 |  1 +
 config/locales/es.yml                    |  1 +
 config/locales/eu.yml                    |  1 +
 config/locales/fi.yml                    |  3 +-
 config/locales/fo.yml                    |  1 +
 config/locales/gl.yml                    |  1 +
 config/locales/he.yml                    |  1 +
 config/locales/hu.yml                    |  1 +
 config/locales/ie.yml                    |  2 +
 config/locales/is.yml                    |  1 +
 config/locales/it.yml                    |  1 +
 config/locales/ja.yml                    |  1 +
 config/locales/ko.yml                    |  1 +
 config/locales/lad.yml                   | 40 ++++++++++++++
 config/locales/nl.yml                    |  1 +
 config/locales/nn.yml                    |  7 +++
 config/locales/no.yml                    | 69 +++++++++++++-----------
 config/locales/pl.yml                    |  1 +
 config/locales/pt-PT.yml                 |  1 +
 config/locales/simple_form.no.yml        |  4 +-
 config/locales/sk.yml                    |  2 +
 config/locales/sl.yml                    |  1 +
 config/locales/sr-Latn.yml               |  1 +
 config/locales/sr.yml                    |  1 +
 config/locales/sv.yml                    |  1 +
 config/locales/th.yml                    | 11 +++-
 config/locales/tr.yml                    |  1 +
 config/locales/uk.yml                    |  1 +
 config/locales/vi.yml                    |  1 +
 config/locales/zh-CN.yml                 |  1 +
 config/locales/zh-HK.yml                 |  1 +
 config/locales/zh-TW.yml                 |  1 +
 52 files changed, 231 insertions(+), 53 deletions(-)

diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 4b555c4829..1467f8891e 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -116,7 +116,6 @@
   "compose_form.publish_form": "Artículu nuevu",
   "compose_form.publish_loud": "¡{publish}!",
   "compose_form.save_changes": "Guardar los cambeos",
-  "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
@@ -146,6 +145,7 @@
   "dismissable_banner.community_timeline": "Esta seición contién los artículos públicos más actuales de los perfiles agospiaos nel dominiu {domain}.",
   "dismissable_banner.dismiss": "Escartar",
   "dismissable_banner.explore_tags": "Esta seición contién les etiquetes del fediversu que tán ganando popularidá güei. Les etiquetes más usaes polos perfiles apaecen no cimero.",
+  "dismissable_banner.public_timeline": "Esta seición contién los artículos más nuevos de les persones na web social que les persones de {domain} siguen.",
   "embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.",
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
@@ -155,6 +155,7 @@
   "emoji_button.not_found": "Nun s'atoparon fustaxes que concasen",
   "emoji_button.objects": "Oxetos",
   "emoji_button.people": "Persones",
+  "emoji_button.recent": "D'usu frecuente",
   "emoji_button.search": "Buscar…",
   "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
@@ -217,7 +218,6 @@
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "ensin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
-  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
@@ -259,7 +259,6 @@
   "keyboard_shortcuts.reply": "Responder a un artículu",
   "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
   "keyboard_shortcuts.search": "Enfocar la barra de busca",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "Abrir la columna «Entamar»",
   "keyboard_shortcuts.toggle_sensitivity": "Amosar/anubrir el conteníu multimedia",
   "keyboard_shortcuts.toot": "Comenzar un artículu nuevu",
@@ -412,12 +411,16 @@
   "search.quick_action.go_to_hashtag": "Dir a la etiqueta {x}",
   "search.quick_action.status_search": "Artículos que concasen con {x}",
   "search.search_or_paste": "Busca o apiega una URL",
+  "search_popout.language_code": "códigu de llingua ISO",
   "search_popout.quick_actions": "Aiciones rápides",
   "search_popout.recent": "Busques de recién",
+  "search_popout.specific_date": "data específica",
+  "search_popout.user": "perfil",
   "search_results.accounts": "Perfiles",
   "search_results.all": "Too",
   "search_results.hashtags": "Etiquetes",
   "search_results.nothing_found": "Nun se pudo atopar nada con esos términos de busca",
+  "search_results.see_all": "Ver too",
   "search_results.statuses": "Artículos",
   "search_results.title": "Busca de: {q}",
   "server_banner.introduction": "{domain} ye parte de la rede social descentralizada que tien la teunoloxía de {mastodon}.",
@@ -460,6 +463,7 @@
   "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al filu",
+  "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.show_filter_reason": "Amosar de toes toes",
   "status.show_less": "Amosar menos",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 264781baa3..70ce6611d6 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -683,7 +683,7 @@
   "status.show_more": "펼치기",
   "status.show_more_all": "모두 펼치기",
   "status.show_original": "원본 보기",
-  "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부} other {{attachmentCount}개 첨부}}하여 게시",
+  "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
   "status.translate": "번역",
   "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
   "status.uncached_media_warning": "마리보기 허용되지 않음",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2a911483de..8fde687427 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -328,6 +328,7 @@
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
   "interaction_modal.sign_in": "No estas konektado kon este sirvidor. Ande tyenes tu kuento?",
+  "interaction_modal.sign_in_hint": "Konsejo: Akel es el sitio adonde te enrejistrates. Si no lo akodras, bushka el mesaj de posta elektronika de bienvenida en tu kuti de arivo. Tambien puedes eskrivir tu nombre de utilizador kompleto (por enshemplo @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
   "interaction_modal.title.follow": "Sige a {name}",
   "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
@@ -478,6 +479,7 @@
   "onboarding.actions.go_to_explore": "Va a los trendes",
   "onboarding.actions.go_to_home": "Va a tu linya prinsipala",
   "onboarding.compose.template": "Ke haber, #Mastodon?",
+  "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
   "onboarding.follows.title": "Personaliza tu linya prinsipala",
   "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
   "onboarding.profile.display_name": "Nombre amostrado",
@@ -497,7 +499,9 @@
   "onboarding.start.title": "Lo logrates!",
   "onboarding.steps.follow_people.body": "El buto de Mastodon es segir a djente interesante.",
   "onboarding.steps.follow_people.title": "Personaliza tu linya prinsipala",
+  "onboarding.steps.publish_status.body": "Puedes introdusirte al mundo con teksto, fotos, videos o anketas {emoji}",
   "onboarding.steps.publish_status.title": "Eskrive tu primera publikasyon",
+  "onboarding.steps.setup_profile.body": "Kompleta tu profil para aumentar tus enteraksyones.",
   "onboarding.steps.setup_profile.title": "Personaliza tu profil",
   "onboarding.steps.share_profile.body": "Informe a tus amigos komo toparte en Mastodon",
   "onboarding.steps.share_profile.title": "Partaja tu profil de Mastodon",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b108e581a4..65f27ef061 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -314,7 +314,7 @@
   "home.explore_prompt.body": "ฟีดหน้าแรกของคุณจะมีการผสมผสานของโพสต์จากแฮชแท็กที่คุณได้เลือกติดตาม, ผู้คนที่คุณได้เลือกติดตาม และโพสต์ที่เขาดัน หากนั่นรู้สึกเงียบเกินไป คุณอาจต้องการ:",
   "home.explore_prompt.title": "นี่คือฐานหน้าแรกของคุณภายใน Mastodon",
   "home.hide_announcements": "ซ่อนประกาศ",
-  "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะทำได้!",
+  "home.pending_critical_update.body": "โปรดอัปเดตเซิร์ฟเวอร์ Mastodon ของคุณโดยเร็วที่สุดเท่าที่จะเป็นไปได้!",
   "home.pending_critical_update.link": "ดูการอัปเดต",
   "home.pending_critical_update.title": "มีการอัปเดตความปลอดภัยสำคัญพร้อมใช้งาน!",
   "home.show_announcements": "แสดงประกาศ",
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index a32413cb9a..7e5a4c8876 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -909,6 +909,7 @@ ast:
   users:
     follow_limit_reached: Nun pues siguir a más de %{limit} persones
     invalid_otp_token: El códigu de l'autenticación en dos pasos nun ye válidu
+    rate_limited: Fixéronse milenta intentos d'autenticación. Volvi tentalo dempués.
     seamless_external_login: Aniciesti la sesión pente un serviciu esternu, polo que la configuración de la contraseña ya de la direición de corréu electrónicu nun tán disponibles.
     signed_in_as: 'Aniciesti la sesión como:'
   verification:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 377babe22e..58a5cae2fd 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1843,6 +1843,7 @@ bg:
     go_to_sso_account_settings: Отидете при настройките на акаунта на своя доставчик на идентичност
     invalid_otp_token: Невалиден код
     otp_lost_help_html: Ако загубите достъп до двете, то може да се свържете с %{email}
+    rate_limited: Премного опити за удостоверяване. Опитайте пак по-късно.
     seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
     signed_in_as: 'Влезли като:'
   verification:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 580c4a3ed9..36ebb9785b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1840,6 +1840,7 @@ ca:
     go_to_sso_account_settings: Ves a la configuració del compte del teu proveïdor d'identitat
     invalid_otp_token: El codi de dos factors no és correcte
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
+    rate_limited: Excessius intents d'autenticació, torneu-ho a provar més tard.
     seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
   verification:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e09a6eb2f5..58fd723aef 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1843,6 +1843,7 @@ da:
     go_to_sso_account_settings: Gå til identitetsudbyderens kontoindstillinger
     invalid_otp_token: Ugyldig tofaktorkode
     otp_lost_help_html: Har du mistet adgang til begge, kan du kontakte %{email}
+    rate_limited: For mange godkendelsesforsøg. Prøv igen senere.
     seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
     signed_in_as: 'Logget ind som:'
   verification:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index dc78b188e2..e177c6d2d1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1843,6 +1843,7 @@ de:
     go_to_sso_account_settings: Kontoeinstellungen des Identitätsanbieters aufrufen
     invalid_otp_token: Ungültiger Code der Zwei-Faktor-Authentisierung (2FA)
     otp_lost_help_html: Wenn du beides nicht mehr weißt, melde dich bitte bei uns unter der E-Mail-Adresse %{email}
+    rate_limited: Zu viele Authentisierungsversuche. Bitte versuche es später noch einmal.
     seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
     signed_in_as: 'Angemeldet als:'
   verification:
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index ac7a57c6f8..22fd7ff47b 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -47,19 +47,19 @@ fi:
         subject: 'Mastodon: ohjeet salasanan vaihtoon'
         title: Salasanan vaihto
       two_factor_disabled:
-        explanation: Olet nyt mahdollistanut sisäänkirjautumisen pelkästään sähköpostiosoitteella ja salasanalla.
+        explanation: Sisäänkirjautuminen on nyt mahdollista pelkällä sähköpostiosoitteella ja salasanalla.
         subject: 'Mastodon: kaksivaiheinen todennus poistettu käytöstä'
-        subtitle: Kaksivaiheinen tunnistautuminen käyttäjätilillesi on poistettu käytöstä.
+        subtitle: Kaksivaiheinen todennus on poistettu käytöstä tililtäsi.
         title: 2-vaiheinen todennus pois käytöstä
       two_factor_enabled:
         explanation: Sisäänkirjautuminen edellyttää liitetyn TOTP-sovelluksen luomaa aikarajattua kertatunnuslukua.
         subject: 'Mastodon: kaksivaiheinen todennus otettu käyttöön'
-        subtitle: Kaksivaiheinen kirjautuminen tilillesi on määritetty käyttöön.
+        subtitle: Kaksivaiheinen todennus on otettu käyttöön tilillesi.
         title: 2-vaiheinen todennus käytössä
       two_factor_recovery_codes_changed:
         explanation: Uudet palautuskoodit on nyt luotu ja vanhat on mitätöity.
         subject: 'Mastodon: kaksivaiheisen todennuksen palautuskoodit luotiin uudelleen'
-        subtitle: Aiemmat palautuskoodit on mitätöity, ja korvaavat uudet koodit on luotu.
+        subtitle: Aiemmat palautuskoodit on mitätöity ja tilalle on luotu uudet.
         title: 2-vaiheisen todennuksen palautuskoodit vaihdettiin
       unlock_instructions:
         subject: 'Mastodon: lukituksen poistamisen ohjeet'
@@ -73,13 +73,13 @@ fi:
           subject: 'Mastodon: suojausavain poistettu'
           title: Yksi suojausavaimistasi on poistettu
       webauthn_disabled:
-        explanation: Turva-avaimin kirjautuminen tilillesi on kytketty pois käytöstä.
-        extra: Olet nyt mahdollistanut sisäänkirjautumisen käyttäjätilillesi pelkästään palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
+        explanation: Turva-avaimin kirjautuminen on poistettu käytöstä tililtäsi.
+        extra: Sisäänkirjautuminen on nyt mahdollista pelkällä palveluun liitetyn TOTP-sovelluksen luomalla aikarajoitteisella kertatunnusluvulla.
         subject: 'Mastodon: Todennus suojausavaimilla poistettu käytöstä'
         title: Suojausavaimet poistettu käytöstä
       webauthn_enabled:
-        explanation: Turva-avainkirjautuminen käyttäjätilillesi on otettu käyttöön.
-        extra: Voit nyt kirjautua sisään käyttäen turva-avaintasi.
+        explanation: Turva-avaimella kirjautuminen on otettu käyttöön tilillesi.
+        extra: Voit nyt kirjautua sisään turva-avaimellasi.
         subject: 'Mastodon: Todennus suojausavaimella on otettu käyttöön'
         title: Suojausavaimet käytössä
     omniauth_callbacks:
diff --git a/config/locales/devise.ie.yml b/config/locales/devise.ie.yml
index 97cda4e8c6..332c9da456 100644
--- a/config/locales/devise.ie.yml
+++ b/config/locales/devise.ie.yml
@@ -52,6 +52,7 @@ ie:
         subtitle: 2-factor autentication por tui conto ha esset desactivisat.
         title: 2FA desvalidat
       two_factor_enabled:
+        explanation: Un clave generat del acuplat TOTP-aplication nu va esser besonat por aperter session.
         subject: 'Mastodon: 2-factor autentication activat'
         subtitle: 2-factor autentication ha esset activisat por tui conto.
         title: 2FA permisset
@@ -73,6 +74,7 @@ ie:
           title: Un ex tui claves de securitá ha esset deletet
       webauthn_disabled:
         explanation: Autentication per clave de securitá ha esset desactivisat por tui conto.
+        extra: Aperter session es nu possibil solmen per li clave generat del acuplat TOTP-aplication.
         subject: 'Mastodon: Autentication con claves de securitá desactivisat'
         title: Claves de securitá desactivisat
       webauthn_enabled:
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 9a3ffd9c4d..44a9a31839 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -49,12 +49,12 @@ ja:
       two_factor_disabled:
         explanation: メールアドレスとパスワードのみでログイン可能になりました。
         subject: 'Mastodon: 二要素認証が無効になりました'
-        subtitle: 二要素認証が無効になっています。
+        subtitle: 今後、アカウントへのログインに二要素認証を要求しません。
         title: 二要素認証が無効化されました
       two_factor_enabled:
         explanation: ログインには設定済みのTOTPアプリが生成したトークンが必要です。
         subject: 'Mastodon: 二要素認証が有効になりました'
-        subtitle: 二要素認証が有効になりました。
+        subtitle: 今後、アカウントへのログインに二要素認証が必要になります。
         title: 二要素認証が有効化されました
       two_factor_recovery_codes_changed:
         explanation: 以前のリカバリーコードが無効化され、新しいコードが生成されました。
@@ -73,7 +73,7 @@ ja:
           subject: 'Mastodon: セキュリティキーが削除されました'
           title: セキュリティキーが削除されました
       webauthn_disabled:
-        explanation: セキュリティキー認証が無効になっています。
+        explanation: セキュリティキー認証が無効になりました。
         extra: 設定済みのTOTPアプリが生成したトークンのみでログインできるようになりました。
         subject: 'Mastodon: セキュリティキー認証が無効になりました'
         title: セキュリティキーは無効になっています
diff --git a/config/locales/devise.lad.yml b/config/locales/devise.lad.yml
index bec76d82f9..2b6b8aafb1 100644
--- a/config/locales/devise.lad.yml
+++ b/config/locales/devise.lad.yml
@@ -47,10 +47,14 @@ lad:
         subject: 'Mastodon: Instruksyones para reinisyar kod'
         title: Reinisyar kod
       two_factor_disabled:
+        explanation: Agora puedes konektarte kon tu kuento uzando solo tu adreso de posta i kod.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta inkapasitada'
+        subtitle: La autentifikasyon en dos pasos para tu kuento tiene sido inkapasitada.
         title: Autentifikasyon 2FA inkapasitada
       two_factor_enabled:
+        explanation: Se rekierira un token djenerado por la aplikasyon TOTP konektada para entrar.
         subject: 'Mastodon: La autentifikasyon de dos pasos esta kapasitada'
+        subtitle: La autentifikasyon de dos pasos para tu kuento tiene sido kapasitada.
         title: Autentifikasyon 2FA aktivada
       two_factor_recovery_codes_changed:
         explanation: Los kodiches de rekuperasyon previos tienen sido invalidados i se djeneraron kodiches muevos.
@@ -69,9 +73,13 @@ lad:
           subject: 'Mastodon: Yave de sigurita supremida'
           title: Una de tus yaves de sigurita tiene sido supremida
       webauthn_disabled:
+        explanation: La autentifikasyon kon yaves de sigurita tiene sido inkapasitada para tu kuento.
+        extra: Agora el inisyo de sesyon solo es posivle utilizando el token djeenerado por la aplikasyon TOTP konektada.
         subject: 'Mastodon: autentifikasyon kon yaves de sigurita inkapasitada'
         title: Yaves de sigurita inkapasitadas
       webauthn_enabled:
+        explanation: La autentifikasyon kon yave de sigurita tiene sido kapasitada para tu kuento.
+        extra: Agora tu yave de sigurita puede ser utilizada para konektarte kon tu kuento.
         subject: 'Mastodon: Autentifikasyon de yave de sigurita aktivada'
         title: Yaves de sigurita kapasitadas
     omniauth_callbacks:
diff --git a/config/locales/devise.nn.yml b/config/locales/devise.nn.yml
index acee9fdcdc..96920d42b5 100644
--- a/config/locales/devise.nn.yml
+++ b/config/locales/devise.nn.yml
@@ -47,14 +47,19 @@ nn:
         subject: 'Mastodon: Instuksjonar for å endra passord'
         title: Attstilling av passord
       two_factor_disabled:
+        explanation: Innlogging er nå mulig med kun e-postadresse og passord.
         subject: 'Mastodon: To-faktor-autentisering deaktivert'
+        subtitle: To-faktor autentisering for din konto har blitt deaktivert.
         title: 2FA deaktivert
       two_factor_enabled:
+        explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
         subject: 'Mastodon: To-faktor-autentisering aktivert'
+        subtitle: Tofaktorautentisering er aktivert for din konto.
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
         explanation: Dei førre gjenopprettingskodane er ugyldige og nye er genererte.
         subject: 'Mastodon: To-faktor-gjenopprettingskodar har vorte genererte på nytt'
+        subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
         title: 2FA-gjenopprettingskodane er endra
       unlock_instructions:
         subject: 'Mastodon: Instruksjonar for å opne kontoen igjen'
@@ -68,9 +73,13 @@ nn:
           subject: 'Mastodon: Sikkerheitsnøkkel sletta'
           title: Ein av sikkerheitsnøklane dine har blitt sletta
       webauthn_disabled:
+        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
+        extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
         subject: 'Mastodon: Autentisering med sikkerheitsnøklar vart skrudd av'
         title: Sikkerheitsnøklar deaktivert
       webauthn_enabled:
+        explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
+        extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
         subject: 'Mastodon: Sikkerheitsnøkkelsautentisering vart skrudd på'
         title: Sikkerheitsnøklar aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index 0d824da815..961778eaa5 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -47,14 +47,19 @@
         subject: 'Mastodon: Hvordan nullstille passord'
         title: Nullstill passord
       two_factor_disabled:
+        explanation: Innlogging er nå mulig med kun e-postadresse og passord.
         subject: 'Mastodon: Tofaktorautentisering deaktivert'
+        subtitle: To-faktor autentisering for din konto har blitt deaktivert.
         title: 2FA deaktivert
       two_factor_enabled:
+        explanation: En token generert av den sammenkoblede TOTP-appen vil være påkrevd for innlogging.
         subject: 'Mastodon: Tofaktorautentisering aktivert'
+        subtitle: Tofaktorautentisering er aktivert for din konto.
         title: 2FA aktivert
       two_factor_recovery_codes_changed:
         explanation: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
         subject: 'Mastodon: Tofaktor-gjenopprettingskoder har blitt generert på nytt'
+        subtitle: De forrige gjenopprettingskodene er gjort ugyldige og nye er generert.
         title: 2FA-gjenopprettingskodene ble endret
       unlock_instructions:
         subject: 'Mastodon: Instruksjoner for å gjenåpne konto'
@@ -68,9 +73,13 @@
           subject: 'Mastodon: Sikkerhetsnøkkel slettet'
           title: En av sikkerhetsnøklene dine har blitt slettet
       webauthn_disabled:
+        explanation: Autentisering med sikkerhetsnøkler er deaktivert for kontoen din.
+        extra: Innlogging er nå mulig med kun tilgangstoken generert av den sammenkoblede TOTP-appen.
         subject: 'Mastodon: Autentisering med sikkerhetsnøkler ble skrudd av'
         title: Sikkerhetsnøkler deaktivert
       webauthn_enabled:
+        explanation: Sikkerhetsnøkkelautentisering har blitt aktivert for kontoen din.
+        extra: Sikkerhetsnøkkelen din kan nå bli brukt for innlogging.
         subject: 'Mastodon: Sikkerhetsnøkkelsautentisering ble skrudd på'
         title: Sikkerhetsnøkler aktivert
     omniauth_callbacks:
diff --git a/config/locales/devise.sl.yml b/config/locales/devise.sl.yml
index 72269e4826..2d567e63f4 100644
--- a/config/locales/devise.sl.yml
+++ b/config/locales/devise.sl.yml
@@ -47,14 +47,19 @@ sl:
         subject: 'Mastodon: navodila za ponastavitev gesla'
         title: Ponastavitev gesla
       two_factor_disabled:
+        explanation: Prijava je sedaj mogoče le z uporabo e-poštnega naslova in gesla.
         subject: 'Mastodon: dvojno preverjanje pristnosti je onemogočeno'
+        subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo onemogočeno.
         title: 2FA onemogočeno
       two_factor_enabled:
+        explanation: Za prijavo bo zahtevan žeton, ustvarjen s povezano aplikacijo TOTP.
         subject: 'Mastodon: dvojno preverjanje pristnosti je omogočeno'
+        subtitle: Dvo-faktorsko preverjanje pristnosti za vaš račun je bilo omogočeno.
         title: 2FA omogočeno
       two_factor_recovery_codes_changed:
         explanation: Prejšnje obnovitvene kode so postale neveljavne in ustvarjene so bile nove.
         subject: 'Mastodon: varnostne obnovitvene kode za dvojno preverjanje pristnosti so ponovno izdelane'
+        subtitle: Prejšnje kode za obnovitev so bile razveljavljene, ustvarjene pa so bile nove.
         title: obnovitvene kode 2FA spremenjene
       unlock_instructions:
         subject: 'Mastodon: navodila za odklepanje'
@@ -68,9 +73,13 @@ sl:
           subject: 'Mastodon: varnostna koda izbrisana'
           title: Ena od vaših varnostnih kod je bila izbrisana
       webauthn_disabled:
+        explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo onemogočeno.
+        extra: Prijava je sedaj mogoče le z uporabo žetona, ustvarjenega s povezano aplikacijo TOTP.
         subject: 'Mastodon: overjanje pristnosti z varnosnimi kodami je onemogočeno'
         title: Varnostne kode onemogočene
       webauthn_enabled:
+        explanation: Preverjanje pristnosti z varnostnimi ključi za vaš račun je bilo omogočeno.
+        extra: Za prijavo sedaj lahko uporabite svoj varnostni ključ.
         subject: 'Mastodon: preverjanje pristnosti z varnostno kodo je omogočeno'
         title: Varnostne kode omogočene
     omniauth_callbacks:
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index 13fdea3fef..40baabcf75 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -47,14 +47,19 @@ th:
         subject: 'Mastodon: คำแนะนำการตั้งรหัสผ่านใหม่'
         title: การตั้งรหัสผ่านใหม่
       two_factor_disabled:
+        explanation: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงที่อยู่อีเมลและรหัสผ่านเท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+        subtitle: ปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
         title: ปิดใช้งาน 2FA แล้ว
       two_factor_enabled:
+        explanation: จะต้องใช้โทเคนที่สร้างโดยแอป TOTP ที่จับคู่สำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยแล้ว'
+        subtitle: เปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยสำหรับบัญชีของคุณแล้ว
         title: เปิดใช้งาน 2FA แล้ว
       two_factor_recovery_codes_changed:
-        explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสใหม่แล้ว
+        explanation: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
         subject: 'Mastodon: สร้างรหัสกู้คืนสองปัจจัยใหม่แล้ว'
+        subtitle: ยกเลิกรหัสกู้คืนก่อนหน้านี้และสร้างรหัสกู้คืนใหม่แล้ว
         title: เปลี่ยนรหัสกู้คืน 2FA แล้ว
       unlock_instructions:
         subject: 'Mastodon: คำแนะนำการปลดล็อค'
@@ -68,9 +73,13 @@ th:
           subject: 'Mastodon: ลบกุญแจความปลอดภัยแล้ว'
           title: ลบหนึ่งในกุญแจความปลอดภัยของคุณแล้ว
       webauthn_disabled:
+        explanation: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+        extra: ตอนนี้สามารถเข้าสู่ระบบได้โดยใช้เพียงโทเคนที่สร้างโดยแอป TOTP ที่จับคู่เท่านั้น
         subject: 'Mastodon: ปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: ปิดใช้งานกุญแจความปลอดภัยแล้ว
       webauthn_enabled:
+        explanation: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยสำหรับบัญชีของคุณแล้ว
+        extra: ตอนนี้สามารถใช้กุญแจความปลอดภัยของคุณสำหรับการเข้าสู่ระบบ
         subject: 'Mastodon: เปิดใช้งานการรับรองความถูกต้องด้วยกุญแจความปลอดภัยแล้ว'
         title: เปิดใช้งานกุญแจความปลอดภัยแล้ว
     omniauth_callbacks:
diff --git a/config/locales/doorkeeper.ia.yml b/config/locales/doorkeeper.ia.yml
index ec85df24fc..d689354f61 100644
--- a/config/locales/doorkeeper.ia.yml
+++ b/config/locales/doorkeeper.ia.yml
@@ -17,6 +17,7 @@ ia:
       index:
         application: Application
         delete: Deler
+        empty: Tu non ha applicationes.
         name: Nomine
         new: Nove application
         show: Monstrar
@@ -47,6 +48,7 @@ ia:
       title:
         accounts: Contos
         admin/accounts: Gestion de contos
+        all: Accesso plen a tu conto de Mastodon
         bookmarks: Marcapaginas
         conversations: Conversationes
         favourites: Favoritos
@@ -61,8 +63,15 @@ ia:
           applications: Applicationes
           oauth2_provider: Fornitor OAuth2
     scopes:
+      read:favourites: vider tu favoritos
+      read:lists: vider tu listas
+      read:notifications: vider tu notificationes
+      read:statuses: vider tote le messages
       write:accounts: modificar tu profilo
+      write:blocks: blocar contos e dominios
       write:favourites: messages favorite
+      write:filters: crear filtros
       write:lists: crear listas
+      write:media: incargar files de medios
       write:notifications: rader tu notificationes
       write:statuses: publicar messages
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 1bcf36700b..beb6aa6d9f 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -309,6 +309,7 @@ eo:
       unpublish: Malpublikigi
       unpublished_msg: Anonco sukcese malpublikigita!
       updated_msg: Anonco sukcese ĝisdatigis!
+    critical_update_pending: Kritika ĝisdatigo pritraktotas
     custom_emojis:
       assign_category: Atribui kategorion
       by_domain: Domajno
@@ -424,6 +425,7 @@ eo:
       view: Vidi domajna blokado
     email_domain_blocks:
       add_new: Aldoni novan
+      allow_registrations_with_approval: Permesi aliĝojn kun aprobo
       attempts_over_week:
         one: "%{count} provo ekde lasta semajno"
         other: "%{count} registroprovoj ekde lasta semajno"
@@ -770,11 +772,21 @@ eo:
           approved: Bezonas aprobi por aliĝi
           none: Neniu povas aliĝi
           open: Iu povas aliĝi
+      security:
+        authorized_fetch: Devigi aŭtentigon de frataraj serviloj
+      title: Agordoj de la servilo
     site_uploads:
       delete: Forigi elŝutitan dosieron
       destroyed_msg: Reteja alŝuto sukcese forigita!
     software_updates:
+      critical_update: Kritika — bonvolu ĝisdatiĝi rapide
       documentation_link: Lerni pli
+      release_notes: Eldono-notoj
+      title: Disponeblaj ĝisdatigoj
+      type: Tipo
+      types:
+        major: Ĉefa eldono
+        minor: Neĉefa eldono
     statuses:
       account: Skribanto
       application: Aplikaĵo
@@ -1259,6 +1271,9 @@ eo:
       overwrite: Anstataŭigi
       overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
     preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
+    states:
+      finished: Finita
+      unconfirmed: Nekonfirmita
     success: Viaj datumoj estis sukcese alŝutitaj kaj estos traktitaj kiel planite
     titles:
       following: Importado de sekvaj kontoj
@@ -1528,6 +1543,7 @@ eo:
       unknown_browser: Nekonata retumilo
       weibo: Weibo
     current_session: Nuna seanco
+    date: Dato
     description: "%{browser} en %{platform}"
     explanation: Ĉi tiuj estas la retumiloj nun ensalutintaj al via Mastodon-konto.
     ip: IP
@@ -1693,6 +1709,7 @@ eo:
     webauthn: Sekurecaj ŝlosiloj
   user_mailer:
     appeal_approved:
+      action: Konto-agordoj
       explanation: La apelacio de la admono kontra via konto je %{strike_date} pri sendodato %{appeal_date} aprobitas.
       subject: Via apelacio de %{date} aprobitas
       title: Apelacio estis aprobita
@@ -1701,6 +1718,7 @@ eo:
       subject: Via apelacio de %{date} estis malaprobita
       title: Apelacio estis malaprobita
     backup_ready:
+      extra: Estas nun preta por elŝuto!
       subject: Via arkivo estas preta por elŝutado
       title: Arkiva elŝuto
     suspicious_sign_in:
@@ -1756,6 +1774,7 @@ eo:
     go_to_sso_account_settings: Iru al la agordoj de la konto de via identeca provizanto
     invalid_otp_token: Nevalida kodo de dufaktora aŭtentigo
     otp_lost_help_html: Se vi perdas aliron al ambaŭ, vi povas kontakti %{email}
+    rate_limited: Estas tro multaj aŭtentigaj provoj, reprovu poste.
     seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
     signed_in_as: 'Salutinta kiel:'
   verification:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 26c18b5feb..0b6e58db59 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1843,6 +1843,7 @@ es-AR:
     go_to_sso_account_settings: Andá a la configuración de cuenta de tu proveedor de identidad
     invalid_otp_token: Código de dos factores no válido
     otp_lost_help_html: Si perdiste al acceso a ambos, podés ponerte en contacto con %{email}
+    rate_limited: Demasiados intentos de autenticación; intentá de nuevo más tarde.
     seamless_external_login: Iniciaste sesión desde un servicio externo, así que la configuración de contraseña y correo electrónico no están disponibles.
     signed_in_as: 'Iniciaste sesión como:'
   verification:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 32178d0b04..11c327bcca 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1843,6 +1843,7 @@ es-MX:
     go_to_sso_account_settings: Diríjete a la configuración de la cuenta de su proveedor de identidad
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9235b985fb..4dbb76c526 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1843,6 +1843,7 @@ es:
     go_to_sso_account_settings: Diríjase a la configuración de la cuenta de su proveedor de identidad
     invalid_otp_token: Código de dos factores incorrecto
     otp_lost_help_html: Si perdiste al acceso a ambos, puedes ponerte en contancto con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtalo de nuevo más tarde.
     seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
     signed_in_as: 'Sesión iniciada como:'
   verification:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 4b91f7a524..bfa1f829b6 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1847,6 +1847,7 @@ eu:
     go_to_sso_account_settings: Jo zure identitate-hornitzaileko kontuaren ezarpenetara
     invalid_otp_token: Bi faktoreetako kode baliogabea
     otp_lost_help_html: 'Bietara sarbidea galdu baduzu, jarri kontaktuan hemen: %{email}'
+    rate_limited: Autentifikazio saiakera gehiegi, saiatu berriro geroago.
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 26fe6b7f02..9d8974392f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1786,7 +1786,7 @@ fi:
       subtitle: Vetoomuksesi on hylätty.
       title: Valitus hylätty
     backup_ready:
-      explanation: Olet pyytänyt täysvarmuuskopion Mastodon-tilistäsi.
+      explanation: Olet pyytänyt täyden varmuuskopion Mastodon-tilistäsi.
       extra: Se on nyt valmis ladattavaksi!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
@@ -1843,6 +1843,7 @@ fi:
     go_to_sso_account_settings: Avaa identiteettitarjoajasi tiliasetukset
     invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
     otp_lost_help_html: Jos sinulla ei ole pääsyä kumpaankaan, voit ottaa yhteyden osoitteeseen %{email}
+    rate_limited: Liian monta todennusyritystä. Yritä myöhemmin uudelleen.
     seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
     signed_in_as: 'Kirjautunut tilillä:'
   verification:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 03a525fa5d..dabaf24ba7 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1843,6 +1843,7 @@ fo:
     go_to_sso_account_settings: Far til kontustillingarnar hjá samleikaveitaranum hjá tær
     invalid_otp_token: Ógyldug tvey-stigs koda
     otp_lost_help_html: Hevur tú mist atgongd til bæði, so kanst tú koma í samband við %{email}
+    rate_limited: Ov nógvar samgildisroyndir, royn aftur seinni.
     seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
     signed_in_as: 'Ritað/ur inn sum:'
   verification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 1398f6ad0b..3c43a4e23d 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1843,6 +1843,7 @@ gl:
     go_to_sso_account_settings: Ir aos axustes da conta no teu provedor de identidade
     invalid_otp_token: O código do segundo factor non é válido
     otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email}
+    rate_limited: Demasiados intentos de autenticación, inténtao máis tarde.
     seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
     signed_in_as: 'Rexistrada como:'
   verification:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 2969cf33e8..db57912d89 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1907,6 +1907,7 @@ he:
     go_to_sso_account_settings: מעבר לאפיוני החשבון שלך בשרת הזהות
     invalid_otp_token: קוד דו-שלבי שגוי
     otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
+    rate_limited: יותר מדי ניסיונות אימות, נסו שוב מאוחר יותר.
     seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
     signed_in_as: 'מחובר בתור:'
   verification:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 7cfd7d80e2..8fce206e9e 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1843,6 +1843,7 @@ hu:
     go_to_sso_account_settings: Ugrás az azonosítási szolgáltatód fiókbeállításaihoz
     invalid_otp_token: Érvénytelen ellenőrző kód
     otp_lost_help_html: Ha mindkettőt elvesztetted, kérhetsz segítséget itt %{email}
+    rate_limited: Túl sok hiteleítési kísérlet történt. Próbáld újra később.
     seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
     signed_in_as: Bejelentkezve mint
   verification:
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c8cd5d5f8d..c77a8f802d 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1786,6 +1786,7 @@ ie:
       subtitle: Tui apelle ha esset rejectet.
       title: Apelle rejectet
     backup_ready:
+      explanation: Tu petit un complet archive de tui conto de Mastodon.
       extra: It es ja pret a descargar!
       subject: Tui archive es pret por descargar
       title: Descargar archive
@@ -1842,6 +1843,7 @@ ie:
     go_to_sso_account_settings: Ear al parametres de conto de tui provisor de identification
     invalid_otp_token: Ínvalid 2-factor code
     otp_lost_help_html: Si tu perdit accesse a ambis, tu posse contacter %{email}
+    rate_limited: Tro mult de provas de autentication, ples provar denov plu tard.
     seamless_external_login: Tu ha intrat per un servicie external, dunc parametres pri tui passa-parol e email-adresse ne es disponibil.
     signed_in_as: 'Session apertet quam:'
   verification:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 9f8d5d42dc..b048d5cb00 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1847,6 +1847,7 @@ is:
     go_to_sso_account_settings: Fara í stillingar aðgangsins hjá auðkennisveitunni þinni
     invalid_otp_token: Ógildur tveggja-þátta kóði
     otp_lost_help_html: Ef þú hefur misst aðganginn að hvoru tveggja, geturðu sett þig í samband við %{email}
+    rate_limited: Of margar tilraunir til auðkenningar, prófaðu aftur síðar.
     seamless_external_login: Innskráning þín er í gegnum utanaðkomandi þjónustu, þannig að stillingar fyrir lykilorð og tölvupóst eru ekki aðgengilegar.
     signed_in_as: 'Skráð inn sem:'
   verification:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a17fae4804..adcef9559f 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1845,6 +1845,7 @@ it:
     go_to_sso_account_settings: Vai alle impostazioni dell'account del tuo provider di identità
     invalid_otp_token: Codice d'accesso non valido
     otp_lost_help_html: Se perdessi l'accesso ad entrambi, puoi entrare in contatto con %{email}
+    rate_limited: Troppi tentativi di autenticazione, per favore riprova più tardi.
     seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
     signed_in_as: 'Hai effettuato l''accesso come:'
   verification:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a68426cb53..c966cbe36f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1813,6 +1813,7 @@ ja:
     go_to_sso_account_settings: 外部サービスアカウントの設定はこちらで行ってください
     invalid_otp_token: 二要素認証コードが間違っています
     otp_lost_help_html: どちらも使用できない場合、%{email}に連絡を取ると解決できるかもしれません
+    rate_limited: 認証に失敗した回数が多すぎます。時間をおいてからログインしてください。
     seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
     signed_in_as: '下記でログイン中:'
   verification:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b85b9b5861..946aa35657 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1813,6 +1813,7 @@ ko:
     go_to_sso_account_settings: ID 공급자의 계정 설정으로 이동
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
     otp_lost_help_html: 만약 양쪽 모두를 잃어버렸다면 %{email}을 통해 복구할 수 있습니다
+    rate_limited: 너무 많은 인증 시도가 있었습니다, 잠시 후에 시도하세요.
     seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
     signed_in_as: '다음과 같이 로그인 중:'
   verification:
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index d1247fc781..5a09c4c609 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -384,6 +384,7 @@ lad:
         cancel: Anula
         confirm: Suspende
         permanent_action: Si kites la suspensyon no restoraras dingunos datos ni relasyones.
+        preamble_html: Estas a punto de suspender <strong>%{domain}</strong> i sus subdomenos.
         remove_all_data: Esto efasara todo el kontenido, multimedia i datos de profiles de los kuentos en este domeno de tu sirvidor.
         stop_communication: Tu sirvidor deshara de komunikarse kon estos sirvidores.
         title: Konfirma bloko de domeno para %{domain}
@@ -608,6 +609,7 @@ lad:
       created_at: Raportado
       delete_and_resolve: Efasa publikasyones
       forwarded: Reembiado
+      forwarded_replies_explanation: Este raporto vyene de un utilizador remoto i es sovre kontenido remoto. Tiene sido reembiado a ti porke el kontenido raportado esta en una repuesta a uno de tus utilizadores.
       forwarded_to: Reembiado a %{domain}
       mark_as_resolved: Marka komo rezolvido
       mark_as_sensitive: Marka komo sensivle
@@ -712,6 +714,7 @@ lad:
         manage_users: Administra utilizadores
         manage_users_description: Permete a los utilizadores ver los peratim de otros utilizadores i realizar aksyones de moderasyon kontra eyos
         manage_webhooks: Administrar webhooks
+        manage_webhooks_description: Permite a los utilizadores konfigurar webhooks para evenimientos administrativos
         view_audit_log: Mostra defter de revisyon
         view_audit_log_description: Permete a los utilizadores ver una estoria de aksyones administrativas en el sirvidor
         view_dashboard: Ve pano
@@ -738,6 +741,8 @@ lad:
       branding:
         preamble: La marka de tu sirvidor lo desferensia de otros sirvidores de la red. Esta enformasyon puede amostrarse por una varieta de entornos, komo en la enterfaz web de Mastodon, en aplikasyones nativas, en previsualizasiones de atadijos en otros sitios internetikos i en aplikasyones de mesajes, etc. Por esta razon, es mijor mantener esta enformasyon klara, breve i konsiza.
         title: Marka
+      captcha_enabled:
+        title: Solisita ke los muevos utilizadores rezolven un CAPTCHA para konfirmar su konto
       content_retention:
         preamble: Kontrola komo el kontenido jenerado por el utilizador se magazina en Mastodon.
         title: Retensyon de kontenido
@@ -765,6 +770,9 @@ lad:
           approved: Se rekiere achetasion para enrejistrarse
           none: Permete a los utilizadores trokar la konfigurasyon del sitio
           open: Kualkiera puede enrejistrarse
+      security:
+        authorized_fetch_overridden_hint: Agora no puedes trokar esta konfigurasyon dkee esta sovreeskrita por una variable de entorno.
+        federation_authentication: Forzamyento de autentifikasyon para la federasyon
       title: Konfigurasyon del sirvidor
     site_uploads:
       delete: Efasa dosya kargada
@@ -820,8 +828,13 @@ lad:
     system_checks:
       database_schema_check:
         message_html: Ay migrasyones asperando de la baza de datos. Por favor, egzekutalas para asigurarte de ke la aplikasyon fonksiona komo deveria
+      elasticsearch_health_red:
+        message_html: El klaster de Elasticsearch no es sano (estado kolorado), funksyones de bushkeda no estan disponivles
+      elasticsearch_health_yellow:
+        message_html: El klaster de Elasticsearch no es sano (estado amariyo), es posivle ke keras investigar la razon
       elasticsearch_preset:
         action: Ve dokumentasyon
+        message_html: Tu klaster de Elasticsearch tiene mas ke un nodo, ama Mastodon no esta konfigurado para uzarlos.
       elasticsearch_preset_single_node:
         action: Ve dokumentasyon
       elasticsearch_running_check:
@@ -1012,12 +1025,17 @@ lad:
   auth:
     apply_for_account: Solisita un kuento
     captcha_confirmation:
+      help_html: Si tyenes problemas kon rezolver el CAPTCHA, puedes kontaktarnos en %{email} i podremos ayudarte.
+      hint_html: Una koza mas! Tenemos ke konfirmar ke eres umano (para evitar spam!). Rezolve el CAPTCHA abasho i klika "Kontinua".
       title: Kontrolo de sigurita
     confirmations:
+      awaiting_review: Tu adreso de posta tiene sido konfirmado! La taifa de %{domain} esta revizando tu enrejistrasyon. Risiviras un meil si acheten tu kuento!
       awaiting_review_title: Estamos revizando tu enrejistramiento
       clicking_this_link: klikando en este atadijo
       login_link: konektate kon kuento
       proceed_to_login_html: Agora puedes ir a %{login_link}.
+      redirect_to_app_html: Seras readresado a la aplikasyon <strong>%{app_name}</strong>. Si esto no afita, aprova %{clicking_this_link} o regresa manualmente a la aplikasyon.
+      registration_complete: Tu enrejistrasyon en %{domain} ya esta kompletada!
       welcome_title: Bienvenido, %{name}!
       wrong_email_hint: Si este adreso de posta es inkorekto, puedes trokarlo en las preferensyas del kuento.
     delete_account: Efasa kuento
@@ -1054,6 +1072,7 @@ lad:
     rules:
       accept: Acheta
       back: Atras
+      invited_by: 'Puedes adjuntarte a %{domain} grasyas a la envitasyon de:'
       preamble: Estas son establesidas i aplikadas por los moderadores de %{domain}.
       preamble_invited: Antes de kontinuar, por favor reviza las reglas del sirvidor establesidas por los moderatores de %{domain}.
       title: Algunas reglas bazikas.
@@ -1078,6 +1097,7 @@ lad:
       functional: Tu kuento esta kompletamente funksyonal.
       pending: Tu solisitasyon esta asperando la revizion por muestros administradores. Esto puede tadrar algun tiempo. Arisiviras una posta elektronika si la solisitasyon sea achetada.
       redirecting_to: Tu kuento se topa inaktivo porke esta siendo readresado a %{acct}.
+      self_destruct: Deke %{domain} va a serrarse, solo tendras akseso limitado a tu kuento.
       view_strikes: Ve amonestamientos pasados kontra tu kuento
     too_fast: Formulario enviado demaziado rapido, aprovalo de muevo.
     use_security_key: Uza la yave de sigurita
@@ -1271,6 +1291,19 @@ lad:
       merge_long: Manten rejistros egzistentes i adjusta muevos
       overwrite: Sobreskrive
       overwrite_long: Mete muevos rejistros en vez de los aktuales
+    overwrite_preambles:
+      blocking_html: Estas a punto de <strong>substituyir tu lista de blokos</strong> por asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Estas a punto de <strong>substituyir tus markadores</strong> por asta <strong>%{total_items} publikasyones</strong> ke vinyeron de <strong>%{filename}</strong>.
+      domain_blocking_html: Estas a punto de <strong>substituyir tu lista de blokos de domeno</strong> por asta <strong>%{total_items} domenos </strong> de <strong>%{filename}</strong>.
+      following_html: Estas a punto de <strong>segir</strong> asta <strong>%{total_items} kuentos</strong> de <strong>%{filename}</strong> i <strong>deshar de segir todos los otros kuentos</strong>.
+      lists_html: Estas a punto de <strong>sustituyir tus listas</strong> con el kontenido de <strong>%{filename}</strong>. Asta <strong>%{total_items} kuentos</strong> seran adjustados a muevas listas.
+      muting_html: Estas a punto de <strong>substituyir tu lista de kuentos silensyados</strong> por asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Estas a punto de <strong>blokar</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      bookmarks_html: Estas a punto de adjustar asta <strong>%{total_items} publikasyones</strong> de <strong>%{filename}</strong> a tus <strong>markadores</strong>.
+      domain_blocking_html: Estas a punto de <strong>blokar</strong> asta <strong>%{total_items} domenos </strong> de <strong>%{filename}</strong>.
+      following_html: Estas a punto de <strong>segir</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
+      muting_html: Estas a punto de <strong>silensyar</strong> asta <strong>%{total_items} kuentos </strong> de <strong>%{filename}</strong>.
     preface: Puedes importar siertos datos, komo todas las personas a las kualas estas sigiendo o blokando en tu kuento en esta instansya, dizde dosyas eksportadas de otra instansya.
     recent_imports: Importasyones resyentes
     states:
@@ -1474,7 +1507,9 @@ lad:
     public_timelines: Linyas de tiempo publikas
   privacy:
     privacy: Privasita
+    reach: Alkanse
     search: Bushkeda
+    title: Privasita i alkanse
   privacy_policy:
     title: Politika de privasita
   reactions:
@@ -1711,6 +1746,7 @@ lad:
       action: Preferensyas de kuento
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue achetada. Tu kuento se topa de muevo en dobro estado.
       subject: Tu apelasyon del %{date} fue achetada
+      subtitle: Tu konto de muevo tiene una reputasyon buena.
       title: Apelasyon achetada
     appeal_rejected:
       explanation: La apelasyon del amonestamiento kontra tu kuento del %{strike_date} ke mandates el %{appeal_date} fue refuzada.
@@ -1718,6 +1754,7 @@ lad:
       subtitle: Tu apelasyon fue refuzada.
       title: Apelasyon refuzada
     backup_ready:
+      extra: Agora esta pronto para abashar!
       subject: Tu dosya esta pronta para abashar
       title: Abasha dosya
     suspicious_sign_in:
@@ -1773,6 +1810,8 @@ lad:
     go_to_sso_account_settings: Va a la konfigurasyon de kuento de tu prokurador de identita
     invalid_otp_token: Kodiche de dos pasos no valido
     otp_lost_help_html: Si pedriste akseso a los dos, puedes kontaktarte kon %{email}
+    rate_limited: Demaziadas provas de autentifikasyon, aprova de muevo dempues.
+    seamless_external_login: Estas konektado por un servisyo eksterno i estonses la konfigurasyon de kod i konto de posta no estan disponivles.
     signed_in_as: 'Konektado komo:'
   verification:
     here_is_how: Ansina es komo
@@ -1785,6 +1824,7 @@ lad:
       success: Tu yave de sigurita fue adjustada kon sukseso.
     delete: Efasa
     delete_confirmation: Estas siguro ke keres efasar esta yave de sigurita?
+    description_html: Si kapasites <strong>autentifikasyon kon yave de sigurita</strong>, nesesitaras uno de tus yaves de sigurita para konektarte kon tu kuento.
     destroy:
       error: Uvo un problem al efasar tu yave de sigurita. Por favor aprova de muevo.
       success: Tu yave de sigurita fue efasada kon sukseso.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9235b99fed..5ffa788a8c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1843,6 +1843,7 @@ nl:
     go_to_sso_account_settings: Ga naar de accountinstellingen van je identiteitsprovider
     invalid_otp_token: Ongeldige tweestaps-toegangscode
     otp_lost_help_html: Als je toegang tot beiden kwijt bent geraakt, neem dan contact op via %{email}
+    rate_limited: Te veel authenticatiepogingen, probeer het later opnieuw.
     seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
     signed_in_as: 'Ingelogd als:'
   verification:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 914ee7fb04..626252be00 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1608,6 +1608,7 @@ nn:
       unknown_browser: Ukjend nettlesar
       weibo: Weibo
     current_session: Noverande økt
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Desse nettlesarane er logga inn på Mastodon-kontoen din.
     ip: IP-adresse
@@ -1774,14 +1775,19 @@ nn:
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
+      action: Kontoinnstillinger
       explanation: Apellen på prikken mot din kontor på %{strike_date} som du la inn på %{appeal_date} har blitt godkjend. Din konto er nok ein gong i god stand.
       subject: Din klage fra %{date} er godkjent
+      subtitle: Kontoen din er tilbake i god stand.
       title: Anke godkjend
     appeal_rejected:
       explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
       subject: Din klage fra %{date} er avvist
+      subtitle: Anken din har blitt avvist.
       title: Anke avvist
     backup_ready:
+      explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
+      extra: Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
     suspicious_sign_in:
@@ -1837,6 +1843,7 @@ nn:
     go_to_sso_account_settings: Gå til kontoinnstillingane hjå identitetsleverandøren din
     invalid_otp_token: Ugyldig tostegskode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+    rate_limited: For mange autentiseringsforsøk, prøv igjen seinare.
     seamless_external_login: Du er logga inn gjennom eit eksternt reiskap, so passord og e-postinstillingar er ikkje tilgjengelege.
     signed_in_as: 'Logga inn som:'
   verification:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 61cc89181e..d90aa5bab5 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -229,7 +229,7 @@
         update_status: Oppdater statusen
         update_user_role: Oppdater rolle
       actions:
-        approve_appeal_html: "%{name} godkjente klagen på modereringa fra %{target}"
+        approve_appeal_html: "%{name} godkjente anken på moderering fra %{target}"
         approve_user_html: "%{name} godkjente registrering fra %{target}"
         assigned_to_self_report_html: "%{name} tildelte rapport %{target} til seg selv"
         change_email_user_html: "%{name} endret e-postadressen til brukeren %{target}"
@@ -266,7 +266,7 @@
         enable_user_html: "%{name} aktiverte innlogging for bruker %{target}"
         memorialize_account_html: "%{name} endret %{target}s konto til en minneside"
         promote_user_html: "%{name} forfremmet bruker %{target}"
-        reject_appeal_html: "%{name} avviste moderasjonsavgjørelsesklagen fra %{target}"
+        reject_appeal_html: "%{name} avviste anken på moderering fra %{target}"
         reject_user_html: "%{name} avslo registrering fra %{target}"
         remove_avatar_user_html: "%{name} fjernet %{target} sitt profilbilde"
         reopen_report_html: "%{name} gjenåpnet rapporten %{target}"
@@ -372,8 +372,8 @@
       website: Nettside
     disputes:
       appeals:
-        empty: Ingen klager funnet.
-        title: Klager
+        empty: Ingen anker funnet.
+        title: Anker
     domain_allows:
       add_new: Hvitelist domene
       created_msg: Domenet har blitt hvitelistet
@@ -692,8 +692,8 @@
         invite_users_description: Lar brukere invitere nye personer til serveren
         manage_announcements: Behandle Kunngjøringer
         manage_announcements_description: Lar brukere endre kunngjøringer på serveren
-        manage_appeals: Behandle klager
-        manage_appeals_description: Lar brukere gjennomgå klager mot modereringsaktiviteter
+        manage_appeals: Behandle anker
+        manage_appeals_description: Lar brukere gjennomgå anker mot modereringsaktiviteter
         manage_blocks: Behandle Blokker
         manage_blocks_description: Lar brukere blokkere e-postleverandører og IP-adresser
         manage_custom_emojis: Administrer egendefinerte Emojier
@@ -829,8 +829,8 @@
         sensitive: "%{name} merket %{target}s konto som følsom"
         silence: "%{name} begrenset %{target}s konto"
         suspend: "%{name} suspenderte %{target}s konto"
-      appeal_approved: Klage tatt til følge
-      appeal_pending: Klage behandles
+      appeal_approved: Anket
+      appeal_pending: Anke behandles
       appeal_rejected: Anke avvist
     system_checks:
       database_schema_check:
@@ -975,9 +975,9 @@
         sensitive: å merke kontoen sin som følsom
         silence: for å begrense deres konto
         suspend: for å avslutte kontoen
-      body: "%{target} klager på en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
-      next_steps: Du kan godkjenne klagen for å angre på moderasjonsvedtaket eller ignorere det.
-      subject: "%{username} klager på en moderasjonsbeslutning for %{instance}"
+      body: "%{target} anker en moderasjonsbeslutning av %{action_taken_by} fra %{date}, noe som var %{type}. De skrev:"
+      next_steps: Du kan godkjenne anken for å angre på moderasjonsvedtaket eller ignorere det.
+      subject: "%{username} anker en moderasjonsbeslutning for %{instance}"
     new_critical_software_updates:
       body: Nye kritiske versjoner av Mastodon har blitt utgitt, det kan være fordelaktig å oppdatere så snart som mulig!
       subject: Kritiske Mastodon-oppdateringer er tilgjengelige for %{instance}!
@@ -1161,19 +1161,19 @@
   disputes:
     strikes:
       action_taken: Handling utført
-      appeal: Klage
-      appeal_approved: Denne advarselens klage ble tatt til følge og er ikke lenger gyldig
-      appeal_rejected: Klagen ble avvist
-      appeal_submitted_at: Klage levert
-      appealed_msg: Din klage har blitt levert. Du får beskjed om den blir godkjent.
+      appeal: Anke
+      appeal_approved: Denne advarselens anke ble tatt til følge og er ikke lenger gyldig
+      appeal_rejected: Anken ble avvist
+      appeal_submitted_at: Anke levert
+      appealed_msg: Anken din har blitt levert. Du får beskjed om den blir godkjent.
       appeals:
-        submit: Lever klage
-      approve_appeal: Godkjenn klage
+        submit: Lever anke
+      approve_appeal: Godkjenn anke
       associated_report: Tilhørende rapport
       created_at: Datert
       description_html: Dette er tiltakene mot din konto og advarsler som har blitt sent til deg av %{instance}-personalet.
       recipient: Adressert til
-      reject_appeal: Avvis klage
+      reject_appeal: Avvis anke
       status: 'Innlegg #%{id}'
       status_removed: Innlegg allerede fjernet fra systemet
       title: "%{action} fra %{date}"
@@ -1185,9 +1185,9 @@
         sensitive: Merking av konto som sensitiv
         silence: Begrensning av konto
         suspend: Suspensjon av konto
-      your_appeal_approved: Din klage har blitt godkjent
-      your_appeal_pending: Du har levert en klage
-      your_appeal_rejected: Din klage har blitt avvist
+      your_appeal_approved: Anken din har blitt godkjent
+      your_appeal_pending: Du har levert en anke
+      your_appeal_rejected: Anken din har blitt avvist
   domain_validator:
     invalid_domain: er ikke et gyldig domenenavn
   edit_profile:
@@ -1608,6 +1608,7 @@
       unknown_browser: Ukjent Nettleser
       weibo: Weibo
     current_session: Nåværende økt
+    date: Dato
     description: "%{browser} på %{platform}"
     explanation: Dette er nettlesere som er pålogget på din Mastodon-konto akkurat nå.
     ip: IP-adresse
@@ -1740,7 +1741,7 @@
     sensitive_content: Følsomt innhold
   strikes:
     errors:
-      too_late: Det er for sent å klage på denne advarselen
+      too_late: Det er for sent å anke denne advarselen
   tags:
     does_not_match_previous_name: samsvarer ikke med det forrige navnet
   themes:
@@ -1774,14 +1775,19 @@
     webauthn: Sikkerhetsnøkler
   user_mailer:
     appeal_approved:
-      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
-      subject: Din klage fra %{date} er godkjent
-      title: Klage godkjent
+      action: Kontoinnstillinger
+      explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt godkjent. Din konto er nok en gang i god stand.
+      subject: Anken din fra %{date} er godkjent
+      subtitle: Kontoen din er tilbake i god stand.
+      title: Anke godkjent
     appeal_rejected:
-      explanation: Klagen på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
-      subject: Din klage fra %{date} er avvist
-      title: Klage avvist
+      explanation: Anken på advarselen mot din konto den %{strike_date} som du sendte inn den %{appeal_date} har blitt avvist.
+      subject: Anken din fra %{date} er avvist
+      subtitle: Anken din har blitt avvist.
+      title: Anke avvist
     backup_ready:
+      explanation: Du etterspurte en fullstendig sikkerhetskopi av din Mastodon-konto.
+      extra: Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
     suspicious_sign_in:
@@ -1792,8 +1798,8 @@
       subject: Din konto ble tatt i bruk fra en ny IP-adresse
       title: En ny pålogging
     warning:
-      appeal: Lever en klage
-      appeal_description: Hvis du mener dette er feil, kan du sende inn en klage til personalet i %{instance}.
+      appeal: Lever en anke
+      appeal_description: Hvis du mener dette er feil, kan du sende inn en anke til personalet i %{instance}.
       categories:
         spam: Søppelpost
         violation: Innholdet bryter følgende retningslinjer for fellesskapet
@@ -1837,6 +1843,7 @@
     go_to_sso_account_settings: Gå til din identitetsleverandørs kontoinnstillinger
     invalid_otp_token: Ugyldig to-faktorkode
     otp_lost_help_html: Hvis du mistet tilgangen til begge deler, kan du komme i kontakt med %{email}
+    rate_limited: For mange autentiseringsforsøk, prøv igjen senere.
     seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
     signed_in_as: 'Innlogget som:'
   verification:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8a973b71c7..4d8fde8f4f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1907,6 +1907,7 @@ pl:
     go_to_sso_account_settings: Przejdź do ustawień konta dostawcy tożsamości
     invalid_otp_token: Kod uwierzytelniający jest niepoprawny
     otp_lost_help_html: Jeżeli utracisz dostęp do obu, możesz skontaktować się z %{email}
+    rate_limited: Zbyt wiele prób uwierzytelnienia. Spróbuj ponownie później.
     seamless_external_login: Zalogowano z użyciem zewnętrznej usługi, więc ustawienia hasła i adresu e-mail nie są dostępne.
     signed_in_as: 'Zalogowano jako:'
   verification:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index fc1e3e6367..2e077b37a8 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1843,6 +1843,7 @@ pt-PT:
     go_to_sso_account_settings: Ir para as definições de conta do seu fornecedor de identidade
     invalid_otp_token: Código de autenticação inválido
     otp_lost_help_html: Se perdeu o acesso a ambos, pode entrar em contacto com %{email}
+    rate_limited: Demasiadas tentativas de autenticação, tente novamente mais tarde.
     seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
     signed_in_as: 'Registado como:'
   verification:
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index ca2020e21e..7651792212 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -36,7 +36,7 @@
         starts_at: Valgfritt. I tilfellet din kunngjøring er bundet til en spesifikk tidsramme
         text: Du kan bruke innlegg-syntaks. Vennligst vær oppmerksom på plassen som kunngjøringen vil ta opp på brukeren sin skjerm
       appeal:
-        text: Du kan kun klage på en advarsel en gang
+        text: Du kan kun anke en advarsel en gang
       defaults:
         autofollow: Folk som lager en konto gjennom invitasjonen, vil automatisk følge deg
         avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
@@ -282,7 +282,7 @@
           sign_up_requires_approval: Begrens påmeldinger
         severity: Oppføring
       notification_emails:
-        appeal: Noen klager på en moderator sin avgjørelse
+        appeal: Noen anker en moderator sin avgjørelse
         digest: Send sammendrag på e-post
         favourite: Send e-post når noen setter din status som favoritt
         follow: Send e-post når noen følger deg
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 89f456a205..c639bbe1a6 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -732,6 +732,7 @@ sk:
     new_appeal:
       actions:
         none: varovanie
+        silence: obmedziť ich účet
     new_pending_account:
       body: Podrobnosti o novom účte sú uvedené nižšie. Môžeš túto registračnú požiadavku buď prijať, alebo zamietnúť.
       subject: Nový účet očakáva preverenie na %{instance} (%{username})
@@ -1279,6 +1280,7 @@ sk:
     follow_limit_reached: Nemôžeš následovať viac ako %{limit} ľudí
     invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
+    rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.
     seamless_external_login: Si prihlásená/ý cez externú službu, takže nastavenia hesla a emailu ti niesú prístupné.
     signed_in_as: 'Prihlásená/ý ako:'
   verification:
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1a0afe034f..ba707f49eb 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1907,6 +1907,7 @@ sl:
     go_to_sso_account_settings: Pojdite na nastavitve svojega računa ponudnika identitete
     invalid_otp_token: Neveljavna dvofaktorska koda
     otp_lost_help_html: Če ste izgubili dostop do obeh, stopite v stik z %{email}
+    rate_limited: Preveč poskusov preverjanja pristnosti, poskusite kasneje.
     seamless_external_login: Prijavljeni ste prek zunanje storitve, tako da nastavitve gesla in e-pošte niso na voljo.
     signed_in_as: 'Vpisani kot:'
   verification:
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index fc1239bedf..39c9f2f873 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1875,6 +1875,7 @@ sr-Latn:
     go_to_sso_account_settings: Idite na podešavanja naloga svog dobavljača identiteta
     invalid_otp_token: Neispravni dvofaktorski kod
     otp_lost_help_html: Ako izgubite pristup za oba, možete stupiti u kontakt sa %{email}
+    rate_limited: Previše pokušaja autentifikacije, pokušajte ponovo kasnije.
     seamless_external_login: Prijavljeni ste putem spoljašnje usluge, tako da lozinka i podešavanja E-pošte nisu dostupni.
     signed_in_as: 'Prijavljen/a kao:'
   verification:
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 4e5e58c859..0cf35c14cc 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1875,6 +1875,7 @@ sr:
     go_to_sso_account_settings: Идите на подешавања налога свог добављача идентитета
     invalid_otp_token: Неисправни двофакторски код
     otp_lost_help_html: Ако изгубите приступ за оба, можете ступити у контакт са %{email}
+    rate_limited: Превише покушаја аутентификације, покушајте поново касније.
     seamless_external_login: Пријављени сте путем спољашње услуге, тако да лозинка и подешавања Е-поште нису доступни.
     signed_in_as: 'Пријављен/а као:'
   verification:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index d4657e9743..3a82f29d2f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1842,6 +1842,7 @@ sv:
     go_to_sso_account_settings: Gå till din identitetsleverantörs kontoinställningar
     invalid_otp_token: Ogiltig tvåfaktorskod
     otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
+    rate_limited: För många autentiseringsförsök, försök igen senare.
     seamless_external_login: Du är inloggad via en extern tjänst, inställningar för lösenord och e-post är därför inte tillgängliga.
     signed_in_as: 'Inloggad som:'
   verification:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 7bea8f9de8..ac5cfbacf5 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -847,7 +847,7 @@ th:
         message_html: ไม่มีกระบวนการ Sidekiq ที่กำลังทำงานสำหรับคิว %{value} โปรดตรวจทานการกำหนดค่า Sidekiq ของคุณ
       software_version_critical_check:
         action: ดูการอัปเดตที่พร้อมใช้งาน
-        message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้
+        message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้
       software_version_patch_check:
         action: ดูการอัปเดตที่พร้อมใช้งาน
         message_html: มีการอัปเดต Mastodon ที่แก้ไขข้อบกพร่องพร้อมใช้งาน
@@ -961,7 +961,7 @@ th:
       next_steps: คุณสามารถอนุมัติการอุทธรณ์เพื่อเลิกทำการตัดสินใจในการควบคุม หรือเพิกเฉยต่อการอุทธรณ์
       subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
     new_critical_software_updates:
-      body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะทำได้!
+      body: มีการปล่อยรุ่น Mastodon สำคัญใหม่ คุณอาจต้องการอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้!
       subject: การอัปเดต Mastodon สำคัญพร้อมใช้งานสำหรับ %{instance}!
     new_pending_account:
       body: รายละเอียดของบัญชีใหม่อยู่ด้านล่าง คุณสามารถอนุมัติหรือปฏิเสธใบสมัครนี้
@@ -1582,6 +1582,7 @@ th:
       unknown_browser: เบราว์เซอร์ที่ไม่รู้จัก
       weibo: Weibo
     current_session: เซสชันปัจจุบัน
+    date: วันที่
     description: "%{browser} ใน %{platform}"
     explanation: นี่คือเว็บเบราว์เซอร์ที่เข้าสู่ระบบบัญชี Mastodon ของคุณในปัจจุบัน
     ip: IP
@@ -1742,14 +1743,19 @@ th:
     webauthn: กุญแจความปลอดภัย
   user_mailer:
     appeal_approved:
+      action: การตั้งค่าบัญชี
       explanation: อนุมัติการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
       subject: อนุมัติการอุทธรณ์ของคุณจาก %{date} แล้ว
+      subtitle: บัญชีของคุณอยู่ในสถานะที่ดีอีกครั้งหนึ่ง
       title: อนุมัติการอุทธรณ์แล้ว
     appeal_rejected:
       explanation: ปฏิเสธการอุทธรณ์การดำเนินการต่อบัญชีของคุณเมื่อ %{strike_date} ที่คุณได้ส่งเมื่อ %{appeal_date} แล้ว
       subject: ปฏิเสธการอุทธรณ์ของคุณจาก %{date} แล้ว
+      subtitle: ปฏิเสธการอุทธรณ์ของคุณแล้ว
       title: ปฏิเสธการอุทธรณ์แล้ว
     backup_ready:
+      explanation: คุณได้ขอข้อมูลสำรองแบบเต็มของบัญชี Mastodon ของคุณ
+      extra: ตอนนี้ข้อมูลสำรองพร้อมสำหรับการดาวน์โหลดแล้ว!
       subject: การเก็บถาวรของคุณพร้อมสำหรับการดาวน์โหลดแล้ว
       title: การส่งออกการเก็บถาวร
     suspicious_sign_in:
@@ -1805,6 +1811,7 @@ th:
     go_to_sso_account_settings: ไปยังการตั้งค่าบัญชีของผู้ให้บริการข้อมูลประจำตัวของคุณ
     invalid_otp_token: รหัสสองปัจจัยไม่ถูกต้อง
     otp_lost_help_html: หากคุณสูญเสียการเข้าถึงทั้งสองอย่าง คุณสามารถติดต่อ %{email}
+    rate_limited: มีความพยายามในการรับรองความถูกต้องมากเกินไป ลองอีกครั้งในภายหลัง
     seamless_external_login: คุณได้เข้าสู่ระบบผ่านบริการภายนอก ดังนั้นจึงไม่มีการตั้งค่ารหัสผ่านและอีเมล
     signed_in_as: 'ลงชื่อเข้าเป็น:'
   verification:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 99b5e782ce..3b74c4eaa1 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1843,6 +1843,7 @@ tr:
     go_to_sso_account_settings: Kimlik sağlayıcı hesap ayarlarına gidin
     invalid_otp_token: Geçersiz iki adımlı doğrulama kodu
     otp_lost_help_html: Her ikisine de erişiminizi kaybettiyseniz, %{email} ile irtibata geçebilirsiniz
+    rate_limited: Çok fazla kimlik doğrulama denemesi. Daha sonra tekrar deneyin.
     seamless_external_login: Harici bir servis aracılığıyla oturum açtınız, bu nedenle parola ve e-posta ayarları mevcut değildir.
     signed_in_as: 'Oturum açtı:'
   verification:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a80fbf1404..40a858d72a 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1903,6 +1903,7 @@ uk:
     go_to_sso_account_settings: Перейдіть до налаштувань облікового запису постачальника ідентифікації
     invalid_otp_token: Введено неправильний код
     otp_lost_help_html: Якщо ви втратили доступ до обох, ви можете отримати доступ з %{email}
+    rate_limited: Занадто багато спроб з'єднання. Спробуйте ще раз пізніше.
     seamless_external_login: Ви увійшли за допомогою зовнішнього сервісу, тому налаштування паролю та електронної пошти недоступні.
     signed_in_as: 'Ви увійшли як:'
   verification:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dabb73a475..3817b18f07 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1811,6 +1811,7 @@ vi:
     go_to_sso_account_settings: Thiết lập tài khoản nhà cung cấp danh tính
     invalid_otp_token: Mã xác minh 2 bước không hợp lệ
     otp_lost_help_html: Nếu bạn mất quyền truy cập vào cả hai, bạn có thể đăng nhập bằng %{email}
+    rate_limited: Quá nhiều lần thử, vui lòng thử lại sau.
     seamless_external_login: Bạn đã đăng nhập thông qua một dịch vụ bên ngoài, vì vậy mật khẩu và email không khả dụng.
     signed_in_as: 'Đăng nhập bằng:'
   verification:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6611510b7d..80bb5653ca 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1811,6 +1811,7 @@ zh-CN:
     go_to_sso_account_settings: 转到您的身份提供商进行账户设置
     invalid_otp_token: 输入的双因素认证代码无效
     otp_lost_help_html: 如果你不慎丢失了所有的代码，请联系 %{email} 寻求帮助
+    rate_limited: 验证尝试次数过多，请稍后再试。
     seamless_external_login: 因为你是通过外部服务登录的，所以密码和电子邮件地址设置都不可用。
     signed_in_as: 当前登录的账户：
   verification:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 4b682f9358..ac32c03e95 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1811,6 +1811,7 @@ zh-HK:
     go_to_sso_account_settings: 前往你身份提供者的帳號設定
     invalid_otp_token: 雙重認證碼不正確
     otp_lost_help_html: 如果這兩者你均無法登入，你可以聯繫 %{email}
+    rate_limited: 嘗試認證次數太多，請稍後再試。
     seamless_external_login: 因為你正在使用第三方服務登入，所以不能設定密碼和電郵。
     signed_in_as: 目前登入的帳戶：
   verification:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index dd17de7ef1..6662e44cdc 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1813,6 +1813,7 @@ zh-TW:
     go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
     invalid_otp_token: 兩階段認證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
+    rate_limited: 身份驗證嘗試太多次，請稍後再試。
     seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
     signed_in_as: 目前登入的帳號：
   verification:

From 5efb00ddb8cd8d4d36382a66e048e5c78424f9a1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Jan 2024 06:55:51 -0500
Subject: [PATCH 380/436] Use ruby version 3.2.3 (#28817)

---
 .ruby-version | 2 +-
 Dockerfile    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index be94e6f53d..b347b11eac 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.2.3
diff --git a/Dockerfile b/Dockerfile
index 96f8b5cd27..119c266b89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@
 ARG TARGETPLATFORM=${TARGETPLATFORM}
 ARG BUILDPLATFORM=${BUILDPLATFORM}
 
-# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.2"]
-ARG RUBY_VERSION="3.2.2"
+# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.2.3"]
+ARG RUBY_VERSION="3.2.3"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 ARG NODE_MAJOR_VERSION="20"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
 FROM docker.io/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim as node
-# Ruby image to use for base image based on combined variables (ex: 3.2.2-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.2.3-slim-bookworm)
 FROM docker.io/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} as ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA

From 7ecf7f540309a968027ff6ac3874e3643f3fe3e1 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Jan 2024 06:58:54 -0500
Subject: [PATCH 381/436] Move controller->request specs for api/v1/statuses/*
 (#28818)

---
 .../favourited_by_accounts_controller.rb      |  2 +-
 .../reblogged_by_accounts_controller.rb       |  2 +-
 .../statuses/favourited_by_accounts_spec.rb}  | 60 +++++++++++--------
 .../statuses/reblogged_by_accounts_spec.rb}   | 53 +++++++++-------
 4 files changed, 69 insertions(+), 48 deletions(-)
 rename spec/{controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb => requests/api/v1/statuses/favourited_by_accounts_spec.rb} (52%)
 rename spec/{controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb => requests/api/v1/statuses/reblogged_by_accounts_spec.rb} (57%)

diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 3cca246ce8..98b69c347f 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
 
   def load_accounts
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
     scope.merge(paginated_favourites).to_a
   end
 
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index dd3e60846b..aacab5f8f4 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
 
   def load_accounts
     scope = default_accounts
-    scope = scope.where.not(id: current_account.excluded_from_timeline_account_ids) unless current_account.nil?
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
     scope.merge(paginated_statuses).to_a
   end
 
diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
similarity index 52%
rename from spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
index 01816743e5..44296f4c37 100644
--- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/favourited_by_accounts_spec.rb
@@ -2,21 +2,21 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Favourited by Accounts' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:accounts' }
+  # let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:alice) { Fabricate(:account) }
   let(:bob)   { Fabricate(:account) }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
+    subject do
+      get "/api/v1/statuses/#{status.id}/favourited_by", headers: headers, params: { limit: 2 }
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/statuses/:status_id/favourited_by' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
@@ -24,30 +24,38 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         Favourite.create!(account: bob, status: status)
       end
 
-      it 'returns http success' do
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(response).to have_http_status(200)
-        expect(response.headers['Link'].links.size).to eq(2)
-      end
+      it 'returns http success and accounts who favourited the status' do
+        subject
 
-      it 'returns accounts who favorited the status' do
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(response)
+          .to have_http_status(200)
+        expect(response.headers['Link'].links.size)
+          .to eq(2)
+
+        expect(body_as_json.size)
+          .to eq(2)
+        expect(body_as_json)
+          .to contain_exactly(
+            include(id: alice.id.to_s),
+            include(id: bob.id.to_s)
+          )
       end
 
       it 'does not return blocked users' do
         user.account.block!(bob)
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 1
-        expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+        subject
+
+        expect(body_as_json.size)
+          .to eq 1
+        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
 
   context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
+    subject do
+      get "/api/v1/statuses/#{status.id}/favourited_by", params: { limit: 2 }
     end
 
     context 'with a private status' do
@@ -59,7 +67,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         end
 
         it 'returns http unauthorized' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(404)
         end
       end
@@ -74,7 +83,8 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController do
         end
 
         it 'returns http success' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(200)
         end
       end
diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
similarity index 57%
rename from spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
rename to spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
index 0d15cca75c..6f99ce9464 100644
--- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+++ b/spec/requests/api/v1/statuses/reblogged_by_accounts_spec.rb
@@ -2,21 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
-  render_views
-
-  let(:user)  { Fabricate(:user) }
-  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
-  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
+RSpec.describe 'API V1 Statuses Reblogged by Accounts' do
+  let(:user) { Fabricate(:user) }
+  let(:scopes)  { 'read:accounts' }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
   let(:alice) { Fabricate(:account) }
   let(:bob)   { Fabricate(:account) }
 
   context 'with an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token) { token }
+    subject do
+      get "/api/v1/statuses/#{status.id}/reblogged_by", headers: headers, params: { limit: 2 }
     end
 
-    describe 'GET #index' do
+    describe 'GET /api/v1/statuses/:status_id/reblogged_by' do
       let(:status) { Fabricate(:status, account: user.account) }
 
       before do
@@ -25,27 +24,37 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
       end
 
       it 'returns accounts who reblogged the status', :aggregate_failures do
-        get :index, params: { status_id: status.id, limit: 2 }
+        subject
 
-        expect(response).to have_http_status(200)
-        expect(response.headers['Link'].links.size).to eq(2)
+        expect(response)
+          .to have_http_status(200)
+        expect(response.headers['Link'].links.size)
+          .to eq(2)
 
-        expect(body_as_json.size).to eq 2
-        expect([body_as_json[0][:id], body_as_json[1][:id]]).to contain_exactly(alice.id.to_s, bob.id.to_s)
+        expect(body_as_json.size)
+          .to eq(2)
+        expect(body_as_json)
+          .to contain_exactly(
+            include(id: alice.id.to_s),
+            include(id: bob.id.to_s)
+          )
       end
 
       it 'does not return blocked users' do
         user.account.block!(bob)
-        get :index, params: { status_id: status.id, limit: 2 }
-        expect(body_as_json.size).to eq 1
-        expect(body_as_json[0][:id]).to eq alice.id.to_s
+
+        subject
+
+        expect(body_as_json.size)
+          .to eq 1
+        expect(body_as_json.first[:id]).to eq(alice.id.to_s)
       end
     end
   end
 
   context 'without an oauth token' do
-    before do
-      allow(controller).to receive(:doorkeeper_token).and_return(nil)
+    subject do
+      get "/api/v1/statuses/#{status.id}/reblogged_by", params: { limit: 2 }
     end
 
     context 'with a private status' do
@@ -57,7 +66,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
         end
 
         it 'returns http unauthorized' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(404)
         end
       end
@@ -72,7 +82,8 @@ RSpec.describe Api::V1::Statuses::RebloggedByAccountsController do
         end
 
         it 'returns http success' do
-          get :index, params: { status_id: status.id }
+          subject
+
           expect(response).to have_http_status(200)
         end
       end

From 18004bf22723b677345f417b24729c7e17dac36e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 22 Jan 2024 08:55:37 -0500
Subject: [PATCH 382/436] Add `Account.matches_uri_prefix` scope and use in
 activitypub/followers_synchronizations controller (#28820)

---
 .../followers_synchronizations_controller.rb  |  2 +-
 app/models/account.rb                         |  1 +
 spec/models/account_spec.rb                   | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
index 976caa3445..d2942104e5 100644
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -24,7 +24,7 @@ class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseContro
   end
 
   def set_items
-    @items = @account.followers.where(Account.arel_table[:uri].matches("#{Account.sanitize_sql_like(uri_prefix)}/%", false, true)).or(@account.followers.where(uri: uri_prefix)).pluck(:uri)
+    @items = @account.followers.matches_uri_prefix(uri_prefix).pluck(:uri)
   end
 
   def collection_presenter
diff --git a/app/models/account.rb b/app/models/account.rb
index 2fdfc2d514..05e1f943ca 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -123,6 +123,7 @@ class Account < ApplicationRecord
   scope :bots, -> { where(actor_type: %w(Application Service)) }
   scope :groups, -> { where(actor_type: 'Group') }
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
+  scope :matches_uri_prefix, ->(value) { where(arel_table[:uri].matches("#{sanitize_sql_like(value)}/%", false, true)).or(where(uri: value)) }
   scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
   scope :without_unapproved, -> { left_outer_joins(:user).merge(User.approved.confirmed).or(remote) }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 8488ccea45..7ef5ca94cc 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -835,6 +835,31 @@ RSpec.describe Account do
   end
 
   describe 'scopes' do
+    describe 'matches_uri_prefix' do
+      let!(:alice) { Fabricate :account, domain: 'host.example', uri: 'https://host.example/user/a' }
+      let!(:bob) { Fabricate :account, domain: 'top-level.example', uri: 'https://top-level.example' }
+
+      it 'returns accounts which start with the value' do
+        results = described_class.matches_uri_prefix('https://host.example')
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(alice)
+          .and not_include(bob)
+      end
+
+      it 'returns accounts which equal the value' do
+        results = described_class.matches_uri_prefix('https://top-level.example')
+
+        expect(results.size)
+          .to eq(1)
+        expect(results)
+          .to include(bob)
+          .and not_include(alice)
+      end
+    end
+
     describe 'auditable' do
       let!(:alice) { Fabricate :account }
       let!(:bob) { Fabricate :account }

From e2d9635074ad33cc8144adc434bcd90faae9c424 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 22 Jan 2024 14:55:43 +0100
Subject: [PATCH 383/436] Add notification email on invalid second
 authenticator (#28822)

---
 app/controllers/auth/sessions_controller.rb   |  5 ++++
 app/mailers/user_mailer.rb                    | 12 ++++++++++
 app/views/user_mailer/failed_2fa.html.haml    | 24 +++++++++++++++++++
 app/views/user_mailer/failed_2fa.text.erb     | 15 ++++++++++++
 config/locales/en.yml                         |  6 +++++
 .../auth/sessions_controller_spec.rb          | 20 +++++++++++++---
 spec/mailers/previews/user_mailer_preview.rb  |  5 ++++
 spec/mailers/user_mailer_spec.rb              | 18 ++++++++++++++
 8 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 app/views/user_mailer/failed_2fa.html.haml
 create mode 100644 app/views/user_mailer/failed_2fa.text.erb

diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 6bc48a7804..962b78de65 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -181,6 +181,11 @@ class Auth::SessionsController < Devise::SessionsController
       ip: request.remote_ip,
       user_agent: request.user_agent
     )
+
+    # Only send a notification email every hour at most
+    return if redis.set("2fa_failure_notification:#{user.id}", '1', ex: 1.hour, get: true).present?
+
+    UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later!
   end
 
   def second_factor_attempts_key(user)
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 432b851b5e..3b1a085cb8 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -191,6 +191,18 @@ class UserMailer < Devise::Mailer
     end
   end
 
+  def failed_2fa(user, remote_ip, user_agent, timestamp)
+    @resource   = user
+    @remote_ip  = remote_ip
+    @user_agent = user_agent
+    @detection  = Browser.new(user_agent)
+    @timestamp  = timestamp.to_time.utc
+
+    I18n.with_locale(locale) do
+      mail subject: default_i18n_subject
+    end
+  end
+
   private
 
   def default_devise_subject
diff --git a/app/views/user_mailer/failed_2fa.html.haml b/app/views/user_mailer/failed_2fa.html.haml
new file mode 100644
index 0000000000..e1da35ce06
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.html.haml
@@ -0,0 +1,24 @@
+= content_for :heading do
+  = render 'application/mailer/heading', heading_title: t('user_mailer.failed_2fa.title'), heading_subtitle: t('user_mailer.failed_2fa.explanation'), heading_image_url: frontend_asset_url('images/mailer-new/heading/login.png')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t 'user_mailer.failed_2fa.details'
+            %p
+              %strong #{t('sessions.ip')}:
+              = @remote_ip
+              %br/
+              %strong #{t('sessions.browser')}:
+              %span{ title: @user_agent }
+                = t 'sessions.description',
+                    browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s),
+                    platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
+              %br/
+              %strong #{t('sessions.date')}:
+              = l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone)
+            = render 'application/mailer/button', text: t('settings.account_settings'), url: edit_user_registration_url
+      %p= t 'user_mailer.failed_2fa.further_actions_html',
+            action: link_to(t('user_mailer.suspicious_sign_in.change_password'), edit_user_registration_url)
diff --git a/app/views/user_mailer/failed_2fa.text.erb b/app/views/user_mailer/failed_2fa.text.erb
new file mode 100644
index 0000000000..c1dbf7d929
--- /dev/null
+++ b/app/views/user_mailer/failed_2fa.text.erb
@@ -0,0 +1,15 @@
+<%= t 'user_mailer.failed_2fa.title' %>
+
+===
+
+<%= t 'user_mailer.failed_2fa.explanation' %>
+
+<%= t 'user_mailer.failed_2fa.details' %>
+
+<%= t('sessions.ip') %>: <%= @remote_ip %>
+<%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
+<%= l(@timestamp.in_time_zone(@resource.time_zone.presence), format: :with_time_zone) %>
+
+<%= t 'user_mailer.failed_2fa.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
+
+=> <%= edit_user_registration_url %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 89ca0ad72c..83eaaa4552 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1791,6 +1791,12 @@ en:
       extra: It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    failed_2fa:
+      details: 'Here are details of the sign-in attempt:'
+      explanation: Someone has tried to sign in to your account but provided an invalid second authentication factor.
+      further_actions_html: If this wasn't you, we recommend that you %{action} immediately as it may be compromised.
+      subject: Second factor authentication failure
+      title: Failed second factor authentication
     suspicious_sign_in:
       change_password: change your password
       details: 'Here are details of the sign-in:'
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index d238626c9d..b663f55afa 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -265,21 +265,35 @@ RSpec.describe Auth::SessionsController do
         context 'when repeatedly using an invalid TOTP code before using a valid code' do
           before do
             stub_const('Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR', 2)
+
+            # Travel to the beginning of an hour to avoid crossing rate-limit buckets
+            travel_to '2023-12-20T10:00:00Z'
           end
 
           it 'does not log the user in' do
-            # Travel to the beginning of an hour to avoid crossing rate-limit buckets
-            travel_to '2023-12-20T10:00:00Z'
-
             Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
               post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
               expect(controller.current_user).to be_nil
             end
 
             post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+
             expect(controller.current_user).to be_nil
             expect(flash[:alert]).to match I18n.t('users.rate_limited')
           end
+
+          it 'sends a suspicious sign-in mail', :sidekiq_inline do
+            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+              expect(controller.current_user).to be_nil
+            end
+
+            post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+
+            expect(UserMailer.deliveries.size).to eq(1)
+            expect(UserMailer.deliveries.first.to.first).to eq(user.email)
+            expect(UserMailer.deliveries.first.subject).to eq(I18n.t('user_mailer.failed_2fa.subject'))
+          end
         end
 
         context 'when using a valid OTP' do
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 098c9cd901..2722538e1a 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -93,4 +93,9 @@ class UserMailerPreview < ActionMailer::Preview
   def suspicious_sign_in
     UserMailer.suspicious_sign_in(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
   end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/failed_2fa
+  def failed_2fa
+    UserMailer.failed_2fa(User.first, '127.0.0.1', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0', Time.now.utc)
+  end
 end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 4a43928248..404b834702 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -135,6 +135,24 @@ describe UserMailer do
                      'user_mailer.suspicious_sign_in.subject'
   end
 
+  describe '#failed_2fa' do
+    let(:ip) { '192.168.0.1' }
+    let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
+    let(:timestamp) { Time.now.utc }
+    let(:mail) { described_class.failed_2fa(receiver, ip, agent, timestamp) }
+
+    it 'renders failed 2FA notification' do
+      receiver.update!(locale: nil)
+
+      expect(mail)
+        .to be_present
+        .and(have_body_text(I18n.t('user_mailer.failed_2fa.explanation')))
+    end
+
+    include_examples 'localized subject',
+                     'user_mailer.failed_2fa.subject'
+  end
+
   describe '#appeal_approved' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
     let(:mail) { described_class.appeal_approved(receiver, appeal) }

From 67f54c4e75aeaa78ba72e10603b43a713929fcbd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 04:06:53 -0500
Subject: [PATCH 384/436] Fix `Rails/WhereExists` cop in app/validators
 (#28854)

---
 .rubocop_todo.yml                    | 2 --
 app/validators/reaction_validator.rb | 2 +-
 app/validators/vote_validator.rb     | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a2ee32d284..4d2f11ff7b 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -88,8 +88,6 @@ Rails/WhereExists:
     - 'app/serializers/rest/announcement_serializer.rb'
     - 'app/services/activitypub/fetch_remote_status_service.rb'
     - 'app/services/vote_service.rb'
-    - 'app/validators/reaction_validator.rb'
-    - 'app/validators/vote_validator.rb'
     - 'app/workers/move_worker.rb'
     - 'lib/tasks/tests.rake'
     - 'spec/models/account_spec.rb'
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb
index 4ed3376e8b..89d83de5a2 100644
--- a/app/validators/reaction_validator.rb
+++ b/app/validators/reaction_validator.rb
@@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
   end
 
   def new_reaction?(reaction)
-    !reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
+    !reaction.announcement.announcement_reactions.exists?(name: reaction.name)
   end
 
   def limit_reached?(reaction)
diff --git a/app/validators/vote_validator.rb b/app/validators/vote_validator.rb
index fa2bd223dc..e725b4c0b8 100644
--- a/app/validators/vote_validator.rb
+++ b/app/validators/vote_validator.rb
@@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
     if vote.persisted?
       account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
     else
-      account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
+      account_votes_on_same_poll(vote).exists?(choice: vote.choice)
     end
   end
 

From defe5f407600e9259f6b7c0683b8d56a0349b3d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 04:07:22 -0500
Subject: [PATCH 385/436] Fix `Rails/WhereExists` cop in lib/tasks (#28852)

---
 .rubocop_todo.yml    | 1 -
 lib/tasks/tests.rake | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4d2f11ff7b..c0fb7a5ce2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -89,7 +89,6 @@ Rails/WhereExists:
     - 'app/services/activitypub/fetch_remote_status_service.rb'
     - 'app/services/vote_service.rb'
     - 'app/workers/move_worker.rb'
-    - 'lib/tasks/tests.rake'
     - 'spec/models/account_spec.rb'
     - 'spec/services/activitypub/process_collection_service_spec.rb'
     - 'spec/services/purge_domain_service_spec.rb'
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index c3a9dbfd73..45f055e218 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -24,7 +24,7 @@ namespace :tests do
         exit(1)
       end
 
-      if Account.where(domain: Rails.configuration.x.local_domain).exists?
+      if Account.exists?(domain: Rails.configuration.x.local_domain)
         puts 'Faux remote accounts not properly cleaned up'
         exit(1)
       end

From b0207d77579e8179b683fe56711a83f5d2fb0909 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 04:10:11 -0500
Subject: [PATCH 386/436] Add coverage for `Tag.recently_used` scope (#28850)

---
 app/models/tag.rb       |  4 +++-
 spec/models/tag_spec.rb | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 46e55d74f9..f2168ae904 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -39,6 +39,8 @@ class Tag < ApplicationRecord
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/
 
+  RECENT_STATUS_LIMIT = 1000
+
   validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
   validates :display_name, format: { with: HASHTAG_NAME_RE }
   validate :validate_name_change, if: -> { !new_record? && name_changed? }
@@ -53,7 +55,7 @@ class Tag < ApplicationRecord
   scope :not_trendable, -> { where(trendable: false) }
   scope :recently_used, lambda { |account|
                           joins(:statuses)
-                            .where(statuses: { id: account.statuses.select(:id).limit(1000) })
+                            .where(statuses: { id: account.statuses.select(:id).limit(RECENT_STATUS_LIMIT) })
                             .group(:id).order(Arel.sql('count(*) desc'))
                         }
   scope :matches_name, ->(term) { where(arel_table[:name].lower.matches(arel_table.lower("#{sanitize_sql_like(Tag.normalize(term))}%"), nil, true)) } # Search with case-sensitive to use B-tree index
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 6177b7a25a..69aaeed0af 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -100,6 +100,38 @@ RSpec.describe Tag do
     end
   end
 
+  describe '.recently_used' do
+    let(:account) { Fabricate(:account) }
+    let(:other_person_status) { Fabricate(:status) }
+    let(:out_of_range) { Fabricate(:status, account: account) }
+    let(:older_in_range) { Fabricate(:status, account: account) }
+    let(:newer_in_range) { Fabricate(:status, account: account) }
+    let(:unused_tag) { Fabricate(:tag) }
+    let(:used_tag_one) { Fabricate(:tag) }
+    let(:used_tag_two) { Fabricate(:tag) }
+    let(:used_tag_on_out_of_range) { Fabricate(:tag) }
+
+    before do
+      stub_const 'Tag::RECENT_STATUS_LIMIT', 2
+
+      other_person_status.tags << used_tag_one
+
+      out_of_range.tags << used_tag_on_out_of_range
+
+      older_in_range.tags << used_tag_one
+      older_in_range.tags << used_tag_two
+
+      newer_in_range.tags << used_tag_one
+    end
+
+    it 'returns tags used by account within last X statuses ordered most used first' do
+      results = described_class.recently_used(account)
+
+      expect(results)
+        .to eq([used_tag_one, used_tag_two])
+    end
+  end
+
   describe '.find_normalized' do
     it 'returns tag for a multibyte case-insensitive name' do
       upcase_string   = 'abcABCａｂｃＡＢＣやゆよ'

From d03fe2bdee45b895a907aa484128cbe96c44b847 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 04:31:59 -0500
Subject: [PATCH 387/436] N+1 fixes for CLI maintenance command (#28847)

---
 lib/mastodon/cli/maintenance.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index e2ea866152..73012812fd 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -275,7 +275,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_email
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
         say "e-mail will be disabled for the following accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
@@ -289,7 +289,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_confirmation_token
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).order(created_at: :desc).to_a.drop(1)
+        users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -313,7 +313,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_password_token
       ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
-        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
         users.each do |user|
@@ -591,7 +591,7 @@ module Mastodon::CLI
     end
 
     def deduplicate_local_accounts!(scope)
-      accounts = scope.order(id: :desc).to_a
+      accounts = scope.order(id: :desc).includes(:account_stat, :user).to_a
 
       say "Multiple local accounts were found for username '#{accounts.first.username}'.", :yellow
       say 'All those accounts are distinct accounts but only the most recently-created one is fully-functional.', :yellow

From 78ee1453f99bbdd1411349ac5b84833ff7b9e6cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:11:37 +0100
Subject: [PATCH 388/436] New Crowdin Translations (automated) (#28857)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  4 ++--
 app/javascript/mastodon/locales/pt-BR.json |  2 ++
 config/locales/bg.yml                      |  5 +++++
 config/locales/ca.yml                      | 15 ++++++++++++---
 config/locales/de.yml                      |  8 +++++++-
 config/locales/devise.ca.yml               |  8 ++++----
 config/locales/es-AR.yml                   |  6 ++++++
 config/locales/es-MX.yml                   |  2 ++
 config/locales/es.yml                      |  2 ++
 config/locales/et.yml                      |  7 +++++++
 config/locales/eu.yml                      |  6 ++++++
 config/locales/fi.yml                      |  6 ++++++
 config/locales/fo.yml                      |  6 ++++++
 config/locales/fy.yml                      |  1 +
 config/locales/he.yml                      |  6 ++++++
 config/locales/hu.yml                      |  6 ++++++
 config/locales/is.yml                      |  6 ++++++
 config/locales/it.yml                      |  6 ++++++
 config/locales/ko.yml                      |  2 ++
 config/locales/lad.yml                     |  2 ++
 config/locales/lt.yml                      |  7 +++++++
 config/locales/nl.yml                      |  5 +++++
 config/locales/nn.yml                      |  6 ++++++
 config/locales/no.yml                      |  6 ++++++
 config/locales/pl.yml                      |  6 ++++++
 config/locales/pt-BR.yml                   |  7 +++++++
 config/locales/pt-PT.yml                   |  6 ++++++
 config/locales/sr-Latn.yml                 |  6 ++++++
 config/locales/sr.yml                      |  6 ++++++
 config/locales/sv.yml                      |  3 +++
 config/locales/tr.yml                      |  6 ++++++
 config/locales/zh-CN.yml                   |  6 ++++++
 config/locales/zh-HK.yml                   |  6 ++++++
 config/locales/zh-TW.yml                   |  6 ++++++
 34 files changed, 178 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 290b364a52..7d1049a30f 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -150,7 +150,7 @@
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.option_placeholder": "Opció {number}",
   "compose_form.poll.remove_option": "Elimina aquesta opció",
-  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
+  "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
   "compose_form.publish": "Tut",
   "compose_form.publish_form": "Nou tut",
@@ -607,7 +607,7 @@
   "search.quick_action.status_search": "Tuts coincidint amb {x}",
   "search.search_or_paste": "Cerca o escriu l'URL",
   "search_popout.full_text_search_disabled_message": "No disponible a {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Només disponible en iniciar la sessió.",
+  "search_popout.full_text_search_logged_out_message": "Només disponible amb la sessió iniciada.",
   "search_popout.language_code": "Codi de llengua ISO",
   "search_popout.options": "Opcions de cerca",
   "search_popout.quick_actions": "Accions ràpides",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 482cc8ee73..b8e18e1229 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -32,6 +32,7 @@
   "account.featured_tags.last_status_never": "Sem publicações",
   "account.featured_tags.title": "Hashtags em destaque de {name}",
   "account.follow": "Seguir",
+  "account.follow_back": "Seguir de volta",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -52,6 +53,7 @@
   "account.mute_notifications_short": "Silenciar notificações",
   "account.mute_short": "Silenciar",
   "account.muted": "Silenciado",
+  "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
   "account.posts": "Toots",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 58a5cae2fd..c3eaa7e4c2 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1790,6 +1790,11 @@ bg:
       extra: Вече е готово за теглене!
       subject: Вашият архив е готов за изтегляне
       title: Сваляне на архива
+    failed_2fa:
+      details: 'Ето подробности на опита за влизане:'
+      explanation: Някой се опита да влезе в акаунта ви, но предостави невалиден втори фактор за удостоверяване.
+      subject: Неуспешен втори фактор за удостоверяване
+      title: Провал на втория фактор за удостоверяване
     suspicious_sign_in:
       change_password: промяна на паролата ви
       details: 'Ето подробности при вход:'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 36ebb9785b..38ef976b83 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -425,7 +425,7 @@ ca:
       view: Veure el bloqueig del domini
     email_domain_blocks:
       add_new: Afegir nou
-      allow_registrations_with_approval: Registre permès amb validació
+      allow_registrations_with_approval: Permet els registres amb validació
       attempts_over_week:
         one: "%{count} intent en la darrera setmana"
         other: "%{count} intents de registre en la darrera setmana"
@@ -1046,6 +1046,7 @@ ca:
       clicking_this_link: en clicar aquest enllaç
       login_link: inici de sessió
       proceed_to_login_html: Ara pots passar a %{login_link}.
+      redirect_to_app_html: Se us hauria d'haver redirigit a l'app <strong>%{app_name}</strong>. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
       registration_complete: La teva inscripció a %{domain} ja és completa.
       welcome_title: Hola, %{name}!
       wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
@@ -1109,6 +1110,7 @@ ca:
       functional: El teu compte està completament operatiu.
       pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan sigui aprovada.
       redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
+      self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
       view_strikes: Veure accions del passat contra el teu compte
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
     use_security_key: Usa clau de seguretat
@@ -1580,6 +1582,7 @@ ca:
     over_total_limit: Has superat el límit de %{limit} tuts programats
     too_soon: La data programada ha de ser futura
   self_destruct:
+    lead_html: Lamentablement, <strong>%{domain}</strong> tanca de forma definitiva. Si hi teníeu un compte, no el podreu continuar utilitzant, però podeu demanar una còpia de les vostres dades.
     title: Aquest servidor tancarà
   sessions:
     activity: Última activitat
@@ -1784,9 +1787,15 @@ ca:
       title: Apel·lació rebutjada
     backup_ready:
       explanation: Heu demanat una còpia completa de les dades del vostre compte de Mastodon.
-      extra: Ja us ho podeu baixar
+      extra: Ja la podeu baixar
       subject: L'arxiu està preparat per a descàrrega
       title: Recollida de l'arxiu
+    failed_2fa:
+      details: 'Aquests són els detalls de l''intent d''accés:'
+      explanation: Algú ha intentat accedir al vostre compte però no ha proporcionat un factor de doble autenticació correcte.
+      further_actions_html: Si no heu estat vosaltres, us recomanem que %{action} immediatament perquè pot estar compromès.
+      subject: Ha fallat el factor de doble autenticació
+      title: Ha fallat l'autenticació de doble factor
     suspicious_sign_in:
       change_password: canvia la teva contrasenya
       details: 'Aquest són els detalls de l''inici de sessió:'
@@ -1840,7 +1849,7 @@ ca:
     go_to_sso_account_settings: Ves a la configuració del compte del teu proveïdor d'identitat
     invalid_otp_token: El codi de dos factors no és correcte
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
-    rate_limited: Excessius intents d'autenticació, torneu-ho a provar més tard.
+    rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
     seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
   verification:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e177c6d2d1..9568f698d1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1790,8 +1790,14 @@ de:
       extra: Sie ist jetzt zum Herunterladen bereit!
       subject: Dein persönliches Archiv kann heruntergeladen werden
       title: Archiv-Download
+    failed_2fa:
+      details: 'Details zum Anmeldeversuch:'
+      explanation: Jemand hat versucht, sich bei deinem Konto anzumelden, aber die Zwei-Faktor-Authentisierung schlug fehl.
+      further_actions_html: Solltest du das nicht gewesen sein, empfehlen wir dir, sofort %{action}, da dein Konto möglicherweise kompromittiert ist.
+      subject: Zwei-Faktor-Authentisierung fehlgeschlagen
+      title: Zwei-Faktor-Authentisierung fehlgeschlagen
     suspicious_sign_in:
-      change_password: dein Passwort ändern
+      change_password: dein Passwort zu ändern
       details: 'Hier sind die Details zu den Anmeldeversuchen:'
       explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
       further_actions_html: Wenn du das nicht warst, empfehlen wir dir schnellstmöglich, %{action} und die Zwei-Faktor-Authentisierung (2FA) für dein Konto zu aktivieren, um es abzusichern.
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 2bf741ee40..3720d3c5f7 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -49,19 +49,19 @@ ca:
         subject: 'Mastodon: Instruccions per a reiniciar contrasenya'
         title: Contrasenya restablerta
       two_factor_disabled:
-        explanation: Només es pot accedir amb compte de correu i contrasenya.
+        explanation: Ara es pot accedir amb només compte de correu i contrasenya.
         subject: 'Mastodon: Autenticació de doble factor desactivada'
         subtitle: S'ha deshabilitat l'autenticació de doble factor al vostre compte.
         title: A2F desactivada
       two_factor_enabled:
-        explanation: Per accedir fa falta un token generat per l'aplicació TOTP aparellada.
+        explanation: Per accedir cal un token generat per l'aplicació TOTP aparellada.
         subject: 'Mastodon: Autenticació de doble factor activada'
         subtitle: S'ha habilitat l'autenticació de doble factor al vostre compte.
         title: A2F activada
       two_factor_recovery_codes_changed:
         explanation: Els codis de recuperació anteriors ja no són vàlids i se n'han generat de nous.
         subject: 'Mastodon: codis de recuperació de doble factor regenerats'
-        subtitle: S'han invalidat els codis de recuperació anteriors i se n'ha generat de nous.
+        subtitle: S'han invalidat els codis de recuperació anteriors i se n'han generat de nous.
         title: Codis de recuperació A2F canviats
       unlock_instructions:
         subject: 'Mastodon: Instruccions per a desblocar'
@@ -76,7 +76,7 @@ ca:
           title: Una de les teves claus de seguretat ha estat esborrada
       webauthn_disabled:
         explanation: S'ha deshabilitat l'autenticació amb claus de seguretat al vostre compte.
-        extra: Ara només podeu accedir amb el token generat amb l'aplicació TOTP aparellada.
+        extra: Ara es pot accedir amb només el token generat amb l'aplicació TOTP aparellada.
         subject: 'Mastodon: S''ha desactivat l''autenticació amb claus de seguretat'
         title: Claus de seguretat desactivades
       webauthn_enabled:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 0b6e58db59..cc55d3d3ff 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1790,6 +1790,12 @@ es-AR:
       extra: "¡Ya está lista para descargar!"
       subject: Tu archivo historial está listo para descargar
       title: Descargar archivo historial
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien intentó iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación no válido.
+      further_actions_html: Si vos no fuiste, te recomendamos que %{action} inmediatamente, ya que la seguridad de tu cuenta podría estar comprometida.
+      subject: Fallo de autenticación del segundo factor
+      title: Fallo en la autenticación del segundo factor
     suspicious_sign_in:
       change_password: cambiés tu contraseña
       details: 'Acá están los detalles del inicio de sesión:'
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 11c327bcca..040d8a9d3c 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1790,6 +1790,8 @@ es-MX:
       extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4dbb76c526..ffe3eb5b00 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1790,6 +1790,8 @@ es:
       extra: "¡Ya está listo para descargar!"
       subject: Tu archivo está preparado para descargar
       title: Descargar archivo
+    failed_2fa:
+      details: 'Estos son los detalles del intento de inicio de sesión:'
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 71f49e1abb..f82ee6cb8f 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1792,6 +1792,12 @@ et:
       extra: See on nüüd allalaadimiseks valmis!
       subject: Arhiiv on allalaadimiseks valmis
       title: Arhiivi väljavõte
+    failed_2fa:
+      details: 'Sisenemise üksikasjad:'
+      explanation: Keegi püüdis Su kontole siseneda, ent sisestas vale teisese autentimisfaktori.
+      further_actions_html: Kui see polnud Sina, siis soovitame viivitamata %{action}, kuna see võib olla lekkinud.
+      subject: Kaheastmelise autentimise nurjumine
+      title: Kaheastmeline autentimine nurjus
     suspicious_sign_in:
       change_password: muuta oma salasõna
       details: 'Sisenemise üksikasjad:'
@@ -1848,6 +1854,7 @@ et:
     go_to_sso_account_settings: Mine oma idenditeedipakkuja kontosätetesse
     invalid_otp_token: Vale kaheastmeline võti
     otp_lost_help_html: Kui kaotasid ligipääsu mõlemale, saad võtta ühendust %{email}-iga
+    rate_limited: Liiga palju autentimise katseid, proovi hiljem uuesti.
     seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
     signed_in_as: 'Sisse logitud kasutajana:'
   verification:
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index bfa1f829b6..bd6ea8c832 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1794,6 +1794,12 @@ eu:
       extra: Deskargatzeko prest!
       subject: Zure artxiboa deskargatzeko prest dago
       title: Artxiboa jasotzea
+    failed_2fa:
+      details: 'Hemen dituzu saio-hasieraren saiakeraren xehetasunak:'
+      explanation: Norbait zure kontuan saioa hasten saiatu da, baina bigarren autentifikazioaren faktore baliogabea eman du.
+      further_actions_html: Ez bazara zu izan, "%{action}" ekintza berehala egitea gomendatzen dugu, kontua arriskarazi daiteke eta.
+      subject: Autentifikazioaren bigarren faktoreak huts egin du
+      title: Huts egin duen autentifikazioaren bigarren faktorea
     suspicious_sign_in:
       change_password: aldatu pasahitza
       details: 'Hemen daude saio hasieraren xehetasunak:'
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 9d8974392f..8e61c7b2a0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1790,6 +1790,12 @@ fi:
       extra: Se on nyt valmis ladattavaksi!
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
+    failed_2fa:
+      details: 'Tässä on tiedot kirjautumisyrityksestä:'
+      explanation: Joku on yrittänyt kirjautua tilillesi, mutta antanut virheellisen kaksivaiheisen todennuksen.
+      further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
+      subject: Kaksivaiheisen todennuksen virhe
+      title: Epäonnistunut kaksivaiheinen todennus
     suspicious_sign_in:
       change_password: vaihda salasanasi
       details: 'Tässä on tiedot kirjautumisesta:'
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index dabaf24ba7..8e34265313 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1790,6 +1790,12 @@ fo:
       extra: Tað er nú klárt at taka niður!
       subject: Savnið hjá tær er tøkt at taka niður
       title: Tak savn niður
+    failed_2fa:
+      details: 'Her eru smálutirnir í innritanarroyndini:'
+      explanation: Onkur hevur roynt at rita inn á tína kontu, men gav eitt ógildugt seinna samgildi.
+      further_actions_html: Um hetta ikki var tú, so skjóta vit upp, at tú %{action} beinan vegin, tí tað kann vera sett í vanda.
+      subject: Seinna samgildi miseydnaðist
+      title: Miseydnað seinna samgildi
     suspicious_sign_in:
       change_password: broyt loyniorðið hjá tær
       details: 'Her eru smálutirnir í innritanini:'
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 1d648f4790..f861bc3e4a 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1843,6 +1843,7 @@ fy:
     go_to_sso_account_settings: Gean nei de accountynstellingen fan jo identiteitsprovider
     invalid_otp_token: Unjildige twa-stapstagongskoade
     otp_lost_help_html: As jo tagong ta beide kwytrekke binne, nim dan kontakt op fia %{email}
+    rate_limited: Te folle autentikaasjebesykjen, probearje it letter opnij.
     seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
     signed_in_as: 'Oanmeld as:'
   verification:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index db57912d89..1f5fd096ac 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1854,6 +1854,12 @@ he:
       extra: הגיבוי מוכן להורדה!
       subject: הארכיון שלך מוכן להורדה
       title: הוצאת ארכיון
+    failed_2fa:
+      details: 'הנה פרטי נסיון ההתחברות:'
+      explanation: פולני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
+      further_actions_html: אם הנסיון לא היה שלך, אנו ממליצים על %{action} באופן מיידי כדי שהחשבון לא יפול קורבן.
+      subject: נכשל אימות בגורם שני
+      title: אימות בגורם שני נכשל
     suspicious_sign_in:
       change_password: שינוי הסיסמא שלך
       details: 'הנה פרטי ההתחברות:'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8fce206e9e..2870435ea7 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1790,6 +1790,12 @@ hu:
       extra: Már letöltésre kész!
       subject: Az adataidról készült archív letöltésre kész
       title: Archiválás
+    failed_2fa:
+      details: 'Itt vannak a bejelentkezési kísérlet részletei:'
+      explanation: Valaki megpróbált bejelentkezni a fiókodba, de a második hitelesítési lépése érvénytelen volt.
+      further_actions_html: Ha ez nem te voltál, azt javasoljuk, hogy azonnal %{action}, mivel lehetséges, hogy az rossz kezekbe került.
+      subject: Második körös hitelesítés sikertelen
+      title: Sikertelen a második körös hitelesítés
     suspicious_sign_in:
       change_password: módosítsd a jelszavad
       details: 'Itt vannak a bejelentkezés részletei:'
diff --git a/config/locales/is.yml b/config/locales/is.yml
index b048d5cb00..191383f56c 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1794,6 +1794,12 @@ is:
       extra: Það er núna tilbúið til niðurhals!
       subject: Safnskráin þín er tilbúin til niðurhals
       title: Taka út í safnskrá
+    failed_2fa:
+      details: 'Hér eru nánari upplýsingar um innskráningartilraunina:'
+      explanation: Einhver reyndi að skrá sig inn á aðganginn þinn en gaf upp ógild gögn seinna þrepi auðkenningar.
+      further_actions_html: Ef þetta varst ekki þú, þá mælum við eindregið með því að þú %{action} samstundis, þar sem það gæti verið berskjaldað.
+      subject: Bilun í seinna þrepi auðkenningar
+      title: Seinna þrep auðkenningar brást
     suspicious_sign_in:
       change_password: breytir lykilorðinu þínu
       details: 'Hér eru nánari upplýsingar um innskráninguna:'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index adcef9559f..89ff071f36 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1792,6 +1792,12 @@ it:
       extra: Ora è pronto per il download!
       subject: Il tuo archivio è pronto per essere scaricato
       title: Esportazione archivio
+    failed_2fa:
+      details: 'Questi sono i dettagli del tentativo di accesso:'
+      explanation: Qualcuno ha tentato di accedere al tuo account ma ha fornito un secondo fattore di autenticazione non valido.
+      further_actions_html: Se non eri tu, ti consigliamo di %{action} immediatamente poiché potrebbe essere compromesso.
+      subject: Errore di autenticazione del secondo fattore
+      title: Autenticazione del secondo fattore non riuscita
     suspicious_sign_in:
       change_password: cambiare la tua password
       details: 'Questi sono i dettagli del tentativo di accesso:'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 946aa35657..b3c786e265 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1760,6 +1760,8 @@ ko:
       extra: 다운로드 할 준비가 되었습니다!
       subject: 아카이브를 다운로드할 수 있습니다
       title: 아카이브 테이크아웃
+    failed_2fa:
+      details: '로그인 시도에 대한 상세 정보입니다:'
     suspicious_sign_in:
       change_password: 암호 변경
       details: '로그인에 대한 상세 정보입니다:'
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 5a09c4c609..be5d2d21bd 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1757,6 +1757,8 @@ lad:
       extra: Agora esta pronto para abashar!
       subject: Tu dosya esta pronta para abashar
       title: Abasha dosya
+    failed_2fa:
+      details: 'Aki estan los peratim de las provas de koneksyon kon tu kuento:'
     suspicious_sign_in:
       change_password: troka tu kod
       details: 'Aki estan los peratim de la koneksyon kon tu kuento:'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index f3715fd2ee..ba8b53fdc9 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -559,6 +559,12 @@ lt:
       extra: Jį jau galima atsisiųsti!
       subject: Jūsų archyvas paruoštas parsisiuntimui
       title: Archyvas išimtas
+    failed_2fa:
+      details: 'Štai išsami informacija apie bandymą prisijungti:'
+      explanation: Kažkas bandė prisijungti prie tavo paskyros, bet nurodė netinkamą antrąjį tapatybės nustatymo veiksnį.
+      further_actions_html: Jei tai buvo ne tu, rekomenduojame nedelsiant imtis %{action}, nes jis gali būti pažeistas.
+      subject: Antrojo veiksnio tapatybės nustatymas nesėkmingai
+      title: Nepavyko atlikti antrojo veiksnio tapatybės nustatymo
     warning:
       subject:
         disable: Jūsų paskyra %{acct} buvo užšaldyta
@@ -584,6 +590,7 @@ lt:
     go_to_sso_account_settings: Eik į savo tapatybės teikėjo paskyros nustatymus
     invalid_otp_token: Netinkamas dviejų veiksnių kodas
     otp_lost_help_html: Jei praradai prieigą prie abiejų, gali susisiek su %{email}
+    rate_limited: Per daug tapatybės nustatymo bandymų. Bandyk dar kartą vėliau.
     seamless_external_login: Esi prisijungęs (-usi) per išorinę paslaugą, todėl slaptažodžio ir el. pašto nustatymai nepasiekiami.
     signed_in_as: 'Prisijungta kaip:'
   verification:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 5ffa788a8c..2d27f9165d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1790,6 +1790,11 @@ nl:
       extra: Het staat nu klaar om te worden gedownload!
       subject: Jouw archief staat klaar om te worden gedownload
       title: Archief ophalen
+    failed_2fa:
+      details: 'Hier zijn details van de aanmeldpoging:'
+      explanation: Iemand heeft geprobeerd om in te loggen op uw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
+      subject: Tweede factor authenticatiefout
+      title: Tweestapsverificatie mislukt
     suspicious_sign_in:
       change_password: je wachtwoord te wijzigen
       details: 'Hier zijn de details van inlogpoging:'
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 626252be00..95eed49785 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1790,6 +1790,12 @@ nn:
       extra: Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
+    failed_2fa:
+      details: 'Her er detaljane om innloggingsforsøket:'
+      explanation: Nokon har prøvd å logge inn på kontoen din, men brukte ein ugyldig andre-autentiseringsfaktor.
+      further_actions_html: Om dette ikkje var deg, rår me deg til å %{action} med éin gong, då det kan vere kompomittert.
+      subject: To-faktor-autentiseringsfeil
+      title: Mislukka to-faktor-autentisering
     suspicious_sign_in:
       change_password: endre passord
       details: 'Her er påloggingsdetaljane:'
diff --git a/config/locales/no.yml b/config/locales/no.yml
index d90aa5bab5..7ece8564fc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1790,6 +1790,12 @@
       extra: Den er nå klar for nedlasting!
       subject: Arkivet ditt er klart til å lastes ned
       title: Nedlasting av arkiv
+    failed_2fa:
+      details: 'Her er detaljer om påloggingsforsøket:'
+      explanation: Noen har prøvd å logge på kontoen din, men ga en ugyldig andre-autentiseringsfaktor.
+      further_actions_html: Hvis dette ikke var deg, anbefaler vi at du %{action} umiddelbart fordi det kan ha blitt kompromittert.
+      subject: Andre-autentiseringsfaktorfeil
+      title: Mislykket andre-autentiseringsfaktor
     suspicious_sign_in:
       change_password: endre passord
       details: 'Her er detaljer om påloggingen:'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 4d8fde8f4f..6718f1994b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1854,6 +1854,12 @@ pl:
       extra: Gotowe do pobrania!
       subject: Twoje archiwum jest gotowe do pobrania
       title: Odbiór archiwum
+    failed_2fa:
+      details: 'Oto szczegóły próby logowania:'
+      explanation: Ktoś próbował zalogować się na twoje konto, ale nie przeszedł drugiego etapu autoryzacji.
+      further_actions_html: Jeśli to nie ty, polecamy natychmiastowo %{action}, bo może ono być narażone.
+      subject: Błąd drugiego etapu uwierzytelniania
+      title: Nieudane uwierzytelnienie w drugim etapie
     suspicious_sign_in:
       change_password: zmień hasło
       details: 'Oto szczegóły logowania:'
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 47ad0ac448..c1a47c0161 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1789,6 +1789,12 @@ pt-BR:
       extra: Agora está pronto para baixar!
       subject: Seu arquivo está pronto para ser baixado
       title: Baixar arquivo
+    failed_2fa:
+      details: 'Aqui estão os detalhes da tentativa de acesso:'
+      explanation: Alguém tentou entrar em sua conta, mas forneceu um segundo fator de autenticação inválido.
+      further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois ela pode ser comprometida.
+      subject: Falha na autenticação do segundo fator
+      title: Falha na autenticação do segundo fator
     suspicious_sign_in:
       change_password: Altere sua senha
       details: 'Aqui estão os detalhes do acesso:'
@@ -1842,6 +1848,7 @@ pt-BR:
     go_to_sso_account_settings: Vá para as configurações de conta do seu provedor de identidade
     invalid_otp_token: Código de dois fatores inválido
     otp_lost_help_html: Se você perder o acesso à ambos, você pode entrar em contato com %{email}
+    rate_limited: Muitas tentativas de autenticação; tente novamente mais tarde.
     seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
     signed_in_as: 'Entrou como:'
   verification:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 2e077b37a8..268531718d 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1790,6 +1790,12 @@ pt-PT:
       extra: Está pronta para transferir!
       subject: O seu arquivo está pronto para descarregar
       title: Arquivo de ficheiros
+    failed_2fa:
+      details: 'Aqui estão os detalhes da tentativa de entrada:'
+      explanation: Alguém tentou entrar em sua conta mas forneceu um segundo fator de autenticação inválido.
+      further_actions_html: Se não foi você, recomendamos que %{action} imediatamente, pois pode ter sido comprometido.
+      subject: Falha na autenticação do segundo fator
+      title: Falha na autenticação do segundo fator
     suspicious_sign_in:
       change_password: alterar a sua palavra-passe
       details: 'Eis os pormenores do início de sessão:'
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 39c9f2f873..9cb555c943 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1822,6 +1822,12 @@ sr-Latn:
       extra: Sada je spremno za preuzimanje!
       subject: Vaša arhiva je spremna za preuzimanje
       title: Izvoz arhive
+    failed_2fa:
+      details: 'Evo detalja o pokušaju prijavljivanja:'
+      explanation: Neko je pokušao da se prijavi na vaš nalog ali je dao nevažeći drugi faktor autentifikacije.
+      further_actions_html: Ako to niste bili vi, preporučujemo vam da odmah %{action} jer može biti ugrožena.
+      subject: Neuspeh drugog faktora autentifikacije
+      title: Nije uspeo drugi faktor autentifikacije
     suspicious_sign_in:
       change_password: promenite svoju lozinku
       details: 'Evo detalja o prijavi:'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 0cf35c14cc..e1c2e992ed 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1822,6 +1822,12 @@ sr:
       extra: Сада је спремно за преузимање!
       subject: Ваша архива је спремна за преузимање
       title: Извоз архиве
+    failed_2fa:
+      details: 'Ево детаља о покушају пријављивања:'
+      explanation: Неко је покушао да се пријави на ваш налог али је дао неважећи други фактор аутентификације.
+      further_actions_html: Ако то нисте били ви, препоручујемо вам да одмах %{action} јер може бити угрожена.
+      subject: Неуспех другог фактора аутентификације
+      title: Није успео други фактор аутентификације
     suspicious_sign_in:
       change_password: промените своју лозинку
       details: 'Ево детаља о пријави:'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 3a82f29d2f..c9000d50fc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1789,6 +1789,9 @@ sv:
       extra: Nu redo för nedladdning!
       subject: Ditt arkiv är klart för nedladdning
       title: Arkivuttagning
+    failed_2fa:
+      further_actions_html: Om detta inte var du, rekommenderar vi att du %{action} omedelbart eftersom ditt konto kan ha äventyrats.
+      title: Misslyckad tvåfaktorsautentisering
     suspicious_sign_in:
       change_password: Ändra ditt lösenord
       details: 'Här är inloggningsdetaljerna:'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3b74c4eaa1..fa84d2a96d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1790,6 +1790,12 @@ tr:
       extra: Şimdi indirebilirsiniz!
       subject: Arşiviniz indirilmeye hazır
       title: Arşiv paketlemesi
+    failed_2fa:
+      details: 'Oturum açma denemesinin ayrıntıları şöyledir:'
+      explanation: Birisi hesabınızda oturum açmaya çalıştı ancak hatalı bir iki aşamalı doğrulama kodu kullandı.
+      further_actions_html: Eğer bu kişi siz değilseniz, hemen %{action} yapmanızı öneriyoruz çünkü hesabınız ifşa olmuş olabilir.
+      subject: İki aşamalı doğrulama başarısızlığı
+      title: Başarısız iki aşamalı kimlik doğrulama
     suspicious_sign_in:
       change_password: parolanızı değiştirin
       details: 'Oturum açma ayrıntıları şöyledir:'
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 80bb5653ca..272787ce25 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1758,6 +1758,12 @@ zh-CN:
       extra: 现在它可以下载了！
       subject: 你的存档已经准备完毕
       title: 存档导出
+    failed_2fa:
+      details: 以下是该次登录尝试的详情：
+      explanation: 有人试图登录到您的账户，但提供了无效的辅助认证因子。
+      further_actions_html: 如果这不是您所为，您的密码可能已经泄露，建议您立即 %{action} 。
+      subject: 辅助认证失败
+      title: 辅助认证失败
     suspicious_sign_in:
       change_password: 更改密码
       details: 以下是该次登录的详细信息：
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ac32c03e95..0c39aa8c0b 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1758,6 +1758,12 @@ zh-HK:
       extra: 現在可以下載了！
       subject: 你的備份檔已可供下載
       title: 檔案匯出
+    failed_2fa:
+      details: 以下是嘗試登入的細節：
+      explanation: 有人嘗試登入你的帳號，但沒有通過雙重認證。
+      further_actions_html: 如果這不是你，我們建議你立刻%{action}，因為你的帳號或已遭到侵害。
+      subject: 雙重認證失敗
+      title: 雙重認證失敗
     suspicious_sign_in:
       change_password: 更改你的密碼
       details: 以下是登入的細節：
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 6662e44cdc..8726ea72a4 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1760,6 +1760,12 @@ zh-TW:
       extra: 準備好下載了！
       subject: 您的備份檔已可供下載
       title: 檔案匯出
+    failed_2fa:
+      details: 以下是該登入嘗試之詳細資訊：
+      explanation: 有人嘗試登入您的帳號，但提供了無效的第二個驗證因子。
+      further_actions_html: 若這並非您所為，我們建議您立刻 %{action}，因為其可能已被入侵。
+      subject: 第二因子驗證失敗
+      title: 第二因子身份驗證失敗
     suspicious_sign_in:
       change_password: 變更密碼
       details: 以下是該登入之詳細資訊：

From ceade78182e882f3a045d4c6c748743bfc0b8f5e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 06:41:34 -0500
Subject: [PATCH 389/436] Fix `Rails/WhereExists` cop in app/services (#28853)

---
 .rubocop_todo.yml                                       | 2 --
 app/services/activitypub/fetch_remote_status_service.rb | 2 +-
 app/services/vote_service.rb                            | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c0fb7a5ce2..bef79e451a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -86,8 +86,6 @@ Rails/WhereExists:
     - 'app/models/status.rb'
     - 'app/policies/status_policy.rb'
     - 'app/serializers/rest/announcement_serializer.rb'
-    - 'app/services/activitypub/fetch_remote_status_service.rb'
-    - 'app/services/vote_service.rb'
     - 'app/workers/move_worker.rb'
     - 'spec/models/account_spec.rb'
     - 'spec/services/activitypub/process_collection_service_spec.rb'
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index a491b32b26..e3a9b60b56 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -44,7 +44,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
 
     # If we fetched a status that already exists, then we need to treat the
     # activity as an update rather than create
-    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.where(uri: object_uri, account_id: actor.id).exists?
+    activity_json['type'] = 'Update' if equals_or_includes_any?(activity_json['type'], %w(Create)) && Status.exists?(uri: object_uri, account_id: actor.id)
 
     with_redis do |redis|
       discoveries = redis.incr("status_discovery_per_request:#{@request_id}")
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 3e92a1690a..878350388b 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -19,7 +19,7 @@ class VoteService < BaseService
     already_voted = true
 
     with_redis_lock("vote:#{@poll.id}:#{@account.id}") do
-      already_voted = @poll.votes.where(account: @account).exists?
+      already_voted = @poll.votes.exists?(account: @account)
 
       ApplicationRecord.transaction do
         @choices.each do |choice|

From c0e8e457abee9d6f6dd20338bdaac90cb9e1f7bc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 Jan 2024 06:41:54 -0500
Subject: [PATCH 390/436] Eager loading fixes for `api/` controllers (#28848)

---
 .../api/v1/accounts/follower_accounts_controller.rb           | 2 +-
 .../api/v1/accounts/following_accounts_controller.rb          | 2 +-
 app/controllers/api/v1/blocks_controller.rb                   | 2 +-
 app/controllers/api/v1/directories_controller.rb              | 2 +-
 app/controllers/api/v1/endorsements_controller.rb             | 2 +-
 app/controllers/api/v1/follow_requests_controller.rb          | 2 +-
 app/controllers/api/v1/lists/accounts_controller.rb           | 4 ++--
 app/controllers/api/v1/mutes_controller.rb                    | 2 +-
 .../api/v1/statuses/favourited_by_accounts_controller.rb      | 2 +-
 .../api/v1/statuses/reblogged_by_accounts_controller.rb       | 2 +-
 app/controllers/api/v2/filters_controller.rb                  | 2 +-
 app/models/account_suggestions.rb                             | 2 +-
 app/models/report.rb                                          | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index d6a5a7176d..f60181f1eb 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:active_relationships, :account_stat).references(:active_relationships)
+    Account.includes(:active_relationships, :account_stat, :user).references(:active_relationships)
   end
 
   def paginated_follows
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index b8578ef539..3ab8c1efd6 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -30,7 +30,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:passive_relationships, :account_stat).references(:passive_relationships)
+    Account.includes(:passive_relationships, :account_stat, :user).references(:passive_relationships)
   end
 
   def paginated_follows
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 06a8bfa891..0934622f88 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::BlocksController < Api::BaseController
   end
 
   def paginated_blocks
-    @paginated_blocks ||= Block.eager_load(target_account: :account_stat)
+    @paginated_blocks ||= Block.eager_load(target_account: [:account_stat, :user])
                                .joins(:target_account)
                                .merge(Account.without_suspended)
                                .where(account: current_account)
diff --git a/app/controllers/api/v1/directories_controller.rb b/app/controllers/api/v1/directories_controller.rb
index e79b20ce42..6c540404ea 100644
--- a/app/controllers/api/v1/directories_controller.rb
+++ b/app/controllers/api/v1/directories_controller.rb
@@ -27,7 +27,7 @@ class Api::V1::DirectoriesController < Api::BaseController
       scope.merge!(local_account_scope) if local_accounts?
       scope.merge!(account_exclusion_scope) if current_account
       scope.merge!(account_domain_block_scope) if current_account && !local_accounts?
-    end
+    end.includes(:account_stat, user: :role)
   end
 
   def local_accounts?
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
index 46e3fcd647..2216a9860d 100644
--- a/app/controllers/api/v1/endorsements_controller.rb
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::EndorsementsController < Api::BaseController
   end
 
   def endorsed_accounts
-    current_account.endorsed_accounts.includes(:account_stat).without_suspended
+    current_account.endorsed_accounts.includes(:account_stat, :user).without_suspended
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index ee717ebbcc..87f6df5f94 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -37,7 +37,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
   end
 
   def default_accounts
-    Account.without_suspended.includes(:follow_requests, :account_stat).references(:follow_requests)
+    Account.without_suspended.includes(:follow_requests, :account_stat, :user).references(:follow_requests)
   end
 
   def paginated_follow_requests
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 8e12cb7b65..0604ad60fc 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController
 
   def load_accounts
     if unlimited?
-      @list.accounts.without_suspended.includes(:account_stat).all
+      @list.accounts.without_suspended.includes(:account_stat, :user).all
     else
-      @list.accounts.without_suspended.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+      @list.accounts.without_suspended.includes(:account_stat, :user).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
     end
   end
 
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 555485823c..2fb685ac39 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::MutesController < Api::BaseController
   end
 
   def paginated_mutes
-    @paginated_mutes ||= Mute.eager_load(:target_account)
+    @paginated_mutes ||= Mute.eager_load(target_account: [:account_stat, :user])
                              .joins(:target_account)
                              .merge(Account.without_suspended)
                              .where(account: current_account)
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 98b69c347f..069ad37cb2 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::V1::Statuses::Bas
   def default_accounts
     Account
       .without_suspended
-      .includes(:favourites, :account_stat)
+      .includes(:favourites, :account_stat, :user)
       .references(:favourites)
       .where(favourites: { status_id: @status.id })
   end
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index aacab5f8f4..b8a997518d 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::V1::Statuses::Base
   end
 
   def default_accounts
-    Account.without_suspended.includes(:statuses, :account_stat).references(:statuses)
+    Account.without_suspended.includes(:statuses, :account_stat, :user).references(:statuses)
   end
 
   def paginated_statuses
diff --git a/app/controllers/api/v2/filters_controller.rb b/app/controllers/api/v2/filters_controller.rb
index 2fcdeeae45..09d4813f34 100644
--- a/app/controllers/api/v2/filters_controller.rb
+++ b/app/controllers/api/v2/filters_controller.rb
@@ -35,7 +35,7 @@ class Api::V2::FiltersController < Api::BaseController
   private
 
   def set_filters
-    @filters = current_account.custom_filters.includes(:keywords)
+    @filters = current_account.custom_filters.includes(:keywords, :statuses)
   end
 
   def set_filter
diff --git a/app/models/account_suggestions.rb b/app/models/account_suggestions.rb
index d62176c7ca..25c8b04d50 100644
--- a/app/models/account_suggestions.rb
+++ b/app/models/account_suggestions.rb
@@ -29,7 +29,7 @@ class AccountSuggestions
       # a complicated query on this end.
 
       account_ids  = account_ids_with_sources[offset, limit]
-      accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat).index_by(&:id)
+      accounts_map = Account.where(id: account_ids.map(&:first)).includes(:account_stat, :user).index_by(&:id)
 
       account_ids.filter_map do |(account_id, source)|
         next unless accounts_map.key?(account_id)
diff --git a/app/models/report.rb b/app/models/report.rb
index 126701b3d6..38da26d7b7 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -41,7 +41,7 @@ class Report < ApplicationRecord
 
   scope :unresolved, -> { where(action_taken_at: nil) }
   scope :resolved,   -> { where.not(action_taken_at: nil) }
-  scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with({ user: [:invite_request, :invite] })) }
+  scope :with_accounts, -> { includes([:account, :target_account, :action_taken_by_account, :assigned_account].index_with([:account_stat, { user: [:invite_request, :invite, :ips] }])) }
 
   # A report is considered local if the reporter is local
   delegate :local?, to: :account

From 61a0ec69fcf5565a96c2cc53167f74e6ff0391d8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 23 Jan 2024 12:44:50 +0100
Subject: [PATCH 391/436] chore(deps): update devdependencies (non-major)
 (#28840)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 .devcontainer/codespaces/devcontainer.json | 18 ++++-----
 .devcontainer/devcontainer.json            | 16 ++++----
 jsconfig.json                              |  4 +-
 streaming/tsconfig.json                    |  4 +-
 tsconfig.json                              |  8 ++--
 yarn.lock                                  | 46 +++++++++++-----------
 6 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index ca9156fdaa..b32e4026d2 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -5,7 +5,7 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   "features": {
-    "ghcr.io/devcontainers/features/sshd:1": {}
+    "ghcr.io/devcontainers/features/sshd:1": {},
   },
 
   "runServices": ["app", "db", "redis"],
@@ -15,16 +15,16 @@
   "portsAttributes": {
     "3000": {
       "label": "web",
-      "onAutoForward": "notify"
+      "onAutoForward": "notify",
     },
     "4000": {
       "label": "stream",
-      "onAutoForward": "silent"
-    }
+      "onAutoForward": "silent",
+    },
   },
 
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "silent",
   },
 
   "remoteEnv": {
@@ -33,7 +33,7 @@
     "STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev",
     "DISABLE_FORGERY_REQUEST_PROTECTION": "true",
     "ES_ENABLED": "",
-    "LIBRE_TRANSLATE_ENDPOINT": ""
+    "LIBRE_TRANSLATE_ENDPOINT": "",
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -43,7 +43,7 @@
   "customizations": {
     "vscode": {
       "settings": {},
-      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
-    }
-  }
+      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
+    },
+  },
 }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fa8d6542c1..ed71235b3b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 
   "features": {
-    "ghcr.io/devcontainers/features/sshd:1": {}
+    "ghcr.io/devcontainers/features/sshd:1": {},
   },
 
   "forwardPorts": [3000, 4000],
@@ -14,17 +14,17 @@
     "3000": {
       "label": "web",
       "onAutoForward": "notify",
-      "requireLocalPort": true
+      "requireLocalPort": true,
     },
     "4000": {
       "label": "stream",
       "onAutoForward": "silent",
-      "requireLocalPort": true
-    }
+      "requireLocalPort": true,
+    },
   },
 
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "silent",
   },
 
   "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -34,7 +34,7 @@
   "customizations": {
     "vscode": {
       "settings": {},
-      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
-    }
-  }
+      "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
+    },
+  },
 }
diff --git a/jsconfig.json b/jsconfig.json
index d52816a98b..7b710de83c 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,7 +11,7 @@
     "noEmit": true,
     "resolveJsonModule": true,
     "strict": false,
-    "target": "ES2022"
+    "target": "ES2022",
   },
-  "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
+  "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"],
 }
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index f7bb711b9b..a0cf68ef90 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -6,7 +6,7 @@
     "moduleResolution": "node",
     "noUnusedParameters": false,
     "tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
-    "paths": {}
+    "paths": {},
   },
-  "include": ["./*.js", "./.eslintrc.js"]
+  "include": ["./*.js", "./.eslintrc.js"],
 }
diff --git a/tsconfig.json b/tsconfig.json
index a193ea35f2..dc71fc4a9c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,12 +15,12 @@
     "paths": {
       "mastodon": ["app/javascript/mastodon"],
       "mastodon/*": ["app/javascript/mastodon/*"],
-      "@/*": ["app/javascript/*"]
-    }
+      "@/*": ["app/javascript/*"],
+    },
   },
   "include": [
     "app/javascript/mastodon",
     "app/javascript/packs",
-    "app/javascript/types"
-  ]
+    "app/javascript/types",
+  ],
 }
diff --git a/yarn.lock b/yarn.lock
index aca2278f9f..61f699d19e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1538,7 +1538,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.4.0":
+"@csstools/css-parser-algorithms@npm:^2.5.0":
   version: 2.5.0
   resolution: "@csstools/css-parser-algorithms@npm:2.5.0"
   peerDependencies:
@@ -1547,14 +1547,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.2.2":
+"@csstools/css-tokenizer@npm:^2.2.3":
   version: 2.2.3
   resolution: "@csstools/css-tokenizer@npm:2.2.3"
   checksum: 557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.6":
+"@csstools/media-query-list-parser@npm:^2.1.7":
   version: 2.1.7
   resolution: "@csstools/media-query-list-parser@npm:2.1.7"
   peerDependencies:
@@ -1777,8 +1777,8 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.2.4
-  resolution: "@formatjs/cli@npm:6.2.4"
+  version: 6.2.6
+  resolution: "@formatjs/cli@npm:6.2.6"
   peerDependencies:
     vue: ^3.3.4
   peerDependenciesMeta:
@@ -1786,7 +1786,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 3f6bbbc633a3a6ebd4e6fcfc3a9f889bc044043452cbc8f81abcaee97aaef991a778ae785d3b9d21ecc5f55b147eb0009b44520bb895fe244b4c14a36d9b05bd
+  checksum: f8b0bc45c72b83437f0dc91a2d3ea513852c11bfd8eedbc2f255b19552f153bccb4d38fcd281f897ca60d0dfddf2b99de22e5a87cb1e173ca11df88c61cde2e4
   languageName: node
   linkType: hard
 
@@ -11330,10 +11330,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "meow@npm:13.0.0"
-  checksum: fab0f91578154c048e792a81704f3f28099ffff900f364df8a85f6e770a57e1c124859a25e186186e149dad30692c7893af0dfd71517bea343bfe5d749b1fa04
+"meow@npm:^13.1.0":
+  version: 13.1.0
+  resolution: "meow@npm:13.1.0"
+  checksum: 2dac9dbf99a17ce29618fe5919072a9b28e2aedb9547f9b1f15d046d5501dd6c14fe1f35f7a5665d0ee7111c98c4d359fcf3f985463ec5896dd50177363f442d
   languageName: node
   linkType: hard
 
@@ -13200,7 +13200,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.32":
+"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.33":
   version: 8.4.33
   resolution: "postcss@npm:8.4.33"
   dependencies:
@@ -13295,11 +13295,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.0.0":
-  version: 3.2.2
-  resolution: "prettier@npm:3.2.2"
+  version: 3.2.4
+  resolution: "prettier@npm:3.2.4"
   bin:
     prettier: bin/prettier.cjs
-  checksum: e84d0d2a4ce2b88ee1636904effbdf68b59da63d9f887128f2ed5382206454185432e7c0a9578bc4308bc25d099cfef47fd0b9c211066777854e23e65e34044d
+  checksum: 88dfeb78ac6096522c9a5b81f1413d875f568420d9bb6a5e5103527912519b993f2bcdcac311fcff5718d5869671d44e4f85827d3626f3a6ce32b9abc65d88e0
   languageName: node
   linkType: hard
 
@@ -15785,12 +15785,12 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.0.2":
-  version: 16.1.0
-  resolution: "stylelint@npm:16.1.0"
+  version: 16.2.0
+  resolution: "stylelint@npm:16.2.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^2.4.0"
-    "@csstools/css-tokenizer": "npm:^2.2.2"
-    "@csstools/media-query-list-parser": "npm:^2.1.6"
+    "@csstools/css-parser-algorithms": "npm:^2.5.0"
+    "@csstools/css-tokenizer": "npm:^2.2.3"
+    "@csstools/media-query-list-parser": "npm:^2.1.7"
     "@csstools/selector-specificity": "npm:^3.0.1"
     balanced-match: "npm:^2.0.0"
     colord: "npm:^2.9.3"
@@ -15810,14 +15810,14 @@ __metadata:
     is-plain-object: "npm:^5.0.0"
     known-css-properties: "npm:^0.29.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^13.0.0"
+    meow: "npm:^13.1.0"
     micromatch: "npm:^4.0.5"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.0.0"
-    postcss: "npm:^8.4.32"
+    postcss: "npm:^8.4.33"
     postcss-resolve-nested-selector: "npm:^0.1.1"
     postcss-safe-parser: "npm:^7.0.0"
-    postcss-selector-parser: "npm:^6.0.13"
+    postcss-selector-parser: "npm:^6.0.15"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
@@ -15828,7 +15828,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 765eea0b07319d1e7989502c07b8b5794938e5a8542bec00990b09ec10c3f7006891689930099e948d06c9ef9982066edb98b1ea64a435138a6b0f0905eb2b87
+  checksum: 6fdf0451833c11b18c9aa502f687febd6881a912ac94f39d509b894b0f74ccb636f3dac2991c69cc82dc6190731cc2fa48e307fed477d2a0fce57067cd22b572
   languageName: node
   linkType: hard
 

From 01ce9df88008cee705b7e02a4581802afa07c3df Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Jan 2024 08:03:30 +0100
Subject: [PATCH 392/436] Fix search form re-rendering spuriously in web UI
 (#28876)

---
 .../features/compose/containers/search_container.js       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/containers/search_container.js b/app/javascript/mastodon/features/compose/containers/search_container.js
index 758b6b07db..616b91369c 100644
--- a/app/javascript/mastodon/features/compose/containers/search_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_container.js
@@ -1,3 +1,4 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { connect } from 'react-redux';
 
 import {
@@ -12,10 +13,15 @@ import {
 
 import Search from '../components/search';
 
+const getRecentSearches = createSelector(
+  state => state.getIn(['search', 'recent']),
+  recent => recent.reverse(),
+);
+
 const mapStateToProps = state => ({
   value: state.getIn(['search', 'value']),
   submitted: state.getIn(['search', 'submitted']),
-  recent: state.getIn(['search', 'recent']).reverse(),
+  recent: getRecentSearches(state),
 });
 
 const mapDispatchToProps = dispatch => ({

From 5b1eb09d546120cb456990e15a740d994011013f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Jan 2024 10:38:10 +0100
Subject: [PATCH 393/436] Add annual reports for accounts (#28693)

---
 .../api/v1/annual_reports_controller.rb       | 30 +++++++++
 app/lib/annual_report.rb                      | 43 +++++++++++++
 app/lib/annual_report/archetype.rb            | 49 +++++++++++++++
 .../commonly_interacted_with_accounts.rb      | 22 +++++++
 .../annual_report/most_reblogged_accounts.rb  | 22 +++++++
 app/lib/annual_report/most_used_apps.rb       | 22 +++++++
 app/lib/annual_report/percentiles.rb          | 62 +++++++++++++++++++
 app/lib/annual_report/source.rb               | 16 +++++
 app/lib/annual_report/time_series.rb          | 30 +++++++++
 app/lib/annual_report/top_hashtags.rb         | 22 +++++++
 app/lib/annual_report/top_statuses.rb         | 21 +++++++
 app/lib/annual_report/type_distribution.rb    | 20 ++++++
 app/models/generated_annual_report.rb         | 37 +++++++++++
 app/presenters/annual_reports_presenter.rb    | 23 +++++++
 .../rest/annual_report_serializer.rb          |  5 ++
 .../rest/annual_reports_serializer.rb         |  7 +++
 app/workers/generate_annual_report_worker.rb  | 11 ++++
 app/workers/scheduler/indexing_scheduler.rb   |  2 +
 config/routes/api.rb                          |  6 ++
 ...1033014_create_generated_annual_reports.rb | 17 +++++
 db/schema.rb                                  | 14 ++++-
 21 files changed, 480 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/v1/annual_reports_controller.rb
 create mode 100644 app/lib/annual_report.rb
 create mode 100644 app/lib/annual_report/archetype.rb
 create mode 100644 app/lib/annual_report/commonly_interacted_with_accounts.rb
 create mode 100644 app/lib/annual_report/most_reblogged_accounts.rb
 create mode 100644 app/lib/annual_report/most_used_apps.rb
 create mode 100644 app/lib/annual_report/percentiles.rb
 create mode 100644 app/lib/annual_report/source.rb
 create mode 100644 app/lib/annual_report/time_series.rb
 create mode 100644 app/lib/annual_report/top_hashtags.rb
 create mode 100644 app/lib/annual_report/top_statuses.rb
 create mode 100644 app/lib/annual_report/type_distribution.rb
 create mode 100644 app/models/generated_annual_report.rb
 create mode 100644 app/presenters/annual_reports_presenter.rb
 create mode 100644 app/serializers/rest/annual_report_serializer.rb
 create mode 100644 app/serializers/rest/annual_reports_serializer.rb
 create mode 100644 app/workers/generate_annual_report_worker.rb
 create mode 100644 db/migrate/20240111033014_create_generated_annual_reports.rb

diff --git a/app/controllers/api/v1/annual_reports_controller.rb b/app/controllers/api/v1/annual_reports_controller.rb
new file mode 100644
index 0000000000..9bc8e68ac2
--- /dev/null
+++ b/app/controllers/api/v1/annual_reports_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Api::V1::AnnualReportsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, except: :index
+  before_action :require_user!
+  before_action :set_annual_report, except: :index
+
+  def index
+    with_read_replica do
+      @presenter = AnnualReportsPresenter.new(GeneratedAnnualReport.where(account_id: current_account.id).pending)
+      @relationships = StatusRelationshipsPresenter.new(@presenter.statuses, current_account.id)
+    end
+
+    render json: @presenter,
+           serializer: REST::AnnualReportsSerializer,
+           relationships: @relationships
+  end
+
+  def read
+    @annual_report.view!
+    render_empty
+  end
+
+  private
+
+  def set_annual_report
+    @annual_report = GeneratedAnnualReport.find_by!(account_id: current_account.id, year: params[:id])
+  end
+end
diff --git a/app/lib/annual_report.rb b/app/lib/annual_report.rb
new file mode 100644
index 0000000000..cf4297f2a4
--- /dev/null
+++ b/app/lib/annual_report.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class AnnualReport
+  include DatabaseHelper
+
+  SOURCES = [
+    AnnualReport::Archetype,
+    AnnualReport::TypeDistribution,
+    AnnualReport::TopStatuses,
+    AnnualReport::MostUsedApps,
+    AnnualReport::CommonlyInteractedWithAccounts,
+    AnnualReport::TimeSeries,
+    AnnualReport::TopHashtags,
+    AnnualReport::MostRebloggedAccounts,
+    AnnualReport::Percentiles,
+  ].freeze
+
+  SCHEMA = 1
+
+  def initialize(account, year)
+    @account = account
+    @year = year
+  end
+
+  def generate
+    return if GeneratedAnnualReport.exists?(account: @account, year: @year)
+
+    GeneratedAnnualReport.create(
+      account: @account,
+      year: @year,
+      schema_version: SCHEMA,
+      data: data
+    )
+  end
+
+  private
+
+  def data
+    with_read_replica do
+      SOURCES.each_with_object({}) { |klass, hsh| hsh.merge!(klass.new(@account, @year).generate) }
+    end
+  end
+end
diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
new file mode 100644
index 0000000000..ea9ef366df
--- /dev/null
+++ b/app/lib/annual_report/archetype.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AnnualReport::Archetype < AnnualReport::Source
+  # Average number of posts (including replies and reblogs) made by
+  # each active user in a single year (2023)
+  AVERAGE_PER_YEAR = 113
+
+  def generate
+    {
+      archetype: archetype,
+    }
+  end
+
+  private
+
+  def archetype
+    if (standalone_count + replies_count + reblogs_count) < AVERAGE_PER_YEAR
+      :lurker
+    elsif reblogs_count > (standalone_count * 2)
+      :booster
+    elsif polls_count > (standalone_count * 0.1) # standalone_count includes posts with polls
+      :pollster
+    elsif replies_count > (standalone_count * 2)
+      :replier
+    else
+      :oracle
+    end
+  end
+
+  def polls_count
+    @polls_count ||= base_scope.where.not(poll_id: nil).count
+  end
+
+  def reblogs_count
+    @reblogs_count ||= base_scope.where.not(reblog_of_id: nil).count
+  end
+
+  def replies_count
+    @replies_count ||= base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
+  end
+
+  def standalone_count
+    @standalone_count ||= base_scope.without_replies.without_reblogs.count
+  end
+
+  def base_scope
+    @account.statuses.where(id: year_as_snowflake_range)
+  end
+end
diff --git a/app/lib/annual_report/commonly_interacted_with_accounts.rb b/app/lib/annual_report/commonly_interacted_with_accounts.rb
new file mode 100644
index 0000000000..af5e854c22
--- /dev/null
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::CommonlyInteractedWithAccounts < AnnualReport::Source
+  SET_SIZE = 40
+
+  def generate
+    {
+      commonly_interacted_with_accounts: commonly_interacted_with_accounts.map do |(account_id, count)|
+                                           {
+                                             account_id: account_id,
+                                             count: count,
+                                           }
+                                         end,
+    }
+  end
+
+  private
+
+  def commonly_interacted_with_accounts
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('in_reply_to_account_id, count(*) AS total'))
+  end
+end
diff --git a/app/lib/annual_report/most_reblogged_accounts.rb b/app/lib/annual_report/most_reblogged_accounts.rb
new file mode 100644
index 0000000000..e3e8a7c90b
--- /dev/null
+++ b/app/lib/annual_report/most_reblogged_accounts.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostRebloggedAccounts < AnnualReport::Source
+  SET_SIZE = 10
+
+  def generate
+    {
+      most_reblogged_accounts: most_reblogged_accounts.map do |(account_id, count)|
+                                 {
+                                   account_id: account_id,
+                                   count: count,
+                                 }
+                               end,
+    }
+  end
+
+  private
+
+  def most_reblogged_accounts
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).where.not(reblog_of_id: nil).joins(reblog: :account).group('accounts.id').having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('accounts.id, count(*) as total'))
+  end
+end
diff --git a/app/lib/annual_report/most_used_apps.rb b/app/lib/annual_report/most_used_apps.rb
new file mode 100644
index 0000000000..85ff1ff86e
--- /dev/null
+++ b/app/lib/annual_report/most_used_apps.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::MostUsedApps < AnnualReport::Source
+  SET_SIZE = 10
+
+  def generate
+    {
+      most_used_apps: most_used_apps.map do |(name, count)|
+                        {
+                          name: name,
+                          count: count,
+                        }
+                      end,
+    }
+  end
+
+  private
+
+  def most_used_apps
+    @account.statuses.reorder(nil).where(id: year_as_snowflake_range).joins(:application).group('oauth_applications.name').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('oauth_applications.name, count(*) as total'))
+  end
+end
diff --git a/app/lib/annual_report/percentiles.rb b/app/lib/annual_report/percentiles.rb
new file mode 100644
index 0000000000..9fe4698ee5
--- /dev/null
+++ b/app/lib/annual_report/percentiles.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class AnnualReport::Percentiles < AnnualReport::Source
+  def generate
+    {
+      percentiles: {
+        followers: (total_with_fewer_followers / (total_with_any_followers + 1.0)) * 100,
+        statuses: (total_with_fewer_statuses / (total_with_any_statuses + 1.0)) * 100,
+      },
+    }
+  end
+
+  private
+
+  def followers_gained
+    @followers_gained ||= @account.passive_relationships.where("date_part('year', follows.created_at) = ?", @year).count
+  end
+
+  def statuses_created
+    @statuses_created ||= @account.statuses.where(id: year_as_snowflake_range).count
+  end
+
+  def total_with_fewer_followers
+    @total_with_fewer_followers ||= Follow.find_by_sql([<<~SQL.squish, { year: @year, comparison: followers_gained }]).first.total
+      WITH tmp0 AS (
+        SELECT follows.target_account_id
+        FROM follows
+        INNER JOIN accounts ON accounts.id = follows.target_account_id
+        WHERE date_part('year', follows.created_at) = :year
+          AND accounts.domain IS NULL
+        GROUP BY follows.target_account_id
+        HAVING COUNT(*) < :comparison
+      )
+      SELECT count(*) AS total
+      FROM tmp0
+    SQL
+  end
+
+  def total_with_fewer_statuses
+    @total_with_fewer_statuses ||= Status.find_by_sql([<<~SQL.squish, { comparison: statuses_created, min_id: year_as_snowflake_range.first, max_id: year_as_snowflake_range.last }]).first.total
+      WITH tmp0 AS (
+        SELECT statuses.account_id
+        FROM statuses
+        INNER JOIN accounts ON accounts.id = statuses.account_id
+        WHERE statuses.id BETWEEN :min_id AND :max_id
+          AND accounts.domain IS NULL
+        GROUP BY statuses.account_id
+        HAVING count(*) < :comparison
+      )
+      SELECT count(*) AS total
+      FROM tmp0
+    SQL
+  end
+
+  def total_with_any_followers
+    @total_with_any_followers ||= Follow.where("date_part('year', follows.created_at) = ?", @year).joins(:target_account).merge(Account.local).count('distinct follows.target_account_id')
+  end
+
+  def total_with_any_statuses
+    @total_with_any_statuses ||= Status.where(id: year_as_snowflake_range).joins(:account).merge(Account.local).count('distinct statuses.account_id')
+  end
+end
diff --git a/app/lib/annual_report/source.rb b/app/lib/annual_report/source.rb
new file mode 100644
index 0000000000..1ccb622676
--- /dev/null
+++ b/app/lib/annual_report/source.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AnnualReport::Source
+  attr_reader :account, :year
+
+  def initialize(account, year)
+    @account = account
+    @year = year
+  end
+
+  protected
+
+  def year_as_snowflake_range
+    (Mastodon::Snowflake.id_at(DateTime.new(year, 1, 1))..Mastodon::Snowflake.id_at(DateTime.new(year, 12, 31)))
+  end
+end
diff --git a/app/lib/annual_report/time_series.rb b/app/lib/annual_report/time_series.rb
new file mode 100644
index 0000000000..a144bac0d1
--- /dev/null
+++ b/app/lib/annual_report/time_series.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class AnnualReport::TimeSeries < AnnualReport::Source
+  def generate
+    {
+      time_series: (1..12).map do |month|
+                     {
+                       month: month,
+                       statuses: statuses_per_month[month] || 0,
+                       following: following_per_month[month] || 0,
+                       followers: followers_per_month[month] || 0,
+                     }
+                   end,
+    }
+  end
+
+  private
+
+  def statuses_per_month
+    @statuses_per_month ||= @account.statuses.reorder(nil).where(id: year_as_snowflake_range).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+
+  def following_per_month
+    @following_per_month ||= @account.active_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+
+  def followers_per_month
+    @followers_per_month ||= @account.passive_relationships.where("date_part('year', created_at) = ?", @year).group(:period).pluck(Arel.sql("date_part('month', created_at)::int AS period, count(*)")).to_h
+  end
+end
diff --git a/app/lib/annual_report/top_hashtags.rb b/app/lib/annual_report/top_hashtags.rb
new file mode 100644
index 0000000000..488dacb1b4
--- /dev/null
+++ b/app/lib/annual_report/top_hashtags.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopHashtags < AnnualReport::Source
+  SET_SIZE = 40
+
+  def generate
+    {
+      top_hashtags: top_hashtags.map do |(name, count)|
+                      {
+                        name: name,
+                        count: count,
+                      }
+                    end,
+    }
+  end
+
+  private
+
+  def top_hashtags
+    Tag.joins(:statuses).where(statuses: { id: @account.statuses.where(id: year_as_snowflake_range).reorder(nil).select(:id) }).group(:id).having('count(*) > 1').order(total: :desc).limit(SET_SIZE).pluck(Arel.sql('COALESCE(tags.display_name, tags.name), count(*) AS total'))
+  end
+end
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
new file mode 100644
index 0000000000..112e5591ce
--- /dev/null
+++ b/app/lib/annual_report/top_statuses.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AnnualReport::TopStatuses < AnnualReport::Source
+  def generate
+    top_reblogs = base_scope.order(reblogs_count: :desc).first&.id
+    top_favourites = base_scope.where.not(id: top_reblogs).order(favourites_count: :desc).first&.id
+    top_replies = base_scope.where.not(id: [top_reblogs, top_favourites]).order(replies_count: :desc).first&.id
+
+    {
+      top_statuses: {
+        by_reblogs: top_reblogs,
+        by_favourites: top_favourites,
+        by_replies: top_replies,
+      },
+    }
+  end
+
+  def base_scope
+    @account.statuses.with_public_visibility.joins(:status_stat).where(id: year_as_snowflake_range).reorder(nil)
+  end
+end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
new file mode 100644
index 0000000000..fc12a6f1f4
--- /dev/null
+++ b/app/lib/annual_report/type_distribution.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AnnualReport::TypeDistribution < AnnualReport::Source
+  def generate
+    {
+      type_distribution: {
+        total: base_scope.count,
+        reblogs: base_scope.where.not(reblog_of_id: nil).count,
+        replies: base_scope.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
+        standalone: base_scope.without_replies.without_reblogs.count,
+      },
+    }
+  end
+
+  private
+
+  def base_scope
+    @account.statuses.where(id: year_as_snowflake_range)
+  end
+end
diff --git a/app/models/generated_annual_report.rb b/app/models/generated_annual_report.rb
new file mode 100644
index 0000000000..43c97d7108
--- /dev/null
+++ b/app/models/generated_annual_report.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: generated_annual_reports
+#
+#  id             :bigint(8)        not null, primary key
+#  account_id     :bigint(8)        not null
+#  year           :integer          not null
+#  data           :jsonb            not null
+#  schema_version :integer          not null
+#  viewed_at      :datetime
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#
+
+class GeneratedAnnualReport < ApplicationRecord
+  belongs_to :account
+
+  scope :pending, -> { where(viewed_at: nil) }
+
+  def viewed?
+    viewed_at.present?
+  end
+
+  def view!
+    update!(viewed_at: Time.now.utc)
+  end
+
+  def account_ids
+    data['most_reblogged_accounts'].pluck('account_id') + data['commonly_interacted_with_accounts'].pluck('account_id')
+  end
+
+  def status_ids
+    data['top_statuses'].values
+  end
+end
diff --git a/app/presenters/annual_reports_presenter.rb b/app/presenters/annual_reports_presenter.rb
new file mode 100644
index 0000000000..001e1d37b0
--- /dev/null
+++ b/app/presenters/annual_reports_presenter.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AnnualReportsPresenter
+  alias read_attribute_for_serialization send
+
+  attr_reader :annual_reports
+
+  def initialize(annual_reports)
+    @annual_reports = annual_reports
+  end
+
+  def accounts
+    @accounts ||= Account.where(id: @annual_reports.flat_map(&:account_ids)).includes(:account_stat, :moved_to_account, user: :role)
+  end
+
+  def statuses
+    @statuses ||= Status.where(id: @annual_reports.flat_map(&:status_ids)).with_includes
+  end
+
+  def self.model_name
+    @model_name ||= ActiveModel::Name.new(self)
+  end
+end
diff --git a/app/serializers/rest/annual_report_serializer.rb b/app/serializers/rest/annual_report_serializer.rb
new file mode 100644
index 0000000000..1fb5ddb5c1
--- /dev/null
+++ b/app/serializers/rest/annual_report_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportSerializer < ActiveModel::Serializer
+  attributes :year, :data, :schema_version
+end
diff --git a/app/serializers/rest/annual_reports_serializer.rb b/app/serializers/rest/annual_reports_serializer.rb
new file mode 100644
index 0000000000..ea9572be1b
--- /dev/null
+++ b/app/serializers/rest/annual_reports_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class REST::AnnualReportsSerializer < ActiveModel::Serializer
+  has_many :annual_reports, serializer: REST::AnnualReportSerializer
+  has_many :accounts, serializer: REST::AccountSerializer
+  has_many :statuses, serializer: REST::StatusSerializer
+end
diff --git a/app/workers/generate_annual_report_worker.rb b/app/workers/generate_annual_report_worker.rb
new file mode 100644
index 0000000000..7094c1ab9c
--- /dev/null
+++ b/app/workers/generate_annual_report_worker.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class GenerateAnnualReportWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, year)
+    AnnualReport.new(Account.find(account_id), year).generate
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordNotUnique
+    true
+  end
+end
diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb
index 5c985e25a0..f52d0141d4 100644
--- a/app/workers/scheduler/indexing_scheduler.rb
+++ b/app/workers/scheduler/indexing_scheduler.rb
@@ -24,6 +24,8 @@ class Scheduler::IndexingScheduler
     end
   end
 
+  private
+
   def indexes
     [AccountsIndex, TagsIndex, PublicStatusesIndex, StatusesIndex]
   end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 0fe9f69abc..853a44e0e1 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -51,6 +51,12 @@ namespace :api, format: false do
     resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
     resources :preferences, only: [:index]
 
+    resources :annual_reports, only: [:index] do
+      member do
+        post :read
+      end
+    end
+
     resources :announcements, only: [:index] do
       scope module: :announcements do
         resources :reactions, only: [:update, :destroy]
diff --git a/db/migrate/20240111033014_create_generated_annual_reports.rb b/db/migrate/20240111033014_create_generated_annual_reports.rb
new file mode 100644
index 0000000000..2a755fb14e
--- /dev/null
+++ b/db/migrate/20240111033014_create_generated_annual_reports.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateGeneratedAnnualReports < ActiveRecord::Migration[7.1]
+  def change
+    create_table :generated_annual_reports do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_cascade: :delete }, index: false
+      t.integer :year, null: false
+      t.jsonb :data, null: false
+      t.integer :schema_version, null: false
+      t.datetime :viewed_at
+
+      t.timestamps
+    end
+
+    add_index :generated_annual_reports, [:account_id, :year], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cbe54c1db7..50f4e7189d 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[7.1].define(version: 2024_01_09_103012) do
+ActiveRecord::Schema[7.1].define(version: 2024_01_11_033014) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -516,6 +516,17 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
     t.index ["target_account_id"], name: "index_follows_on_target_account_id"
   end
 
+  create_table "generated_annual_reports", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.integer "year", null: false
+    t.jsonb "data", null: false
+    t.integer "schema_version", null: false
+    t.datetime "viewed_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "year"], name: "index_generated_annual_reports_on_account_id_and_year", unique: true
+  end
+
   create_table "identities", force: :cascade do |t|
     t.string "provider", default: "", null: false
     t.string "uid", default: "", null: false
@@ -1226,6 +1237,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_09_103012) do
   add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
   add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
   add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
+  add_foreign_key "generated_annual_reports", "accounts"
   add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
   add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
   add_foreign_key "invites", "users", on_delete: :cascade

From 599bc69503e9ef54655626052c8337cedb8519d0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 04:57:32 -0500
Subject: [PATCH 394/436] Simplify `AccountSummary.filtered` query generation
 (#28868)

---
 app/models/account_summary.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/account_summary.rb b/app/models/account_summary.rb
index 0d8835b83c..2a21d09a8b 100644
--- a/app/models/account_summary.rb
+++ b/app/models/account_summary.rb
@@ -12,9 +12,11 @@
 class AccountSummary < ApplicationRecord
   self.primary_key = :account_id
 
+  has_many :follow_recommendation_suppressions, primary_key: :account_id, foreign_key: :account_id, inverse_of: false
+
   scope :safe, -> { where(sensitive: false) }
   scope :localized, ->(locale) { where(language: locale) }
-  scope :filtered, -> { joins(arel_table.join(FollowRecommendationSuppression.arel_table, Arel::Nodes::OuterJoin).on(arel_table[:account_id].eq(FollowRecommendationSuppression.arel_table[:account_id])).join_sources).where(FollowRecommendationSuppression.arel_table[:id].eq(nil)) }
+  scope :filtered, -> { where.missing(:follow_recommendation_suppressions) }
 
   def self.refresh
     Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)

From 9d413cbaf83f1a030a250806302c1a21435559d7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 04:57:49 -0500
Subject: [PATCH 395/436] Fix `Rails/WhereExists` cop in app/models (#28863)

---
 .rubocop_todo.yml                | 3 ---
 app/models/poll.rb               | 2 +-
 app/models/session_activation.rb | 2 +-
 app/models/status.rb             | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index bef79e451a..b62dfa72a8 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -81,9 +81,6 @@ Rails/WhereExists:
     - 'app/lib/delivery_failure_tracker.rb'
     - 'app/lib/feed_manager.rb'
     - 'app/lib/suspicious_sign_in_detector.rb'
-    - 'app/models/poll.rb'
-    - 'app/models/session_activation.rb'
-    - 'app/models/status.rb'
     - 'app/policies/status_policy.rb'
     - 'app/serializers/rest/announcement_serializer.rb'
     - 'app/workers/move_worker.rb'
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 37149c3d86..cc4184f80a 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -57,7 +57,7 @@ class Poll < ApplicationRecord
   end
 
   def voted?(account)
-    account.id == account_id || votes.where(account: account).exists?
+    account.id == account_id || votes.exists?(account: account)
   end
 
   def own_votes(account)
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 7f5f0d9a9a..c67180d3ba 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -41,7 +41,7 @@ class SessionActivation < ApplicationRecord
 
   class << self
     def active?(id)
-      id && where(session_id: id).exists?
+      id && exists?(session_id: id)
     end
 
     def activate(**options)
diff --git a/app/models/status.rb b/app/models/status.rb
index 9a2169f995..e3d41cceda 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -263,7 +263,7 @@ class Status < ApplicationRecord
   end
 
   def reported?
-    @reported ||= Report.where(target_account: account).unresolved.where('? = ANY(status_ids)', id).exists?
+    @reported ||= Report.where(target_account: account).unresolved.exists?(['? = ANY(status_ids)', id])
   end
 
   def emojis

From a34d27c18f936b63fa1d595b42b69df618793a69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:06:56 +0100
Subject: [PATCH 396/436] New Crowdin Translations (automated) (#28875)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 config/locales/ar.yml             |  1 +
 config/locales/bg.yml             |  1 +
 config/locales/da.yml             |  6 ++++++
 config/locales/devise.ru.yml      |  9 +++++++++
 config/locales/devise.sq.yml      |  9 +++++++++
 config/locales/es-MX.yml          |  4 ++++
 config/locales/es.yml             |  4 ++++
 config/locales/fy.yml             |  6 ++++++
 config/locales/gl.yml             |  6 ++++++
 config/locales/ru.yml             | 14 ++++++++++++++
 config/locales/simple_form.sk.yml |  1 +
 config/locales/sk.yml             |  3 +++
 config/locales/sq.yml             | 13 +++++++++++++
 config/locales/tr.yml             |  2 +-
 config/locales/vi.yml             |  6 ++++++
 15 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3c8c643fe7..e6d653c674 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1934,6 +1934,7 @@ ar:
     go_to_sso_account_settings: انتقل إلى إعدادات حساب مزود الهوية الخاص بك
     invalid_otp_token: رمز المصادقة بخطوتين غير صالح
     otp_lost_help_html: إن فقدتَهُما ، يمكنك الاتصال بـ %{email}
+    rate_limited: عدد محاولات التحقق كثير جدًا، يرجى المحاولة مرة أخرى لاحقًا.
     seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة.
     signed_in_as: 'تم تسجيل دخولك بصفة:'
   verification:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c3eaa7e4c2..b9a3135448 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1793,6 +1793,7 @@ bg:
     failed_2fa:
       details: 'Ето подробности на опита за влизане:'
       explanation: Някой се опита да влезе в акаунта ви, но предостави невалиден втори фактор за удостоверяване.
+      further_actions_html: Ако не бяхте вие, то препоръчваме да направите %{action} незабавно, тъй като може да се злепостави.
       subject: Неуспешен втори фактор за удостоверяване
       title: Провал на втория фактор за удостоверяване
     suspicious_sign_in:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 58fd723aef..d92d001905 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1790,6 +1790,12 @@ da:
       extra: Sikkerhedskopien kan nu downloades!
       subject: Dit arkiv er klar til download
       title: Arkiv download
+    failed_2fa:
+      details: 'Her er detaljerne om login-forsøget:'
+      explanation: Nogen har forsøgt at logge ind på kontoen, men har angivet en ugyldig anden godkendelsesfaktor.
+      further_actions_html: Var dette ikke dig, anbefales det straks at %{action}, da den kan være kompromitteret.
+      subject: Anden faktor godkendelsesfejl
+      title: Fejlede på anden faktor godkendelse
     suspicious_sign_in:
       change_password: ændrer din adgangskode
       details: 'Her er nogle detaljer om login-forsøget:'
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index ccbd13438d..9dd418f2cd 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -47,14 +47,19 @@ ru:
         subject: 'Mastodon: Инструкция по сбросу пароля'
         title: Сброс пароля
       two_factor_disabled:
+        explanation: Вход в систему теперь возможен только с использованием адреса электронной почты и пароля.
         subject: 'Mastodon: Двухфакторная авторизация отключена'
+        subtitle: Двухфакторная аутентификация для вашей учетной записи была отключена.
         title: 2ФА отключена
       two_factor_enabled:
+        explanation: Для входа в систему потребуется токен, сгенерированный сопряженным приложением TOTP.
         subject: 'Mastodon: Настроена двухфакторная авторизация'
+        subtitle: Для вашей учетной записи была включена двухфакторная аутентификация.
         title: 2ФА включена
       two_factor_recovery_codes_changed:
         explanation: Предыдущие резервные коды были аннулированы и созданы новые.
         subject: 'Mastodon: Резервные коды двуфакторной авторизации обновлены'
+        subtitle: Предыдущие коды восстановления были аннулированы и сгенерированы новые.
         title: Коды восстановления 2FA изменены
       unlock_instructions:
         subject: 'Mastodon: Инструкция по разблокировке'
@@ -68,9 +73,13 @@ ru:
           subject: 'Мастодон: Ключ Безопасности удален'
           title: Один из ваших защитных ключей был удален
       webauthn_disabled:
+        explanation: Аутентификация с помощью ключей безопасности была отключена для вашей учетной записи.
+        extra: Теперь вход в систему возможен только с использованием токена, сгенерированного сопряженным приложением TOTP.
         subject: 'Мастодон: Аутентификация с ключами безопасности отключена'
         title: Ключи безопасности отключены
       webauthn_enabled:
+        explanation: Для вашей учетной записи включена аутентификация по ключу безопасности.
+        extra: Теперь ваш ключ безопасности можно использовать для входа в систему.
         subject: 'Мастодон: Включена аутентификация по ключу безопасности'
         title: Ключи безопасности включены
     omniauth_callbacks:
diff --git a/config/locales/devise.sq.yml b/config/locales/devise.sq.yml
index 7cea2f8e2e..32136a0baa 100644
--- a/config/locales/devise.sq.yml
+++ b/config/locales/devise.sq.yml
@@ -47,14 +47,19 @@ sq:
         subject: 'Mastodon: Udhëzime ricaktimi fjalëkalimi'
         title: Ricaktim fjalëkalimi
       two_factor_disabled:
+        explanation: Hyrja tanimë është e mundshme duke përdorur vetëm adresë email dhe fjalëkalim.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi dyfaktorësh'
+        subtitle: Mirëfilltësimi dyfaktorësh për llogarinë tuaj është çaktivizuar.
         title: 2FA u çaktivizua
       two_factor_enabled:
+        explanation: Për të kryer hyrjen do të kërkohet doemos një token i prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U aktivizua mirëfilltësimi dyfaktorësh'
+        subtitle: Për llogarinë tuaj është aktivizuar mirëfilltësmi dyfaktorësh.
         title: 2FA u aktivizua
       two_factor_recovery_codes_changed:
         explanation: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
         subject: 'Mastodon: U riprodhuan kode rikthimi dyfaktorësh'
+        subtitle: Kodet e dikurshëm të rikthimit janë bërë të pavlefshëm dhe janë prodhuar të rinj.
         title: Kodet e rikthimit 2FA u ndryshuan
       unlock_instructions:
         subject: 'Mastodon: Udhëzime shkyçjeje'
@@ -68,9 +73,13 @@ sq:
           subject: 'Mastodon: Fshirje kyçi sigurie'
           title: Një nga kyçet tuaj të sigurisë është fshirë
       webauthn_disabled:
+        explanation: Mirëfilltësimi me kyçe sigurie është çaktivizuar për llogarinë tuaj.
+        extra: Hyrjet tani janë të mundshme vetëm duke përdorur token-in e prodhuar nga aplikacioni TOTP i çiftuar.
         subject: 'Mastodon: U çaktivizua mirëfilltësimi me kyçe sigurie'
         title: U çaktivizuan kyçe sigurie
       webauthn_enabled:
+        explanation: Mirëfilltësimi me kyçe sigurie është aktivizuar për këtë llogari.
+        extra: Kyçi juaj i sigurisë tanimë mund të përdoret për hyrje.
         subject: 'Mastodon: U aktivizua mirëfilltësim me kyçe sigurie'
         title: U aktivizuan kyçe sigurie
     omniauth_callbacks:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 040d8a9d3c..b84fb7cf96 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1792,6 +1792,10 @@ es-MX:
       title: Descargar archivo
     failed_2fa:
       details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+      further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometido.
+      subject: Fallo de autenticación de segundo factor
+      title: Falló la autenticación de segundo factor
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ffe3eb5b00..95816d6bcb 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1792,6 +1792,10 @@ es:
       title: Descargar archivo
     failed_2fa:
       details: 'Estos son los detalles del intento de inicio de sesión:'
+      explanation: Alguien ha intentado iniciar sesión en tu cuenta pero proporcionó un segundo factor de autenticación inválido.
+      further_actions_html: Si no fuiste tú, se recomienda %{action} inmediatamente ya que puede estar comprometida.
+      subject: Fallo de autenticación del segundo factor
+      title: Fallo en la autenticación del segundo factor
     suspicious_sign_in:
       change_password: cambies tu contraseña
       details: 'Aquí están los detalles del inicio de sesión:'
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index f861bc3e4a..c59ad72725 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1790,6 +1790,12 @@ fy:
       extra: It stiet no klear om download te wurden!
       subject: Jo argyf stiet klear om download te wurden
       title: Argyf ophelje
+    failed_2fa:
+      details: 'Hjir binne de details fan de oanmeldbesykjen:'
+      explanation: Ien hat probearre om oan te melden op jo account, mar hat in ûnjildige twaddeferifikaasjefaktor opjûn.
+      further_actions_html: As jo dit net wiene, rekommandearje wy jo oan daliks %{action}, omdat it kompromitearre wêze kin.
+      subject: Twaddefaktorautentikaasjeflater
+      title: Twastapsferifikaasje mislearre
     suspicious_sign_in:
       change_password: wizigje jo wachtwurd
       details: 'Hjir binne de details fan oanmeldbesykjen:'
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3c43a4e23d..087ed2ec76 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1790,6 +1790,12 @@ gl:
       extra: Está preparada para descargala!
       subject: O teu ficheiro xa está preparado para descargar
       title: Leve o ficheiro
+    failed_2fa:
+      details: 'Detalles do intento de acceso:'
+      explanation: Alguén intentou acceder á túa conta mais fíxoo cun segundo factor de autenticación non válido.
+      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente xa que a conta podería estar en risco.
+      subject: Fallo co segundo factor de autenticación
+      title: Fallou o segundo factor de autenticación
     suspicious_sign_in:
       change_password: cambia o teu contrasinal
       details: 'Estos son os detalles do acceso:'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2644275c37..24edbdc75e 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -439,6 +439,7 @@ ru:
       view: Посмотреть доменные блокировки
     email_domain_blocks:
       add_new: Добавить новую
+      allow_registrations_with_approval: Разрешить регистрацию с одобрением
       attempts_over_week:
         few: "%{count} попытки за последнюю неделю"
         many: "%{count} попыток за последнюю неделю"
@@ -1659,6 +1660,7 @@ ru:
       unknown_browser: Неизвестный браузер
       weibo: Weibo
     current_session: Текущая сессия
+    date: Дата
     description: "%{browser} на %{platform}"
     explanation: Здесь отображаются все браузеры, с которых выполнен вход в вашу учётную запись. Авторизованные приложения находятся в секции «Приложения».
     ip: IP
@@ -1837,16 +1839,27 @@ ru:
     webauthn: Ключи безопасности
   user_mailer:
     appeal_approved:
+      action: Настройки аккаунта
       explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись снова на хорошем счету.
       subject: Ваше обжалование от %{date} была одобрено
+      subtitle: Ваш аккаунт снова с хорошей репутацией.
       title: Обжалование одобрено
     appeal_rejected:
       explanation: Апелляция на разблокировку против вашей учетной записи %{strike_date}, которую вы подали на %{appeal_date}, была одобрена. Ваша учетная запись восстановлена.
       subject: Ваше обжалование от %{date} отклонено
+      subtitle: Ваша апелляция отклонена.
       title: Обжалование отклонено
     backup_ready:
+      explanation: Вы запросили полное резервное копирование вашей учетной записи Mastodon.
+      extra: Теперь он готов к загрузке!
       subject: Ваш архив готов к загрузке
       title: Архив ваших данных готов
+    failed_2fa:
+      details: 'Вот подробности попытки регистрации:'
+      explanation: Кто-то пытался войти в вашу учетную запись, но указал неверный второй фактор аутентификации.
+      further_actions_html: Если это не вы, мы рекомендуем %{action} немедленно принять меры, так как он может быть скомпрометирован.
+      subject: Сбой двухфакторной аутентификации
+      title: Сбой двухфакторной аутентификации
     suspicious_sign_in:
       change_password: сменить пароль
       details: 'Подробности о новом входе:'
@@ -1900,6 +1913,7 @@ ru:
     go_to_sso_account_settings: Перейти к настройкам сторонних аккаунтов учетной записи
     invalid_otp_token: Введен неверный код двухфакторной аутентификации
     otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
+    rate_limited: Слишком много попыток аутентификации, повторите попытку позже.
     seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
     signed_in_as: 'Выполнен вход под именем:'
   verification:
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index e13a05835f..614812a3a9 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -60,6 +60,7 @@ sk:
         fields:
           name: Označenie
           value: Obsah
+        unlocked: Automaticky prijímaj nových nasledovateľov
       account_alias:
         acct: Adresa starého účtu
       account_migration:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c639bbe1a6..e83ae348f6 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -430,6 +430,7 @@ sk:
       dashboard:
         instance_accounts_dimension: Najsledovanejšie účty
         instance_accounts_measure: uložené účty
+        instance_followers_measure: naši nasledovatelia tam
         instance_follows_measure: ich sledovatelia tu
         instance_languages_dimension: Najpopulárnejšie jazyky
         instance_media_attachments_measure: uložené mediálne prílohy
@@ -1257,6 +1258,8 @@ sk:
       extra: Teraz je pripravená na stiahnutie!
       subject: Tvoj archív je pripravený na stiahnutie
       title: Odber archívu
+    failed_2fa:
+      details: 'Tu sú podrobnosti o pokuse o prihlásenie:'
     warning:
       subject:
         disable: Tvoj účet %{acct} bol zamrazený
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 1693db7f31..d6e6925c70 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1604,6 +1604,7 @@ sq:
       unknown_browser: Shfletues i Panjohur
       weibo: Weibo
     current_session: Sesioni i tanishëm
+    date: Datë
     description: "%{browser} në %{platform}"
     explanation: Këta janë shfletuesit e përdorur tani për hyrje te llogaria juaj Mastodon.
     ip: IP
@@ -1770,16 +1771,27 @@ sq:
     webauthn: Kyçe sigurie
   user_mailer:
     appeal_approved:
+      action: Rregullime Llogarie
       explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date} është miratuar. Llogaria juaj është sërish në pozita të mira.
       subject: Apelimi juaj i datës %{date} u miratua
+      subtitle: Llogaria juaj edhe një herë është e shëndetshme.
       title: Apelimi u miratua
     appeal_rejected:
       explanation: Apelimi i paralajmërimit kundër llogarisë tuaj më %{strike_date}, të cilin e parashtruar më %{appeal_date}, u hodh poshtë.
       subject: Apelimi juaj prej %{date} është hedhur poshtë
+      subtitle: Apelimi juaj është hedhur poshtë.
       title: Apelimi u hodh poshtë
     backup_ready:
+      explanation: Kërkuat një kopjeruajtje të plotë të llogarisë tuaj Mastodon.
+      extra: Tani është gati për shkarkim!
       subject: Arkivi juaj është gati për shkarkim
       title: Marrje arkivi me vete
+    failed_2fa:
+      details: 'Ja hollësitë e përpjekjes për hyrje:'
+      explanation: Dikush ka provuar të hyjë në llogarinë tuaj, por dha faktor të dytë mirëfilltësimi.
+      further_actions_html: Nëse s’qetë ju, rekomandojmë të %{action} menjëherë, ngaqë mund të jetë komprometua.
+      subject: Dështim faktori të dytë mirëfilltësimesh
+      title: Dështoi mirëfilltësimi me faktor të dytë
     suspicious_sign_in:
       change_password: ndryshoni fjalëkalimin tuaj
       details: 'Ja hollësitë për hyrjen:'
@@ -1833,6 +1845,7 @@ sq:
     go_to_sso_account_settings: Kaloni te rregullime llogarie te shërbimi juaj i identitetit
     invalid_otp_token: Kod dyfaktorësh i pavlefshëm
     otp_lost_help_html: Nëse humbët hyrjen te të dy, mund të lidheni me %{email}
+    rate_limited: Shumë përpjekje mirëfilltësimi, riprovoni më vonë.
     seamless_external_login: Jeni futur përmes një shërbimi të jashtëm, ndaj s’ka rregullime fjalëkalimi dhe email.
     signed_in_as: 'I futur si:'
   verification:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index fa84d2a96d..2b5b5ad45b 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1791,7 +1791,7 @@ tr:
       subject: Arşiviniz indirilmeye hazır
       title: Arşiv paketlemesi
     failed_2fa:
-      details: 'Oturum açma denemesinin ayrıntıları şöyledir:'
+      details: 'İşte oturum açma girişiminin ayrıntıları:'
       explanation: Birisi hesabınızda oturum açmaya çalıştı ancak hatalı bir iki aşamalı doğrulama kodu kullandı.
       further_actions_html: Eğer bu kişi siz değilseniz, hemen %{action} yapmanızı öneriyoruz çünkü hesabınız ifşa olmuş olabilir.
       subject: İki aşamalı doğrulama başarısızlığı
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3817b18f07..1ece72e154 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1758,6 +1758,12 @@ vi:
       extra: Hiện nó đã sẵn sàng tải xuống!
       subject: Dữ liệu cá nhân của bạn đã sẵn sàng để tải về
       title: Nhận dữ liệu cá nhân
+    failed_2fa:
+      details: 'Chi tiết thông tin đăng nhập:'
+      explanation: Ai đó đã cố đăng nhập vào tài khoản của bạn nhưng cung cấp yếu tố xác thực thứ hai không hợp lệ.
+      further_actions_html: Nếu không phải bạn, hãy lập tức %{action} vì có thể có rủi ro.
+      subject: Xác minh hai bước thất bại
+      title: Xác minh hai bước thất bại
     suspicious_sign_in:
       change_password: đổi mật khẩu của bạn
       details: 'Chi tiết thông tin đăng nhập:'

From a11a2fb052ad2903426e7798040f699b8a1f051c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 05:31:31 -0500
Subject: [PATCH 397/436] Add error classes to api/base errors coverage
 (#28864)

---
 spec/controllers/api/base_controller_spec.rb | 30 +++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index db1e8777f7..f8e014be2f 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -12,7 +12,7 @@ describe Api::BaseController do
       head 200
     end
 
-    def error
+    def failure
       FakeService.new
     end
   end
@@ -30,7 +30,7 @@ describe Api::BaseController do
 
     it 'does not protect from forgery' do
       ActionController::Base.allow_forgery_protection = true
-      post 'success'
+      post :success
       expect(response).to have_http_status(200)
     end
   end
@@ -50,47 +50,55 @@ describe Api::BaseController do
 
     it 'returns http forbidden for unconfirmed accounts' do
       user.update(confirmed_at: nil)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for pending accounts' do
       user.update(approved: false)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for disabled accounts' do
       user.update(disabled: true)
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
 
     it 'returns http forbidden for suspended accounts' do
       user.account.suspend!
-      post 'success'
+      post :success
       expect(response).to have_http_status(403)
     end
   end
 
   describe 'error handling' do
     before do
-      routes.draw { get 'error' => 'api/base#error' }
+      routes.draw { get 'failure' => 'api/base#failure' }
     end
 
     {
       ActiveRecord::RecordInvalid => 422,
-      Mastodon::ValidationError => 422,
       ActiveRecord::RecordNotFound => 404,
-      Mastodon::UnexpectedResponseError => 503,
+      ActiveRecord::RecordNotUnique => 422,
+      Date::Error => 422,
       HTTP::Error => 503,
-      OpenSSL::SSL::SSLError => 503,
+      Mastodon::InvalidParameterError => 400,
       Mastodon::NotPermittedError => 403,
+      Mastodon::RaceConditionError => 503,
+      Mastodon::RateLimitExceededError => 429,
+      Mastodon::UnexpectedResponseError => 503,
+      Mastodon::ValidationError => 422,
+      OpenSSL::SSL::SSLError => 503,
+      Seahorse::Client::NetworkingError => 503,
+      Stoplight::Error::RedLight => 503,
     }.each do |error, code|
       it "Handles error class of #{error}" do
         allow(FakeService).to receive(:new).and_raise(error)
 
-        get 'error'
+        get :failure
+
         expect(response).to have_http_status(code)
         expect(FakeService).to have_received(:new)
       end

From 7a1f087659204e9d0cbba2de37e45b1921cefe20 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 05:32:54 -0500
Subject: [PATCH 398/436] Add `created_before` and `updated_before` scopes to
 `MediaAttachment` (#28869)

---
 app/lib/vacuum/media_attachments_vacuum.rb | 10 ++++++++--
 app/models/media_attachment.rb             | 12 +++++++-----
 lib/mastodon/cli/statuses.rb               |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/lib/vacuum/media_attachments_vacuum.rb b/app/lib/vacuum/media_attachments_vacuum.rb
index ab7ea4092f..e558195290 100644
--- a/app/lib/vacuum/media_attachments_vacuum.rb
+++ b/app/lib/vacuum/media_attachments_vacuum.rb
@@ -27,11 +27,17 @@ class Vacuum::MediaAttachmentsVacuum
   end
 
   def media_attachments_past_retention_period
-    MediaAttachment.remote.cached.where(MediaAttachment.arel_table[:created_at].lt(@retention_period.ago)).where(MediaAttachment.arel_table[:updated_at].lt(@retention_period.ago))
+    MediaAttachment
+      .remote
+      .cached
+      .created_before(@retention_period.ago)
+      .updated_before(@retention_period.ago)
   end
 
   def orphaned_media_attachments
-    MediaAttachment.unattached.where(MediaAttachment.arel_table[:created_at].lt(TTL.ago))
+    MediaAttachment
+      .unattached
+      .created_before(TTL.ago)
   end
 
   def retention_period?
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 1f40e5725e..7ff6a15f5d 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -204,12 +204,14 @@ class MediaAttachment < ApplicationRecord
   validates :file, presence: true, if: :local?
   validates :thumbnail, absence: true, if: -> { local? && !audio_or_video? }
 
-  scope :attached,   -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
-  scope :cached,     -> { remote.where.not(file_file_name: nil) }
-  scope :local,      -> { where(remote_url: '') }
-  scope :ordered,    -> { order(id: :asc) }
-  scope :remote,     -> { where.not(remote_url: '') }
+  scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
+  scope :cached, -> { remote.where.not(file_file_name: nil) }
+  scope :created_before, ->(value) { where(arel_table[:created_at].lt(value)) }
+  scope :local, -> { where(remote_url: '') }
+  scope :ordered, -> { order(id: :asc) }
+  scope :remote, -> { where.not(remote_url: '') }
   scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) }
+  scope :updated_before, ->(value) { where(arel_table[:updated_at].lt(value)) }
 
   attr_accessor :skip_download
 
diff --git a/lib/mastodon/cli/statuses.rb b/lib/mastodon/cli/statuses.rb
index 7acf3f9b77..48d76e0288 100644
--- a/lib/mastodon/cli/statuses.rb
+++ b/lib/mastodon/cli/statuses.rb
@@ -120,7 +120,7 @@ module Mastodon::CLI
 
       say('Beginning removal of now-orphaned media attachments to free up disk space...')
 
-      scope     = MediaAttachment.unattached.where('created_at < ?', options[:days].pred.days.ago)
+      scope     = MediaAttachment.unattached.created_before(options[:days].pred.days.ago)
       processed = 0
       removed   = 0
       progress  = create_progress_bar(scope.count)

From b19ae521b7d28a76e8e1d8da8157e051e9d8de6c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Jan 2024 11:49:19 +0100
Subject: [PATCH 399/436] Add confirmation when redirecting logged-out requests
 to permalink (#27792)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../concerns/web_app_controller_concern.rb    | 15 ++++-
 .../redirect/accounts_controller.rb           | 10 +++
 app/controllers/redirect/base_controller.rb   | 24 +++++++
 .../redirect/statuses_controller.rb           | 10 +++
 .../styles/mastodon/containers.scss           | 56 +++++++++++++++++
 app/lib/permalink_redirector.rb               | 63 +++++++++++--------
 app/views/redirects/show.html.haml            |  8 +++
 config/locales/en.yml                         |  3 +
 config/routes.rb                              |  5 ++
 9 files changed, 165 insertions(+), 29 deletions(-)
 create mode 100644 app/controllers/redirect/accounts_controller.rb
 create mode 100644 app/controllers/redirect/base_controller.rb
 create mode 100644 app/controllers/redirect/statuses_controller.rb
 create mode 100644 app/views/redirects/show.html.haml

diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index 5687d6e5b6..b8c909877b 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -21,10 +21,19 @@ module WebAppControllerConcern
   def redirect_unauthenticated_to_permalinks!
     return if user_signed_in? && current_account.moved_to_account_id.nil?
 
-    redirect_path = PermalinkRedirector.new(request.path).redirect_path
-    return if redirect_path.blank?
+    permalink_redirector = PermalinkRedirector.new(request.path)
+    return if permalink_redirector.redirect_path.blank?
 
     expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in?
-    redirect_to(redirect_path)
+
+    respond_to do |format|
+      format.html do
+        redirect_to(permalink_redirector.redirect_confirmation_path, allow_other_host: false)
+      end
+
+      format.json do
+        redirect_to(permalink_redirector.redirect_uri, allow_other_host: true)
+      end
+    end
   end
 end
diff --git a/app/controllers/redirect/accounts_controller.rb b/app/controllers/redirect/accounts_controller.rb
new file mode 100644
index 0000000000..98d2cc2b1f
--- /dev/null
+++ b/app/controllers/redirect/accounts_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Redirect::AccountsController < ApplicationController
+  private
+
+  def set_resource
+    @resource = Account.find(params[:id])
+    not_found if @resource.local?
+  end
+end
diff --git a/app/controllers/redirect/base_controller.rb b/app/controllers/redirect/base_controller.rb
new file mode 100644
index 0000000000..90894ec1ed
--- /dev/null
+++ b/app/controllers/redirect/base_controller.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class Redirect::BaseController < ApplicationController
+  vary_by 'Accept-Language'
+
+  before_action :set_resource
+  before_action :set_app_body_class
+
+  def show
+    @redirect_path = ActivityPub::TagManager.instance.url_for(@resource)
+
+    render 'redirects/show', layout: 'application'
+  end
+
+  private
+
+  def set_app_body_class
+    @body_classes = 'app-body'
+  end
+
+  def set_resource
+    raise NotImplementedError
+  end
+end
diff --git a/app/controllers/redirect/statuses_controller.rb b/app/controllers/redirect/statuses_controller.rb
new file mode 100644
index 0000000000..37a938c651
--- /dev/null
+++ b/app/controllers/redirect/statuses_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Redirect::StatusesController < Redirect::BaseController
+  private
+
+  def set_resource
+    @resource = Status.find(params[:id])
+    not_found if @resource.local? || !@resource.distributable?
+  end
+end
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 3d646da239..b6e995787d 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -104,3 +104,59 @@
     margin-inline-start: 10px;
   }
 }
+
+.redirect {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  font-size: 14px;
+  line-height: 18px;
+
+  &__logo {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 30px;
+
+    img {
+      height: 48px;
+    }
+  }
+
+  &__message {
+    text-align: center;
+
+    h1 {
+      font-size: 17px;
+      line-height: 22px;
+      font-weight: 700;
+      margin-bottom: 30px;
+    }
+
+    p {
+      margin-bottom: 30px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    a {
+      color: $highlight-text-color;
+      font-weight: 500;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__link {
+    margin-top: 15px;
+  }
+}
diff --git a/app/lib/permalink_redirector.rb b/app/lib/permalink_redirector.rb
index 0dd37483e2..f551f69db8 100644
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -5,17 +5,46 @@ class PermalinkRedirector
 
   def initialize(path)
     @path = path
+    @object = nil
+  end
+
+  def object
+    @object ||= begin
+      if at_username_status_request? || statuses_status_request?
+        status = Status.find_by(id: second_segment)
+        status if status&.distributable? && !status&.local?
+      elsif at_username_request?
+        username, domain = first_segment.delete_prefix('@').split('@')
+        domain = nil if TagManager.instance.local_domain?(domain)
+        account = Account.find_remote(username, domain)
+        account unless account&.local?
+      elsif accounts_request? && record_integer_id_request?
+        account = Account.find_by(id: second_segment)
+        account unless account&.local?
+      end
+    end
   end
 
   def redirect_path
-    if at_username_status_request? || statuses_status_request?
-      find_status_url_by_id(second_segment)
-    elsif at_username_request?
-      find_account_url_by_name(first_segment)
-    elsif accounts_request? && record_integer_id_request?
-      find_account_url_by_id(second_segment)
-    elsif @path.start_with?('/deck')
-      @path.delete_prefix('/deck')
+    return ActivityPub::TagManager.instance.url_for(object) if object.present?
+
+    @path.delete_prefix('/deck') if @path.start_with?('/deck')
+  end
+
+  def redirect_uri
+    return ActivityPub::TagManager.instance.uri_for(object) if object.present?
+
+    @path.delete_prefix('/deck') if @path.start_with?('/deck')
+  end
+
+  def redirect_confirmation_path
+    case object.class.name
+    when 'Account'
+      redirect_account_path(object.id)
+    when 'Status'
+      redirect_status_path(object.id)
+    else
+      @path.delete_prefix('/deck') if @path.start_with?('/deck')
     end
   end
 
@@ -56,22 +85,4 @@ class PermalinkRedirector
   def path_segments
     @path_segments ||= @path.delete_prefix('/deck').delete_prefix('/').split('/')
   end
-
-  def find_status_url_by_id(id)
-    status = Status.find_by(id: id)
-    ActivityPub::TagManager.instance.url_for(status) if status&.distributable? && !status.account.local?
-  end
-
-  def find_account_url_by_id(id)
-    account = Account.find_by(id: id)
-    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
-  end
-
-  def find_account_url_by_name(name)
-    username, domain = name.gsub(/\A@/, '').split('@')
-    domain           = nil if TagManager.instance.local_domain?(domain)
-    account          = Account.find_remote(username, domain)
-
-    ActivityPub::TagManager.instance.url_for(account) if account.present? && !account.local?
-  end
 end
diff --git a/app/views/redirects/show.html.haml b/app/views/redirects/show.html.haml
new file mode 100644
index 0000000000..0d09387a9c
--- /dev/null
+++ b/app/views/redirects/show.html.haml
@@ -0,0 +1,8 @@
+.redirect
+  .redirect__logo
+    = link_to render_logo, root_path
+
+  .redirect__message
+    %h1= t('redirects.title', instance: site_hostname)
+    %p= t('redirects.prompt')
+    %p= link_to @redirect_path, @redirect_path, rel: 'noreferrer noopener'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83eaaa4552..9d739be07f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1547,6 +1547,9 @@ en:
     errors:
       limit_reached: Limit of different reactions reached
       unrecognized_emoji: is not a recognized emoji
+  redirects:
+    prompt: If you trust this link, click it to continue.
+    title: You are leaving %{instance}.
   relationships:
     activity: Account activity
     confirm_follow_selected_followers: Are you sure you want to follow selected followers?
diff --git a/config/routes.rb b/config/routes.rb
index 85c3b18556..c4f862acaf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -162,6 +162,11 @@ Rails.application.routes.draw do
     end
   end
 
+  namespace :redirect do
+    resources :accounts, only: :show
+    resources :statuses, only: :show
+  end
+
   resources :media, only: [:show] do
     get :player
   end

From 41c2af22705d9a8b265f77dae5da960d2eef2150 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:50:41 +0100
Subject: [PATCH 400/436] chore(deps): update dependency rubocop to v1.60.1
 (#28731)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 93931d8724..54955000b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -504,7 +504,7 @@ GEM
     orm_adapter (0.5.0)
     ox (2.14.17)
     parallel (1.24.0)
-    parser (3.2.2.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -610,7 +610,7 @@ GEM
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     reline (0.4.2)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -650,11 +650,11 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
     rspec-support (3.12.1)
-    rubocop (1.59.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)

From 1290fede651b47585de7dbfe4a9b118dc9d59856 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 06:51:09 -0500
Subject: [PATCH 401/436] Fix `Rails/WhereExists` cop in app/lib (#28862)

---
 .rubocop_todo.yml                      | 4 ----
 app/lib/activitypub/activity/create.rb | 4 ++--
 app/lib/delivery_failure_tracker.rb    | 2 +-
 app/lib/feed_manager.rb                | 6 +++---
 app/lib/suspicious_sign_in_detector.rb | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b62dfa72a8..302c66a16a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -77,10 +77,6 @@ Rails/WhereExists:
   Exclude:
     - 'app/controllers/activitypub/inboxes_controller.rb'
     - 'app/controllers/admin/email_domain_blocks_controller.rb'
-    - 'app/lib/activitypub/activity/create.rb'
-    - 'app/lib/delivery_failure_tracker.rb'
-    - 'app/lib/feed_manager.rb'
-    - 'app/lib/suspicious_sign_in_detector.rb'
     - 'app/policies/status_policy.rb'
     - 'app/serializers/rest/announcement_serializer.rb'
     - 'app/workers/move_worker.rb'
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 5a2d33c1fa..62c35d4dd3 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -320,7 +320,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     already_voted = true
 
     with_redis_lock("vote:#{replied_to_status.poll_id}:#{@account.id}") do
-      already_voted = poll.votes.where(account: @account).exists?
+      already_voted = poll.votes.exists?(account: @account)
       poll.votes.create!(account: @account, choice: poll.options.index(@object['name']), uri: object_uri)
     end
 
@@ -406,7 +406,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     return false if local_usernames.empty?
 
-    Account.local.where(username: local_usernames).exists?
+    Account.local.exists?(username: local_usernames)
   end
 
   def tombstone_exists?
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index d938269829..e17b45d667 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -28,7 +28,7 @@ class DeliveryFailureTracker
   end
 
   def available?
-    !UnavailableDomain.where(domain: @host).exists?
+    !UnavailableDomain.exists?(domain: @host)
   end
 
   def exhausted_deliveries_days
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 53767486ff..38a177e645 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -420,8 +420,8 @@ class FeedManager
     check_for_blocks = status.active_mentions.pluck(:account_id)
     check_for_blocks.push(status.in_reply_to_account) if status.reply? && !status.in_reply_to_account_id.nil?
 
-    should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions)                                                       # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
-    should_filter ||= status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists? # of if the account is silenced and I'm not following them
+    should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
+    should_filter ||= status.account.silenced? && !Follow.exists?(account_id: receiver_id, target_account_id: status.account_id) # Filter if the account is silenced and I'm not following them
 
     should_filter
   end
@@ -434,7 +434,7 @@ class FeedManager
     if status.reply? && status.in_reply_to_account_id != status.account_id
       should_filter = status.in_reply_to_account_id != list.account_id
       should_filter &&= !list.show_followed?
-      should_filter &&= !(list.show_list? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
+      should_filter &&= !(list.show_list? && ListAccount.exists?(list_id: list.id, account_id: status.in_reply_to_account_id))
 
       return !!should_filter
     end
diff --git a/app/lib/suspicious_sign_in_detector.rb b/app/lib/suspicious_sign_in_detector.rb
index 1af5188c65..74f49aa558 100644
--- a/app/lib/suspicious_sign_in_detector.rb
+++ b/app/lib/suspicious_sign_in_detector.rb
@@ -19,7 +19,7 @@ class SuspiciousSignInDetector
   end
 
   def previously_seen_ip?(request)
-    @user.ips.where('ip <<= ?', masked_ip(request)).exists?
+    @user.ips.exists?(['ip <<= ?', masked_ip(request)])
   end
 
   def freshly_signed_up?

From 5a838ceaa9a003bc2e2fdee727d4aa87cd53de4f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 24 Jan 2024 13:37:43 +0100
Subject: [PATCH 402/436] Use active variants for boost icons and increase icon
 size (#27924)

---
 app/javascript/mastodon/components/status_action_bar.jsx    | 4 +++-
 .../mastodon/features/status/components/action_bar.jsx      | 4 +++-
 app/javascript/svg-icons/repeat_active.svg                  | 4 ++++
 app/javascript/svg-icons/repeat_disabled.svg                | 0
 app/javascript/svg-icons/repeat_private.svg                 | 0
 app/javascript/svg-icons/repeat_private_active.svg          | 6 ++++++
 6 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 app/javascript/svg-icons/repeat_active.svg
 mode change 100755 => 100644 app/javascript/svg-icons/repeat_disabled.svg
 mode change 100755 => 100644 app/javascript/svg-icons/repeat_private.svg
 create mode 100644 app/javascript/svg-icons/repeat_private_active.svg

diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index bfe77a4900..b111a65385 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -18,8 +18,10 @@ import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
 import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -366,7 +368,7 @@ class StatusActionBar extends ImmutablePureComponent {
 
     if (status.get('reblogged')) {
       reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
+      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
     } else if (publicStatus) {
       reblogTitle = intl.formatMessage(messages.reblog);
       reblogIconComponent = RepeatIcon;
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 4cb06aac2c..c243a49129 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -17,8 +17,10 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
@@ -296,7 +298,7 @@ class ActionBar extends PureComponent {
 
     if (status.get('reblogged')) {
       reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
+      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
     } else if (publicStatus) {
       reblogTitle = intl.formatMessage(messages.reblog);
       reblogIconComponent = RepeatIcon;
diff --git a/app/javascript/svg-icons/repeat_active.svg b/app/javascript/svg-icons/repeat_active.svg
new file mode 100644
index 0000000000..a5bbb8fc4f
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_active.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 22L3 18L7 14L8.4 15.45L6.85 17H17V13H19V19H6.85L8.4 20.55L7 22ZM5 11V5H17.15L15.6 3.45L17 2L21 6L17 10L15.6 8.55L17.15 7H7V11H5Z"/>
+<path d="M9 9H15V15H9V9Z"/>
+</svg>
diff --git a/app/javascript/svg-icons/repeat_disabled.svg b/app/javascript/svg-icons/repeat_disabled.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private.svg b/app/javascript/svg-icons/repeat_private.svg
old mode 100755
new mode 100644
diff --git a/app/javascript/svg-icons/repeat_private_active.svg b/app/javascript/svg-icons/repeat_private_active.svg
new file mode 100644
index 0000000000..cf2a05c84e
--- /dev/null
+++ b/app/javascript/svg-icons/repeat_private_active.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.4 15.45L7 14L3 18L7 22L8.4 20.55L6.85 19H13.5V18C13.5 17.6567 13.5638 17.3171 13.6988 17H6.85L8.4 15.45Z"/>
+<path d="M15 14.1883C14.8435 14.443 14.7232 14.7147 14.6398 15H9V9H15V14.1883Z"/>
+<path d="M5 5V11H7V7H17.15L15.6 8.55L17 10L21 6L17 2L15.6 3.45L17.15 5H5Z"/>
+<path d="M16 22C15.7167 22 15.475 21.9083 15.275 21.725C15.0917 21.525 15 21.2833 15 21V18C15 17.7167 15.0917 17.4833 15.275 17.3C15.475 17.1 15.7167 17 16 17V16C16 15.45 16.1917 14.9833 16.575 14.6C16.975 14.2 17.45 14 18 14C18.55 14 19.0167 14.2 19.4 14.6C19.8 14.9833 20 15.45 20 16V17C20.2833 17 20.5167 17.1 20.7 17.3C20.9 17.4833 21 17.7167 21 18V21C21 21.2833 20.9 21.525 20.7 21.725C20.5167 21.9083 20.2833 22 20 22H16ZM17 17H19V16C19 15.7167 18.9 15.4833 18.7 15.3C18.5167 15.1 18.2833 15 18 15C17.7167 15 17.475 15.1 17.275 15.3C17.0917 15.4833 17 15.7167 17 16V17Z"/>
+</svg>

From 64993d3f779a6e01c104e1a2024a87c9785bc79d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:37:37 +0100
Subject: [PATCH 403/436] chore(deps): update dependency haml_lint to v0.55.0
 (#28856)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 54955000b1..97d2b5f7a0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.53.0)
+    haml_lint (0.55.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow

From ea5397c3735145ad62374798506f57afa122959d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:55:06 +0100
Subject: [PATCH 404/436] chore(deps): update dependency selenium-webdriver to
 v4.17.0 (#28858)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 97d2b5f7a0..77d924f948 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,7 +696,8 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.17.0)
+      base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)

From 559bbf0aa6ceca1cbf417fcc76ea7ef359e42099 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:51:18 +0100
Subject: [PATCH 405/436] chore(deps): update artifact actions (major) to v4
 (major) (#28415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/test-ruby.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index ae25648a0b..346703ced4 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -52,7 +52,7 @@ jobs:
         run: |
           tar --exclude={"*.br","*.gz"} -zcf artifacts.tar.gz public/assets public/packs*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: matrix.mode == 'test'
         with:
           path: |-
@@ -117,7 +117,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './'
           name: ${{ github.sha }}
@@ -193,7 +193,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './public'
           name: ${{ github.sha }}
@@ -213,14 +213,14 @@ jobs:
       - run: bundle exec rake spec:system
 
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: e2e-logs-${{ matrix.ruby-version }}
           path: log/
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: e2e-screenshots
@@ -297,7 +297,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: './public'
           name: ${{ github.sha }}
@@ -317,14 +317,14 @@ jobs:
       - run: bin/rspec --tag search
 
       - name: Archive logs
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-search-logs-${{ matrix.ruby-version }}
           path: log/
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-search-screenshots

From 7019af431d2b91a4d31ede9558bb3a17c3875f37 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:51:36 +0100
Subject: [PATCH 406/436] fix(deps): update dependency dotenv to v16.4.0
 (#28872)

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

diff --git a/yarn.lock b/yarn.lock
index 61f699d19e..53d2caaed9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6901,9 +6901,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.3.2
-  resolution: "dotenv@npm:16.3.2"
-  checksum: a87d62cef0810b670cb477db1a24a42a093b6b428c9e65c185ce1d6368ad7175234b13547718ba08da18df43faae4f814180cc0366e11be1ded2277abc4dd22e
+  version: 16.4.0
+  resolution: "dotenv@npm:16.4.0"
+  checksum: 70c3b422cefaffdba300aecd9157668590c3b5e66efb3742b7dec207f85023e5997364f04030fc0393fae52bf3a874979632d289ab4fafc1386ff2c68f2f2e8d
   languageName: node
   linkType: hard
 

From 9c5be139806ba323f760ceb24476c1261af2ed41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:51:47 +0100
Subject: [PATCH 407/436] chore(deps): update dependency chewy to v7.5.0
 (#28730)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 77d924f948..d573debe4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
       activesupport
     cbor (0.5.9.6)
     charlock_holmes (0.7.7)
-    chewy (7.4.0)
+    chewy (7.5.0)
       activesupport (>= 5.2)
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl
@@ -445,7 +445,7 @@ GEM
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.3.0)

From 38f7f8b9096a3c56c676942730184f01e17bd93d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 24 Jan 2024 12:30:28 -0500
Subject: [PATCH 408/436] Tidy up association declaration in `Instance` model
 (#28880)

---
 app/models/instance.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/instance.rb b/app/models/instance.rb
index 8f8d87c62a..2dec75d6fe 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -13,12 +13,12 @@ class Instance < ApplicationRecord
 
   attr_accessor :failure_days
 
-  has_many :accounts, foreign_key: :domain, primary_key: :domain, inverse_of: false
-
   with_options foreign_key: :domain, primary_key: :domain, inverse_of: false do
     belongs_to :domain_block
     belongs_to :domain_allow
-    belongs_to :unavailable_domain # skipcq: RB-RL1031
+    belongs_to :unavailable_domain
+
+    has_many :accounts, dependent: nil
   end
 
   scope :searchable, -> { where.not(domain: DomainBlock.select(:domain)) }

From 9a8293f58d0317e3917b855483a5b2958226f2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Thu, 25 Jan 2024 19:37:09 +0900
Subject: [PATCH 409/436] Fix process of receiving posts with bearcaps is not
 working (#26527)

---
 app/lib/activitypub/activity/create.rb      |  2 +-
 app/lib/activitypub/parser/status_parser.rb | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 62c35d4dd3..85195f4c39 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -108,7 +108,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status_params
-    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url)
+    @status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object)
 
     attachment_ids = process_attachments.take(4).map(&:id)
 
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index 45f5fc5bf2..cfc2b8788b 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -4,12 +4,13 @@ class ActivityPub::Parser::StatusParser
   include JsonLdHelper
 
   # @param [Hash] json
-  # @param [Hash] magic_values
-  # @option magic_values [String] :followers_collection
-  def initialize(json, magic_values = {})
-    @json         = json
-    @object       = json['object'] || json
-    @magic_values = magic_values
+  # @param [Hash] options
+  # @option options [String] :followers_collection
+  # @option options [Hash]   :object
+  def initialize(json, **options)
+    @json    = json
+    @object  = options[:object] || json['object'] || json
+    @options = options
   end
 
   def uri
@@ -78,7 +79,7 @@ class ActivityPub::Parser::StatusParser
       :public
     elsif audience_cc.any? { |cc| ActivityPub::TagManager.instance.public_collection?(cc) }
       :unlisted
-    elsif audience_to.include?(@magic_values[:followers_collection])
+    elsif audience_to.include?(@options[:followers_collection])
       :private
     else
       :direct

From c50274a0acd3679160984bbf410bff46fd76179c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Jan 2024 11:44:25 +0100
Subject: [PATCH 410/436] Fix redirect confirmation for accounts (#28902)

---
 app/controllers/redirect/accounts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/redirect/accounts_controller.rb b/app/controllers/redirect/accounts_controller.rb
index 98d2cc2b1f..713ccf2ca1 100644
--- a/app/controllers/redirect/accounts_controller.rb
+++ b/app/controllers/redirect/accounts_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Redirect::AccountsController < ApplicationController
+class Redirect::AccountsController < Redirect::BaseController
   private
 
   def set_resource

From 0471a780556720338fef29266f2fc2578ab2010c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Jan 2024 12:13:33 +0100
Subject: [PATCH 411/436] Add tests for redirect confirmations (#28903)

---
 spec/features/redirections_spec.rb | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 spec/features/redirections_spec.rb

diff --git a/spec/features/redirections_spec.rb b/spec/features/redirections_spec.rb
new file mode 100644
index 0000000000..f73ab58470
--- /dev/null
+++ b/spec/features/redirections_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'redirection confirmations' do
+  let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/foo', url: 'https://example.com/@foo') }
+  let(:status)  { Fabricate(:status, account: account, uri: 'https://example.com/users/foo/statuses/1', url: 'https://example.com/@foo/1') }
+
+  context 'when a logged out user visits a local page for a remote account' do
+    it 'shows a confirmation page' do
+      visit "/@#{account.pretty_acct}"
+
+      # It explains about the redirect
+      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+      # It features an appropriate link
+      expect(page).to have_link(account.url, href: account.url)
+    end
+  end
+
+  context 'when a logged out user visits a local page for a remote status' do
+    it 'shows a confirmation page' do
+      visit "/@#{account.pretty_acct}/#{status.id}"
+
+      # It explains about the redirect
+      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+
+      # It features an appropriate link
+      expect(page).to have_link(status.url, href: status.url)
+    end
+  end
+end

From 087415d0fe8d9a719eb2df7e915b08f4d4d0360a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Jan 2024 12:13:36 +0100
Subject: [PATCH 412/436] Add tests for processing statuses using bearcap URIs
 (#28904)

---
 spec/lib/activitypub/activity/create_spec.rb | 43 ++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 3e3a4978c8..e4966cffa3 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -893,6 +893,49 @@ RSpec.describe ActivityPub::Activity::Create do
       end
     end
 
+    context 'when object URI uses bearcaps' do
+      subject { described_class.new(json, sender) }
+
+      let(:token) { 'foo' }
+
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#foo'].join,
+          type: 'Create',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: Addressable::URI.new(scheme: 'bear', query_values: { t: token, u: object_json[:id] }).to_s,
+        }.with_indifferent_access
+      end
+
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          to: 'https://www.w3.org/ns/activitystreams#Public',
+        }
+      end
+
+      before do
+        stub_request(:get, object_json[:id])
+          .with(headers: { Authorization: "Bearer #{token}" })
+          .to_return(body: Oj.dump(object_json), headers: { 'Content-Type': 'application/activity+json' })
+
+        subject.perform
+      end
+
+      it 'creates status' do
+        status = sender.statuses.first
+
+        expect(status).to_not be_nil
+        expect(status).to have_attributes(
+          visibility: 'public',
+          text: 'Lorem ipsum'
+        )
+      end
+    end
+
     context 'with an encrypted message' do
       subject { described_class.new(json, sender, delivery: true, delivered_to_account_id: recipient.id) }
 

From d158f7e6228e9c3f9d93bff86eccd71bdb542558 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:33:56 +0100
Subject: [PATCH 413/436] chore(deps): update dependency rspec-rails to v6.1.1
 (#28905)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index d573debe4b..a31d0a929c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -360,7 +360,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.5)
-    io-console (0.7.1)
+    io-console (0.7.2)
     irb (1.11.1)
       rdoc
       reline (>= 0.4.2)
@@ -445,7 +445,7 @@ GEM
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.21.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.3.0)
@@ -636,7 +636,7 @@ GEM
     rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.1.0)
+    rspec-rails (6.1.1)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)

From 1a565e4bea45828bfbe16c2c581ec5bc676c5223 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 12:36:20 +0000
Subject: [PATCH 414/436] fix(deps): update dependency axios to v1.6.6 (#28895)

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

diff --git a/yarn.lock b/yarn.lock
index 53d2caaed9..29bcb3575b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4673,13 +4673,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.6.5
-  resolution: "axios@npm:1.6.5"
+  version: 1.6.6
+  resolution: "axios@npm:1.6.6"
   dependencies:
     follow-redirects: "npm:^1.15.4"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: aeb9acf87590d8aa67946072ced38e01ca71f5dfe043782c0ccea667e5dd5c45830c08afac9be3d7c894f09684b8ab2a458f497d197b73621233bcf202d9d468
+  checksum: 974f54cfade94fd4c0191309122a112c8d233089cecb0070cd8e0904e9bd9c364ac3a6fd0f981c978508077249788950427c565f54b7b2110e5c3426006ff343
   languageName: node
   linkType: hard
 

From 7c9c6c7f80d57ea0fd504b59debe6439d28cb1b5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 07:37:07 -0500
Subject: [PATCH 415/436] Fix remaining `Rails/WhereExists` cop violations,
 regenerate todo (#28892)

---
 .rubocop_todo.yml                               | 17 +----------------
 .../activitypub/inboxes_controller.rb           |  2 +-
 .../admin/email_domain_blocks_controller.rb     |  2 +-
 app/policies/status_policy.rb                   |  2 +-
 app/serializers/rest/announcement_serializer.rb |  2 +-
 app/workers/move_worker.rb                      |  2 +-
 .../process_collection_service_spec.rb          |  2 +-
 7 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 302c66a16a..77f7e70734 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.59.0.
+# using RuboCop version 1.60.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -70,21 +70,6 @@ Rails/UniqueValidationWithoutIndex:
     - 'app/models/identity.rb'
     - 'app/models/webauthn_credential.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: exists, where
-Rails/WhereExists:
-  Exclude:
-    - 'app/controllers/activitypub/inboxes_controller.rb'
-    - 'app/controllers/admin/email_domain_blocks_controller.rb'
-    - 'app/policies/status_policy.rb'
-    - 'app/serializers/rest/announcement_serializer.rb'
-    - 'app/workers/move_worker.rb'
-    - 'spec/models/account_spec.rb'
-    - 'spec/services/activitypub/process_collection_service_spec.rb'
-    - 'spec/services/purge_domain_service_spec.rb'
-    - 'spec/services/unallow_domain_service_spec.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: ==, equal?, eql?
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index 5ee85474e7..ba85e0a722 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -24,7 +24,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
 
   def unknown_affected_account?
     json = Oj.load(body, mode: :strict)
-    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists?
+    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.exists?(uri: json['actor'])
   rescue Oj::ParseError
     false
   end
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index ff754bc0b4..faa0a061a6 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -38,7 +38,7 @@ module Admin
           log_action :create, @email_domain_block
 
           (@email_domain_block.other_domains || []).uniq.each do |domain|
-            next if EmailDomainBlock.where(domain: domain).exists?
+            next if EmailDomainBlock.exists?(domain: domain)
 
             other_email_domain_block = EmailDomainBlock.create!(domain: domain, allow_with_approval: @email_domain_block.allow_with_approval, parent: @email_domain_block)
             log_action :create, other_email_domain_block
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 322d3aec5c..540e266427 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -57,7 +57,7 @@ class StatusPolicy < ApplicationPolicy
     if record.mentions.loaded?
       record.mentions.any? { |mention| mention.account_id == current_account.id }
     else
-      record.mentions.where(account: current_account).exists?
+      record.mentions.exists?(account: current_account)
     end
   end
 
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index 23b2fa514b..8cee271272 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -23,7 +23,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   end
 
   def read
-    object.announcement_mutes.where(account: current_user.account).exists?
+    object.announcement_mutes.exists?(account: current_user.account)
   end
 
   def content
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index 73ae268bee..a18f38556b 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -123,7 +123,7 @@ class MoveWorker
   end
 
   def add_account_note_if_needed!(account, id)
-    unless AccountNote.where(account: account, target_account: @target_account).exists?
+    unless AccountNote.exists?(account: account, target_account: @target_account)
       text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
         I18n.t(id, acct: @source_account.acct)
       end
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index f4a2b8fec6..63502c546e 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -265,7 +265,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
             anything
           )
 
-          expect(Status.where(uri: 'https://example.com/users/bob/fake-status').exists?).to be false
+          expect(Status.exists?(uri: 'https://example.com/users/bob/fake-status')).to be false
         end
       end
     end

From a69506a434a605fd8ad67f4eb938a328753bbe06 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:37:23 +0100
Subject: [PATCH 416/436] fix(deps): update dependency dotenv to v16.4.1
 (#28889)

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

diff --git a/yarn.lock b/yarn.lock
index 29bcb3575b..78261b3b84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6901,9 +6901,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^16.0.3":
-  version: 16.4.0
-  resolution: "dotenv@npm:16.4.0"
-  checksum: 70c3b422cefaffdba300aecd9157668590c3b5e66efb3742b7dec207f85023e5997364f04030fc0393fae52bf3a874979632d289ab4fafc1386ff2c68f2f2e8d
+  version: 16.4.1
+  resolution: "dotenv@npm:16.4.1"
+  checksum: ef3d95f48f38146df0881a4b58447ae437d2da3f6d645074b84de4e64ef64ba75fc357c5ed66b3c2b813b5369fdeb6a4777d6ade2d50e54eed6aa06dddc98bc4
   languageName: node
   linkType: hard
 

From 6b6586f5d099a9089c8bf9dc7d7406a86c0a48eb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 08:00:34 -0500
Subject: [PATCH 417/436] Add `CustomFilterKeyword#to_regex` method (#28893)

---
 app/models/custom_filter.rb               | 11 +------
 app/models/custom_filter_keyword.rb       | 16 +++++++++++
 spec/models/custom_filter_keyword_spec.rb | 35 +++++++++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 spec/models/custom_filter_keyword_spec.rb

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 371267fc28..c8120c2395 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -68,16 +68,7 @@ class CustomFilter < ApplicationRecord
 
       scope = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account_id: account_id }).where(Arel.sql('expires_at IS NULL OR expires_at > NOW()'))
       scope.to_a.group_by(&:custom_filter).each do |filter, keywords|
-        keywords.map! do |keyword|
-          if keyword.whole_word
-            sb = /\A[[:word:]]/.match?(keyword.keyword) ? '\b' : ''
-            eb = /[[:word:]]\z/.match?(keyword.keyword) ? '\b' : ''
-
-            /(?mix:#{sb}#{Regexp.escape(keyword.keyword)}#{eb})/
-          else
-            /#{Regexp.escape(keyword.keyword)}/i
-          end
-        end
+        keywords.map!(&:to_regex)
 
         filters_hash[filter.id] = { keywords: Regexp.union(keywords), filter: filter }
       end.to_h
diff --git a/app/models/custom_filter_keyword.rb b/app/models/custom_filter_keyword.rb
index 3158b3b79a..979d0b822e 100644
--- a/app/models/custom_filter_keyword.rb
+++ b/app/models/custom_filter_keyword.rb
@@ -23,8 +23,24 @@ class CustomFilterKeyword < ApplicationRecord
   before_destroy :prepare_cache_invalidation!
   after_commit :invalidate_cache!
 
+  def to_regex
+    if whole_word?
+      /(?mix:#{to_regex_sb}#{Regexp.escape(keyword)}#{to_regex_eb})/
+    else
+      /#{Regexp.escape(keyword)}/i
+    end
+  end
+
   private
 
+  def to_regex_sb
+    /\A[[:word:]]/.match?(keyword) ? '\b' : ''
+  end
+
+  def to_regex_eb
+    /[[:word:]]\z/.match?(keyword) ? '\b' : ''
+  end
+
   def prepare_cache_invalidation!
     custom_filter.prepare_cache_invalidation!
   end
diff --git a/spec/models/custom_filter_keyword_spec.rb b/spec/models/custom_filter_keyword_spec.rb
new file mode 100644
index 0000000000..4e3ab060a0
--- /dev/null
+++ b/spec/models/custom_filter_keyword_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomFilterKeyword do
+  describe '#to_regex' do
+    context 'when whole_word is true' do
+      it 'builds a regex with boundaries and the keyword' do
+        keyword = described_class.new(whole_word: true, keyword: 'test')
+
+        expect(keyword.to_regex).to eq(/(?mix:\b#{Regexp.escape(keyword.keyword)}\b)/)
+      end
+
+      it 'builds a regex with starting boundary and the keyword when end with non-word' do
+        keyword = described_class.new(whole_word: true, keyword: 'test#')
+
+        expect(keyword.to_regex).to eq(/(?mix:\btest\#)/)
+      end
+
+      it 'builds a regex with end boundary and the keyword when start with non-word' do
+        keyword = described_class.new(whole_word: true, keyword: '#test')
+
+        expect(keyword.to_regex).to eq(/(?mix:\#test\b)/)
+      end
+    end
+
+    context 'when whole_word is false' do
+      it 'builds a regex with the keyword' do
+        keyword = described_class.new(whole_word: false, keyword: 'test')
+
+        expect(keyword.to_regex).to eq(/test/i)
+      end
+    end
+  end
+end

From 59d2ea0d82493fdd948c91c6c715ea461b60619b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 14:00:44 +0100
Subject: [PATCH 418/436] New Crowdin Translations (automated) (#28899)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/af.json    |  1 +
 app/javascript/mastodon/locales/ca.json    |  2 +-
 app/javascript/mastodon/locales/oc.json    | 13 ++++++++
 app/javascript/mastodon/locales/zh-TW.json | 12 +++----
 config/locales/br.yml                      |  3 ++
 config/locales/ca.yml                      |  3 ++
 config/locales/da.yml                      |  3 ++
 config/locales/de.yml                      |  3 ++
 config/locales/devise.fr-CA.yml            |  4 +++
 config/locales/devise.fr.yml               |  4 +++
 config/locales/devise.sv.yml               |  1 +
 config/locales/devise.zh-TW.yml            | 14 ++++----
 config/locales/es-AR.yml                   |  3 ++
 config/locales/es-MX.yml                   |  3 ++
 config/locales/es.yml                      |  3 ++
 config/locales/eu.yml                      |  3 ++
 config/locales/fi.yml                      |  7 ++--
 config/locales/fo.yml                      |  3 ++
 config/locales/fr-CA.yml                   | 10 ++++++
 config/locales/fr.yml                      | 10 ++++++
 config/locales/gl.yml                      |  3 ++
 config/locales/he.yml                      |  5 ++-
 config/locales/hu.yml                      |  2 ++
 config/locales/is.yml                      |  3 ++
 config/locales/it.yml                      |  3 ++
 config/locales/ja.yml                      |  6 ++++
 config/locales/ko.yml                      |  7 ++++
 config/locales/lad.yml                     |  3 ++
 config/locales/lt.yml                      |  3 ++
 config/locales/nl.yml                      |  6 +++-
 config/locales/nn.yml                      |  3 ++
 config/locales/no.yml                      |  3 ++
 config/locales/pl.yml                      |  3 ++
 config/locales/pt-BR.yml                   |  3 ++
 config/locales/pt-PT.yml                   |  3 ++
 config/locales/ru.yml                      |  3 ++
 config/locales/sk.yml                      |  3 ++
 config/locales/sq.yml                      |  3 ++
 config/locales/sr-Latn.yml                 |  3 ++
 config/locales/sr.yml                      |  3 ++
 config/locales/sv.yml                      |  3 ++
 config/locales/tr.yml                      |  3 ++
 config/locales/uk.yml                      |  3 ++
 config/locales/vi.yml                      |  3 ++
 config/locales/zh-CN.yml                   |  3 ++
 config/locales/zh-HK.yml                   |  3 ++
 config/locales/zh-TW.yml                   | 39 ++++++++++++----------
 47 files changed, 197 insertions(+), 36 deletions(-)

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 6c37cdf5ca..d1873d6dce 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -3,6 +3,7 @@
   "about.contact": "Kontak:",
   "about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie",
+  "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
   "about.domain_blocks.silenced.title": "Beperk",
   "about.domain_blocks.suspended.title": "Opgeskort",
   "about.not_available": "Hierdie inligting is nie op hierdie bediener beskikbaar gestel nie.",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 7d1049a30f..c763a32ba8 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -521,7 +521,7 @@
   "poll.total_people": "{count, plural, one {# persona} other {# persones}}",
   "poll.total_votes": "{count, plural, one {# vot} other {# vots}}",
   "poll.vote": "Vota",
-  "poll.voted": "Vas votar per aquesta resposta",
+  "poll.voted": "Vau votar aquesta resposta",
   "poll.votes": "{votes, plural, one {# vot} other {# vots}}",
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 833bfe6ace..1ecfbcaf06 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -18,6 +18,7 @@
   "account.blocked": "Blocat",
   "account.browse_more_on_origin_server": "Navigar sul perfil original",
   "account.cancel_follow_request": "Retirar la demanda d’abonament",
+  "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
   "account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
   "account.domain_blocked": "Domeni amagat",
@@ -28,6 +29,7 @@
   "account.featured_tags.last_status_never": "Cap de publicacion",
   "account.featured_tags.title": "Etiquetas en avant de {name}",
   "account.follow": "Sègre",
+  "account.follow_back": "Sègre en retorn",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
@@ -48,6 +50,7 @@
   "account.mute_notifications_short": "Amudir las notificacions",
   "account.mute_short": "Amudir",
   "account.muted": "Mes en silenci",
+  "account.mutual": "Mutual",
   "account.no_bio": "Cap de descripcion pas fornida.",
   "account.open_original_page": "Dobrir la pagina d’origina",
   "account.posts": "Tuts",
@@ -172,6 +175,7 @@
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
   "conversation.with": "Amb {names}",
+  "copy_icon_button.copied": "Copiat al quichapapièr",
   "copypaste.copied": "Copiat",
   "copypaste.copy_to_clipboard": "Copiar al quichapapièr",
   "directory.federated": "Del fediverse conegut",
@@ -294,6 +298,8 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "far davalar dins la lista",
   "keyboard_shortcuts.enter": "dobrir los estatuts",
+  "keyboard_shortcuts.favourite": "Marcar coma favorit",
+  "keyboard_shortcuts.favourites": "Dobrir la lista dels favorits",
   "keyboard_shortcuts.federated": "dobrir lo flux public global",
   "keyboard_shortcuts.heading": "Acorchis clavièr",
   "keyboard_shortcuts.home": "dobrir lo flux public local",
@@ -339,6 +345,7 @@
   "lists.search": "Cercar demest lo mond que seguètz",
   "lists.subheading": "Vòstras listas",
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
+  "loading_indicator.label": "Cargament…",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
   "mute_modal.duration": "Durada",
   "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
@@ -371,6 +378,7 @@
   "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
   "notification.admin.report": "{name} senhalèt {target}",
   "notification.admin.sign_up": "{name} se marquèt",
+  "notification.favourite": "{name} a mes vòstre estatut en favorit",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} a demandat a vos sègre",
   "notification.mention": "{name} vos a mencionat",
@@ -423,6 +431,8 @@
   "onboarding.compose.template": "Adiu #Mastodon !",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.profile.display_name": "Nom d’afichatge",
+  "onboarding.profile.note": "Biografia",
   "onboarding.share.title": "Partejar vòstre perfil",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
@@ -504,6 +514,7 @@
   "report_notification.categories.spam": "Messatge indesirable",
   "report_notification.categories.violation": "Violacion de las règlas",
   "report_notification.open": "Dobrir lo senhalament",
+  "search.no_recent_searches": "Cap de recèrcas recentas",
   "search.placeholder": "Recercar",
   "search.search_or_paste": "Recercar o picar una URL",
   "search_popout.language_code": "Còdi ISO de lenga",
@@ -536,6 +547,7 @@
   "status.copy": "Copiar lo ligam de l’estatut",
   "status.delete": "Escafar",
   "status.detailed_status": "Vista detalhada de la convèrsa",
+  "status.direct": "Mencionar @{name} en privat",
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
   "status.edited": "Modificat {date}",
@@ -626,6 +638,7 @@
   "upload_modal.preview_label": "Apercebut ({ratio})",
   "upload_progress.label": "Mandadís…",
   "upload_progress.processing": "Tractament…",
+  "username.taken": "Aqueste nom d’utilizaire es pres. Ensajatz-ne un autre",
   "video.close": "Tampar la vidèo",
   "video.download": "Telecargar lo fichièr",
   "video.exit_fullscreen": "Sortir plen ecran",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 9983936953..cc8b583120 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -48,7 +48,7 @@
   "account.locked_info": "此帳號的隱私狀態設定為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
   "account.media": "媒體",
   "account.mention": "提及 @{name}",
-  "account.moved_to": "{name} 現在的新帳號為：",
+  "account.moved_to": "{name} 目前的新帳號為：",
   "account.mute": "靜音 @{name}",
   "account.mute_notifications_short": "靜音推播通知",
   "account.mute_short": "靜音",
@@ -59,7 +59,7 @@
   "account.posts": "嘟文",
   "account.posts_with_replies": "嘟文與回覆",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等待核准。按一下以取消跟隨請求",
+  "account.requested": "正在等候審核。按一下以取消跟隨請求",
   "account.requested_follow": "{name} 要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示來自 @{name} 的嘟文",
@@ -84,7 +84,7 @@
   "admin.impact_report.title": "影響總結",
   "alert.rate_limited.message": "請於 {retry_time, time, medium} 後重試。",
   "alert.rate_limited.title": "已限速",
-  "alert.unexpected.message": "發生了非預期的錯誤。",
+  "alert.unexpected.message": "發生非預期的錯誤。",
   "alert.unexpected.title": "哎呀！",
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
@@ -241,7 +241,7 @@
   "empty_column.followed_tags": "您還沒有跟隨任何主題標籤。當您跟隨主題標籤時，它們將於此顯示。",
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
   "empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
-  "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出了新的嘟文時，它們將顯示於此。",
+  "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
   "empty_column.lists": "您還沒有建立任何列表。當您建立列表時，它將於此顯示。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
   "empty_column.notifications": "您還沒有收到任何通知，當您與別人開始互動時，它將於此顯示。",
@@ -303,8 +303,8 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} 名} other {{counter} 名}}參與者",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
   "hashtag.counter_by_uses_today": "本日有 {count, plural, one {{counter} 則} other {{counter} 則}}嘟文",
-  "hashtag.follow": "追蹤主題標籤",
-  "hashtag.unfollow": "取消追蹤主題標籤",
+  "hashtag.follow": "跟隨主題標籤",
+  "hashtag.unfollow": "取消跟隨主題標籤",
   "hashtags.and_other": "…及其他 {count, plural, other {# 個}}",
   "home.actions.go_to_explore": "看看發生什麼新鮮事",
   "home.actions.go_to_suggestions": "尋找一些人來跟隨",
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 7af72457d0..d20609a8ce 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -443,6 +443,9 @@ br:
   preferences:
     other: All
     posting_defaults: Arventennoù embann dre ziouer
+  redirects:
+    prompt: M'ho peus fiziañs el liamm-mañ, klikit warnañ evit kenderc'hel.
+    title: O kuitaat %{instance} emaoc'h.
   relationships:
     dormant: O kousket
     followers: Heulier·ezed·ien
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 38ef976b83..58f6e26374 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1546,6 +1546,9 @@ ca:
     errors:
       limit_reached: Límit de diferents reaccions assolit
       unrecognized_emoji: no és un emoji reconegut
+  redirects:
+    prompt: Si confieu en aquest enllaç, feu-hi clic per a continuar.
+    title: Esteu sortint de %{instance}.
   relationships:
     activity: Activitat del compte
     confirm_follow_selected_followers: Segur que vols seguir els seguidors seleccionats?
diff --git a/config/locales/da.yml b/config/locales/da.yml
index d92d001905..57899d5f71 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1546,6 +1546,9 @@ da:
     errors:
       limit_reached: Grænse for forskellige reaktioner nået
       unrecognized_emoji: er ikke en genkendt emoji
+  redirects:
+    prompt: Er der tillid til dette link, så klik på det for at fortsætte.
+    title: Nu forlades %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Sikker på, at de valgte følgere skal følges?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9568f698d1..b77f415190 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1546,6 +1546,9 @@ de:
     errors:
       limit_reached: Limit für verschiedene Reaktionen erreicht
       unrecognized_emoji: ist ein unbekanntes Emoji
+  redirects:
+    prompt: Wenn du diesem Link vertraust, dann klicke ihn an, um fortzufahren.
+    title: Du verlässt %{instance}.
   relationships:
     activity: Kontoaktivität
     confirm_follow_selected_followers: Möchtest du den ausgewählten Followern folgen?
diff --git a/config/locales/devise.fr-CA.yml b/config/locales/devise.fr-CA.yml
index 34104e0ac5..7f13f67828 100644
--- a/config/locales/devise.fr-CA.yml
+++ b/config/locales/devise.fr-CA.yml
@@ -73,9 +73,13 @@ fr-CA:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
+        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+        extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
+        explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+        extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 1fc6663bfe..8a5b8384e0 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -73,9 +73,13 @@ fr:
           subject: 'Mastodon: Clé de sécurité supprimée'
           title: Une de vos clés de sécurité a été supprimée
       webauthn_disabled:
+        explanation: L'authentification avec les clés de sécurité a été désactivée pour votre compte.
+        extra: La connexion est maintenant possible en utilisant uniquement le jeton généré par l'application TOTP associée.
         subject: 'Mastodon: Authentification avec clés de sécurité désactivée'
         title: Clés de sécurité désactivées
       webauthn_enabled:
+        explanation: L'authentification par clé de sécurité a été activée pour votre compte.
+        extra: Votre clé de sécurité peut maintenant être utilisée pour vous connecter.
         subject: 'Mastodon: Authentification de la clé de sécurité activée'
         title: Clés de sécurité activées
     omniauth_callbacks:
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
index b089f21427..6544f426bd 100644
--- a/config/locales/devise.sv.yml
+++ b/config/locales/devise.sv.yml
@@ -77,6 +77,7 @@ sv:
         subject: 'Mastodon: Autentisering med säkerhetsnycklar är inaktiverat'
         title: Säkerhetsnycklar inaktiverade
       webauthn_enabled:
+        extra: Din säkerhetsnyckel kan nu användas för inloggning.
         subject: 'Mastodon: Autentisering med säkerhetsnyckel är aktiverat'
         title: Säkerhetsnycklar aktiverade
     omniauth_callbacks:
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 762c8eba84..06438971a7 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -47,14 +47,14 @@ zh-TW:
         subject: Mastodon：重設密碼指引
         title: 重設密碼
       two_factor_disabled:
-        explanation: 現在僅可使用電子郵件地址與密碼登入。
+        explanation: 目前僅可使用電子郵件地址與密碼登入。
         subject: Mastodon：已停用兩階段驗證
-        subtitle: 您帳號的兩步驟驗證已停用。
+        subtitle: 您帳號之兩階段驗證已停用。
         title: 已停用兩階段驗證
       two_factor_enabled:
-        explanation: 登入時需要配對的 TOTP 應用程式產生的權杖。
+        explanation: 登入時需要配對的 TOTP 應用程式產生之 token。
         subject: Mastodon：已啟用兩階段驗證
-        subtitle: 您的帳號已啟用兩步驟驗證。
+        subtitle: 您的帳號之兩階段驗證已啟用。
         title: 已啟用兩階段驗證
       two_factor_recovery_codes_changed:
         explanation: 之前的備用驗證碼已經失效，且已產生新的。
@@ -74,12 +74,12 @@ zh-TW:
           title: 您的一支安全密鑰已經被移除
       webauthn_disabled:
         explanation: 您的帳號已停用安全金鑰身份驗證。
-        extra: 現在僅可使用配對的 TOTP 應用程式產生的權杖登入。
+        extra: 現在僅可使用配對的 TOTP 應用程式產生之 token 登入。
         subject: Mastodon：安全密鑰認證方式已停用
         title: 已停用安全密鑰
       webauthn_enabled:
-        explanation: 您的帳號已啟用安全金鑰驗證。
-        extra: 您的安全金鑰現在可用於登入。
+        explanation: 您的帳號已啟用安全金鑰身分驗證。
+        extra: 您的安全金鑰現在已可用於登入。
         subject: Mastodon：已啟用安全密鑰認證
         title: 已啟用安全密鑰
     omniauth_callbacks:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index cc55d3d3ff..d1dbdbf0b8 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1546,6 +1546,9 @@ es-AR:
     errors:
       limit_reached: Se alcanzó el límite de reacciones diferentes
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confiás en este enlace, dale clic o un toque para continuar.
+    title: Estás dejando %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro que querés seguir a los seguidores seleccionados?"
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index b84fb7cf96..4d228e98d4 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1546,6 +1546,9 @@ es-MX:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confías en este enlace, púlsalo para continuar.
+    title: Vas a salir de %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 95816d6bcb..08fc0988e4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1546,6 +1546,9 @@ es:
     errors:
       limit_reached: Límite de reacciones diferentes alcanzado
       unrecognized_emoji: no es un emoji conocido
+  redirects:
+    prompt: Si confías en este enlace, púlsalo para continuar.
+    title: Vas a salir de %{instance}.
   relationships:
     activity: Actividad de la cuenta
     confirm_follow_selected_followers: "¿Estás seguro de que quieres seguir a las cuentas seleccionadas?"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index bd6ea8c832..44688577a9 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1550,6 +1550,9 @@ eu:
     errors:
       limit_reached: Erreakzio desberdinen muga gaindituta
       unrecognized_emoji: ez da emoji ezaguna
+  redirects:
+    prompt: Esteka honetan fidatzen bazara, egin klik jarraitzeko.
+    title: "%{instance} instantziatik zoaz."
   relationships:
     activity: Kontuaren aktibitatea
     confirm_follow_selected_followers: Ziur hautatutako jarraitzaileei jarraitu nahi dituzula?
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 8e61c7b2a0..856532f8f1 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1546,6 +1546,9 @@ fi:
     errors:
       limit_reached: Erilaisten reaktioiden raja saavutettu
       unrecognized_emoji: ei ole tunnistettu emoji
+  redirects:
+    prompt: Jos luotat tähän linkkiin, jatka napsauttamalla.
+    title: Olet poistumassa palvelimelta %{instance}.
   relationships:
     activity: Tilin aktiivisuus
     confirm_follow_selected_followers: Haluatko varmasti seurata valittuja seuraajia?
@@ -1791,8 +1794,8 @@ fi:
       subject: Arkisto on valmiina ladattavaksi
       title: Arkiston tallennus
     failed_2fa:
-      details: 'Tässä on tiedot kirjautumisyrityksestä:'
-      explanation: Joku on yrittänyt kirjautua tilillesi, mutta antanut virheellisen kaksivaiheisen todennuksen.
+      details: 'Tässä on tietoja kirjautumisyrityksestä:'
+      explanation: Joku on yrittänyt kirjautua tilillesi mutta on antanut virheellisen toisen vaiheen todennustekijän.
       further_actions_html: Jos se et ollut sinä, suosittelemme, että %{action} välittömästi, sillä se on saattanut vaarantua.
       subject: Kaksivaiheisen todennuksen virhe
       title: Epäonnistunut kaksivaiheinen todennus
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 8e34265313..10b1e76f5f 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1546,6 +1546,9 @@ fo:
     errors:
       limit_reached: Mark fyri ymisk aftursvar rokkið
       unrecognized_emoji: er ikki eitt kenslutekn, sum kennist aftur
+  redirects:
+    prompt: Um tú lítir á hetta leinkið, so kanst tú klikkja á tað fyri at halda fram.
+    title: Tú fer burtur úr %{instance}.
   relationships:
     activity: Kontuvirksemi
     confirm_follow_selected_followers: Vil tú veruliga fylgja valdu fylgjarunum?
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index dbdff5f52c..3676d0b7b5 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1546,6 +1546,9 @@ fr-CA:
     errors:
       limit_reached: Limite de réactions différentes atteinte
       unrecognized_emoji: n’est pas un émoji reconnu
+  redirects:
+    prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+    title: Vous quittez %{instance}.
   relationships:
     activity: Activité du compte
     confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1790,6 +1793,12 @@ fr-CA:
       extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
+    failed_2fa:
+      details: 'Voici les détails de la tentative de connexion :'
+      explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+      further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+      subject: Échec de l'authentification à double facteur
+      title: Échec de l'authentification à double facteur
     suspicious_sign_in:
       change_password: changer votre mot de passe
       details: 'Voici les détails de la connexion :'
@@ -1843,6 +1852,7 @@ fr-CA:
     go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+    rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
     seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fe1a219a31..a3aaf7a26e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1546,6 +1546,9 @@ fr:
     errors:
       limit_reached: Limite de réactions différentes atteinte
       unrecognized_emoji: n’est pas un émoji reconnu
+  redirects:
+    prompt: Si vous faites confiance à ce lien, cliquez pour continuer.
+    title: Vous quittez %{instance}.
   relationships:
     activity: Activité du compte
     confirm_follow_selected_followers: Voulez-vous vraiment suivre les abonné⋅e⋅s sélectionné⋅e⋅s ?
@@ -1790,6 +1793,12 @@ fr:
       extra: Elle est maintenant prête à être téléchargée !
       subject: Votre archive est prête à être téléchargée
       title: Récupération de l’archive
+    failed_2fa:
+      details: 'Voici les détails de la tentative de connexion :'
+      explanation: Quelqu'un a essayé de se connecter à votre compte mais a fourni un second facteur d'authentification invalide.
+      further_actions_html: Si ce n'était pas vous, nous vous recommandons %{action} immédiatement car il pourrait être compromis.
+      subject: Échec de l'authentification à double facteur
+      title: Échec de l'authentification à double facteur
     suspicious_sign_in:
       change_password: changer votre mot de passe
       details: 'Voici les détails de la connexion :'
@@ -1843,6 +1852,7 @@ fr:
     go_to_sso_account_settings: Accédez aux paramètres du compte de votre fournisseur d'identité
     invalid_otp_token: Le code d’authentification à deux facteurs est invalide
     otp_lost_help_html: Si vous perdez accès aux deux, vous pouvez contacter %{email}
+    rate_limited: Trop de tentatives d'authentification, réessayez plus tard.
     seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
     signed_in_as: 'Connecté·e en tant que :'
   verification:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 087ed2ec76..7b3fd1a6eb 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1546,6 +1546,9 @@ gl:
     errors:
       limit_reached: Acadouse o límite das diferentes reaccións
       unrecognized_emoji: non é unha emoticona recoñecida
+  redirects:
+    prompt: Se confías nesta ligazón, preme nela para continuar.
+    title: Vas saír de %{instance}.
   relationships:
     activity: Actividade da conta
     confirm_follow_selected_followers: Tes a certeza de querer seguir as seguidoras seleccionadas?
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 1f5fd096ac..05b52213a7 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1598,6 +1598,9 @@ he:
     errors:
       limit_reached: גבול מספר התגובות השונות הושג
       unrecognized_emoji: הוא לא אמוג'י מוכר
+  redirects:
+    prompt: יש ללחוץ על הקישור, אם לדעתך ניתן לסמוך עליו.
+    title: יציאה מתוך %{instance}.
   relationships:
     activity: רמת פעילות
     confirm_follow_selected_followers: האם את/ה בטוח/ה שברצונך לעקוב אחרי החשבונות שסומנו?
@@ -1856,7 +1859,7 @@ he:
       title: הוצאת ארכיון
     failed_2fa:
       details: 'הנה פרטי נסיון ההתחברות:'
-      explanation: פולני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
+      explanation: פלוני אלמוני ניסה להתחבר לחשבונך אך האימות המשני נכשל.
       further_actions_html: אם הנסיון לא היה שלך, אנו ממליצים על %{action} באופן מיידי כדי שהחשבון לא יפול קורבן.
       subject: נכשל אימות בגורם שני
       title: אימות בגורם שני נכשל
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 2870435ea7..8cbbb64c97 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1546,6 +1546,8 @@ hu:
     errors:
       limit_reached: A különböző reakciók száma elérte a határértéket
       unrecognized_emoji: nem ismert emodzsi
+  redirects:
+    prompt: Ha megbízunk ebben a hivatkozásban, kattintsunk rá a folytatáshoz.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 191383f56c..d374c60755 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1550,6 +1550,9 @@ is:
     errors:
       limit_reached: Hámarki mismunandi viðbragða náð
       unrecognized_emoji: er ekki þekkt tjáningartákn
+  redirects:
+    prompt: Ef þú treystir þessum tengli, geturðu smellt á hann til að halda áfram.
+    title: Þú ert að yfirgefa %{instance}.
   relationships:
     activity: Virkni aðgangs
     confirm_follow_selected_followers: Ertu viss um að þú viljir fylgjast með völdum fylgjendum?
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 89ff071f36..31de2252d1 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1548,6 +1548,9 @@ it:
     errors:
       limit_reached: Raggiunto il limite di reazioni diverse
       unrecognized_emoji: non è un emoji riconosciuto
+  redirects:
+    prompt: Se ti fidi di questo collegamento, fai clic su di esso per continuare.
+    title: Stai lasciando %{instance}.
   relationships:
     activity: Attività dell'account
     confirm_follow_selected_followers: Sei sicuro di voler seguire i follower selezionati?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index c966cbe36f..2051e30aee 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1758,6 +1758,12 @@ ja:
       extra: ダウンロードの準備ができました！
       subject: アーカイブの準備ができました
       title: アーカイブの取り出し
+    failed_2fa:
+      details: '試行されたログインの詳細は以下のとおりです:'
+      explanation: アカウントへのログインが試行されましたが、二要素認証で不正な回答が送信されました。
+      further_actions_html: このログインに心当たりがない場合は、ただちに%{action}してください。
+      subject: 二要素認証に失敗しました
+      title: 二要素認証に失敗した記録があります
     suspicious_sign_in:
       change_password: パスワードを変更
       details: 'ログインの詳細は以下のとおりです:'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b3c786e265..9f4f1343c7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1522,6 +1522,9 @@ ko:
     errors:
       limit_reached: 리액션 갯수 제한에 도달했습니다
       unrecognized_emoji: 인식 되지 않은 에모지입니다
+  redirects:
+    prompt: 이 링크를 믿을 수 있다면, 클릭해서 계속하세요.
+    title: "%{instance}를 떠나려고 합니다."
   relationships:
     activity: 계정 활동
     confirm_follow_selected_followers: 정말로 선택된 팔로워들을 팔로우하시겠습니까?
@@ -1762,6 +1765,10 @@ ko:
       title: 아카이브 테이크아웃
     failed_2fa:
       details: '로그인 시도에 대한 상세 정보입니다:'
+      explanation: 누군가가 내 계정에 로그인을 시도했지만 2차인증에 올바른 값을 입력하지 못했습니다.
+      further_actions_html: 만약 당신이 한 게 아니었다면 유출의 가능성이 있으니 가능한 빨리 %{action} 하시기 바랍니다.
+      subject: 2차 인증 실패
+      title: 2차 인증에 실패했습니다
     suspicious_sign_in:
       change_password: 암호 변경
       details: '로그인에 대한 상세 정보입니다:'
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index be5d2d21bd..02308cf2f0 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1516,6 +1516,9 @@ lad:
     errors:
       limit_reached: Limito de reaksyones desferentes alkansado
       unrecognized_emoji: no es un emoji konesido
+  redirects:
+    prompt: Si konfiyas en este atadijo, klikalo para kontinuar.
+    title: Estas salyendo de %{instance}.
   relationships:
     activity: Aktivita del kuento
     confirm_follow_selected_followers: Estas siguro ke keres segir a los suivantes eskojidos?
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index ba8b53fdc9..1d159bf45a 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -478,6 +478,9 @@ lt:
     other: Kita
   privacy:
     hint_html: "<strong>Tikrink, kaip nori, kad tavo profilis ir įrašai būtų randami.</strong> Įjungus įvairias Mastodon funkcijas, jos gali padėti pasiekti platesnę auditoriją. Akimirką peržiūrėk šiuos nustatymus, kad įsitikintum, jog jie atitinka tavo naudojimo būdą."
+  redirects:
+    prompt: Jei pasitiki šia nuoroda, spustelėk ją, kad tęstum.
+    title: Palieki %{instance}
   remote_follow:
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
   scheduled_statuses:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2d27f9165d..a3657890da 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1546,6 +1546,9 @@ nl:
     errors:
       limit_reached: Limiet van verschillende emoji-reacties bereikt
       unrecognized_emoji: is geen bestaande emoji-reactie
+  redirects:
+    prompt: Als je deze link vertrouwt, klik er dan op om door te gaan.
+    title: Je verlaat %{instance}.
   relationships:
     activity: Accountactiviteit
     confirm_follow_selected_followers: Weet je zeker dat je de geselecteerde volgers wilt volgen?
@@ -1792,7 +1795,8 @@ nl:
       title: Archief ophalen
     failed_2fa:
       details: 'Hier zijn details van de aanmeldpoging:'
-      explanation: Iemand heeft geprobeerd om in te loggen op uw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
+      explanation: Iemand heeft geprobeerd om in te loggen op jouw account maar heeft een ongeldige tweede verificatiefactor opgegeven.
+      further_actions_html: Als jij dit niet was, raden we je aan om onmiddellijk %{action} aangezien het in gevaar kan zijn.
       subject: Tweede factor authenticatiefout
       title: Tweestapsverificatie mislukt
     suspicious_sign_in:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 95eed49785..ffa5198a3a 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1546,6 +1546,9 @@ nn:
     errors:
       limit_reached: Grensen for forskjellige reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
+  redirects:
+    prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
+    title: Du forlater %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du ynskjer å fylgja dei valde fylgjarane?
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 7ece8564fc..d26b20379e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1546,6 +1546,9 @@
     errors:
       limit_reached: Grensen for ulike reaksjoner nådd
       unrecognized_emoji: er ikke en gjenkjent emoji
+  redirects:
+    prompt: Hvis du stoler på denne lenken, så trykk på den for å fortsette.
+    title: Du forlater %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Er du sikker på at du vil følge valgte følgere?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6718f1994b..5bc78a6adf 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1598,6 +1598,9 @@ pl:
     errors:
       limit_reached: Przekroczono limit różnych reakcji
       unrecognized_emoji: nie jest znanym emoji
+  redirects:
+    prompt: Kliknij ten link jeżeli mu ufasz.
+    title: Opuszczasz %{instance}.
   relationships:
     activity: Aktywność konta
     confirm_follow_selected_followers: Czy na pewno chcesz obserwować wybranych obserwujących?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c1a47c0161..79396d627f 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1546,6 +1546,9 @@ pt-BR:
     errors:
       limit_reached: Limite de reações diferentes atingido
       unrecognized_emoji: não é um emoji reconhecido
+  redirects:
+    prompt: Se você confia neste link, clique nele para continuar.
+    title: Você está saindo de %{instance}.
   relationships:
     activity: Atividade da conta
     confirm_follow_selected_followers: Tem certeza que deseja seguir os seguidores selecionados?
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 268531718d..8a20bc68a1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1546,6 +1546,9 @@ pt-PT:
     errors:
       limit_reached: Alcançado limite de reações diferentes
       unrecognized_emoji: não é um emoji reconhecido
+  redirects:
+    prompt: Se confia nesta hiperligação, clique nela para continuar.
+    title: Está a deixar %{instance}.
   relationships:
     activity: Atividade da conta
     confirm_follow_selected_followers: Tem a certeza que deseja seguir os seguidores selecionados?
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 24edbdc75e..04e49e0427 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1598,6 +1598,9 @@ ru:
     errors:
       limit_reached: Достигнут лимит разных реакций
       unrecognized_emoji: не является распознанным эмодзи
+  redirects:
+    prompt: Если вы доверяете этой ссылке, нажмите на нее, чтобы продолжить.
+    title: Вы покидаете %{instance}.
   relationships:
     activity: Активность учётной записи
     confirm_follow_selected_followers: Вы уверены, что хотите подписаться на выбранных подписчиков?
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index e83ae348f6..20df763463 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1101,6 +1101,9 @@ sk:
     errors:
       limit_reached: Maximálny počet rôznorodých reakcií bol dosiahnutý
       unrecognized_emoji: je neznámy smajlík
+  redirects:
+    prompt: Ak tomuto odkazu veríš, klikni naňho pre pokračovanie.
+    title: Opúšťaš %{instance}.
   relationships:
     activity: Aktivita účtu
     confirm_follow_selected_followers: Si si istý/á, že chceš nasledovať vybraných sledujúcich?
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index d6e6925c70..3dd4731209 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1542,6 +1542,9 @@ sq:
     errors:
       limit_reached: U mbërrit në kufirin e reagimeve të ndryshme
       unrecognized_emoji: s’është emotikon i pranuar
+  redirects:
+    prompt: Nëse e besoni këtë lidhje, klikoni që të vazhdohet.
+    title: Po e braktisni %{instance}.
   relationships:
     activity: Veprimtari llogarie
     confirm_follow_selected_followers: Jeni i sigurt se doni të ndiqet ndjekësit e përzgjedhur?
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 9cb555c943..b55b6e0d19 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1572,6 +1572,9 @@ sr-Latn:
     errors:
       limit_reached: Dostignuto je ograničenje različitih reakcija
       unrecognized_emoji: nije prepoznat emodži
+  redirects:
+    prompt: Ako verujete ovoj vezi, kliknite na nju za nastavak.
+    title: Napuštate %{instance}.
   relationships:
     activity: Aktivnost naloga
     confirm_follow_selected_followers: Da li ste sigurni da želite da pratite izabrane pratioce?
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index e1c2e992ed..8de7c90e73 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1572,6 +1572,9 @@ sr:
     errors:
       limit_reached: Достигнуто је ограничење различитих реакција
       unrecognized_emoji: није препознат емоџи
+  redirects:
+    prompt: Ако верујете овој вези, кликните на њу за наставак.
+    title: Напуштате %{instance}.
   relationships:
     activity: Активност налога
     confirm_follow_selected_followers: Да ли сте сигурни да желите да пратите изабране пратиоце?
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index c9000d50fc..deac7cc638 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1545,6 +1545,9 @@ sv:
     errors:
       limit_reached: Gränsen för unika reaktioner uppnådd
       unrecognized_emoji: är inte en igenkänd emoji
+  redirects:
+    prompt: Om du litar på denna länk, klicka på den för att fortsätta.
+    title: Du lämnar %{instance}.
   relationships:
     activity: Kontoaktivitet
     confirm_follow_selected_followers: Är du säker på att du vill följa valda följare?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 2b5b5ad45b..b3a52715b7 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1546,6 +1546,9 @@ tr:
     errors:
       limit_reached: Farklı reaksiyonların sınırına ulaşıldı
       unrecognized_emoji: tanınan bir emoji değil
+  redirects:
+    prompt: Eğer bu bağlantıya güveniyorsanız, tıklayıp devam edebilirsiniz.
+    title: "%{instance} sunucusundan ayrılıyorsunuz."
   relationships:
     activity: Hesap etkinliği
     confirm_follow_selected_followers: Seçili takipçileri takip etmek istediğinizden emin misiniz?
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 40a858d72a..531bdb3d59 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1598,6 +1598,9 @@ uk:
     errors:
       limit_reached: Досягнуто обмеження різних реакцій
       unrecognized_emoji: не є розпізнаним емоджі
+  redirects:
+    prompt: Якщо ви довіряєте цьому посиланню, натисніть, щоб продовжити.
+    title: Ви покидаєте %{instance}.
   relationships:
     activity: Діяльність облікового запису
     confirm_follow_selected_followers: Ви справді бажаєте підписатися на обраних підписників?
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 1ece72e154..045a000e38 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1520,6 +1520,9 @@ vi:
     errors:
       limit_reached: Bạn không nên thao tác liên tục
       unrecognized_emoji: không phải là emoji
+  redirects:
+    prompt: Nếu bạn tin tưởng, hãy nhấn tiếp tục.
+    title: Bạn đang thoát khỏi %{instance}.
   relationships:
     activity: Tương tác
     confirm_follow_selected_followers: Bạn có chắc muốn theo dõi những người đã chọn?
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 272787ce25..d1255bfefe 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1520,6 +1520,9 @@ zh-CN:
     errors:
       limit_reached: 互动种类的限制
       unrecognized_emoji: 不是一个可识别的表情
+  redirects:
+    prompt: 如果您信任此链接，请单击以继续跳转。
+    title: 您正在离开 %{instance} 。
   relationships:
     activity: 账号活动
     confirm_follow_selected_followers: 您确定想要关注所选的关注者吗？
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 0c39aa8c0b..b010a75c04 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1520,6 +1520,9 @@ zh-HK:
     errors:
       limit_reached: 已達到可以給予反應極限
       unrecognized_emoji: 不能識別這個emoji
+  redirects:
+    prompt: 如果你信任此連結，點擊它繼續。
+    title: 你即將離開 %{instance}。
   relationships:
     activity: 帳戶活動
     confirm_follow_selected_followers: 你確定要追蹤選取的追蹤者嗎？
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8726ea72a4..72e63e47d3 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -57,7 +57,7 @@ zh-TW:
       destroyed_msg: 即將刪除 %{username} 的資料
       disable: 停用
       disable_sign_in_token_auth: 停用電子郵件 token 驗證
-      disable_two_factor_authentication: 停用兩階段認證
+      disable_two_factor_authentication: 停用兩階段驗證
       disabled: 已停用
       display_name: 暱稱
       domain: 站點
@@ -195,7 +195,7 @@ zh-TW:
         destroy_status: 刪除狀態
         destroy_unavailable_domain: 刪除無法存取的網域
         destroy_user_role: 移除角色
-        disable_2fa_user: 停用兩階段認證
+        disable_2fa_user: 停用兩階段驗證
         disable_custom_emoji: 停用自訂顏文字
         disable_sign_in_token_auth_user: 停用使用者電子郵件 token 驗證
         disable_user: 停用帳號
@@ -254,7 +254,7 @@ zh-TW:
         destroy_status_html: "%{name} 已刪除 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 已恢復對網域 %{target} 的發送"
         destroy_user_role_html: "%{name} 已刪除 %{target} 角色"
-        disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段認證 (2FA) "
+        disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段驗證 (2FA) "
         disable_custom_emoji_html: "%{name} 已停用自訂表情符號 %{target}"
         disable_sign_in_token_auth_user_html: "%{name} 已停用 %{target} 之使用者電子郵件 token 驗證"
         disable_user_html: "%{name} 將使用者 %{target} 設定為禁止登入"
@@ -418,7 +418,7 @@ zh-TW:
       view: 顯示已封鎖網域
     email_domain_blocks:
       add_new: 加入新項目
-      allow_registrations_with_approval: 經允許後可註冊
+      allow_registrations_with_approval: 經審核後可註冊
       attempts_over_week:
         other: 上週共有 %{count} 次註冊嘗試
       created_msg: 已成功將電子郵件網域加入黑名單
@@ -505,7 +505,7 @@ zh-TW:
       delivery_available: 可傳送
       delivery_error_days: 遞送失敗天數
       delivery_error_hint: 若 %{count} 日皆無法遞送 ，則會自動標記無法遞送。
-      destroyed_msg: 來自 %{domain} 的資料現在正在佇列中等待刪除。
+      destroyed_msg: 來自 %{domain} 的資料目前正在佇列中等待刪除。
       empty: 找不到網域
       known_accounts:
         other: "%{count} 個已知帳號"
@@ -759,7 +759,7 @@ zh-TW:
         title: 註冊
       registrations_mode:
         modes:
-          approved: 註冊需要核准
+          approved: 註冊需要審核
           none: 沒有人可註冊
           open: 任何人皆能註冊
       security:
@@ -870,7 +870,7 @@ zh-TW:
       links:
         allow: 允許連結
         allow_provider: 允許發行者
-        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索現在世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
+        description_html: 這些連結是正在被您伺服器上看到該嘟文之帳號大量分享。這些連結可以幫助您的使用者探索目前世界上正在發生的事情。除非您核准該發行者，連結將不被公開展示。您也可以核准或駁回個別連結。
         disallow: 不允許連結
         disallow_provider: 不允許發行者
         no_link_selected: 因未選取任何連結，所以什麼事都沒發生
@@ -1062,7 +1062,7 @@ zh-TW:
       cas: CAS
       saml: SAML
     register: 註冊
-    registration_closed: "%{instance} 現在不開放新成員"
+    registration_closed: "%{instance} 目前不開放新成員"
     resend_confirmation: 重新傳送確認連結
     reset_password: 重設密碼
     rules:
@@ -1522,6 +1522,9 @@ zh-TW:
     errors:
       limit_reached: 達到可回應之上限
       unrecognized_emoji: 並非一個可識別的 emoji
+  redirects:
+    prompt: 若您信任此連結，請點擊以繼續。
+    title: 您將要離開 %{instance} 。
   relationships:
     activity: 帳號動態
     confirm_follow_selected_followers: 您確定要跟隨選取的跟隨者嗎？
@@ -1627,7 +1630,7 @@ zh-TW:
     relationships: 跟隨中與跟隨者
     statuses_cleanup: 自動嘟文刪除
     strikes: 管理警告
-    two_factor_authentication: 兩階段認證
+    two_factor_authentication: 兩階段驗證
     webauthn_authentication: 安全金鑰
   statuses:
     attached:
@@ -1733,11 +1736,11 @@ zh-TW:
     disable: 停用兩階段驗證
     disabled_success: 已成功啟用兩階段驗證
     edit: 編輯
-    enabled: 兩階段認證已啟用
-    enabled_success: 已成功啟用兩階段認證
+    enabled: 兩階段驗證已啟用
+    enabled_success: 兩階段驗證已成功啟用
     generate_recovery_codes: 產生備用驗證碼
     lost_recovery_codes: 讓您能於遺失手機時，使用備用驗證碼登入。若您已遺失備用驗證碼，可於此產生一批新的，舊有的備用驗證碼將會失效。
-    methods: 兩步驟方式
+    methods: 兩階段驗證
     otp: 驗證應用程式
     recovery_codes: 備份備用驗證碼
     recovery_codes_regenerated: 成功產生新的備用驗證碼
@@ -1757,15 +1760,15 @@ zh-TW:
       title: 申訴被駁回
     backup_ready:
       explanation: 您要求完整備份您的 Mastodon 帳號。
-      extra: 準備好下載了！
+      extra: 準備好可供下載了！
       subject: 您的備份檔已可供下載
       title: 檔案匯出
     failed_2fa:
       details: 以下是該登入嘗試之詳細資訊：
-      explanation: 有人嘗試登入您的帳號，但提供了無效的第二個驗證因子。
+      explanation: 有人嘗試登入您的帳號，但提供了無效的兩階段驗證。
       further_actions_html: 若這並非您所為，我們建議您立刻 %{action}，因為其可能已被入侵。
-      subject: 第二因子驗證失敗
-      title: 第二因子身份驗證失敗
+      subject: 兩階段驗證失敗
+      title: 兩階段驗證失敗
     suspicious_sign_in:
       change_password: 變更密碼
       details: 以下是該登入之詳細資訊：
@@ -1817,9 +1820,9 @@ zh-TW:
   users:
     follow_limit_reached: 您無法跟隨多於 %{limit} 個人
     go_to_sso_account_settings: 前往您的身分提供商 (identity provider) 之帳號設定
-    invalid_otp_token: 兩階段認證碼不正確
+    invalid_otp_token: 兩階段驗證碼不正確
     otp_lost_help_html: 如果您無法存取這兩者，您可以透過 %{email} 與我們聯繫
-    rate_limited: 身份驗證嘗試太多次，請稍後再試。
+    rate_limited: 過多次身份驗證嘗試，請稍後再試。
     seamless_external_login: 由於您是由外部系統登入，所以不能設定密碼與電子郵件。
     signed_in_as: 目前登入的帳號：
   verification:

From ca7053f19c425616b90774cd2f2553f0842cd314 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 08:10:39 -0500
Subject: [PATCH 419/436] Consolidate db test prep steps to rake task (#28886)

---
 .../workflows/test-migrations-one-step.yml    | 19 ++--------------
 .../workflows/test-migrations-two-step.yml    | 22 +++----------------
 lib/tasks/tests.rake                          | 18 +++++++++++++++
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/test-migrations-one-step.yml b/.github/workflows/test-migrations-one-step.yml
index 5dca8e376d..1ff5cc06b9 100644
--- a/.github/workflows/test-migrations-one-step.yml
+++ b/.github/workflows/test-migrations-one-step.yml
@@ -78,23 +78,8 @@ jobs:
       - name: Create database
         run: './bin/rails db:create'
 
-      - name: Run migrations up to v2.0.0
-        run: './bin/rails db:migrate VERSION=20171010025614'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2'
-
-      - name: Run migrations up to v2.4.0
-        run: './bin/rails db:migrate VERSION=20180514140000'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4'
-
-      - name: Run migrations up to v2.4.3
-        run: './bin/rails db:migrate VERSION=20180707154237'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4_3'
+      - name: Run historical migrations with data population
+        run: './bin/rails tests:migrations:prepare_database'
 
       - name: Run all remaining migrations
         run: './bin/rails db:migrate'
diff --git a/.github/workflows/test-migrations-two-step.yml b/.github/workflows/test-migrations-two-step.yml
index 59485d285d..6698847315 100644
--- a/.github/workflows/test-migrations-two-step.yml
+++ b/.github/workflows/test-migrations-two-step.yml
@@ -45,6 +45,7 @@ jobs:
           --health-retries 5
         ports:
           - 5432:5432
+
       redis:
         image: redis:7-alpine
         options: >-
@@ -77,28 +78,11 @@ jobs:
       - name: Create database
         run: './bin/rails db:create'
 
-      - name: Run migrations up to v2.0.0
-        run: './bin/rails db:migrate VERSION=20171010025614'
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2'
-
-      - name: Run pre-deployment migrations up to v2.4.0
-        run: './bin/rails db:migrate VERSION=20180514140000'
+      - name: Run historical migrations with data population
+        run: './bin/rails tests:migrations:prepare_database'
         env:
           SKIP_POST_DEPLOYMENT_MIGRATIONS: true
 
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4'
-
-      - name: Run migrations up to v2.4.3
-        run: './bin/rails db:migrate VERSION=20180707154237'
-        env:
-          SKIP_POST_DEPLOYMENT_MIGRATIONS: true
-
-      - name: Populate database with test data
-        run: './bin/rails tests:migrations:populate_v2_4_3'
-
       - name: Run all remaining pre-deployment migrations
         run: './bin/rails db:migrate'
         env:
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
index 45f055e218..885be79f41 100644
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@@ -2,6 +2,22 @@
 
 namespace :tests do
   namespace :migrations do
+    desc 'Prepares all migrations and test data for consistency checks'
+    task prepare_database: :environment do
+      {
+        '2' => 2017_10_10_025614,
+        '2_4' => 2018_05_14_140000,
+        '2_4_3' => 2018_07_07_154237,
+      }.each do |release, version|
+        ActiveRecord::Tasks::DatabaseTasks
+          .migration_connection
+          .migration_context
+          .migrate(version)
+        Rake::Task["tests:migrations:populate_v#{release}"]
+          .invoke
+      end
+    end
+
     desc 'Check that database state is consistent with a successful migration from populated data'
     task check_database: :environment do
       unless Account.find_by(username: 'admin', domain: nil)&.hide_collections? == false
@@ -88,6 +104,8 @@ namespace :tests do
         puts 'Locale for fr-QC users not updated to fr-CA as expected'
         exit(1)
       end
+
+      puts 'No errors found. Database state is consistent with a successful migration process.'
     end
 
     desc 'Populate the database with test data for 2.4.3'

From c8f59d2ca4d693f328d8f68a21749ab4efc8c820 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 08:28:49 -0500
Subject: [PATCH 420/436] Fix `Style/TernaryParentheses` cop (#28387)

---
 .rubocop_todo.yml                  | 7 -------
 config/environments/development.rb | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 77f7e70734..fd9dc18ac7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -279,13 +279,6 @@ Style/StringLiterals:
     - 'config/initializers/webauthn.rb'
     - 'config/routes.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
-  Exclude:
-    - 'config/environments/development.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3c13ada380..a855f5a16b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -85,7 +85,7 @@ Rails.application.configure do
   # If using a Heroku, Vagrant or generic remote development environment,
   # use letter_opener_web, accessible at  /letter_opener.
   # Otherwise, use letter_opener, which launches a browser window to view sent mail.
-  config.action_mailer.delivery_method = (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) ? :letter_opener_web : :letter_opener
+  config.action_mailer.delivery_method = ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV'] ? :letter_opener_web : :letter_opener
 
   # We provide a default secret for the development environment here.
   # This value should not be used in production environments!

From 2866106ec1fb1ac5b30f432730bd20c6459f6600 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 08:37:25 -0500
Subject: [PATCH 421/436] Reduce factory creation in
 `spec/models/account_statuses_cleanup_policy` (#28361)

---
 .../account_statuses_cleanup_policy_spec.rb   | 165 +++++++-----------
 1 file changed, 59 insertions(+), 106 deletions(-)

diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb
index da2a774b2d..a08fd723a4 100644
--- a/spec/models/account_statuses_cleanup_policy_spec.rb
+++ b/spec/models/account_statuses_cleanup_policy_spec.rb
@@ -296,16 +296,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
       let!(:old_status)               { Fabricate(:status, created_at: 1.year.ago, account: account) }
       let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
 
-      it 'returns statuses including max_id' do
-        expect(subject).to include(old_status.id)
-      end
-
-      it 'returns statuses including older than max_id' do
-        expect(subject).to include(very_old_status.id)
-      end
-
-      it 'does not return statuses newer than max_id' do
-        expect(subject).to_not include(slightly_less_old_status.id)
+      it 'returns statuses included the max_id and older than the max_id but not newer than max_id' do
+        expect(subject)
+          .to include(old_status.id)
+          .and include(very_old_status.id)
+          .and not_include(slightly_less_old_status.id)
       end
     end
 
@@ -315,16 +310,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
       let!(:old_status)               { Fabricate(:status, created_at: 1.year.ago, account: account) }
       let!(:slightly_less_old_status) { Fabricate(:status, created_at: 6.months.ago, account: account) }
 
-      it 'returns statuses including min_id' do
-        expect(subject).to include(old_status.id)
-      end
-
-      it 'returns statuses including newer than max_id' do
-        expect(subject).to include(slightly_less_old_status.id)
-      end
-
-      it 'does not return statuses older than min_id' do
-        expect(subject).to_not include(very_old_status.id)
+      it 'returns statuses including min_id and newer than min_id, but not older than min_id' do
+        expect(subject)
+          .to include(old_status.id)
+          .and include(slightly_less_old_status.id)
+          .and not_include(very_old_status.id)
       end
     end
 
@@ -339,12 +329,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_status_age = 2.years.seconds
       end
 
-      it 'does not return unrelated old status' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns only oldest status for deletion' do
-        expect(subject.pluck(:id)).to eq [very_old_status.id]
+      it 'does not return unrelated old status and does return oldest status' do
+        expect(subject.pluck(:id))
+          .to not_include(unrelated_status.id)
+          .and eq [very_old_status.id]
       end
     end
 
@@ -358,12 +346,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old direct message for deletion' do
-        expect(subject.pluck(:id)).to_not include(direct_message.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status except does not return the old direct message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(direct_message.id)
+          .and include(very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -377,12 +363,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = true
       end
 
-      it 'does not return the old self-bookmarked message for deletion' do
-        expect(subject.pluck(:id)).to_not include(self_bookmarked.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old self-bookmarked message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(self_bookmarked.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -396,12 +380,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old self-bookmarked message for deletion' do
-        expect(subject.pluck(:id)).to_not include(self_faved.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old self-faved message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(self_faved.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -415,12 +397,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old message with media for deletion' do
-        expect(subject.pluck(:id)).to_not include(status_with_media.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old message with media for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(status_with_media.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -434,12 +414,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old poll message for deletion' do
-        expect(subject.pluck(:id)).to_not include(status_with_poll.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old poll message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(status_with_poll.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -453,12 +431,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the old pinned message for deletion' do
-        expect(subject.pluck(:id)).to_not include(pinned_status.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the old pinned message for deletion' do
+        expect(subject.pluck(:id))
+          .to not_include(pinned_status.id)
+          .and include(direct_message.id, very_old_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -472,16 +448,11 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = false
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns every other old status for deletion' do
-        expect(subject.pluck(:id)).to include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns every old status but does not return the recent or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(unrelated_status.id)
+          .and include(direct_message.id, very_old_status.id, pinned_status.id, self_faved.id, self_bookmarked.id, status_with_poll.id, status_with_media.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -495,12 +466,10 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.keep_self_bookmark = true
       end
 
-      it 'does not return unrelated old status' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns only normal statuses for deletion' do
-        expect(subject.pluck(:id)).to contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns normal statuses and does not return unrelated old status' do
+        expect(subject.pluck(:id))
+          .to not_include(unrelated_status.id)
+          .and contain_exactly(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
 
@@ -509,20 +478,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_reblogs = 5
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the toot reblogged 5 times' do
-        expect(subject.pluck(:id)).to_not include(reblogged_secondary.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns old statuses not reblogged as much' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
+      it 'returns old not-reblogged statuses but does not return the recent, 5-times reblogged, or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(reblogged_secondary.id)
+          .and not_include(unrelated_status.id)
+          .and include(very_old_status.id, faved_primary.id, faved_secondary.id, reblogged_primary.id)
       end
     end
 
@@ -531,20 +492,12 @@ RSpec.describe AccountStatusesCleanupPolicy do
         account_statuses_cleanup_policy.min_favs = 5
       end
 
-      it 'does not return the recent toot' do
-        expect(subject.pluck(:id)).to_not include(recent_status.id)
-      end
-
-      it 'does not return the toot faved 5 times' do
-        expect(subject.pluck(:id)).to_not include(faved_secondary.id)
-      end
-
-      it 'does not return the unrelated toot' do
-        expect(subject.pluck(:id)).to_not include(unrelated_status.id)
-      end
-
-      it 'returns old statuses not faved as much' do
-        expect(subject.pluck(:id)).to include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
+      it 'returns old not-faved statuses but does not return the recent, 5-times faved, or unrelated statuses' do
+        expect(subject.pluck(:id))
+          .to not_include(recent_status.id)
+          .and not_include(faved_secondary.id)
+          .and not_include(unrelated_status.id)
+          .and include(very_old_status.id, faved_primary.id, reblogged_primary.id, reblogged_secondary.id)
       end
     end
   end

From 274a48a9f4cd5bb36ad6933d736c04d04db75af0 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 08:49:33 -0500
Subject: [PATCH 422/436] Extract helper methods for db connection and table
 existence check in `CLI::Maintenance` task (#28281)

---
 lib/mastodon/cli/maintenance.rb | 150 +++++++++++++++++---------------
 1 file changed, 81 insertions(+), 69 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 73012812fd..c644729b5e 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -72,6 +72,10 @@ module Mastodon::CLI
         local? ? username : "#{username}@#{domain}"
       end
 
+      def db_table_exists?(table)
+        ActiveRecord::Base.connection.table_exists?(table)
+      end
+
       # This is a duplicate of the Account::Merging concern because we need it
       # to be independent from code version.
       def merge_with!(other_account)
@@ -88,12 +92,12 @@ module Mastodon::CLI
           AccountModerationNote, AccountPin, AccountStat, ListAccount,
           PollVote, Mention
         ]
-        owned_classes << AccountDeletionRequest if ActiveRecord::Base.connection.table_exists?(:account_deletion_requests)
-        owned_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
-        owned_classes << FollowRecommendationSuppression if ActiveRecord::Base.connection.table_exists?(:follow_recommendation_suppressions)
-        owned_classes << AccountIdentityProof if ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
-        owned_classes << Appeal if ActiveRecord::Base.connection.table_exists?(:appeals)
-        owned_classes << BulkImport if ActiveRecord::Base.connection.table_exists?(:bulk_imports)
+        owned_classes << AccountDeletionRequest if db_table_exists?(:account_deletion_requests)
+        owned_classes << AccountNote if db_table_exists?(:account_notes)
+        owned_classes << FollowRecommendationSuppression if db_table_exists?(:follow_recommendation_suppressions)
+        owned_classes << AccountIdentityProof if db_table_exists?(:account_identity_proofs)
+        owned_classes << Appeal if db_table_exists?(:appeals)
+        owned_classes << BulkImport if db_table_exists?(:bulk_imports)
 
         owned_classes.each do |klass|
           klass.where(account_id: other_account.id).find_each do |record|
@@ -104,7 +108,7 @@ module Mastodon::CLI
         end
 
         target_classes = [Follow, FollowRequest, Block, Mute, AccountModerationNote, AccountPin]
-        target_classes << AccountNote if ActiveRecord::Base.connection.table_exists?(:account_notes)
+        target_classes << AccountNote if db_table_exists?(:account_notes)
 
         target_classes.each do |klass|
           klass.where(target_account_id: other_account.id).find_each do |record|
@@ -114,13 +118,13 @@ module Mastodon::CLI
           end
         end
 
-        if ActiveRecord::Base.connection.table_exists?(:canonical_email_blocks)
+        if db_table_exists?(:canonical_email_blocks)
           CanonicalEmailBlock.where(reference_account_id: other_account.id).find_each do |record|
             record.update_attribute(:reference_account_id, id)
           end
         end
 
-        if ActiveRecord::Base.connection.table_exists?(:appeals)
+        if db_table_exists?(:appeals)
           Appeal.where(account_warning_id: other_account.id).find_each do |record|
             record.update_attribute(:account_warning_id, id)
           end
@@ -234,16 +238,16 @@ module Mastodon::CLI
 
       say 'Restoring index_accounts_on_username_and_domain_lower…'
       if migrator_version < 2020_06_20_164023
-        ActiveRecord::Base.connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
+        database_connection.add_index :accounts, 'lower (username), lower(domain)', name: 'index_accounts_on_username_and_domain_lower', unique: true
       else
-        ActiveRecord::Base.connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
+        database_connection.add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true
       end
 
       say 'Reindexing textual indexes on accounts…'
-      ActiveRecord::Base.connection.execute('REINDEX INDEX search_index;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_uri;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_url;')
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
+      database_connection.execute('REINDEX INDEX search_index;')
+      database_connection.execute('REINDEX INDEX index_accounts_on_uri;')
+      database_connection.execute('REINDEX INDEX index_accounts_on_url;')
+      database_connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
     end
 
     def deduplicate_users!
@@ -260,21 +264,21 @@ module Mastodon::CLI
       deduplicate_users_process_password_token
 
       say 'Restoring users indexes…'
-      ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
-      ActiveRecord::Base.connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
+      database_connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
+      database_connection.add_index :users, ['email'], name: 'index_users_on_email', unique: true
+      database_connection.add_index :users, ['remember_token'], name: 'index_users_on_remember_token', unique: true if migrator_version < 2022_01_18_183010
 
       if migrator_version < 2022_03_10_060641
-        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
+        database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true
       else
-        ActiveRecord::Base.connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
       end
 
-      ActiveRecord::Base.connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
+      database_connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
     end
 
     def deduplicate_users_process_email
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users GROUP BY email HAVING count(*) > 1").each do |row|
         users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a
         ref_user = users.shift
         say "Multiple users registered with e-mail address #{ref_user.email}.", :yellow
@@ -288,7 +292,7 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_confirmation_token
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
         users = User.where(id: row['ids'].split(',')).order(created_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting confirmation token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -300,7 +304,7 @@ module Mastodon::CLI
 
     def deduplicate_users_process_remember_token
       if migrator_version < 2022_01_18_183010
-        ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+        database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
           users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
           say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -312,7 +316,7 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_password_token
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
         users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).includes(:account).to_a.drop(1)
         say "Unsetting password reset token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
 
@@ -326,47 +330,47 @@ module Mastodon::CLI
       remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')
 
       say 'Removing duplicate account domain blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_domain_blocks GROUP BY account_id, domain HAVING count(*) > 1").each do |row|
         AccountDomainBlock.where(id: row['ids'].split(',').drop(1)).delete_all
       end
 
       say 'Restoring account domain blocks indexes…'
-      ActiveRecord::Base.connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
+      database_connection.add_index :account_domain_blocks, %w(account_id domain), name: 'index_account_domain_blocks_on_account_id_and_domain', unique: true
     end
 
     def deduplicate_account_identity_proofs!
-      return unless ActiveRecord::Base.connection.table_exists?(:account_identity_proofs)
+      return unless db_table_exists?(:account_identity_proofs)
 
       remove_index_if_exists!(:account_identity_proofs, 'index_account_proofs_on_account_and_provider_and_username')
 
       say 'Removing duplicate account identity proofs…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM account_identity_proofs GROUP BY account_id, provider, provider_username HAVING count(*) > 1").each do |row|
         AccountIdentityProof.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring account identity proofs indexes…'
-      ActiveRecord::Base.connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
+      database_connection.add_index :account_identity_proofs, %w(account_id provider provider_username), name: 'index_account_proofs_on_account_and_provider_and_username', unique: true
     end
 
     def deduplicate_announcement_reactions!
-      return unless ActiveRecord::Base.connection.table_exists?(:announcement_reactions)
+      return unless db_table_exists?(:announcement_reactions)
 
       remove_index_if_exists!(:announcement_reactions, 'index_announcement_reactions_on_account_id_and_announcement_id')
 
       say 'Removing duplicate announcement reactions…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM announcement_reactions GROUP BY account_id, announcement_id, name HAVING count(*) > 1").each do |row|
         AnnouncementReaction.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring announcement_reactions indexes…'
-      ActiveRecord::Base.connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
+      database_connection.add_index :announcement_reactions, %w(account_id announcement_id name), name: 'index_announcement_reactions_on_account_id_and_announcement_id', unique: true
     end
 
     def deduplicate_conversations!
       remove_index_if_exists!(:conversations, 'index_conversations_on_uri')
 
       say 'Deduplicating conversations…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM conversations WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
         conversations = Conversation.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_conversation = conversations.shift
@@ -379,9 +383,9 @@ module Mastodon::CLI
 
       say 'Restoring conversations indexes…'
       if migrator_version < 2022_03_07_083603
-        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
+        database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true
       else
-        ActiveRecord::Base.connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :conversations, ['uri'], name: 'index_conversations_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -389,7 +393,7 @@ module Mastodon::CLI
       remove_index_if_exists!(:custom_emojis, 'index_custom_emojis_on_shortcode_and_domain')
 
       say 'Deduplicating custom_emojis…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emojis GROUP BY shortcode, domain HAVING count(*) > 1").each do |row|
         emojis = CustomEmoji.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_emoji = emojis.shift
@@ -401,14 +405,14 @@ module Mastodon::CLI
       end
 
       say 'Restoring custom_emojis indexes…'
-      ActiveRecord::Base.connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
+      database_connection.add_index :custom_emojis, %w(shortcode domain), name: 'index_custom_emojis_on_shortcode_and_domain', unique: true
     end
 
     def deduplicate_custom_emoji_categories!
       remove_index_if_exists!(:custom_emoji_categories, 'index_custom_emoji_categories_on_name')
 
       say 'Deduplicating custom_emoji_categories…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM custom_emoji_categories GROUP BY name HAVING count(*) > 1").each do |row|
         categories = CustomEmojiCategory.where(id: row['ids'].split(',')).order(id: :desc).to_a
 
         ref_category = categories.shift
@@ -420,26 +424,26 @@ module Mastodon::CLI
       end
 
       say 'Restoring custom_emoji_categories indexes…'
-      ActiveRecord::Base.connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
+      database_connection.add_index :custom_emoji_categories, ['name'], name: 'index_custom_emoji_categories_on_name', unique: true
     end
 
     def deduplicate_domain_allows!
       remove_index_if_exists!(:domain_allows, 'index_domain_allows_on_domain')
 
       say 'Deduplicating domain_allows…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_allows GROUP BY domain HAVING count(*) > 1").each do |row|
         DomainAllow.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring domain_allows indexes…'
-      ActiveRecord::Base.connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
+      database_connection.add_index :domain_allows, ['domain'], name: 'index_domain_allows_on_domain', unique: true
     end
 
     def deduplicate_domain_blocks!
       remove_index_if_exists!(:domain_blocks, 'index_domain_blocks_on_domain')
 
       say 'Deduplicating domain_blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
         domain_blocks = DomainBlock.where(id: row['ids'].split(',')).by_severity.reverse.to_a
 
         reject_media = domain_blocks.any?(&:reject_media?)
@@ -456,49 +460,49 @@ module Mastodon::CLI
       end
 
       say 'Restoring domain_blocks indexes…'
-      ActiveRecord::Base.connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
+      database_connection.add_index :domain_blocks, ['domain'], name: 'index_domain_blocks_on_domain', unique: true
     end
 
     def deduplicate_unavailable_domains!
-      return unless ActiveRecord::Base.connection.table_exists?(:unavailable_domains)
+      return unless db_table_exists?(:unavailable_domains)
 
       remove_index_if_exists!(:unavailable_domains, 'index_unavailable_domains_on_domain')
 
       say 'Deduplicating unavailable_domains…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM unavailable_domains GROUP BY domain HAVING count(*) > 1").each do |row|
         UnavailableDomain.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring unavailable_domains indexes…'
-      ActiveRecord::Base.connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
+      database_connection.add_index :unavailable_domains, ['domain'], name: 'index_unavailable_domains_on_domain', unique: true
     end
 
     def deduplicate_email_domain_blocks!
       remove_index_if_exists!(:email_domain_blocks, 'index_email_domain_blocks_on_domain')
 
       say 'Deduplicating email_domain_blocks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM email_domain_blocks GROUP BY domain HAVING count(*) > 1").each do |row|
         domain_blocks = EmailDomainBlock.where(id: row['ids'].split(',')).order(EmailDomainBlock.arel_table[:parent_id].asc.nulls_first).to_a
         domain_blocks.drop(1).each(&:destroy)
       end
 
       say 'Restoring email_domain_blocks indexes…'
-      ActiveRecord::Base.connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
+      database_connection.add_index :email_domain_blocks, ['domain'], name: 'index_email_domain_blocks_on_domain', unique: true
     end
 
     def deduplicate_media_attachments!
       remove_index_if_exists!(:media_attachments, 'index_media_attachments_on_shortcode')
 
       say 'Deduplicating media_attachments…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM media_attachments WHERE shortcode IS NOT NULL GROUP BY shortcode HAVING count(*) > 1").each do |row|
         MediaAttachment.where(id: row['ids'].split(',').drop(1)).update_all(shortcode: nil)
       end
 
       say 'Restoring media_attachments indexes…'
       if migrator_version < 2022_03_10_060626
-        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
+        database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true
       else
-        ActiveRecord::Base.connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :media_attachments, ['shortcode'], name: 'index_media_attachments_on_shortcode', unique: true, where: 'shortcode IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -506,19 +510,19 @@ module Mastodon::CLI
       remove_index_if_exists!(:preview_cards, 'index_preview_cards_on_url')
 
       say 'Deduplicating preview_cards…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM preview_cards GROUP BY url HAVING count(*) > 1").each do |row|
         PreviewCard.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring preview_cards indexes…'
-      ActiveRecord::Base.connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
+      database_connection.add_index :preview_cards, ['url'], name: 'index_preview_cards_on_url', unique: true
     end
 
     def deduplicate_statuses!
       remove_index_if_exists!(:statuses, 'index_statuses_on_uri')
 
       say 'Deduplicating statuses…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM statuses WHERE uri IS NOT NULL GROUP BY uri HAVING count(*) > 1").each do |row|
         statuses = Status.where(id: row['ids'].split(',')).order(id: :asc).to_a
         ref_status = statuses.shift
         statuses.each do |status|
@@ -529,9 +533,9 @@ module Mastodon::CLI
 
       say 'Restoring statuses indexes…'
       if migrator_version < 2022_03_10_060706
-        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
+        database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true
       else
-        ActiveRecord::Base.connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
+        database_connection.add_index :statuses, ['uri'], name: 'index_statuses_on_uri', unique: true, where: 'uri IS NOT NULL', opclass: :text_pattern_ops
       end
     end
 
@@ -540,7 +544,7 @@ module Mastodon::CLI
       remove_index_if_exists!(:tags, 'index_tags_on_name_lower_btree')
 
       say 'Deduplicating tags…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM tags GROUP BY lower((name)::text) HAVING count(*) > 1").each do |row|
         tags = Tag.where(id: row['ids'].split(',')).order(Arel.sql('(usable::int + trendable::int + listable::int) desc')).to_a
         ref_tag = tags.shift
         tags.each do |tag|
@@ -551,38 +555,38 @@ module Mastodon::CLI
 
       say 'Restoring tags indexes…'
       if migrator_version < 2021_04_21_121431
-        ActiveRecord::Base.connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
+        database_connection.add_index :tags, 'lower((name)::text)', name: 'index_tags_on_name_lower', unique: true
       else
-        ActiveRecord::Base.connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
+        database_connection.execute 'CREATE UNIQUE INDEX index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)'
       end
     end
 
     def deduplicate_webauthn_credentials!
-      return unless ActiveRecord::Base.connection.table_exists?(:webauthn_credentials)
+      return unless db_table_exists?(:webauthn_credentials)
 
       remove_index_if_exists!(:webauthn_credentials, 'index_webauthn_credentials_on_external_id')
 
       say 'Deduplicating webauthn_credentials…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webauthn_credentials GROUP BY external_id HAVING count(*) > 1").each do |row|
         WebauthnCredential.where(id: row['ids'].split(',')).order(id: :desc).to_a.drop(1).each(&:destroy)
       end
 
       say 'Restoring webauthn_credentials indexes…'
-      ActiveRecord::Base.connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
+      database_connection.add_index :webauthn_credentials, ['external_id'], name: 'index_webauthn_credentials_on_external_id', unique: true
     end
 
     def deduplicate_webhooks!
-      return unless ActiveRecord::Base.connection.table_exists?(:webhooks)
+      return unless db_table_exists?(:webhooks)
 
       remove_index_if_exists!(:webhooks, 'index_webhooks_on_url')
 
       say 'Deduplicating webhooks…'
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM webhooks GROUP BY url HAVING count(*) > 1").each do |row|
         Webhook.where(id: row['ids'].split(',')).order(id: :desc).drop(1).each(&:destroy)
       end
 
       say 'Restoring webhooks indexes…'
-      ActiveRecord::Base.connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
+      database_connection.add_index :webhooks, ['url'], name: 'index_webhooks_on_url', unique: true
     end
 
     def deduplicate_software_updates!
@@ -672,7 +676,7 @@ module Mastodon::CLI
 
     def merge_statuses!(main_status, duplicate_status)
       owned_classes = [Favourite, Mention, Poll]
-      owned_classes << Bookmark if ActiveRecord::Base.connection.table_exists?(:bookmarks)
+      owned_classes << Bookmark if db_table_exists?(:bookmarks)
       owned_classes.each do |klass|
         klass.where(status_id: duplicate_status.id).find_each do |record|
           record.update_attribute(:status_id, main_status.id)
@@ -715,13 +719,21 @@ module Mastodon::CLI
     end
 
     def find_duplicate_accounts
-      ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
+      database_connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM accounts GROUP BY lower(username), COALESCE(lower(domain), '') HAVING count(*) > 1")
     end
 
     def remove_index_if_exists!(table, name)
-      ActiveRecord::Base.connection.remove_index(table, name: name) if ActiveRecord::Base.connection.index_name_exists?(table, name)
+      database_connection.remove_index(table, name: name) if database_connection.index_name_exists?(table, name)
     rescue ArgumentError, ActiveRecord::StatementInvalid
       nil
     end
+
+    def database_connection
+      ActiveRecord::Base.connection
+    end
+
+    def db_table_exists?(table)
+      database_connection.table_exists?(table)
+    end
   end
 end

From 3205a654caf903002c2db872f802a3332201678b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jan 2024 15:34:26 +0100
Subject: [PATCH 423/436] Refactor conversations components in web UI (#28833)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/conversation.jsx               | 288 ++++++++++--------
 .../components/conversations_list.jsx         | 117 ++++---
 .../containers/conversation_container.js      |  80 -----
 .../conversations_list_container.js           |  16 -
 .../features/direct_timeline/index.jsx        | 134 ++++----
 5 files changed, 274 insertions(+), 361 deletions(-)
 delete mode 100644 app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
 delete mode 100644 app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js

diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index 274cfa69f5..3af89f9974 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -1,17 +1,24 @@
 import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 
+import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
+
 
 import { HotKeys } from 'react-hotkeys';
 
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { replyCompose } from 'mastodon/actions/compose';
+import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
+import { openModal } from 'mastodon/actions/modal';
+import { muteStatus, unmuteStatus, revealStatus, hideStatus } from 'mastodon/actions/statuses';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -19,7 +26,7 @@ import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import StatusContent from 'mastodon/components/status_content';
 import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
 import { autoPlayGif } from 'mastodon/initial_state';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+import { makeGetStatus } from 'mastodon/selectors';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -29,25 +36,31 @@ const messages = defineMessages({
   delete: { id: 'conversation.delete', defaultMessage: 'Delete conversation' },
   muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
-class Conversation extends ImmutablePureComponent {
+const getAccounts = createSelector(
+  (state) => state.get('accounts'),
+  (_, accountIds) => accountIds,
+  (accounts, accountIds) =>
+    accountIds.map(id => accounts.get(id))
+);
 
-  static propTypes = {
-    conversationId: PropTypes.string.isRequired,
-    accounts: ImmutablePropTypes.list.isRequired,
-    lastStatus: ImmutablePropTypes.map,
-    unread:PropTypes.bool.isRequired,
-    scrollKey: PropTypes.string,
-    onMoveUp: PropTypes.func,
-    onMoveDown: PropTypes.func,
-    markRead: PropTypes.func.isRequired,
-    delete: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithRouterPropTypes,
-  };
+const getStatus = makeGetStatus();
 
-  handleMouseEnter = ({ currentTarget }) => {
+export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown }) => {
+  const id = conversation.get('id');
+  const unread = conversation.get('unread');
+  const lastStatusId = conversation.get('last_status');
+  const accountIds = conversation.get('accounts');
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const history = useHistory();
+  const lastStatus = useSelector(state => getStatus(state, { id: lastStatusId }));
+  const accounts = useSelector(state => getAccounts(state, accountIds));
+
+  const handleMouseEnter = useCallback(({ currentTarget }) => {
     if (autoPlayGif) {
       return;
     }
@@ -58,9 +71,9 @@ class Conversation extends ImmutablePureComponent {
       let emoji = emojis[i];
       emoji.src = emoji.getAttribute('data-original');
     }
-  };
+  }, []);
 
-  handleMouseLeave = ({ currentTarget }) => {
+  const handleMouseLeave = useCallback(({ currentTarget }) => {
     if (autoPlayGif) {
       return;
     }
@@ -71,136 +84,161 @@ class Conversation extends ImmutablePureComponent {
       let emoji = emojis[i];
       emoji.src = emoji.getAttribute('data-static');
     }
-  };
-
-  handleClick = () => {
-    if (!this.props.history) {
-      return;
-    }
-
-    const { lastStatus, unread, markRead } = this.props;
+  }, []);
 
+  const handleClick = useCallback(() => {
     if (unread) {
-      markRead();
+      dispatch(markConversationRead(id));
     }
 
-    this.props.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
-  };
+    history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
+  }, [dispatch, history, unread, id, lastStatus]);
 
-  handleMarkAsRead = () => {
-    this.props.markRead();
-  };
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markConversationRead(id));
+  }, [dispatch, id]);
 
-  handleReply = () => {
-    this.props.reply(this.props.lastStatus, this.props.history);
-  };
+  const handleReply = useCallback(() => {
+    dispatch((_, getState) => {
+      let state = getState();
 
-  handleDelete = () => {
-    this.props.delete();
-  };
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal({
+          modalType: 'CONFIRM',
+          modalProps: {
+            message: intl.formatMessage(messages.replyMessage),
+            confirm: intl.formatMessage(messages.replyConfirm),
+            onConfirm: () => dispatch(replyCompose(lastStatus, history)),
+          },
+        }));
+      } else {
+        dispatch(replyCompose(lastStatus, history));
+      }
+    });
+  }, [dispatch, lastStatus, history, intl]);
 
-  handleHotkeyMoveUp = () => {
-    this.props.onMoveUp(this.props.conversationId);
-  };
+  const handleDelete = useCallback(() => {
+    dispatch(deleteConversation(id));
+  }, [dispatch, id]);
 
-  handleHotkeyMoveDown = () => {
-    this.props.onMoveDown(this.props.conversationId);
-  };
+  const handleHotkeyMoveUp = useCallback(() => {
+    onMoveUp(id);
+  }, [id, onMoveUp]);
 
-  handleConversationMute = () => {
-    this.props.onMute(this.props.lastStatus);
-  };
+  const handleHotkeyMoveDown = useCallback(() => {
+    onMoveDown(id);
+  }, [id, onMoveDown]);
 
-  handleShowMore = () => {
-    this.props.onToggleHidden(this.props.lastStatus);
-  };
-
-  render () {
-    const { accounts, lastStatus, unread, scrollKey, intl } = this.props;
-
-    if (lastStatus === null) {
-      return null;
+  const handleConversationMute = useCallback(() => {
+    if (lastStatus.get('muted')) {
+      dispatch(unmuteStatus(lastStatus.get('id')));
+    } else {
+      dispatch(muteStatus(lastStatus.get('id')));
     }
+  }, [dispatch, lastStatus]);
 
-    const menu = [
-      { text: intl.formatMessage(messages.open), action: this.handleClick },
-      null,
-    ];
-
-    menu.push({ text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMute });
-
-    if (unread) {
-      menu.push({ text: intl.formatMessage(messages.markAsRead), action: this.handleMarkAsRead });
-      menu.push(null);
+  const handleShowMore = useCallback(() => {
+    if (lastStatus.get('hidden')) {
+      dispatch(revealStatus(lastStatus.get('id')));
+    } else {
+      dispatch(hideStatus(lastStatus.get('id')));
     }
+  }, [dispatch, lastStatus]);
 
-    menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDelete });
+  if (!lastStatus) {
+    return null;
+  }
 
-    const names = accounts.map(a => <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}><bdi><strong className='display-name__html' dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }} /></bdi></Link>).reduce((prev, cur) => [prev, ', ', cur]);
+  const menu = [
+    { text: intl.formatMessage(messages.open), action: handleClick },
+    null,
+    { text: intl.formatMessage(lastStatus.get('muted') ? messages.unmuteConversation : messages.muteConversation), action: handleConversationMute },
+  ];
 
-    const handlers = {
-      reply: this.handleReply,
-      open: this.handleClick,
-      moveUp: this.handleHotkeyMoveUp,
-      moveDown: this.handleHotkeyMoveDown,
-      toggleHidden: this.handleShowMore,
-    };
+  if (unread) {
+    menu.push({ text: intl.formatMessage(messages.markAsRead), action: handleMarkAsRead });
+    menu.push(null);
+  }
 
-    return (
-      <HotKeys handlers={handlers}>
-        <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
-          <div className='conversation__avatar' onClick={this.handleClick} role='presentation'>
-            <AvatarComposite accounts={accounts} size={48} />
-          </div>
+  menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
-          <div className='conversation__content'>
-            <div className='conversation__content__info'>
-              <div className='conversation__content__relative-time'>
-                {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
-              </div>
+  const names = accounts.map(a => (
+    <Link to={`/@${a.get('acct')}`} key={a.get('id')} title={a.get('acct')}>
+      <bdi>
+        <strong
+          className='display-name__html'
+          dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
+        />
+      </bdi>
+    </Link>
+  )).reduce((prev, cur) => [prev, ', ', cur]);
 
-              <div className='conversation__content__names' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-                <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
-              </div>
+  const handlers = {
+    reply: handleReply,
+    open: handleClick,
+    moveUp: handleHotkeyMoveUp,
+    moveDown: handleHotkeyMoveDown,
+    toggleHidden: handleShowMore,
+  };
+
+  return (
+    <HotKeys handlers={handlers}>
+      <div className={classNames('conversation focusable muted', { 'conversation--unread': unread })} tabIndex={0}>
+        <div className='conversation__avatar' onClick={handleClick} role='presentation'>
+          <AvatarComposite accounts={accounts} size={48} />
+        </div>
+
+        <div className='conversation__content'>
+          <div className='conversation__content__info'>
+            <div className='conversation__content__relative-time'>
+              {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
             </div>
 
-            <StatusContent
-              status={lastStatus}
-              onClick={this.handleClick}
-              expanded={!lastStatus.get('hidden')}
-              onExpandedToggle={this.handleShowMore}
-              collapsible
+            <div className='conversation__content__names' onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+              <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
+            </div>
+          </div>
+
+          <StatusContent
+            status={lastStatus}
+            onClick={handleClick}
+            expanded={!lastStatus.get('hidden')}
+            onExpandedToggle={handleShowMore}
+            collapsible
+          />
+
+          {lastStatus.get('media_attachments').size > 0 && (
+            <AttachmentList
+              compact
+              media={lastStatus.get('media_attachments')}
             />
+          )}
 
-            {lastStatus.get('media_attachments').size > 0 && (
-              <AttachmentList
-                compact
-                media={lastStatus.get('media_attachments')}
+          <div className='status__action-bar'>
+            <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' iconComponent={ReplyIcon} onClick={handleReply} />
+
+            <div className='status__action-bar-dropdown'>
+              <DropdownMenuContainer
+                scrollKey={scrollKey}
+                status={lastStatus}
+                items={menu}
+                icon='ellipsis-h'
+                iconComponent={MoreHorizIcon}
+                size={18}
+                direction='right'
+                title={intl.formatMessage(messages.more)}
               />
-            )}
-
-            <div className='status__action-bar'>
-              <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.reply)} icon='reply' iconComponent={ReplyIcon} onClick={this.handleReply} />
-
-              <div className='status__action-bar-dropdown'>
-                <DropdownMenuContainer
-                  scrollKey={scrollKey}
-                  status={lastStatus}
-                  items={menu}
-                  icon='ellipsis-h'
-                  iconComponent={MoreHorizIcon}
-                  size={18}
-                  direction='right'
-                  title={intl.formatMessage(messages.more)}
-                />
-              </div>
             </div>
           </div>
         </div>
-      </HotKeys>
-    );
-  }
+      </div>
+    </HotKeys>
+  );
+};
 
-}
-
-export default withRouter(injectIntl(Conversation));
+Conversation.propTypes = {
+  conversation: ImmutablePropTypes.map.isRequired,
+  scrollKey: PropTypes.string,
+  onMoveUp: PropTypes.func,
+  onMoveDown: PropTypes.func,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
index 8c12ea9e5f..c9fc098a52 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
@@ -1,77 +1,72 @@
 import PropTypes from 'prop-types';
+import { useRef, useMemo, useCallback } from 'react';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector, useDispatch } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import ScrollableList from '../../../components/scrollable_list';
-import ConversationContainer from '../containers/conversation_container';
+import { expandConversations } from 'mastodon/actions/conversations';
+import ScrollableList from 'mastodon/components/scrollable_list';
 
-export default class ConversationsList extends ImmutablePureComponent {
+import { Conversation } from './conversation';
 
-  static propTypes = {
-    conversations: ImmutablePropTypes.list.isRequired,
-    scrollKey: PropTypes.string.isRequired,
-    hasMore: PropTypes.bool,
-    isLoading: PropTypes.bool,
-    onLoadMore: PropTypes.func,
-  };
+const focusChild = (node, index, alignTop) => {
+  const element = node.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
 
-  getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id);
-
-  handleMoveUp = id => {
-    const elementIndex = this.getCurrentIndex(id) - 1;
-    this._selectChild(elementIndex, true);
-  };
-
-  handleMoveDown = id => {
-    const elementIndex = this.getCurrentIndex(id) + 1;
-    this._selectChild(elementIndex, false);
-  };
-
-  _selectChild (index, align_top) {
-    const container = this.node.node;
-    const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
-    if (element) {
-      if (align_top && container.scrollTop > element.offsetTop) {
-        element.scrollIntoView(true);
-      } else if (!align_top && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
-        element.scrollIntoView(false);
-      }
-      element.focus();
+  if (element) {
+    if (alignTop && node.scrollTop > element.offsetTop) {
+      element.scrollIntoView(true);
+    } else if (!alignTop && node.scrollTop + node.clientHeight < element.offsetTop + element.offsetHeight) {
+      element.scrollIntoView(false);
     }
+
+    element.focus();
   }
+};
 
-  setRef = c => {
-    this.node = c;
-  };
+export const ConversationsList = ({ scrollKey, ...other }) => {
+  const listRef = useRef();
+  const conversations = useSelector(state => state.getIn(['conversations', 'items']));
+  const isLoading = useSelector(state => state.getIn(['conversations', 'isLoading'], true));
+  const hasMore = useSelector(state => state.getIn(['conversations', 'hasMore'], false));
+  const dispatch = useDispatch();
+  const lastStatusId = conversations.last()?.get('last_status');
 
-  handleLoadOlder = debounce(() => {
-    const last = this.props.conversations.last();
+  const handleMoveUp = useCallback(id => {
+    const elementIndex = conversations.findIndex(x => x.get('id') === id) - 1;
+    focusChild(listRef.current.node, elementIndex, true);
+  }, [listRef, conversations]);
 
-    if (last && last.get('last_status')) {
-      this.props.onLoadMore(last.get('last_status'));
+  const handleMoveDown = useCallback(id => {
+    const elementIndex = conversations.findIndex(x => x.get('id') === id) + 1;
+    focusChild(listRef.current.node, elementIndex, false);
+  }, [listRef, conversations]);
+
+  const debouncedLoadMore = useMemo(() => debounce(id => {
+    dispatch(expandConversations({ maxId: id }));
+  }, 300, { leading: true }), [dispatch]);
+
+  const handleLoadMore = useCallback(() => {
+    if (lastStatusId) {
+      debouncedLoadMore(lastStatusId);
     }
-  }, 300, { leading: true });
+  }, [debouncedLoadMore, lastStatusId]);
 
-  render () {
-    const { conversations, isLoading, onLoadMore, ...other } = this.props;
+  return (
+    <ScrollableList {...other} scrollKey={scrollKey} isLoading={isLoading} showLoading={isLoading && conversations.isEmpty()} hasMore={hasMore} onLoadMore={handleLoadMore} ref={listRef}>
+      {conversations.map(item => (
+        <Conversation
+          key={item.get('id')}
+          conversation={item}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          scrollKey={scrollKey}
+        />
+      ))}
+    </ScrollableList>
+  );
+};
 
-    return (
-      <ScrollableList {...other} isLoading={isLoading} showLoading={isLoading && conversations.isEmpty()} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}>
-        {conversations.map(item => (
-          <ConversationContainer
-            key={item.get('id')}
-            conversationId={item.get('id')}
-            onMoveUp={this.handleMoveUp}
-            onMoveDown={this.handleMoveDown}
-            scrollKey={this.props.scrollKey}
-          />
-        ))}
-      </ScrollableList>
-    );
-  }
-
-}
+ConversationsList.propTypes = {
+  scrollKey: PropTypes.string.isRequired,
+};
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
deleted file mode 100644
index 456fc7d7cc..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { replyCompose } from 'mastodon/actions/compose';
-import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
-import { openModal } from 'mastodon/actions/modal';
-import { muteStatus, unmuteStatus, hideStatus, revealStatus } from 'mastodon/actions/statuses';
-import { makeGetStatus } from 'mastodon/selectors';
-
-import Conversation from '../components/conversation';
-
-const messages = defineMessages({
-  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
-  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
-});
-
-const mapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  return (state, { conversationId }) => {
-    const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
-    const lastStatusId = conversation.get('last_status', null);
-
-    return {
-      accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
-      unread: conversation.get('unread'),
-      lastStatus: lastStatusId && getStatus(state, { id: lastStatusId }),
-    };
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl, conversationId }) => ({
-
-  markRead () {
-    dispatch(markConversationRead(conversationId));
-  },
-
-  reply (status, router) {
-    dispatch((_, getState) => {
-      let state = getState();
-
-      if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({
-          modalType: 'CONFIRM',
-          modalProps: {
-            message: intl.formatMessage(messages.replyMessage),
-            confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router)),
-          },
-        }));
-      } else {
-        dispatch(replyCompose(status, router));
-      }
-    });
-  },
-
-  delete () {
-    dispatch(deleteConversation(conversationId));
-  },
-
-  onMute (status) {
-    if (status.get('muted')) {
-      dispatch(unmuteStatus(status.get('id')));
-    } else {
-      dispatch(muteStatus(status.get('id')));
-    }
-  },
-
-  onToggleHidden (status) {
-    if (status.get('hidden')) {
-      dispatch(revealStatus(status.get('id')));
-    } else {
-      dispatch(hideStatus(status.get('id')));
-    }
-  },
-
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Conversation));
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
deleted file mode 100644
index 1dcd3ec1bd..0000000000
--- a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-
-import { expandConversations } from '../../../actions/conversations';
-import ConversationsList from '../components/conversations_list';
-
-const mapStateToProps = state => ({
-  conversations: state.getIn(['conversations', 'items']),
-  isLoading: state.getIn(['conversations', 'isLoading'], true),
-  hasMore: state.getIn(['conversations', 'hasMore'], false),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onLoadMore: maxId => dispatch(expandConversations({ maxId })),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ConversationsList);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.jsx b/app/javascript/mastodon/features/direct_timeline/index.jsx
index af29d7a5b8..7aee83ec10 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/index.jsx
@@ -1,11 +1,11 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useRef, useCallback, useEffect } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
-import { connect } from 'react-redux';
+import { useDispatch } from 'react-redux';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
@@ -14,103 +14,79 @@ import { connectDirectStream } from 'mastodon/actions/streaming';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 
-import ConversationsListContainer from './containers/conversations_list_container';
+import { ConversationsList } from './components/conversations_list';
 
 const messages = defineMessages({
   title: { id: 'column.direct', defaultMessage: 'Private mentions' },
 });
 
-class DirectTimeline extends PureComponent {
-
-  static propTypes = {
-    dispatch: PropTypes.func.isRequired,
-    columnId: PropTypes.string,
-    intl: PropTypes.object.isRequired,
-    hasUnread: PropTypes.bool,
-    multiColumn: PropTypes.bool,
-  };
-
-  handlePin = () => {
-    const { columnId, dispatch } = this.props;
+const DirectTimeline = ({ columnId, multiColumn }) => {
+  const columnRef = useRef();
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const pinned = !!columnId;
 
+  const handlePin = useCallback(() => {
     if (columnId) {
       dispatch(removeColumn(columnId));
     } else {
       dispatch(addColumn('DIRECT', {}));
     }
-  };
+  }, [dispatch, columnId]);
 
-  handleMove = (dir) => {
-    const { columnId, dispatch } = this.props;
+  const handleMove = useCallback((dir) => {
     dispatch(moveColumn(columnId, dir));
-  };
+  }, [dispatch, columnId]);
 
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  };
-
-  componentDidMount () {
-    const { dispatch } = this.props;
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current.scrollTop();
+  }, [columnRef]);
 
+  useEffect(() => {
     dispatch(mountConversations());
     dispatch(expandConversations());
-    this.disconnect = dispatch(connectDirectStream());
-  }
 
-  componentWillUnmount () {
-    this.props.dispatch(unmountConversations());
+    const disconnect = dispatch(connectDirectStream());
 
-    if (this.disconnect) {
-      this.disconnect();
-      this.disconnect = null;
-    }
-  }
+    return () => {
+      dispatch(unmountConversations());
+      disconnect();
+    };
+  }, [dispatch]);
 
-  setRef = c => {
-    this.column = c;
-  };
+  return (
+    <Column bindToDocument={!multiColumn} ref={columnRef} label={intl.formatMessage(messages.title)}>
+      <ColumnHeader
+        icon='at'
+        iconComponent={AlternateEmailIcon}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+      />
 
-  handleLoadMore = maxId => {
-    this.props.dispatch(expandConversations({ maxId }));
-  };
+      <ConversationsList
+        trackScroll={!pinned}
+        scrollKey={`direct_timeline-${columnId}`}
+        emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
+        bindToDocument={!multiColumn}
+        prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
+        alwaysPrepend
+      />
 
-  render () {
-    const { intl, hasUnread, columnId, multiColumn } = this.props;
-    const pinned = !!columnId;
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
 
-    return (
-      <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
-        <ColumnHeader
-          icon='at'
-          iconComponent={AlternateEmailIcon}
-          active={hasUnread}
-          title={intl.formatMessage(messages.title)}
-          onPin={this.handlePin}
-          onMove={this.handleMove}
-          onClick={this.handleHeaderClick}
-          pinned={pinned}
-          multiColumn={multiColumn}
-        />
+DirectTimeline.propTypes = {
+  columnId: PropTypes.string,
+  multiColumn: PropTypes.bool,
+};
 
-        <ConversationsListContainer
-          trackScroll={!pinned}
-          scrollKey={`direct_timeline-${columnId}`}
-          timelineId='direct'
-          bindToDocument={!multiColumn}
-          onLoadMore={this.handleLoadMore}
-          prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
-          alwaysPrepend
-          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
-        />
-
-        <Helmet>
-          <title>{intl.formatMessage(messages.title)}</title>
-          <meta name='robots' content='noindex' />
-        </Helmet>
-      </Column>
-    );
-  }
-
-}
-
-export default connect()(injectIntl(DirectTimeline));
+export default DirectTimeline;

From 17ea22671de0705ec805bb157754d5ae5f24f9e3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 10:13:41 -0500
Subject: [PATCH 424/436] Fix `Style/GuardClause` cop in app/controllers
 (#28420)

---
 .rubocop_todo.yml                             |  4 ----
 .../admin/confirmations_controller.rb         | 14 +++++++------
 .../auth/confirmations_controller.rb          | 12 ++++++-----
 app/controllers/auth/passwords_controller.rb  | 10 ++++------
 .../webauthn_credentials_controller.rb        | 20 ++++++++-----------
 5 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fd9dc18ac7..c8165c1edf 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -121,10 +121,6 @@ Style/GlobalStdStream:
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
-    - 'app/controllers/admin/confirmations_controller.rb'
-    - 'app/controllers/auth/confirmations_controller.rb'
-    - 'app/controllers/auth/passwords_controller.rb'
-    - 'app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb'
     - 'app/lib/activitypub/activity/block.rb'
     - 'app/lib/request.rb'
     - 'app/lib/request_pool.rb'
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index 7ccf5c9012..702550eecc 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -3,7 +3,7 @@
 module Admin
   class ConfirmationsController < BaseController
     before_action :set_user
-    before_action :check_confirmation, only: [:resend]
+    before_action :redirect_confirmed_user, only: [:resend], if: :user_confirmed?
 
     def create
       authorize @user, :confirm?
@@ -25,11 +25,13 @@ module Admin
 
     private
 
-    def check_confirmation
-      if @user.confirmed?
-        flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
-        redirect_to admin_accounts_path
-      end
+    def redirect_confirmed_user
+      flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
+      redirect_to admin_accounts_path
+    end
+
+    def user_confirmed?
+      @user.confirmed?
     end
   end
 end
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index d9cd630905..7ca7be5f8e 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -7,7 +7,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
 
   before_action :set_body_classes
   before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
-  before_action :require_unconfirmed!
+  before_action :redirect_confirmed_user, if: :signed_in_confirmed_user?
 
   before_action :extend_csp_for_captcha!, only: [:show, :confirm_captcha]
   before_action :require_captcha_if_needed!, only: [:show]
@@ -65,10 +65,12 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
     @confirmation_user.nil? || @confirmation_user.confirmed?
   end
 
-  def require_unconfirmed!
-    if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
-      redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
-    end
+  def redirect_confirmed_user
+    redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
+  end
+
+  def signed_in_confirmed_user?
+    user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
   end
 
   def set_body_classes
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index a752194d5b..de001f062b 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -2,7 +2,7 @@
 
 class Auth::PasswordsController < Devise::PasswordsController
   skip_before_action :check_self_destruct!
-  before_action :check_validity_of_reset_password_token, only: :edit
+  before_action :redirect_invalid_reset_token, only: :edit, unless: :reset_password_token_is_valid?
   before_action :set_body_classes
 
   layout 'auth'
@@ -19,11 +19,9 @@ class Auth::PasswordsController < Devise::PasswordsController
 
   private
 
-  def check_validity_of_reset_password_token
-    unless reset_password_token_is_valid?
-      flash[:error] = I18n.t('auth.invalid_reset_password_token')
-      redirect_to new_password_path(resource_name)
-    end
+  def redirect_invalid_reset_token
+    flash[:error] = I18n.t('auth.invalid_reset_password_token')
+    redirect_to new_password_path(resource_name)
   end
 
   def set_body_classes
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
index c86ede4f3a..9714d54f95 100644
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@@ -6,8 +6,8 @@ module Settings
       skip_before_action :check_self_destruct!
       skip_before_action :require_functional!
 
-      before_action :require_otp_enabled
-      before_action :require_webauthn_enabled, only: [:index, :destroy]
+      before_action :redirect_invalid_otp, unless: -> { current_user.otp_enabled? }
+      before_action :redirect_invalid_webauthn, only: [:index, :destroy], unless: -> { current_user.webauthn_enabled? }
 
       def index; end
       def new; end
@@ -85,18 +85,14 @@ module Settings
 
       private
 
-      def require_otp_enabled
-        unless current_user.otp_enabled?
-          flash[:error] = t('webauthn_credentials.otp_required')
-          redirect_to settings_two_factor_authentication_methods_path
-        end
+      def redirect_invalid_otp
+        flash[:error] = t('webauthn_credentials.otp_required')
+        redirect_to settings_two_factor_authentication_methods_path
       end
 
-      def require_webauthn_enabled
-        unless current_user.webauthn_enabled?
-          flash[:error] = t('webauthn_credentials.not_enabled')
-          redirect_to settings_two_factor_authentication_methods_path
-        end
+      def redirect_invalid_webauthn
+        flash[:error] = t('webauthn_credentials.not_enabled')
+        redirect_to settings_two_factor_authentication_methods_path
       end
     end
   end

From 0b38946c874f4e02295a303514aaf8895cf8a918 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 10:18:15 -0500
Subject: [PATCH 425/436] Update paperclip and climate_control gems (#28379)

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2d4e504ac7..4951304e39 100644
--- a/Gemfile
+++ b/Gemfile
@@ -123,7 +123,7 @@ group :test do
   gem 'database_cleaner-active_record'
 
   # Used to mock environment variables
-  gem 'climate_control', '~> 0.2'
+  gem 'climate_control'
 
   # Generating fake data for specs
   gem 'faker', '~> 3.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index a31d0a929c..57b2580722 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,7 +185,7 @@ GEM
       elasticsearch (>= 7.12.0, < 7.14.0)
       elasticsearch-dsl
     chunky_png (1.4.0)
-    climate_control (0.2.0)
+    climate_control (1.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.2.3)
@@ -746,8 +746,8 @@ GEM
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
+    terrapin (1.0.1)
+      climate_control
     test-prof (1.3.1)
     thor (1.3.0)
     tilt (2.3.0)
@@ -836,7 +836,7 @@ DEPENDENCIES
   capybara (~> 3.39)
   charlock_holmes (~> 0.7.7)
   chewy (~> 7.3)
-  climate_control (~> 0.2)
+  climate_control
   cocoon (~> 1.2)
   color_diff (~> 0.1)
   concurrent-ruby

From 4cdf62e576488e8c41f79c2a04a1630df9685592 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 10:26:51 -0500
Subject: [PATCH 426/436] Extract `rebuild_index` method in maintenance CLI
 (#28911)

---
 lib/mastodon/cli/maintenance.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index c644729b5e..a64206065d 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -244,10 +244,10 @@ module Mastodon::CLI
       end
 
       say 'Reindexing textual indexes on accounts…'
-      database_connection.execute('REINDEX INDEX search_index;')
-      database_connection.execute('REINDEX INDEX index_accounts_on_uri;')
-      database_connection.execute('REINDEX INDEX index_accounts_on_url;')
-      database_connection.execute('REINDEX INDEX index_accounts_on_domain_and_id;') if migrator_version >= 2023_05_24_190515
+      rebuild_index(:search_index)
+      rebuild_index(:index_accounts_on_uri)
+      rebuild_index(:index_accounts_on_url)
+      rebuild_index(:index_accounts_on_domain_and_id) if migrator_version >= 2023_05_24_190515
     end
 
     def deduplicate_users!
@@ -274,7 +274,7 @@ module Mastodon::CLI
         database_connection.add_index :users, ['reset_password_token'], name: 'index_users_on_reset_password_token', unique: true, where: 'reset_password_token IS NOT NULL', opclass: :text_pattern_ops
       end
 
-      database_connection.execute('REINDEX INDEX index_users_on_unconfirmed_email;') if migrator_version >= 2023_07_02_151753
+      rebuild_index(:index_users_on_unconfirmed_email) if migrator_version >= 2023_07_02_151753
     end
 
     def deduplicate_users_process_email
@@ -735,5 +735,9 @@ module Mastodon::CLI
     def db_table_exists?(table)
       database_connection.table_exists?(table)
     end
+
+    def rebuild_index(name)
+      database_connection.execute("REINDEX INDEX #{name}")
+    end
   end
 end

From 42ab855b2339c5cea3229c856ab539f883736b12 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 25 Jan 2024 10:28:27 -0500
Subject: [PATCH 427/436] Add specs for `Instance` model scopes and add
 `with_domain_follows` scope (#28767)

---
 .../admin/export_domain_blocks_controller.rb  |   6 +-
 app/models/instance.rb                        |  14 +++
 spec/models/instance_spec.rb                  | 104 ++++++++++++++++++
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 spec/models/instance_spec.rb

diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
index ffc4478172..9caafd9684 100644
--- a/app/controllers/admin/export_domain_blocks_controller.rb
+++ b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -49,7 +49,7 @@ module Admin
         next
       end
 
-      @warning_domains = Instance.where(domain: @domain_blocks.map(&:domain)).where('EXISTS (SELECT 1 FROM follows JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id WHERE accounts.domain = instances.domain)').pluck(:domain)
+      @warning_domains = instances_from_imported_blocks.pluck(:domain)
     rescue ActionController::ParameterMissing
       flash.now[:alert] = I18n.t('admin.export_domain_blocks.no_file')
       set_dummy_import!
@@ -58,6 +58,10 @@ module Admin
 
     private
 
+    def instances_from_imported_blocks
+      Instance.with_domain_follows(@domain_blocks.map(&:domain))
+    end
+
     def export_filename
       'domain_blocks.csv'
     end
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 2dec75d6fe..0fd31c8097 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -25,11 +25,25 @@ class Instance < ApplicationRecord
   scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
   scope :domain_starts_with, ->(value) { where(arel_table[:domain].matches("#{sanitize_sql_like(value)}%", false, true)) }
   scope :by_domain_and_subdomains, ->(domain) { where("reverse('.' || domain) LIKE reverse(?)", "%.#{domain}") }
+  scope :with_domain_follows, ->(domains) { where(domain: domains).where(domain_account_follows) }
 
   def self.refresh
     Scenic.database.refresh_materialized_view(table_name, concurrently: true, cascade: false)
   end
 
+  def self.domain_account_follows
+    Arel.sql(
+      <<~SQL.squish
+        EXISTS (
+          SELECT 1
+          FROM follows
+          JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id
+          WHERE accounts.domain = instances.domain
+        )
+      SQL
+    )
+  end
+
   def readonly?
     true
   end
diff --git a/spec/models/instance_spec.rb b/spec/models/instance_spec.rb
new file mode 100644
index 0000000000..3e811d3325
--- /dev/null
+++ b/spec/models/instance_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Instance do
+  describe 'Scopes' do
+    before { described_class.refresh }
+
+    describe '#searchable' do
+      let(:expected_domain) { 'host.example' }
+      let(:blocked_domain) { 'other.example' }
+
+      before do
+        Fabricate :account, domain: expected_domain
+        Fabricate :account, domain: blocked_domain
+        Fabricate :domain_block, domain: blocked_domain
+      end
+
+      it 'returns records not domain blocked' do
+        results = described_class.searchable.pluck(:domain)
+
+        expect(results)
+          .to include(expected_domain)
+          .and not_include(blocked_domain)
+      end
+    end
+
+    describe '#matches_domain' do
+      let(:host_domain) { 'host.example.com' }
+      let(:host_under_domain) { 'host_under.example.com' }
+      let(:other_domain) { 'other.example' }
+
+      before do
+        Fabricate :account, domain: host_domain
+        Fabricate :account, domain: host_under_domain
+        Fabricate :account, domain: other_domain
+      end
+
+      it 'returns matching records' do
+        expect(described_class.matches_domain('host.exa').pluck(:domain))
+          .to include(host_domain)
+          .and not_include(other_domain)
+
+        expect(described_class.matches_domain('ple.com').pluck(:domain))
+          .to include(host_domain)
+          .and not_include(other_domain)
+
+        expect(described_class.matches_domain('example').pluck(:domain))
+          .to include(host_domain)
+          .and include(other_domain)
+
+        expect(described_class.matches_domain('host_').pluck(:domain)) # Preserve SQL wildcards
+          .to include(host_domain)
+          .and include(host_under_domain)
+          .and not_include(other_domain)
+      end
+    end
+
+    describe '#by_domain_and_subdomains' do
+      let(:exact_match_domain) { 'example.com' }
+      let(:subdomain_domain) { 'foo.example.com' }
+      let(:partial_domain) { 'grexample.com' }
+
+      before do
+        Fabricate(:account, domain: exact_match_domain)
+        Fabricate(:account, domain: subdomain_domain)
+        Fabricate(:account, domain: partial_domain)
+      end
+
+      it 'returns matching instances' do
+        results = described_class.by_domain_and_subdomains('example.com').pluck(:domain)
+
+        expect(results)
+          .to include(exact_match_domain)
+          .and include(subdomain_domain)
+          .and not_include(partial_domain)
+      end
+    end
+
+    describe '#with_domain_follows' do
+      let(:example_domain) { 'example.host' }
+      let(:other_domain) { 'other.host' }
+      let(:none_domain) { 'none.host' }
+
+      before do
+        example_account = Fabricate(:account, domain: example_domain)
+        other_account = Fabricate(:account, domain: other_domain)
+        Fabricate(:account, domain: none_domain)
+
+        Fabricate :follow, account: example_account
+        Fabricate :follow, target_account: other_account
+      end
+
+      it 'returns instances with domain accounts that have follows' do
+        results = described_class.with_domain_follows(['example.host', 'other.host', 'none.host']).pluck(:domain)
+
+        expect(results)
+          .to include(example_domain)
+          .and include(other_domain)
+          .and not_include(none_domain)
+      end
+    end
+  end
+end

From 6936e5aa693ccc4aabd26ef18a65fbb8132f6f74 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 25 Jan 2024 16:41:31 +0100
Subject: [PATCH 428/436] Change design of compose form in web UI (#28119)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .eslintrc.js                                  |    2 +-
 app/javascript/images/warning-stripes.svg     |   25 +
 .../autosuggest_emoji-test.jsx.snap           |   12 +-
 .../mastodon/components/account.jsx           |    8 +-
 .../mastodon/components/autosuggest_emoji.jsx |    2 +-
 .../components/autosuggest_hashtag.tsx        |   39 +-
 .../mastodon/components/autosuggest_input.jsx |   59 +-
 .../components/autosuggest_textarea.jsx       |   67 +-
 .../mastodon/components/dropdown_menu.jsx     |    2 +-
 app/javascript/mastodon/components/status.jsx |    6 +-
 .../mastodon/components/visibility_icon.tsx   |   13 +-
 .../mastodon/containers/compose_container.jsx |   38 +-
 .../compose/components/action_bar.jsx         |   99 +-
 .../components/autosuggest_account.jsx        |    2 +-
 .../compose/components/character_counter.jsx  |   28 +-
 .../compose/components/compose_form.jsx       |  160 +-
 .../compose/components/edit_indicator.jsx     |   62 +
 .../components/emoji_picker_dropdown.jsx      |   24 +-
 .../compose/components/language_dropdown.jsx  |   35 +-
 .../compose/components/navigation_bar.jsx     |   68 +-
 .../compose/components/poll_button.jsx        |   12 +-
 .../features/compose/components/poll_form.jsx |  281 ++--
 .../compose/components/privacy_dropdown.jsx   |   76 +-
 .../compose/components/reply_indicator.jsx    |   94 +-
 .../features/compose/components/upload.jsx    |   28 +-
 .../compose/components/upload_button.jsx      |   14 +-
 .../compose/components/upload_form.jsx        |   19 +-
 .../compose/components/upload_progress.jsx    |    4 +-
 .../containers/navigation_container.js        |   36 -
 .../containers/poll_button_container.js       |    2 +-
 .../compose/containers/poll_form_container.js |   53 -
 .../containers/reply_indicator_container.js   |   36 -
 .../containers/sensitive_button_container.jsx |   73 -
 .../containers/spoiler_button_container.js    |   10 +-
 .../containers/upload_button_container.js     |    3 +-
 .../compose/containers/upload_container.js    |    1 +
 .../mastodon/features/compose/index.jsx       |    4 -
 .../features/getting_started/index.jsx        |    4 +-
 .../features/standalone/compose/index.jsx     |   32 +-
 .../features/ui/components/compose_panel.jsx  |    6 +-
 .../ui/components/focal_point_modal.jsx       |    2 +-
 .../features/ui/components/mute_modal.jsx     |    1 -
 .../ui/components/navigation_panel.jsx        |    1 -
 app/javascript/mastodon/locales/en.json       |   41 +-
 app/javascript/mastodon/reducers/compose.js   |   20 +-
 .../400-24px/bar_chart_4_bars-fill.svg        |    1 +
 .../400-24px/bar_chart_4_bars.svg             |    1 +
 .../material-icons/400-24px/mood-fill.svg     |    1 +
 .../material-icons/400-24px/mood.svg          |    1 +
 .../400-24px/photo_library-fill.svg           |    1 +
 .../material-icons/400-24px/photo_library.svg |    1 +
 .../400-24px/quiet_time-fill.svg              |    1 +
 .../material-icons/400-24px/quiet_time.svg    |    1 +
 .../400-24px/translate-fill.svg               |    1 +
 .../material-icons/400-24px/translate.svg     |    1 +
 .../material-icons/400-24px/warning-fill.svg  |    1 +
 .../material-icons/400-24px/warning.svg       |    1 +
 app/javascript/packs/share.jsx                |    4 +-
 app/javascript/styles/contrast/diff.scss      |   37 +-
 .../styles/mastodon-light/diff.scss           |  153 +-
 .../styles/mastodon-light/variables.scss      |    9 +-
 app/javascript/styles/mastodon/_mixins.scss   |    5 +-
 app/javascript/styles/mastodon/admin.scss     |    6 +
 app/javascript/styles/mastodon/basics.scss    |    2 +-
 .../styles/mastodon/components.scss           | 1341 +++++++++--------
 .../styles/mastodon/containers.scss           |   26 +-
 .../styles/mastodon/emoji_picker.scss         |   30 +-
 app/javascript/styles/mastodon/modal.scss     |    2 +-
 app/javascript/styles/mastodon/polls.scss     |  125 +-
 spec/system/new_statuses_spec.rb              |    4 +-
 spec/system/share_entrypoint_spec.rb          |    4 +-
 71 files changed, 1574 insertions(+), 1790 deletions(-)
 create mode 100755 app/javascript/images/warning-stripes.svg
 create mode 100644 app/javascript/mastodon/features/compose/components/edit_indicator.jsx
 delete mode 100644 app/javascript/mastodon/features/compose/containers/navigation_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/poll_form_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
 delete mode 100644 app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
 create mode 100644 app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/mood.svg
 create mode 100644 app/javascript/material-icons/400-24px/photo_library-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/photo_library.svg
 create mode 100644 app/javascript/material-icons/400-24px/quiet_time-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/quiet_time.svg
 create mode 100644 app/javascript/material-icons/400-24px/translate-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/translate.svg
 create mode 100644 app/javascript/material-icons/400-24px/warning-fill.svg
 create mode 100644 app/javascript/material-icons/400-24px/warning.svg

diff --git a/.eslintrc.js b/.eslintrc.js
index 1b36bcee25..ebe07f6e79 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -165,7 +165,7 @@ module.exports = defineConfig({
     //   },
     // ],
     'jsx-a11y/no-noninteractive-tabindex': 'off',
-    'jsx-a11y/no-onchange': 'warn',
+    'jsx-a11y/no-onchange': 'off',
     // recommended is full 'error'
     'jsx-a11y/no-static-element-interactions': [
       'warn',
diff --git a/app/javascript/images/warning-stripes.svg b/app/javascript/images/warning-stripes.svg
new file mode 100755
index 0000000000..9d68acdada
--- /dev/null
+++ b/app/javascript/images/warning-stripes.svg
@@ -0,0 +1,25 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_253_1286)">
+<rect width="5" height="80" fill="url(#paint0_linear_253_1286)"/>
+<line x1="-0.860365" y1="6.80136" x2="10.6078" y2="-1.22871" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="14.8314" x2="10.6078" y2="6.80132" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="22.8615" x2="10.6078" y2="14.8314" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="30.8916" x2="10.6078" y2="22.8615" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="38.9216" x2="10.6078" y2="30.8915" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="46.9517" x2="10.6078" y2="38.9216" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="54.9818" x2="10.6078" y2="46.9517" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="63.0118" x2="10.6078" y2="54.9817" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="71.0419" x2="10.6078" y2="63.0118" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="79.072" x2="10.6078" y2="71.0419" stroke="black" stroke-width="3"/>
+<line x1="-0.860365" y1="87.102" x2="10.6078" y2="79.072" stroke="black" stroke-width="3"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_253_1286" x1="2.5" y1="0" x2="2.5" y2="80" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FEC84B"/>
+<stop offset="1" stop-color="#F79009"/>
+</linearGradient>
+<clipPath id="clip0_253_1286">
+<rect width="5" height="80" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
index 1c37278483..dc955b7abe 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap
@@ -9,7 +9,11 @@ exports[`<AutosuggestEmoji /> renders emoji with custom url 1`] = `
     className="emojione"
     src="http://example.com/emoji.png"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
 
@@ -22,6 +26,10 @@ exports[`<AutosuggestEmoji /> renders native emoji 1`] = `
     className="emojione"
     src="/emoji/1f499.svg"
   />
-  :foobar:
+  <div
+    className="autosuggest-emoji__name"
+  >
+    :foobar:
+  </div>
 </div>
 `;
diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index f82dd9153a..4a99dd0bbf 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -37,10 +37,10 @@ class Account extends ImmutablePureComponent {
   static propTypes = {
     size: PropTypes.number,
     account: ImmutablePropTypes.record,
-    onFollow: PropTypes.func.isRequired,
-    onBlock: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onMuteNotifications: PropTypes.func.isRequired,
+    onFollow: PropTypes.func,
+    onBlock: PropTypes.func,
+    onMute: PropTypes.func,
+    onMuteNotifications: PropTypes.func,
     intl: PropTypes.object.isRequired,
     hidden: PropTypes.bool,
     minimal: PropTypes.bool,
diff --git a/app/javascript/mastodon/components/autosuggest_emoji.jsx b/app/javascript/mastodon/components/autosuggest_emoji.jsx
index 28f628b4ac..adea1d9f4b 100644
--- a/app/javascript/mastodon/components/autosuggest_emoji.jsx
+++ b/app/javascript/mastodon/components/autosuggest_emoji.jsx
@@ -35,7 +35,7 @@ export default class AutosuggestEmoji extends PureComponent {
           alt={emoji.native || emoji.colons}
         />
 
-        {emoji.colons}
+        <div className='autosuggest-emoji__name'>{emoji.colons}</div>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_hashtag.tsx b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
index e83d493c2c..036946b0f1 100644
--- a/app/javascript/mastodon/components/autosuggest_hashtag.tsx
+++ b/app/javascript/mastodon/components/autosuggest_hashtag.tsx
@@ -1,5 +1,3 @@
-import { FormattedMessage } from 'react-intl';
-
 import { ShortNumber } from 'mastodon/components/short_number';
 
 interface Props {
@@ -16,27 +14,18 @@ interface Props {
   };
 }
 
-export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => {
-  const weeklyUses = tag.history && (
-    <ShortNumber
-      value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
-    />
-  );
-
-  return (
-    <div className='autosuggest-hashtag'>
-      <div className='autosuggest-hashtag__name'>
-        #<strong>{tag.name}</strong>
-      </div>
-      {tag.history !== undefined && (
-        <div className='autosuggest-hashtag__uses'>
-          <FormattedMessage
-            id='autosuggest_hashtag.per_week'
-            defaultMessage='{count} per week'
-            values={{ count: weeklyUses }}
-          />
-        </div>
-      )}
+export const AutosuggestHashtag: React.FC<Props> = ({ tag }) => (
+  <div className='autosuggest-hashtag'>
+    <div className='autosuggest-hashtag__name'>
+      #<strong>{tag.name}</strong>
     </div>
-  );
-};
+
+    {tag.history !== undefined && (
+      <div className='autosuggest-hashtag__uses'>
+        <ShortNumber
+          value={tag.history.reduce((total, day) => total + day.uses * 1, 0)}
+        />
+      </div>
+    )}
+  </div>
+);
diff --git a/app/javascript/mastodon/components/autosuggest_input.jsx b/app/javascript/mastodon/components/autosuggest_input.jsx
index 06cbb5d75b..f707a18e1d 100644
--- a/app/javascript/mastodon/components/autosuggest_input.jsx
+++ b/app/javascript/mastodon/components/autosuggest_input.jsx
@@ -5,6 +5,8 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
+import Overlay from 'react-overlays/Overlay';
+
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
@@ -195,34 +197,37 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-input'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
+        <input
+          type='text'
+          ref={this.setInput}
+          disabled={disabled}
+          placeholder={placeholder}
+          autoFocus={autoFocus}
+          value={value}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={onKeyUp}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+          dir='auto'
+          aria-autocomplete='list'
+          aria-label={placeholder}
+          id={id}
+          className={className}
+          maxLength={maxLength}
+          lang={lang}
+          spellCheck={spellCheck}
+        />
 
-          <input
-            type='text'
-            ref={this.setInput}
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            dir='auto'
-            aria-autocomplete='list'
-            id={id}
-            className={className}
-            maxLength={maxLength}
-            lang={lang}
-            spellCheck={spellCheck}
-          />
-        </label>
-
-        <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-          {suggestions.map(this.renderSuggestion)}
-        </div>
+        <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={this.input} popperConfig={{ strategy: 'fixed' }}>
+          {({ props }) => (
+            <div {...props}>
+              <div className='autosuggest-textarea__suggestions' style={{ width: this.input?.clientWidth }}>
+                {suggestions.map(this.renderSuggestion)}
+              </div>
+            </div>
+          )}
+        </Overlay>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.jsx b/app/javascript/mastodon/components/autosuggest_textarea.jsx
index 4d173af59d..07fbccacc9 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -5,6 +5,7 @@ import classNames from 'classnames';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
+import Overlay from 'react-overlays/Overlay';
 import Textarea from 'react-textarea-autosize';
 
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
@@ -52,7 +53,6 @@ const AutosuggestTextarea = forwardRef(({
   onFocus,
   autoFocus = true,
   lang,
-  children,
 }, textareaRef) => {
 
   const [suggestionsHidden, setSuggestionsHidden] = useState(true);
@@ -183,40 +183,38 @@ const AutosuggestTextarea = forwardRef(({
     );
   };
 
-  return [
-    <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
-      <div className='autosuggest-textarea'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
+  return (
+    <div className='autosuggest-textarea'>
+      <Textarea
+        ref={textareaRef}
+        className='autosuggest-textarea__textarea'
+        disabled={disabled}
+        placeholder={placeholder}
+        autoFocus={autoFocus}
+        value={value}
+        onChange={handleChange}
+        onKeyDown={handleKeyDown}
+        onKeyUp={onKeyUp}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+        onPaste={handlePaste}
+        dir='auto'
+        aria-autocomplete='list'
+        aria-label={placeholder}
+        lang={lang}
+      />
 
-          <Textarea
-            ref={textareaRef}
-            className='autosuggest-textarea__textarea'
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={handleChange}
-            onKeyDown={handleKeyDown}
-            onKeyUp={onKeyUp}
-            onFocus={handleFocus}
-            onBlur={handleBlur}
-            onPaste={handlePaste}
-            dir='auto'
-            aria-autocomplete='list'
-            lang={lang}
-          />
-        </label>
-      </div>
-      {children}
-    </div>,
-
-    <div className='autosuggest-textarea__suggestions-wrapper' key='suggestions-wrapper'>
-      <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
-        {suggestions.map(renderSuggestion)}
-      </div>
-    </div>,
-  ];
+      <Overlay show={!(suggestionsHidden || suggestions.isEmpty())} offset={[0, 0]} placement='bottom' target={textareaRef} popperConfig={{ strategy: 'fixed' }}>
+        {({ props }) => (
+          <div {...props}>
+            <div className='autosuggest-textarea__suggestions' style={{ width: textareaRef.current?.clientWidth }}>
+              {suggestions.map(renderSuggestion)}
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </div>
+  );
 });
 
 AutosuggestTextarea.propTypes = {
@@ -232,7 +230,6 @@ AutosuggestTextarea.propTypes = {
   onKeyDown: PropTypes.func,
   onPaste: PropTypes.func.isRequired,
   onFocus:PropTypes.func,
-  children: PropTypes.node,
   autoFocus: PropTypes.bool,
   lang: PropTypes.string,
 };
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 04c8bb0980..f6c08dd43b 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -165,7 +165,7 @@ class Dropdown extends PureComponent {
     children: PropTypes.node,
     icon: PropTypes.string,
     iconComponent: PropTypes.func,
-    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]).isRequired,
+    items: PropTypes.oneOfType([PropTypes.array, ImmutablePropTypes.list]),
     loading: PropTypes.bool,
     size: PropTypes.number,
     title: PropTypes.string,
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index ff4fe92525..1171351c51 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -70,9 +70,9 @@ export const defaultMediaVisibility = (status) => {
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
   edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
diff --git a/app/javascript/mastodon/components/visibility_icon.tsx b/app/javascript/mastodon/components/visibility_icon.tsx
index d6ad4095eb..753dc02737 100644
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -2,8 +2,8 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 
 import { Icon } from './icon';
 
@@ -11,14 +11,17 @@ type Visibility = 'public' | 'unlisted' | 'private' | 'direct';
 
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
+  unlisted_short: {
+    id: 'privacy.unlisted.short',
+    defaultMessage: 'Quiet public',
+  },
   private_short: {
     id: 'privacy.private.short',
-    defaultMessage: 'Followers only',
+    defaultMessage: 'Followers',
   },
   direct_short: {
     id: 'privacy.direct.short',
-    defaultMessage: 'Mentioned people only',
+    defaultMessage: 'Specific people',
   },
 });
 
@@ -35,7 +38,7 @@ export const VisibilityIcon: React.FC<{ visibility: Visibility }> = ({
     },
     unlisted: {
       icon: 'unlock',
-      iconComponent: LockOpenIcon,
+      iconComponent: QuietTimeIcon,
       text: intl.formatMessage(messages.unlisted_short),
     },
     private: {
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index f76550678e..171f14d3b2 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -1,14 +1,12 @@
-import { PureComponent } from 'react';
-
 import { Provider } from 'react-redux';
 
-import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from '../actions/store';
-import Compose from '../features/standalone/compose';
-import initialState from '../initial_state';
-import { IntlProvider } from '../locales';
-import { store } from '../store';
-
+import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
+import { hydrateStore } from 'mastodon/actions/store';
+import { Router } from 'mastodon/components/router';
+import Compose from 'mastodon/features/standalone/compose';
+import initialState from 'mastodon/initial_state';
+import { IntlProvider } from 'mastodon/locales';
+import { store } from 'mastodon/store';
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -16,16 +14,14 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class ComposeContainer extends PureComponent {
+const ComposeContainer = () => (
+  <IntlProvider>
+    <Provider store={store}>
+      <Router>
+        <Compose />
+      </Router>
+    </Provider>
+  </IntlProvider>
+);
 
-  render () {
-    return (
-      <IntlProvider>
-        <Provider store={store}>
-          <Compose />
-        </Provider>
-      </IntlProvider>
-    );
-  }
-
-}
+export default ComposeContainer;
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.jsx b/app/javascript/mastodon/features/compose/components/action_bar.jsx
index 411ad77c79..be52eac11e 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/action_bar.jsx
@@ -1,13 +1,13 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import { useDispatch } from 'react-redux';
 
-import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
-
-import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import DropdownMenuContainer from 'mastodon/containers/dropdown_menu_container';
+import { logOut } from 'mastodon/utils/log_out';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
@@ -23,51 +23,52 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
+  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
+  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
 });
 
-class ActionBar extends PureComponent {
+export const ActionBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
+  const handleLogoutClick = useCallback(() => {
+    dispatch(openModal({
+      modalType: 'CONFIRM',
+      modalProps: {
+        message: intl.formatMessage(messages.logoutMessage),
+        confirm: intl.formatMessage(messages.logoutConfirm),
+        closeWhenConfirm: false,
+        onConfirm: () => logOut(),
+      },
+    }));
+  }, [dispatch, intl]);
 
-  handleLogout = () => {
-    this.props.onLogout();
-  };
+  let menu = [];
 
-  render () {
-    const { intl } = this.props;
+  menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+  menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+  menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+  menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+  menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
+  menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+  menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+  menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+  menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+  menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
+  menu.push(null);
+  menu.push({ text: intl.formatMessage(messages.logout), action: handleLogoutClick });
 
-    let menu = [];
-
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
-    menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
-    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
-    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
-    menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
-    menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
-    menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
-    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
-    menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
-    menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.logout), action: this.handleLogout });
-
-    return (
-      <div className='compose__action-bar'>
-        <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='bars' iconComponent={MenuIcon} size={24} direction='right' />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(ActionBar);
+  return (
+    <DropdownMenuContainer
+      items={menu}
+      icon='bars'
+      iconComponent={MoreHorizIcon}
+      size={24}
+      direction='right'
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
index 0a73bc1020..fe684c1483 100644
--- a/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
+++ b/app/javascript/mastodon/features/compose/components/autosuggest_account.jsx
@@ -15,7 +15,7 @@ export default class AutosuggestAccount extends ImmutablePureComponent {
 
     return (
       <div className='autosuggest-account' title={account.get('acct')}>
-        <div className='autosuggest-account-icon'><Avatar account={account} size={18} /></div>
+        <Avatar account={account} size={24} />
         <DisplayName account={account} />
       </div>
     );
diff --git a/app/javascript/mastodon/features/compose/components/character_counter.jsx b/app/javascript/mastodon/features/compose/components/character_counter.jsx
index 42452b30f6..f400d1fe2f 100644
--- a/app/javascript/mastodon/features/compose/components/character_counter.jsx
+++ b/app/javascript/mastodon/features/compose/components/character_counter.jsx
@@ -1,26 +1,18 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
 
 import { length } from 'stringz';
 
-export default class CharacterCounter extends PureComponent {
+export const CharacterCounter = ({ text, max }) => {
+  const diff = max - length(text);
 
-  static propTypes = {
-    text: PropTypes.string.isRequired,
-    max: PropTypes.number.isRequired,
-  };
-
-  checkRemainingText (diff) {
-    if (diff < 0) {
-      return <span className='character-counter character-counter--over'>{diff}</span>;
-    }
-
-    return <span className='character-counter'>{diff}</span>;
+  if (diff < 0) {
+    return <span className='character-counter character-counter--over'>{diff}</span>;
   }
 
-  render () {
-    const diff = this.props.max - length(this.props.text);
-    return this.checkRemainingText(diff);
-  }
+  return <span className='character-counter'>{diff}</span>;
+};
 
-}
+CharacterCounter.propTypes = {
+  text: PropTypes.string.isRequired,
+  max: PropTypes.number.isRequired,
+};
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index fd66874e71..c5ee894683 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -10,8 +10,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { length } from 'stringz';
 
-import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import { Icon }  from 'mastodon/components/icon';
 import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
 
 import AutosuggestInput from '../../../components/autosuggest_input';
@@ -20,25 +18,27 @@ import { Button } from '../../../components/button';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import LanguageDropdown from '../containers/language_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
-import PollFormContainer from '../containers/poll_form_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
 import { countableText } from '../util/counter';
 
-import CharacterCounter from './character_counter';
+import { CharacterCounter } from './character_counter';
+import { EditIndicator } from './edit_indicator';
+import { NavigationBar } from './navigation_bar';
+import { PollForm } from "./poll_form";
+import { ReplyIndicator } from './reply_indicator';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
-  publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
-  publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
-  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning (optional)' },
+  publish: { id: 'compose_form.publish', defaultMessage: 'Post' },
+  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Update' },
+  reply: { id: 'compose_form.reply', defaultMessage: 'Reply' },
 });
 
 class ComposeForm extends ImmutablePureComponent {
@@ -65,6 +65,7 @@ class ComposeForm extends ImmutablePureComponent {
     onPaste: PropTypes.func.isRequired,
     onPickEmoji: PropTypes.func.isRequired,
     autoFocus: PropTypes.bool,
+    withoutNavigation: PropTypes.bool,
     anyMedia: PropTypes.bool,
     isInReply: PropTypes.bool,
     singleColumn: PropTypes.bool,
@@ -223,93 +224,90 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, onPaste, autoFocus } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation } = this.props;
     const { highlighted } = this.state;
     const disabled = this.props.isSubmitting;
 
-    let publishText = '';
-
-    if (this.props.isEditing) {
-      publishText = intl.formatMessage(messages.saveChanges);
-    } else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
-      publishText = <><Icon id='lock' icon={LockIcon} /> {intl.formatMessage(messages.publish)}</>;
-    } else {
-      publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
-    }
-
     return (
       <form className='compose-form' onSubmit={this.handleSubmit}>
+        <ReplyIndicator />
+        {!withoutNavigation && <NavigationBar />}
         <WarningContainer />
 
-        <ReplyIndicatorContainer />
+        <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
+          <div className='compose-form__scrollable'>
+            <EditIndicator />
 
-        <div className={`spoiler-input ${this.props.spoiler ? 'spoiler-input--visible' : ''}`} ref={this.setRef} aria-hidden={!this.props.spoiler}>
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.spoiler_placeholder)}
-            value={this.props.spoilerText}
-            onChange={this.handleChangeSpoilerText}
-            onKeyDown={this.handleKeyDown}
-            disabled={!this.props.spoiler}
-            ref={this.setSpoilerText}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSpoilerSuggestionSelected}
-            searchTokens={[':']}
-            id='cw-spoiler-input'
-            className='spoiler-input__input'
-            lang={this.props.lang}
-            spellCheck
-          />
-        </div>
+            {this.props.spoiler && (
+              <div className='spoiler-input'>
+                <div className='spoiler-input__border' />
 
-        <div className={classNames('compose-form__highlightable', { active: highlighted })}>
-          <AutosuggestTextarea
-            ref={this.textareaRef}
-            placeholder={intl.formatMessage(messages.placeholder)}
-            disabled={disabled}
-            value={this.props.text}
-            onChange={this.handleChange}
-            suggestions={this.props.suggestions}
-            onFocus={this.handleFocus}
-            onKeyDown={this.handleKeyDown}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            onPaste={onPaste}
-            autoFocus={autoFocus}
-            lang={this.props.lang}
-          >
-            <div className='compose-form__modifiers'>
-              <UploadFormContainer />
-              <PollFormContainer />
-            </div>
-          </AutosuggestTextarea>
-          <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <AutosuggestInput
+                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
+                  value={this.props.spoilerText}
+                  disabled={disabled}
+                  onChange={this.handleChangeSpoilerText}
+                  onKeyDown={this.handleKeyDown}
+                  ref={this.setSpoilerText}
+                  suggestions={this.props.suggestions}
+                  onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+                  onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+                  onSuggestionSelected={this.onSpoilerSuggestionSelected}
+                  searchTokens={[':']}
+                  id='cw-spoiler-input'
+                  className='spoiler-input__input'
+                  lang={this.props.lang}
+                  spellCheck
+                />
 
-          <div className='compose-form__buttons-wrapper'>
-            <div className='compose-form__buttons'>
-              <UploadButtonContainer />
-              <PollButtonContainer />
+                <div className='spoiler-input__border' />
+              </div>
+            )}
+
+            <AutosuggestTextarea
+              ref={this.textareaRef}
+              placeholder={intl.formatMessage(messages.placeholder)}
+              disabled={disabled}
+              value={this.props.text}
+              onChange={this.handleChange}
+              suggestions={this.props.suggestions}
+              onFocus={this.handleFocus}
+              onKeyDown={this.handleKeyDown}
+              onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+              onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+              onSuggestionSelected={this.onSuggestionSelected}
+              onPaste={onPaste}
+              autoFocus={autoFocus}
+              lang={this.props.lang}
+            />
+          </div>
+
+          <UploadFormContainer />
+          <PollForm />
+
+          <div className='compose-form__footer'>
+            <div className='compose-form__dropdowns'>
               <PrivacyDropdownContainer disabled={this.props.isEditing} />
-              <SpoilerButtonContainer />
               <LanguageDropdown />
             </div>
 
-            <div className='character-counter__wrapper'>
-              <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
-            </div>
-          </div>
-        </div>
+            <div className='compose-form__actions'>
+              <div className='compose-form__buttons'>
+                <UploadButtonContainer />
+                <PollButtonContainer />
+                <SpoilerButtonContainer />
+                <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+                <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+              </div>
 
-        <div className='compose-form__publish'>
-          <div className='compose-form__publish-button-wrapper'>
-            <Button
-              type='submit'
-              text={publishText}
-              disabled={!this.canSubmit()}
-              block
-            />
+              <div className='compose-form__submit'>
+                <Button
+                  type='submit'
+                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
+                  disabled={!this.canSubmit()}
+                />
+              </div>
+            </div>
           </div>
         </div>
       </form>
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
new file mode 100644
index 0000000000..6cdaaebea5
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -0,0 +1,62 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useDispatch, useSelector } from 'react-redux';
+
+import BarChart4BarsIcon from 'mastodon/../material-icons/400-24px/bar_chart_4_bars.svg?react';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import PhotoLibraryIcon from 'mastodon/../material-icons/400-24px/photo_library.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import { Icon } from 'mastodon/components/icon';
+import { IconButton } from 'mastodon/components/icon_button';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
+
+export const EditIndicator = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const id = useSelector(state => state.getIn(['compose', 'id']));
+  const status = useSelector(state => state.getIn(['statuses', id]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
+
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
+
+  if (!status) {
+    return null;
+  }
+
+  const content = { __html: status.get('contentHtml') };
+
+  return (
+    <div className='edit-indicator'>
+      <div className='edit-indicator__header'>
+        <div className='edit-indicator__display-name'>
+          <Link to={`/@${account.get('acct')}`}>@{account.get('acct')}</Link>
+          ·
+          <Link to={`/@${account.get('acct')}/${status.get('id')}`}><RelativeTimestamp timestamp={status.get('created_at')} /></Link>
+        </div>
+
+        <div className='edit-indicator__cancel'>
+          <IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={handleCancelClick} inverted />
+        </div>
+      </div>
+
+      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+
+      {(status.get('poll') || status.get('media_attachments').size > 0) && (
+        <div className='edit-indicator__attachments'>
+          {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+          {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
index 494b8d8624..9949d2c001 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx
@@ -10,6 +10,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
+import MoodIcon from 'mastodon/../material-icons/400-24px/mood.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 import { assetHost } from 'mastodon/utils/config';
 
 import { buildCustomEmojis, categoriesFromEmojis } from '../../emoji/emoji';
@@ -321,7 +323,6 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
-    button: PropTypes.node,
   };
 
   state = {
@@ -379,23 +380,24 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, button } = this.props;
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
     const title = intl.formatMessage(messages.emoji);
     const { active, loading } = this.state;
 
     return (
-      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown}>
-        <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
-          {button || <img
-            className={classNames('emojione', { 'pulse-loading': active && loading })}
-            alt='🙂'
-            src={`${assetHost}/emoji/1f642.svg`}
-          />}
-        </div>
+      <div className='emoji-picker-dropdown' onKeyDown={this.handleKeyDown} ref={this.setTargetRef}>
+        <IconButton
+          title={title}
+          aria-expanded={active}
+          active={active}
+          iconComponent={MoodIcon}
+          onClick={this.onToggle}
+          inverted
+        />
 
         <Overlay show={active} placement={'bottom'} target={this.findTarget} popperConfig={{ strategy: 'fixed' }}>
           {({ props, placement })=> (
-            <div {...props} style={{ ...props.style, width: 299 }}>
+            <div {...props} style={{ ...props.style }}>
               <div className={`dropdown-animation ${placement}`}>
                 <EmojiPickerMenu
                   custom_emojis={this.props.custom_emojis}
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 13d1c2e1a7..2783ca8be2 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -9,10 +9,11 @@ import { supportsPassiveEvents } from 'detect-passive-events';
 import fuzzysort from 'fuzzysort';
 import Overlay from 'react-overlays/Overlay';
 
+import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
+import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import TranslateIcon from 'mastodon/../material-icons/400-24px/translate.svg?react';
+import { Icon } from 'mastodon/components/icon';
 import { languages as preloadedLanguages } from 'mastodon/initial_state';
-import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
-
-import TextIconButton from './text_icon_button';
 
 const messages = defineMessages({
   changeLanguage: { id: 'compose.language.change', defaultMessage: 'Change language' },
@@ -231,7 +232,7 @@ class LanguageDropdownMenu extends PureComponent {
       <div ref={this.setRef}>
         <div className='emoji-mart-search'>
           <input type='search' value={searchValue} onChange={this.handleSearchChange} onKeyDown={this.handleSearchKeyDown} placeholder={intl.formatMessage(messages.search)} />
-          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}>{!isSearching ? loupeIcon : deleteIcon}</button>
+          <button type='button' className='emoji-mart-search-icon' disabled={!isSearching} aria-label={intl.formatMessage(messages.clear)} onClick={this.handleClear}><Icon icon={!isSearching ? SearchIcon : CancelIcon} /></button>
         </div>
 
         <div className='language-dropdown__dropdown__results emoji-mart-scroll' role='listbox' ref={this.setListRef}>
@@ -297,20 +298,24 @@ class LanguageDropdown extends PureComponent {
   render () {
     const { value, intl, frequentlyUsedLanguages } = this.props;
     const { open, placement } = this.state;
+    const current = preloadedLanguages.find(lang => lang[0] === value) ?? [];
 
     return (
-      <div className={classNames('privacy-dropdown', placement, { active: open })}>
-        <div className='privacy-dropdown__value' ref={this.setTargetRef} >
-          <TextIconButton
-            className='privacy-dropdown__value-icon'
-            label={value && value.toUpperCase()}
-            title={intl.formatMessage(messages.changeLanguage)}
-            active={open}
-            onClick={this.handleToggle}
-          />
-        </div>
+      <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
+        <button
+          type='button'
+          title={intl.formatMessage(messages.changeLanguage)}
+          aria-expanded={open}
+          onClick={this.handleToggle}
+          onMouseDown={this.handleMouseDown}
+          onKeyDown={this.handleButtonKeyDown}
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon icon={TranslateIcon} />
+          <span className='dropdown-button__label'>{current[2] ?? value}</span>
+        </button>
 
-        <Overlay show={open} placement={'bottom'} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation language-dropdown__dropdown ${placement}`} >
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
index 2f0bb79f89..ebf59e4c83 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.jsx
@@ -1,50 +1,36 @@
-import PropTypes from 'prop-types';
+import { useCallback } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
-import { Link } from 'react-router-dom';
+import { useSelector, useDispatch } from 'react-redux';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import { cancelReplyCompose } from 'mastodon/actions/compose';
+import Account from 'mastodon/components/account';
+import { IconButton } from 'mastodon/components/icon_button';
+import { me } from 'mastodon/initial_state';
 
-import { Avatar } from '../../../components/avatar';
+import { ActionBar } from './action_bar';
 
-import ActionBar from './action_bar';
 
-export default class NavigationBar extends ImmutablePureComponent {
+const messages = defineMessages({
+  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
+});
 
-  static propTypes = {
-    account: ImmutablePropTypes.record.isRequired,
-    onLogout: PropTypes.func.isRequired,
-    onClose: PropTypes.func,
-  };
+export const NavigationBar = () => {
+  const dispatch = useDispatch();
+  const intl = useIntl();
+  const account = useSelector(state => state.getIn(['accounts', me]));
+  const isReplying = useSelector(state => !!state.getIn(['compose', 'in_reply_to']));
 
-  render () {
-    const username = this.props.account.get('acct');
-    return (
-      <div className='navigation-bar'>
-        <Link to={`/@${username}`}>
-          <span style={{ display: 'none' }}>{username}</span>
-          <Avatar account={this.props.account} size={46} />
-        </Link>
+  const handleCancelClick = useCallback(() => {
+    dispatch(cancelReplyCompose());
+  }, [dispatch]);
 
-        <div className='navigation-bar__profile'>
-          <span>
-            <Link to={`/@${username}`}>
-              <strong className='navigation-bar__profile-account'>@{username}</strong>
-            </Link>
-          </span>
-
-          <span>
-            <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          </span>
-        </div>
-
-        <div className='navigation-bar__actions'>
-          <ActionBar account={this.props.account} onLogout={this.props.onLogout} />
-        </div>
-      </div>
-    );
-  }
-
-}
+  return (
+    <div className='navigation-bar'>
+      <Account account={account} minimal />
+      {isReplying ? <IconButton title={intl.formatMessage(messages.cancel)} iconComponent={CloseIcon} onClick={handleCancelClick} /> : <ActionBar />}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.jsx b/app/javascript/mastodon/features/compose/components/poll_button.jsx
index 4900d38119..345497abd3 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_button.jsx
@@ -3,11 +3,10 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 
 import { IconButton } from '../../../components/icon_button';
 
-
 const messages = defineMessages({
   add_poll: { id: 'poll_button.add_poll', defaultMessage: 'Add a poll' },
   remove_poll: { id: 'poll_button.remove_poll', defaultMessage: 'Remove poll' },
@@ -22,7 +21,6 @@ class PollButton extends PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     active: PropTypes.bool,
     onClick: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
@@ -33,17 +31,13 @@ class PollButton extends PureComponent {
   };
 
   render () {
-    const { intl, active, unavailable, disabled } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, active, disabled } = this.props;
 
     return (
       <div className='compose-form__poll-button'>
         <IconButton
           icon='tasks'
-          iconComponent={InsertChartIcon}
+          iconComponent={BarChart4BarsIcon}
           title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
           disabled={disabled}
           onClick={this.handleClick}
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.jsx b/app/javascript/mastodon/features/compose/components/poll_form.jsx
index 929b2be57a..3c02810e7a 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/poll_form.jsx
@@ -1,189 +1,162 @@
 import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
+import { useCallback } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import classNames from 'classnames';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useDispatch, useSelector } from 'react-redux';
 
-import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import {
+  changePollSettings,
+  changePollOption,
+  clearComposeSuggestions,
+  fetchComposeSuggestions,
+  selectComposeSuggestion,
+} from 'mastodon/actions/compose';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
-import { Icon }  from 'mastodon/components/icon';
-import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
-  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },
-  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add a choice' },
-  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this choice' },
-  poll_duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll duration' },
+  option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Option {number}' },
+  add_option: { id: 'compose_form.poll.add_option', defaultMessage: 'Add option' },
+  remove_option: { id: 'compose_form.poll.remove_option', defaultMessage: 'Remove this option' },
+  duration: { id: 'compose_form.poll.duration', defaultMessage: 'Poll length' },
+  type: { id: 'compose_form.poll.type', defaultMessage: 'Style' },
   switchToMultiple: { id: 'compose_form.poll.switch_to_multiple', defaultMessage: 'Change poll to allow multiple choices' },
   switchToSingle: { id: 'compose_form.poll.switch_to_single', defaultMessage: 'Change poll to allow for a single choice' },
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+  multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
 });
 
-class OptionIntl extends PureComponent {
+const Select = ({ label, options, value, onChange }) => {
+  return (
+    <label className='compose-form__poll__select'>
+      <span className='compose-form__poll__select__label'>{label}</span>
 
-  static propTypes = {
-    title: PropTypes.string.isRequired,
-    lang: PropTypes.string,
-    index: PropTypes.number.isRequired,
-    isPollMultiple: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onRemove: PropTypes.func.isRequired,
-    onToggleMultiple: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
+      <select className='compose-form__poll__select__value' value={value} onChange={onChange}>
+        {options.map((option, i) => (
+          <option key={i} value={option.value}>{option.label}</option>
+        ))}
+      </select>
+    </label>
+  );
+};
 
-  handleOptionTitleChange = e => {
-    this.props.onChange(this.props.index, e.target.value);
-  };
+Select.propTypes = {
+  label: PropTypes.node,
+  value: PropTypes.any,
+  onChange: PropTypes.func,
+  options: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.node,
+    value: PropTypes.any,
+  })),
+};
 
-  handleOptionRemove = () => {
-    this.props.onRemove(this.props.index);
-  };
+const Option = ({ multipleChoice, index, title, autoFocus }) => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const suggestions = useSelector(state => state.getIn(['compose', 'suggestions']));
+  const lang = useSelector(state => state.getIn(['compose', 'language']));
 
+  const handleChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollOption(index, value));
+  }, [dispatch, index]);
 
-  handleToggleMultiple = e => {
-    this.props.onToggleMultiple();
-    e.preventDefault();
-    e.stopPropagation();
-  };
+  const handleSuggestionsFetchRequested = useCallback(token => {
+    dispatch(fetchComposeSuggestions(token));
+  }, [dispatch]);
 
-  handleCheckboxKeypress = e => {
-    if (e.key === 'Enter' || e.key === ' ') {
-      this.handleToggleMultiple(e);
-    }
-  };
+  const handleSuggestionsClearRequested = useCallback(() => {
+    dispatch(clearComposeSuggestions());
+  }, [dispatch]);
 
-  onSuggestionsClearRequested = () => {
-    this.props.onClearSuggestions();
-  };
+  const handleSuggestionSelected = useCallback((tokenStart, token, value) => {
+    dispatch(selectComposeSuggestion(tokenStart, token, value, ['poll', 'options', index]));
+  }, [dispatch, index]);
 
-  onSuggestionsFetchRequested = (token) => {
-    this.props.onFetchSuggestions(token);
-  };
+  return (
+    <label className={classNames('poll__option editable', { empty: index > 1 && title.length === 0 })}>
+      <span className={classNames('poll__input', { checkbox: multipleChoice })} />
 
-  onSuggestionSelected = (tokenStart, token, value) => {
-    this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
-  };
+      <AutosuggestInput
+        placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
+        maxLength={50}
+        value={title}
+        lang={lang}
+        spellCheck
+        onChange={handleChange}
+        suggestions={suggestions}
+        onSuggestionsFetchRequested={handleSuggestionsFetchRequested}
+        onSuggestionsClearRequested={handleSuggestionsClearRequested}
+        onSuggestionSelected={handleSuggestionSelected}
+        searchTokens={[':']}
+        autoFocus={autoFocus}
+      />
+    </label>
+  );
+};
 
-  render () {
-    const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;
+Option.propTypes = {
+  title: PropTypes.string.isRequired,
+  index: PropTypes.number.isRequired,
+  multipleChoice: PropTypes.bool,
+  autoFocus: PropTypes.bool,
+};
 
-    return (
-      <li>
-        <label className='poll__option editable'>
-          <span
-            className={classNames('poll__input', { checkbox: isPollMultiple })}
-            onClick={this.handleToggleMultiple}
-            onKeyPress={this.handleCheckboxKeypress}
-            role='button'
-            tabIndex={0}
-            title={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-            aria-label={intl.formatMessage(isPollMultiple ? messages.switchToSingle : messages.switchToMultiple)}
-          />
+export const PollForm = () => {
+  const intl = useIntl();
+  const dispatch = useDispatch();
+  const poll = useSelector(state => state.getIn(['compose', 'poll']));
+  const options = poll?.get('options');
+  const expiresIn = poll?.get('expires_in');
+  const isMultiple = poll?.get('multiple');
 
-          <AutosuggestInput
-            placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxLength={50}
-            value={title}
-            lang={lang}
-            spellCheck
-            onChange={this.handleOptionTitleChange}
-            suggestions={this.props.suggestions}
-            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-            onSuggestionSelected={this.onSuggestionSelected}
-            searchTokens={[':']}
-            autoFocus={autoFocus}
-          />
-        </label>
+  const handleDurationChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(value, isMultiple));
+  }, [dispatch, isMultiple]);
 
-        <div className='poll__cancel'>
-          <IconButton disabled={index <= 1} title={intl.formatMessage(messages.remove_option)} icon='times' iconComponent={CloseIcon} onClick={this.handleOptionRemove} />
-        </div>
-      </li>
-    );
+  const handleTypeChange = useCallback(({ target: { value } }) => {
+    dispatch(changePollSettings(expiresIn, value === 'true'));
+  }, [dispatch, expiresIn]);
+
+  if (poll === null) {
+    return null;
   }
 
-}
+  return (
+    <div className='compose-form__poll'>
+      {options.map((title, i) => (
+        <Option
+          title={title}
+          key={i}
+          index={i}
+          multipleChoice={isMultiple}
+          autoFocus={i === 0}
+        />
+      ))}
 
-const Option = injectIntl(OptionIntl);
+      <div className='compose-form__poll__footer'>
+        <Select label={intl.formatMessage(messages.duration)} options={[
+          { value: 300, label: intl.formatMessage(messages.minutes, { number: 5 })},
+          { value: 1800, label: intl.formatMessage(messages.minutes, { number: 30 })},
+          { value: 3600, label: intl.formatMessage(messages.hours, { number: 1 })},
+          { value: 21600, label: intl.formatMessage(messages.hours, { number: 6 })},
+          { value: 43200, label: intl.formatMessage(messages.hours, { number: 12 })},
+          { value: 86400, label: intl.formatMessage(messages.days, { number: 1 })},
+          { value: 259200, label: intl.formatMessage(messages.days, { number: 3 })},
+          { value: 604800, label: intl.formatMessage(messages.days, { number: 7 })},
+        ]} value={expiresIn} onChange={handleDurationChange} />
 
-class PollForm extends ImmutablePureComponent {
+        <div className='compose-form__poll__footer__sep' />
 
-  static propTypes = {
-    options: ImmutablePropTypes.list,
-    lang: PropTypes.string,
-    expiresIn: PropTypes.number,
-    isMultiple: PropTypes.bool,
-    onChangeOption: PropTypes.func.isRequired,
-    onAddOption: PropTypes.func.isRequired,
-    onRemoveOption: PropTypes.func.isRequired,
-    onChangeSettings: PropTypes.func.isRequired,
-    suggestions: ImmutablePropTypes.list,
-    onClearSuggestions: PropTypes.func.isRequired,
-    onFetchSuggestions: PropTypes.func.isRequired,
-    onSuggestionSelected: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleAddOption = () => {
-    this.props.onAddOption('');
-  };
-
-  handleSelectDuration = e => {
-    this.props.onChangeSettings(e.target.value, this.props.isMultiple);
-  };
-
-  handleToggleMultiple = () => {
-    this.props.onChangeSettings(this.props.expiresIn, !this.props.isMultiple);
-  };
-
-  render () {
-    const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
-
-    if (!options) {
-      return null;
-    }
-
-    const autoFocusIndex = options.indexOf('');
-
-    return (
-      <div className='compose-form__poll-wrapper'>
-        <ul>
-          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
-        </ul>
-
-        <div className='poll__footer'>
-          <button type='button' disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' icon={AddIcon} /> <FormattedMessage {...messages.add_option} /></button>
-
-          {/* eslint-disable-next-line jsx-a11y/no-onchange */}
-          <select value={expiresIn} onChange={this.handleSelectDuration}>
-            <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
-            <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
-            <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>
-            <option value={21600}>{intl.formatMessage(messages.hours, { number: 6 })}</option>
-            <option value={43200}>{intl.formatMessage(messages.hours, { number: 12 })}</option>
-            <option value={86400}>{intl.formatMessage(messages.days, { number: 1 })}</option>
-            <option value={259200}>{intl.formatMessage(messages.days, { number: 3 })}</option>
-            <option value={604800}>{intl.formatMessage(messages.days, { number: 7 })}</option>
-          </select>
-        </div>
+        <Select label={intl.formatMessage(messages.type)} options={[
+          { value: false, label: intl.formatMessage(messages.singleChoice) },
+          { value: true, label: intl.formatMessage(messages.multipleChoice) },
+        ]} value={isMultiple} onChange={handleTypeChange} />
       </div>
-    );
-  }
-
-}
-
-export default injectIntl(PollForm);
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index c3446b8d60..82f9027388 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -5,28 +5,27 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
-
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import InfoIcon from '@/material-icons/400-24px/info.svg?react';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
 import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
-import { IconButton } from '../../../components/icon_button';
-
 const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
-  private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
-  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
-  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
+  public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+  direct_long: { id: 'privacy.direct.long', defaultMessage: 'Everyone mentioned in the post' },
+  change_privacy: { id: 'privacy.change', defaultMessage: 'Change post privacy' },
+  unlisted_extra: { id: 'privacy.unlisted.additional', defaultMessage: 'This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.' },
 });
 
 const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
@@ -135,6 +134,12 @@ class PrivacyDropdownMenu extends PureComponent {
               <strong>{item.text}</strong>
               {item.meta}
             </div>
+
+            {item.extra && (
+              <div className='privacy-dropdown__option__additional' title={item.extra}>
+                <Icon id='info-circle' icon={InfoIcon} />
+              </div>
+            )}
           </div>
         ))}
       </div>
@@ -163,30 +168,11 @@ class PrivacyDropdown extends PureComponent {
   };
 
   handleToggle = () => {
-    if (this.props.isUserTouching && this.props.isUserTouching()) {
-      if (this.state.open) {
-        this.props.onModalClose();
-      } else {
-        this.props.onModalOpen({
-          actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
-          onClick: this.handleModalActionClick,
-        });
-      }
-    } else {
-      if (this.state.open && this.activeElement) {
-        this.activeElement.focus({ preventScroll: true });
-      }
-      this.setState({ open: !this.state.open });
+    if (this.state.open && this.activeElement) {
+      this.activeElement.focus({ preventScroll: true });
     }
-  };
 
-  handleModalActionClick = (e) => {
-    e.preventDefault();
-
-    const { value } = this.options[e.currentTarget.getAttribute('data-index')];
-
-    this.props.onModalClose();
-    this.props.onChange(value);
+    this.setState({ open: !this.state.open });
   };
 
   handleKeyDown = e => {
@@ -228,7 +214,7 @@ class PrivacyDropdown extends PureComponent {
 
     this.options = [
       { icon: 'globe', iconComponent: PublicIcon, value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
-      { icon: 'unlock', iconComponent: LockOpenIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
+      { icon: 'unlock', iconComponent: QuietTimeIcon,  value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long), extra: formatMessage(messages.unlisted_extra) },
       { icon: 'lock', iconComponent: LockIcon, value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
     ];
 
@@ -259,23 +245,21 @@ class PrivacyDropdown extends PureComponent {
 
     return (
       <div ref={this.setTargetRef} onKeyDown={this.handleKeyDown}>
-        <IconButton
-          className='privacy-dropdown__value-icon'
-          icon={valueOption.icon}
-          iconComponent={valueOption.iconComponent}
+        <button
+          type='button'
           title={intl.formatMessage(messages.change_privacy)}
-          size={18}
-          expanded={open}
-          active={open}
-          inverted
+          aria-expanded={open}
           onClick={this.handleToggle}
           onMouseDown={this.handleMouseDown}
           onKeyDown={this.handleButtonKeyDown}
-          style={{ height: null, lineHeight: '27px' }}
           disabled={disabled}
-        />
+          className={classNames('dropdown-button', { active: open })}
+        >
+          <Icon id={valueOption.icon} icon={valueOption.iconComponent} />
+          <span className='dropdown-button__label'>{valueOption.text}</span>
+        </button>
 
-        <Overlay show={open} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
+        <Overlay show={open} offset={[5, 5]} placement={placement} flip target={this.findTarget} container={container} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>
           {({ props, placement }) => (
             <div {...props}>
               <div className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}>
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index 8051e01db4..b7959e211d 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -1,74 +1,48 @@
-import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import { useSelector } from 'react-redux';
 
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AttachmentList from 'mastodon/components/attachment_list';
-import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
 
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
+export const ReplyIndicator = () => {
+  const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
+  const status = useSelector(state => state.getIn(['statuses', inReplyToId]));
+  const account = useSelector(state => state.getIn(['accounts', status?.get('account')]));
 
-const messages = defineMessages({
-  cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
-});
+  if (!status) {
+    return null;
+  }
 
-class ReplyIndicator extends ImmutablePureComponent {
+  const content = { __html: status.get('contentHtml') };
 
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onCancel: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    ...WithOptionalRouterPropTypes,
-  };
+  return (
+    <div className='reply-indicator'>
+      <div className='reply-indicator__line' />
 
-  handleClick = () => {
-    this.props.onCancel();
-  };
+      <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
+        <Avatar account={account} size={46} />
+      </Link>
 
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history?.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-  };
-
-  render () {
-    const { status, intl } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    const content = { __html: status.get('contentHtml') };
-
-    return (
-      <div className='reply-indicator'>
-        <div className='reply-indicator__header'>
-          <div className='reply-indicator__cancel'><IconButton title={intl.formatMessage(messages.cancel)} icon='times' iconComponent={CloseIcon} onClick={this.handleClick} inverted /></div>
-
-          <a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='reply-indicator__display-name'>
-            <div className='reply-indicator__display-avatar'><Avatar account={status.get('account')} size={24} /></div>
-            <DisplayName account={status.get('account')} />
-          </a>
-        </div>
+      <div className='reply-indicator__main'>
+        <Link to={`/@${account.get('acct')}`} className='detailed-status__display-name'>
+          <DisplayName account={account} />
+        </Link>
 
         <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
 
-        {status.get('media_attachments').size > 0 && (
-          <AttachmentList
-            compact
-            media={status.get('media_attachments')}
-          />
+        {(status.get('poll') || status.get('media_attachments').size > 0) && (
+          <div className='reply-indicator__attachments'>
+            {status.get('poll') && <><Icon icon={BarChart4BarsIcon} /><FormattedMessage id='reply_indicator.poll' defaultMessage='Poll' /></>}
+            {status.get('media_attachments').size > 0 && <><Icon icon={PhotoLibraryIcon} /><FormattedMessage id='reply_indicator.attachments' defaultMessage='{count, plural, one {# attachment} other {# attachments}}' values={{ count: status.get('media_attachments').size }} /></>}
+          </div>
         )}
       </div>
-    );
-  }
-
-}
-
-export default withOptionalRouter(injectIntl(ReplyIndicator));
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/upload.jsx b/app/javascript/mastodon/features/compose/components/upload.jsx
index 76d394af7a..861232d0ec 100644
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
+
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -9,7 +11,8 @@ import spring from 'react-motion/lib/spring';
 
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
-import InfoIcon from '@/material-icons/400-24px/info.svg?react';
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import { Blurhash } from 'mastodon/components/blurhash';
 import { Icon }  from 'mastodon/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
@@ -18,6 +21,7 @@ export default class Upload extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
+    sensitive: PropTypes.bool,
     onUndo: PropTypes.func.isRequired,
     onOpenFocalPoint: PropTypes.func.isRequired,
   };
@@ -33,7 +37,7 @@ export default class Upload extends ImmutablePureComponent {
   };
 
   render () {
-    const { media } = this.props;
+    const { media, sensitive } = this.props;
 
     if (!media) {
       return null;
@@ -43,22 +47,26 @@ export default class Upload extends ImmutablePureComponent {
     const focusY = media.getIn(['meta', 'focus', 'y']);
     const x = ((focusX /  2) + .5) * 100;
     const y = ((focusY / -2) + .5) * 100;
+    const missingDescription = (media.get('description') || '').length === 0;
 
     return (
       <div className='compose-form__upload'>
         <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
           {({ scale }) => (
-            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
+            <div className='compose-form__upload__thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: !sensitive ? `url(${media.get('preview_url')})` : null, backgroundPosition: `${x}% ${y}%` }}>
+              {sensitive && <Blurhash
+                hash={media.get('blurhash')}
+                className='compose-form__upload__preview'
+              />}
+
               <div className='compose-form__upload__actions'>
-                <button type='button' className='icon-button' onClick={this.handleUndoClick}><Icon id='times' icon={CloseIcon} /> <FormattedMessage id='upload_form.undo' defaultMessage='Delete' /></button>
-                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='pencil' icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
+                <button type='button' className='icon-button compose-form__upload__delete' onClick={this.handleUndoClick}><Icon icon={CloseIcon} /></button>
+                <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon icon={EditIcon} /> <FormattedMessage id='upload_form.edit' defaultMessage='Edit' /></button>
               </div>
 
-              {(media.get('description') || '').length === 0 && (
-                <div className='compose-form__upload__warning'>
-                  <button type='button' className='icon-button' onClick={this.handleFocalPointClick}><Icon id='info-circle' icon={InfoIcon} /> <FormattedMessage id='upload_form.description_missing' defaultMessage='No description added' /></button>
-                </div>
-              )}
+              <div className='compose-form__upload__warning'>
+                <button type='button' className={classNames('icon-button', { active: missingDescription })} onClick={this.handleFocalPointClick}>{missingDescription && <Icon icon={WarningIcon} />} ALT</button>
+              </div>
             </div>
           )}
         </Motion>
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.jsx b/app/javascript/mastodon/features/compose/components/upload_button.jsx
index 923d6a3c47..3866f239d7 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@@ -6,9 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
-
-import { IconButton } from '../../../components/icon_button';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 
 const messages = defineMessages({
   upload: { id: 'upload_button.label', defaultMessage: 'Add images, a video or an audio file' },
@@ -31,7 +30,6 @@ class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
-    unavailable: PropTypes.bool,
     onSelectFile: PropTypes.func.isRequired,
     style: PropTypes.object,
     resetFileKey: PropTypes.number,
@@ -54,17 +52,13 @@ class UploadButton extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
-
-    if (unavailable) {
-      return null;
-    }
+    const { intl, resetFileKey, disabled, acceptContentTypes } = this.props;
 
     const message = intl.formatMessage(messages.upload);
 
     return (
       <div className='compose-form__upload-button'>
-        <IconButton icon='paperclip' iconComponent={AddPhotoAlternateIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
+        <IconButton icon='paperclip' iconComponent={PhotoLibraryIcon} title={message} disabled={disabled} onClick={this.handleClick} className='compose-form__upload-button-icon' size={18} inverted style={iconStyle} />
         <label>
           <span style={{ display: 'none' }}>{message}</span>
           <input
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.jsx b/app/javascript/mastodon/features/compose/components/upload_form.jsx
index cf2e53ad90..46bac7823b 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_form.jsx
@@ -1,7 +1,6 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import SensitiveButtonContainer from '../containers/sensitive_button_container';
 import UploadContainer from '../containers/upload_container';
 import UploadProgressContainer from '../containers/upload_progress_container';
 
@@ -15,17 +14,17 @@ export default class UploadForm extends ImmutablePureComponent {
     const { mediaIds } = this.props;
 
     return (
-      <div className='compose-form__upload-wrapper'>
+      <>
         <UploadProgressContainer />
 
-        <div className='compose-form__uploads-wrapper'>
-          {mediaIds.map(id => (
-            <UploadContainer id={id} key={id} />
-          ))}
-        </div>
-
-        {!mediaIds.isEmpty() && <SensitiveButtonContainer />}
-      </div>
+        {mediaIds.size > 0 && (
+          <div className='compose-form__uploads'>
+            {mediaIds.map(id => (
+              <UploadContainer id={id} key={id} />
+            ))}
+          </div>
+        )}
+      </>
     );
   }
 
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.jsx b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
index e4973b24fd..1276cded1f 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.jsx
@@ -35,9 +35,7 @@ export default class UploadProgress extends PureComponent {
 
     return (
       <div className='upload-progress'>
-        <div className='upload-progress__icon'>
-          <Icon id='upload' icon={UploadFileIcon} />
-        </div>
+        <Icon id='upload' icon={UploadFileIcon} />
 
         <div className='upload-progress__message'>
           {message}
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
deleted file mode 100644
index 70b4026d14..0000000000
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-
-import { connect }   from 'react-redux';
-
-import { openModal } from 'mastodon/actions/modal';
-import { logOut } from 'mastodon/utils/log_out';
-
-import { me } from '../../../initial_state';
-import NavigationBar from '../components/navigation_bar';
-
-const messages = defineMessages({
-  logoutMessage: { id: 'confirmations.logout.message', defaultMessage: 'Are you sure you want to log out?' },
-  logoutConfirm: { id: 'confirmations.logout.confirm', defaultMessage: 'Log out' },
-});
-
-const mapStateToProps = state => {
-  return {
-    account: state.getIn(['accounts', me]),
-  };
-};
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
-  onLogout () {
-    dispatch(openModal({
-      modalType: 'CONFIRM',
-      modalProps: {
-        message: intl.formatMessage(messages.logoutMessage),
-        confirm: intl.formatMessage(messages.logoutConfirm),
-        closeWhenConfirm: false,
-        onConfirm: () => logOut(),
-      },
-    }));
-  },
-});
-
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NavigationBar));
diff --git a/app/javascript/mastodon/features/compose/containers/poll_button_container.js b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
index b7785ecbb4..9de388f64a 100644
--- a/app/javascript/mastodon/features/compose/containers/poll_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
@@ -4,7 +4,7 @@ import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
 const mapStateToProps = state => ({
-  unavailable: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
+  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
   active: state.getIn(['compose', 'poll']) !== null,
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/poll_form_container.js b/app/javascript/mastodon/features/compose/containers/poll_form_container.js
deleted file mode 100644
index 177ffcea6a..0000000000
--- a/app/javascript/mastodon/features/compose/containers/poll_form_container.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import { connect } from 'react-redux';
-
-import {
-  addPollOption,
-  removePollOption,
-  changePollOption,
-  changePollSettings,
-  clearComposeSuggestions,
-  fetchComposeSuggestions,
-  selectComposeSuggestion,
-} from '../../../actions/compose';
-import PollForm from '../components/poll_form';
-
-const mapStateToProps = state => ({
-  suggestions: state.getIn(['compose', 'suggestions']),
-  options: state.getIn(['compose', 'poll', 'options']),
-  lang: state.getIn(['compose', 'language']),
-  expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
-  isMultiple: state.getIn(['compose', 'poll', 'multiple']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  onAddOption(title) {
-    dispatch(addPollOption(title));
-  },
-
-  onRemoveOption(index) {
-    dispatch(removePollOption(index));
-  },
-
-  onChangeOption(index, title) {
-    dispatch(changePollOption(index, title));
-  },
-
-  onChangeSettings(expiresIn, isMultiple) {
-    dispatch(changePollSettings(expiresIn, isMultiple));
-  },
-
-  onClearSuggestions () {
-    dispatch(clearComposeSuggestions());
-  },
-
-  onFetchSuggestions (token) {
-    dispatch(fetchComposeSuggestions(token));
-  },
-
-  onSuggestionSelected (position, token, accountId, path) {
-    dispatch(selectComposeSuggestion(position, token, accountId, path));
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(PollForm);
diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
deleted file mode 100644
index 1147e448af..0000000000
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { connect } from 'react-redux';
-
-import { cancelReplyCompose } from '../../../actions/compose';
-import { makeGetStatus } from '../../../selectors';
-import ReplyIndicator from '../components/reply_indicator';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = state => {
-    let statusId = state.getIn(['compose', 'id'], null);
-    let editing  = true;
-
-    if (statusId === null) {
-      statusId = state.getIn(['compose', 'in_reply_to']);
-      editing  = false;
-    }
-
-    return {
-      status: getStatus(state, { id: statusId }),
-      editing,
-    };
-  };
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = dispatch => ({
-
-  onCancel () {
-    dispatch(cancelReplyCompose());
-  },
-
-});
-
-export default connect(makeMapStateToProps, mapDispatchToProps)(ReplyIndicator);
diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
deleted file mode 100644
index 18283ee98d..0000000000
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { changeComposeSensitivity } from 'mastodon/actions/compose';
-
-const messages = defineMessages({
-  marked: {
-    id: 'compose_form.sensitive.marked',
-    defaultMessage: '{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}',
-  },
-  unmarked: {
-    id: 'compose_form.sensitive.unmarked',
-    defaultMessage: '{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}',
-  },
-});
-
-const mapStateToProps = state => ({
-  active: state.getIn(['compose', 'sensitive']),
-  disabled: state.getIn(['compose', 'spoiler']),
-  mediaCount: state.getIn(['compose', 'media_attachments']).size,
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onClick () {
-    dispatch(changeComposeSensitivity());
-  },
-
-});
-
-class SensitiveButton extends PureComponent {
-
-  static propTypes = {
-    active: PropTypes.bool,
-    disabled: PropTypes.bool,
-    mediaCount: PropTypes.number,
-    onClick: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  render () {
-    const { active, disabled, mediaCount, onClick, intl } = this.props;
-
-    return (
-      <div className='compose-form__sensitive-button'>
-        <label className={classNames('icon-button', { active })} title={intl.formatMessage(active ? messages.marked : messages.unmarked, { count: mediaCount })}>
-          <input
-            name='mark-sensitive'
-            type='checkbox'
-            checked={active}
-            onChange={onClick}
-            disabled={disabled}
-          />
-
-          <FormattedMessage
-            id='compose_form.sensitive.hide'
-            defaultMessage='{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}'
-            values={{ count: mediaCount }}
-          />
-        </label>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SensitiveButton));
diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
index b3d7a71335..a241417735 100644
--- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js
@@ -2,8 +2,10 @@ import { injectIntl, defineMessages } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import WarningIcon from 'mastodon/../material-icons/400-24px/warning.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
+
 import { changeComposeSpoilerness } from '../../../actions/compose';
-import TextIconButton from '../components/text_icon_button';
 
 const messages = defineMessages({
   marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' },
@@ -11,10 +13,12 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = (state, { intl }) => ({
-  label: 'CW',
+  iconComponent: WarningIcon,
   title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked),
   active: state.getIn(['compose', 'spoiler']),
   ariaControls: 'cw-spoiler-input',
+  size: 18,
+  inverted: true,
 });
 
 const mapDispatchToProps = dispatch => ({
@@ -25,4 +29,4 @@ const mapDispatchToProps = dispatch => ({
 
 });
 
-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(TextIconButton));
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(IconButton));
diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 42195da617..7c4757b6c3 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -4,8 +4,7 @@ import { uploadCompose } from '../../../actions/compose';
 import UploadButton from '../components/upload_button';
 
 const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
-  unavailable: state.getIn(['compose', 'poll']) !== null,
+  disabled: state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
   resetFileKey: state.getIn(['compose', 'resetFileKey']),
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js
index 77bb90db87..a17a691444 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_container.js
@@ -5,6 +5,7 @@ import Upload from '../components/upload';
 
 const mapStateToProps = (state, { id }) => ({
   media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
+  sensitive: state.getIn(['compose', 'spoiler']),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx
index ea3a149501..ce8eb9e05d 100644
--- a/app/javascript/mastodon/features/compose/index.jsx
+++ b/app/javascript/mastodon/features/compose/index.jsx
@@ -30,7 +30,6 @@ import { isMobile } from '../../is_mobile';
 import Motion from '../ui/util/optional_motion';
 
 import ComposeFormContainer from './containers/compose_form_container';
-import NavigationContainer from './containers/navigation_container';
 import SearchContainer from './containers/search_container';
 import SearchResultsContainer from './containers/search_results_container';
 
@@ -129,8 +128,6 @@ class Compose extends PureComponent {
 
           <div className='drawer__pager'>
             <div className='drawer__inner' onFocus={this.onFocus}>
-              <NavigationContainer onClose={this.onBlur} />
-
               <ComposeFormContainer autoFocus={!isMobile(window.innerWidth)} />
 
               <div className='drawer__inner__mastodon'>
@@ -152,7 +149,6 @@ class Compose extends PureComponent {
 
     return (
       <Column onFocus={this.onFocus}>
-        <NavigationContainer onClose={this.onBlur} />
         <ComposeFormContainer />
 
         <Helmet>
diff --git a/app/javascript/mastodon/features/getting_started/index.jsx b/app/javascript/mastodon/features/getting_started/index.jsx
index 53bb22ddb2..21a5c2a519 100644
--- a/app/javascript/mastodon/features/getting_started/index.jsx
+++ b/app/javascript/mastodon/features/getting_started/index.jsx
@@ -26,7 +26,7 @@ import ColumnHeader from 'mastodon/components/column_header';
 import LinkFooter from 'mastodon/features/ui/components/link_footer';
 
 import { me, showTrends } from '../../initial_state';
-import NavigationContainer from '../compose/containers/navigation_container';
+import { NavigationBar } from '../compose/components/navigation_bar';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
 
@@ -143,7 +143,7 @@ class GettingStarted extends ImmutablePureComponent {
 
     return (
       <Column>
-        {(signedIn && !multiColumn) ? <NavigationContainer /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
+        {(signedIn && !multiColumn) ? <NavigationBar /> : <ColumnHeader title={intl.formatMessage(messages.menu)} icon='bars' iconComponent={MenuIcon} multiColumn={multiColumn} />}
 
         <div className='getting-started scrollable scrollable--flex'>
           <div className='getting-started__wrapper'>
diff --git a/app/javascript/mastodon/features/standalone/compose/index.jsx b/app/javascript/mastodon/features/standalone/compose/index.jsx
index c36e843f5a..241d9aadfd 100644
--- a/app/javascript/mastodon/features/standalone/compose/index.jsx
+++ b/app/javascript/mastodon/features/standalone/compose/index.jsx
@@ -1,21 +1,15 @@
-import { PureComponent } from 'react';
+import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
+import LoadingBarContainer from 'mastodon/features/ui/containers/loading_bar_container';
+import ModalContainer from 'mastodon/features/ui/containers/modal_container';
+import NotificationsContainer from 'mastodon/features/ui/containers/notifications_container';
 
-import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from '../../ui/containers/notifications_container';
+const Compose = () => (
+  <>
+    <ComposeFormContainer autoFocus withoutNavigation />
+    <NotificationsContainer />
+    <ModalContainer />
+    <LoadingBarContainer className='loading-bar' />
+  </>
+);
 
-export default class Compose extends PureComponent {
-
-  render () {
-    return (
-      <div>
-        <ComposeFormContainer autoFocus />
-        <NotificationsContainer />
-        <ModalContainer />
-        <LoadingBarContainer className='loading-bar' />
-      </div>
-    );
-  }
-
-}
+export default Compose;
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.jsx b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
index 713ecb472b..e6ac79bdd9 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.jsx
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
 import ServerBanner from 'mastodon/components/server_banner';
 import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
-import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
 import SearchContainer from 'mastodon/features/compose/containers/search_container';
 
 import LinkFooter from './link_footer';
@@ -56,10 +55,7 @@ class ComposePanel extends PureComponent {
         )}
 
         {signedIn && (
-          <>
-            <NavigationContainer onClose={this.onBlur} />
-            <ComposeFormContainer singleColumn />
-          </>
+          <ComposeFormContainer singleColumn />
         )}
 
         <LinkFooter />
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
index 25ad1e2e9f..5f430d5392 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@@ -21,7 +21,7 @@ import { Button } from 'mastodon/components/button';
 import { GIFV } from 'mastodon/components/gifv';
 import { IconButton } from 'mastodon/components/icon_button';
 import Audio from 'mastodon/features/audio';
-import CharacterCounter from 'mastodon/features/compose/components/character_counter';
+import { CharacterCounter } from 'mastodon/features/compose/components/character_counter';
 import UploadProgress from 'mastodon/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'mastodon/features/ui/util/async-components';
 import { me } from 'mastodon/initial_state';
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index 2d95cabef8..fa81ea81a3 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -108,7 +108,6 @@ class MuteModal extends PureComponent {
           <div>
             <span><FormattedMessage id='mute_modal.duration' defaultMessage='Duration' />: </span>
 
-            {/* eslint-disable-next-line jsx-a11y/no-onchange */}
             <select value={muteDuration} onChange={this.changeMuteDuration}>
               <option value={0}>{intl.formatMessage(messages.indefinite)}</option>
               <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index d3f46c6d46..bf5e2826bb 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -77,7 +77,6 @@ class NavigationPanel extends Component {
       <div className='navigation-panel'>
         <div className='navigation-panel__logo'>
           <Link to='/' className='column-link column-link--logo'><WordmarkLogo /></Link>
-          {!banner && <hr />}
         </div>
 
         {banner &&
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index be7209d04a..4befe77949 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.add_option": "Add option",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.multiple": "Multiple choice",
+  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.remove_option": "Remove this option",
+  "compose_form.poll.single": "Pick one",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.poll.type": "Style",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.reply": "Reply",
+  "compose_form.save_changes": "Update",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
+  "compose_form.spoiler_placeholder": "Content warning (optional)",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Muted words",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers only",
-  "privacy.public.long": "Visible for all",
+  "privacy.direct.long": "Everyone mentioned in the post",
+  "privacy.direct.short": "Specific people",
+  "privacy.private.long": "Only your followers",
+  "privacy.private.short": "Followers",
+  "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
+  "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
+  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
+  "reply_indicator.poll": "Poll",
   "report.block": "Block",
   "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analyzing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index e6b2509f66..f57bbb77b8 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -40,9 +40,7 @@ import {
   COMPOSE_RESET,
   COMPOSE_POLL_ADD,
   COMPOSE_POLL_REMOVE,
-  COMPOSE_POLL_OPTION_ADD,
   COMPOSE_POLL_OPTION_CHANGE,
-  COMPOSE_POLL_OPTION_REMOVE,
   COMPOSE_POLL_SETTINGS_CHANGE,
   INIT_MEDIA_EDIT_MODAL,
   COMPOSE_CHANGE_MEDIA_DESCRIPTION,
@@ -282,6 +280,18 @@ const updateSuggestionTags = (state, token) => {
   });
 };
 
+const updatePoll = (state, index, value) => state.updateIn(['poll', 'options'], options => {
+  const tmp = options.set(index, value).filterNot(x => x.trim().length === 0);
+
+  if (tmp.size === 0) {
+    return tmp.push('').push('');
+  } else if (tmp.size < 4) {
+    return tmp.push('');
+  }
+
+  return tmp;
+});
+
 export default function compose(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
@@ -518,12 +528,8 @@ export default function compose(state = initialState, action) {
     return state.set('poll', initialPoll);
   case COMPOSE_POLL_REMOVE:
     return state.set('poll', null);
-  case COMPOSE_POLL_OPTION_ADD:
-    return state.updateIn(['poll', 'options'], options => options.push(action.title));
   case COMPOSE_POLL_OPTION_CHANGE:
-    return state.setIn(['poll', 'options', action.index], action.title);
-  case COMPOSE_POLL_OPTION_REMOVE:
-    return state.updateIn(['poll', 'options'], options => options.delete(action.index));
+    return updatePoll(state, action.index, action.title);
   case COMPOSE_POLL_SETTINGS_CHANGE:
     return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
   case COMPOSE_LANGUAGE_CHANGE:
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
new file mode 100644
index 0000000000..63215a3e09
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
new file mode 100644
index 0000000000..63215a3e09
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/bar_chart_4_bars.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M80-120v-80h800v80H80Zm40-120v-280h120v280H120Zm200 0v-480h120v480H320Zm200 0v-360h120v360H520Zm200 0v-600h120v600H720Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood-fill.svg b/app/javascript/material-icons/400-24px/mood-fill.svg
new file mode 100644
index 0000000000..9480d0fb92
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/mood.svg b/app/javascript/material-icons/400-24px/mood.svg
new file mode 100644
index 0000000000..46cafa7680
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/mood.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M620-520q25 0 42.5-17.5T680-580q0-25-17.5-42.5T620-640q-25 0-42.5 17.5T560-580q0 25 17.5 42.5T620-520Zm-280 0q25 0 42.5-17.5T400-580q0-25-17.5-42.5T340-640q-25 0-42.5 17.5T280-580q0 25 17.5 42.5T340-520Zm140 260q68 0 123.5-38.5T684-400H276q25 63 80.5 101.5T480-260Zm0 180q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library-fill.svg b/app/javascript/material-icons/400-24px/photo_library-fill.svg
new file mode 100644
index 0000000000..e68aec8321
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/photo_library.svg b/app/javascript/material-icons/400-24px/photo_library.svg
new file mode 100644
index 0000000000..3b22224b83
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/photo_library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-400h400L622-580l-92 120-62-80-108 140Zm-40 160q-33 0-56.5-23.5T240-320v-480q0-33 23.5-56.5T320-880h480q33 0 56.5 23.5T880-800v480q0 33-23.5 56.5T800-240H320Zm0-80h480v-480H320v480ZM160-80q-33 0-56.5-23.5T80-160v-560h80v560h560v80H160Zm160-720v480-480Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time-fill.svg b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
new file mode 100644
index 0000000000..aed5740db3
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/quiet_time.svg b/app/javascript/material-icons/400-24px/quiet_time.svg
new file mode 100644
index 0000000000..552da6658d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/quiet_time.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M524-40q-84 0-157.5-32t-128-86.5Q184-213 152-286.5T120-444q0-146 93-257.5T450-840q-18 99 11 193.5T561-481q71 71 165.5 100T920-370q-26 144-138 237T524-40Zm0-80q88 0 163-44t118-121q-86-8-163-43.5T504-425q-61-61-97-138t-43-163q-77 43-120.5 118.5T200-444q0 135 94.5 229.5T524-120Zm-20-305Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate-fill.svg b/app/javascript/material-icons/400-24px/translate-fill.svg
new file mode 100644
index 0000000000..ecaaf37f1e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/translate.svg b/app/javascript/material-icons/400-24px/translate.svg
new file mode 100644
index 0000000000..ecaaf37f1e
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/translate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m476-80 182-480h84L924-80h-84l-43-122H603L560-80h-84ZM160-200l-56-56 202-202q-35-35-63.5-80T190-640h84q20 39 40 68t48 58q33-33 68.5-92.5T484-720H40v-80h280v-80h80v80h280v80H564q-21 72-63 148t-83 116l96 98-30 82-122-125-202 201Zm468-72h144l-72-204-72 204Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning-fill.svg b/app/javascript/material-icons/400-24px/warning-fill.svg
new file mode 100644
index 0000000000..c3727d3f57
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm440-120q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/warning.svg b/app/javascript/material-icons/400-24px/warning.svg
new file mode 100644
index 0000000000..238299e606
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m40-120 440-760 440 760H40Zm138-80h604L480-720 178-200Zm302-40q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Zm40-100Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/packs/share.jsx b/app/javascript/packs/share.jsx
index 0f3b84549d..7b5723091c 100644
--- a/app/javascript/packs/share.jsx
+++ b/app/javascript/packs/share.jsx
@@ -13,10 +13,12 @@ function loaded() {
 
   if (mountNode) {
     const attr = mountNode.getAttribute('data-props');
-    if(!attr) return;
+
+    if (!attr) return;
 
     const props = JSON.parse(attr);
     const root = createRoot(mountNode);
+
     root.render(<ComposeContainer {...props} />);
   }
 }
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss
index 1c2386f02d..ae607f484a 100644
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -1,20 +1,7 @@
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload {
-      &-description {
-        input {
-          &::placeholder {
-            opacity: 1;
-          }
-        }
-      }
-    }
-  }
-}
-
 .status__content a,
-.link-footer a,
 .reply-indicator__content a,
+.edit-indicator__content a,
+.link-footer a,
 .status__content__read-more-button,
 .status__content__translate-button {
   text-decoration: underline;
@@ -42,7 +29,9 @@
   }
 }
 
-.status__content a {
+.status__content a,
+.reply-indicator__content a,
+.edit-indicator__content a {
   color: $highlight-text-color;
 }
 
@@ -50,24 +39,10 @@
   color: $darker-text-color;
 }
 
-.compose-form__poll-wrapper .button.button-secondary,
-.compose-form .autosuggest-textarea__textarea::placeholder,
-.compose-form .spoiler-input__input::placeholder,
-.report-dialog-modal__textarea::placeholder,
-.language-dropdown__dropdown__results__item__common-name,
-.compose-form .icon-button {
+.report-dialog-modal__textarea::placeholder {
   color: $inverted-text-color;
 }
 
-.text-icon-button.active {
-  color: $ui-highlight-color;
-}
-
-.language-dropdown__dropdown__results__item.active {
-  background: $ui-highlight-color;
-  font-weight: 500;
-}
-
 .link-button:disabled {
   cursor: not-allowed;
 
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 3a27c974ad..3c75854d9b 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -145,10 +145,6 @@ html {
   }
 }
 
-.compose-form__autosuggest-wrapper,
-.poll__option input[type='text'],
-.compose-form .spoiler-input__input,
-.compose-form__poll-wrapper select,
 .search__input,
 .setting-text,
 .report-dialog-modal__textarea,
@@ -172,28 +168,11 @@ html {
   border-bottom: 0;
 }
 
-.compose-form__poll-wrapper select {
-  background: $simple-background-color
-    url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
-    no-repeat right 8px center / auto 16px;
-}
-
-.compose-form__poll-wrapper,
-.compose-form__poll-wrapper .poll__footer {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
 .notification__filter-bar {
   border: 1px solid lighten($ui-base-color, 8%);
   border-top: 0;
 }
 
-.compose-form .compose-form__buttons-wrapper {
-  background: $ui-base-color;
-  border: 1px solid lighten($ui-base-color, 8%);
-  border-top: 0;
-}
-
 .drawer__header,
 .drawer__inner {
   background: $white;
@@ -206,52 +185,6 @@ html {
     no-repeat bottom / 100% auto;
 }
 
-// Change the colors used in compose-form
-.compose-form {
-  .compose-form__modifiers {
-    .compose-form__upload__actions .icon-button,
-    .compose-form__upload__warning .icon-button {
-      color: lighten($white, 7%);
-
-      &:active,
-      &:focus,
-      &:hover {
-        color: $white;
-      }
-    }
-  }
-
-  .compose-form__buttons-wrapper {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions {
-    background: darken($ui-base-color, 6%);
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: lighten($ui-base-color, 4%);
-    }
-  }
-}
-
-.emoji-mart-bar {
-  border-color: lighten($ui-base-color, 4%);
-
-  &:first-child {
-    background: darken($ui-base-color, 6%);
-  }
-}
-
-.emoji-mart-search input {
-  background: rgba($ui-base-color, 0.3);
-  border-color: $ui-base-color;
-}
-
 .upload-progress__backdrop {
   background: $ui-base-color;
 }
@@ -283,46 +216,11 @@ html {
   background: $ui-base-color;
 }
 
-.privacy-dropdown.active .privacy-dropdown__value.active .icon-button {
-  color: $white;
-}
-
 .account-gallery__item a {
   background-color: $ui-base-color;
 }
 
-// Change the colors used in the dropdown menu
-.dropdown-menu {
-  background: $white;
-
-  &__arrow::before {
-    background-color: $white;
-  }
-
-  &__item {
-    color: $darker-text-color;
-
-    &--dangerous {
-      color: $error-value-color;
-    }
-
-    a,
-    button {
-      background: $white;
-    }
-  }
-}
-
 // Change the text colors on inverted background
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:hover,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content,
-.privacy-dropdown__option:hover .privacy-dropdown__option__content strong,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:active,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:focus,
-.dropdown-menu__item:not(.dropdown-menu__item--dangerous) a:hover,
 .actions-modal ul li:not(:empty) a.active,
 .actions-modal ul li:not(:empty) a.active button,
 .actions-modal ul li:not(:empty) a:active,
@@ -331,7 +229,6 @@ html {
 .actions-modal ul li:not(:empty) a:focus button,
 .actions-modal ul li:not(:empty) a:hover,
 .actions-modal ul li:not(:empty) a:hover button,
-.language-dropdown__dropdown__results__item.active,
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a,
 .simple_form .block-button,
 .simple_form .button,
@@ -339,19 +236,6 @@ html {
   color: $white;
 }
 
-.language-dropdown__dropdown__results__item
-  .language-dropdown__dropdown__results__item__common-name {
-  color: lighten($ui-base-color, 8%);
-}
-
-.language-dropdown__dropdown__results__item.active
-  .language-dropdown__dropdown__results__item__common-name {
-  color: darken($ui-base-color, 12%);
-}
-
-.dropdown-menu__separator,
-.dropdown-menu__item.edited-timestamp__history__item,
-.dropdown-menu__container__header,
 .compare-history-modal .report-modal__target,
 .report-dialog-modal .poll__option.dialog-option {
   border-bottom-color: lighten($ui-base-color, 4%);
@@ -385,10 +269,7 @@ html {
 
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
-.reactions-bar__item:active,
-.language-dropdown__dropdown__results__item:hover,
-.language-dropdown__dropdown__results__item:focus,
-.language-dropdown__dropdown__results__item:active {
+.reactions-bar__item:active {
   background-color: $ui-base-color;
 }
 
@@ -631,11 +512,6 @@ html {
   }
 }
 
-.reply-indicator {
-  background: transparent;
-  border: 1px solid lighten($ui-base-color, 8%);
-}
-
 .status__content,
 .reply-indicator__content {
   a {
@@ -675,3 +551,30 @@ html {
     background-color: rgba($ui-highlight-color, 0.15);
   }
 }
+
+.compose-form__actions .icon-button.active,
+.dropdown-button.active,
+.privacy-dropdown__option.active,
+.privacy-dropdown__option:focus,
+.language-dropdown__dropdown__results__item:focus,
+.language-dropdown__dropdown__results__item.active,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content,
+.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
+.privacy-dropdown__option.active .privacy-dropdown__option__content,
+.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
+.language-dropdown__dropdown__results__item:focus
+  .language-dropdown__dropdown__results__item__common-name,
+.language-dropdown__dropdown__results__item.active
+  .language-dropdown__dropdown__results__item__common-name {
+  color: $white;
+}
+
+.compose-form .spoiler-input__input {
+  color: lighten($ui-highlight-color, 8%);
+}
+
+.compose-form .autosuggest-textarea__textarea,
+.compose-form__highlightable,
+.poll__option input[type='text'] {
+  background: darken($ui-base-color, 10%);
+}
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index ac8a831215..3cf5561ca3 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -5,7 +5,7 @@ $white: #ffffff;
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
 $classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #858afa;
+$classic-highlight-color: #6364ff;
 
 $blurple-600: #563acc; // Iris
 $blurple-500: #6364ff; // Brand purple
@@ -34,7 +34,7 @@ $ui-button-tertiary-border-color: $blurple-500 !default;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
+$highlight-text-color: $ui-highlight-color !default;
 $dark-text-color: #444b5d;
 $action-button-color: #606984;
 
@@ -55,3 +55,8 @@ $account-background-color: $white !default;
 }
 
 $emojis-requiring-inversion: 'chains';
+
+.theme-mastodon-light {
+  --dropdown-border-color: #d9e1e8;
+  --dropdown-background-color: #fff;
+}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index dcfab6bd01..d7f8586dd2 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -15,13 +15,14 @@
   outline: 0;
   box-sizing: border-box;
   width: 100%;
-  border: 0;
   box-shadow: none;
   font-family: inherit;
   background: $ui-base-color;
   color: $darker-text-color;
   border-radius: 4px;
-  font-size: 14px;
+  border: 1px solid lighten($ui-base-color, 8%);
+  font-size: 17px;
+  line-height: normal;
   margin: 0;
 }
 
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index a65f35e7b1..3f538d08d6 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1314,6 +1314,9 @@ a.sparkline {
 
     &__label {
       padding: 15px;
+      display: flex;
+      gap: 8px;
+      align-items: center;
     }
 
     &__rules {
@@ -1324,6 +1327,9 @@ a.sparkline {
   &__rule {
     cursor: pointer;
     padding: 15px;
+    display: flex;
+    gap: 8px;
+    align-items: center;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 6714b24268..28dad81da5 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -8,7 +8,7 @@
 
 body {
   font-family: $font-sans-serif, sans-serif;
-  background: darken($ui-base-color, 7%);
+  background: darken($ui-base-color, 8%);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 93cea5f76c..5b89e7f25d 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -368,46 +368,155 @@ body > [data-popper-placement] {
   }
 }
 
-.compose-form {
-  padding: 15px;
+.autosuggest-textarea {
+  &__textarea {
+    background: transparent;
+    min-height: 100px;
+    padding-bottom: 0;
+    resize: none;
+    scrollbar-color: initial;
 
-  &__sensitive-button {
-    padding: 10px;
-    padding-top: 0;
-    font-size: 14px;
-    font-weight: 500;
-
-    &.active {
-      color: $highlight-text-color;
-    }
-
-    input[type='checkbox'] {
-      appearance: none;
-      display: inline-block;
-      position: relative;
-      border: 1px solid $ui-primary-color;
-      box-sizing: border-box;
-      width: 18px;
-      height: 18px;
-      flex: 0 0 auto;
-      margin-inline-end: 10px;
-      top: -1px;
-      border-radius: 4px;
-      vertical-align: middle;
-      cursor: inherit;
-
-      &:checked {
-        border-color: $highlight-text-color;
-        background: $highlight-text-color
-          url("data:image/svg+xml;utf8,<svg width='18' height='18' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M4.5 8.5L8 12l6-6' stroke='white' stroke-width='1.5'/></svg>")
-          center center no-repeat;
-      }
+    &::-webkit-scrollbar {
+      all: unset;
     }
   }
 
-  .compose-form__warning {
+  &__suggestions {
+    box-shadow: var(--dropdown-shadow);
+    background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 14%);
+    border-radius: 0 0 4px 4px;
+    color: $secondary-text-color;
+    font-size: 14px;
+    padding: 0;
+
+    &__item {
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      height: 48px;
+      cursor: pointer;
+      font-size: 14px;
+      line-height: 20px;
+      letter-spacing: 0.25px;
+      color: $secondary-text-color;
+
+      &:last-child {
+        border-radius: 0 0 4px 4px;
+      }
+
+      &:hover,
+      &:focus,
+      &:active,
+      &.selected {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+
+        .autosuggest-account .display-name__account {
+          color: inherit;
+        }
+      }
+    }
+  }
+}
+
+.autosuggest-account,
+.autosuggest-emoji,
+.autosuggest-hashtag {
+  flex: 1 0 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  padding: 8px 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.autosuggest-account {
+  .display-name {
+    font-weight: 400;
+    display: flex;
+    flex-direction: column;
+    flex: 1 0 0;
+  }
+
+  .display-name__account {
+    display: block;
+    line-height: 16px;
+    font-size: 12px;
+    color: $dark-text-color;
+  }
+}
+
+.autosuggest-hashtag {
+  justify-content: space-between;
+
+  &__name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__uses {
+    flex: 0 0 auto;
+    text-align: end;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-emoji {
+  &__name {
+    flex: 1 0 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.autosuggest-account .account__avatar,
+.autosuggest-emoji img {
+  display: block;
+  width: 24px;
+  height: 24px;
+  flex: 0 0 auto;
+}
+
+.compose-form {
+  display: flex;
+  flex-direction: column;
+  gap: 32px;
+
+  .layout-multiple-columns &,
+  .column & {
+    padding: 15px;
+  }
+
+  &__highlightable {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    flex: 0 1 auto;
+    border-radius: 4px;
+    border: 1px solid lighten($ui-base-color, 8%);
+    transition: border-color 300ms linear;
+    min-height: 0;
+    position: relative;
+    background: $ui-base-color;
+    overflow-y: auto;
+
+    &.active {
+      transition: none;
+      border-color: $ui-highlight-color;
+    }
+  }
+
+  &__warning {
     color: $inverted-text-color;
-    margin-bottom: 10px;
     background: $ui-primary-color;
     box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
     padding: 8px 10px;
@@ -439,32 +548,27 @@ body > [data-popper-placement] {
     }
   }
 
-  .emoji-picker-dropdown {
-    position: absolute;
-    top: 0;
-    inset-inline-end: 0;
-  }
-
-  .compose-form__autosuggest-wrapper {
-    position: relative;
-  }
-
-  .autosuggest-textarea,
-  .autosuggest-input,
   .spoiler-input {
-    position: relative;
-    width: 100%;
-  }
+    display: flex;
+    align-items: stretch;
 
-  .spoiler-input {
-    height: 0;
-    transform-origin: bottom;
-    opacity: 0;
+    &__border {
+      background: url('../images/warning-stripes.svg') repeat-y;
+      width: 5px;
+      flex: 0 0 auto;
 
-    &.spoiler-input--visible {
-      height: 36px;
-      margin-bottom: 11px;
-      opacity: 1;
+      &:first-child {
+        border-start-start-radius: 4px;
+      }
+
+      &:last-child {
+        border-start-end-radius: 4px;
+      }
+    }
+
+    .autosuggest-input {
+      flex: 1 1 auto;
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
     }
   }
 
@@ -474,269 +578,303 @@ body > [data-popper-placement] {
     box-sizing: border-box;
     width: 100%;
     margin: 0;
-    color: $inverted-text-color;
-    background: $simple-background-color;
-    padding: 10px;
+    color: $secondary-text-color;
+    background: $ui-base-color;
     font-family: inherit;
     font-size: 14px;
-    resize: vertical;
+    padding: 12px;
+    line-height: normal;
     border: 0;
     outline: 0;
 
-    &::placeholder {
-      color: $dark-text-color;
-    }
-
     &:focus {
       outline: 0;
     }
-
-    @media screen and (width <= 600px) {
-      font-size: 16px;
-    }
   }
 
   .spoiler-input__input {
-    border-radius: 4px;
+    padding: 12px 12px - 5px;
+    background: mix($ui-base-color, $ui-highlight-color, 85%);
+    color: $highlight-text-color;
   }
 
-  .autosuggest-textarea__textarea {
-    min-height: 100px;
-    border-radius: 4px 4px 0 0;
-    padding-bottom: 0;
-    padding-right: 10px + 22px; // Cannot use inline-end because of dir=auto
-    resize: none;
-    scrollbar-color: initial;
-
-    &::-webkit-scrollbar {
-      all: unset;
-    }
-
-    @media screen and (width <= 600px) {
-      height: 100px !important; // Prevent auto-resize textarea
-      resize: vertical;
-    }
-  }
-
-  .autosuggest-textarea__suggestions-wrapper {
-    position: relative;
-    height: 0;
-  }
-
-  .autosuggest-textarea__suggestions {
-    box-sizing: border-box;
-    display: none;
-    position: absolute;
-    top: 100%;
-    width: 100%;
-    z-index: 99;
-    box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
-    background: $ui-secondary-color;
-    border-radius: 0 0 4px 4px;
-    color: $inverted-text-color;
-    font-size: 14px;
-    padding: 6px;
-
-    &.autosuggest-textarea__suggestions--visible {
-      display: block;
-    }
-  }
-
-  .autosuggest-textarea__suggestions__item {
-    padding: 10px;
-    cursor: pointer;
-    border-radius: 4px;
-
-    &:hover,
-    &:focus,
-    &:active,
-    &.selected {
-      background: darken($ui-secondary-color, 10%);
-    }
-  }
-
-  .autosuggest-account,
-  .autosuggest-emoji,
-  .autosuggest-hashtag {
+  &__dropdowns {
     display: flex;
-    flex-direction: row;
     align-items: center;
-    justify-content: flex-start;
-    line-height: 18px;
-    font-size: 14px;
-  }
+    gap: 8px;
 
-  .autosuggest-hashtag {
-    justify-content: space-between;
-
-    &__name {
-      flex: 1 1 auto;
+    & > div {
       overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    strong {
-      font-weight: 500;
-    }
-
-    &__uses {
-      flex: 0 0 auto;
-      text-align: end;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
-
-  .autosuggest-account-icon,
-  .autosuggest-emoji img {
-    display: block;
-    margin-inline-end: 8px;
-    width: 16px;
-    height: 16px;
-  }
-
-  .autosuggest-account .display-name__account {
-    color: $lighter-text-color;
-  }
-
-  .compose-form__modifiers {
-    color: $inverted-text-color;
-    font-family: inherit;
-    font-size: 14px;
-    background: $simple-background-color;
-
-    .compose-form__upload-wrapper {
-      overflow: hidden;
-    }
-
-    .compose-form__uploads-wrapper {
       display: flex;
-      flex-direction: row;
-      padding: 5px;
-      flex-wrap: wrap;
+    }
+  }
+
+  &__uploads {
+    display: flex;
+    gap: 8px;
+    padding: 0 12px;
+    flex-wrap: wrap;
+    align-self: stretch;
+    align-items: flex-start;
+    align-content: flex-start;
+    justify-content: center;
+  }
+
+  &__upload {
+    flex: 1 1 0;
+    min-width: calc(50% - 8px);
+
+    &__actions {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      padding: 8px;
     }
 
-    .compose-form__upload {
-      flex: 1 1 0;
-      min-width: 40%;
-      margin: 5px;
-
-      &__actions {
-        background: linear-gradient(
-          180deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-      }
-
-      .icon-button {
-        flex: 0 1 auto;
-        color: $secondary-text-color;
-        font-size: 14px;
-        font-weight: 500;
-        padding: 10px;
-        font-family: inherit;
-
-        .icon {
-          width: 15px;
-          height: 15px;
-        }
-
-        &:hover,
-        &:focus,
-        &:active {
-          color: lighten($secondary-text-color, 7%);
-        }
-      }
-
-      &__warning {
-        position: absolute;
-        z-index: 2;
-        bottom: 0;
-        inset-inline-start: 0;
-        inset-inline-end: 0;
-        box-sizing: border-box;
-        background: linear-gradient(
-          0deg,
-          rgba($base-shadow-color, 0.8) 0,
-          rgba($base-shadow-color, 0.35) 80%,
-          transparent
-        );
-      }
+    &__preview {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      border-radius: 6px;
+      z-index: -1;
+      top: 0;
+      inset-inline-start: 0;
     }
 
-    .compose-form__upload-thumbnail {
-      border-radius: 4px;
-      background-color: $base-shadow-color;
+    &__thumbnail {
+      width: 100%;
+      height: 144px;
+      border-radius: 6px;
       background-position: center;
       background-size: cover;
       background-repeat: no-repeat;
-      height: 140px;
-      width: 100%;
       overflow: hidden;
     }
+
+    .icon-button {
+      flex: 0 0 auto;
+      color: $white;
+      background: rgba(0, 0, 0, 75%);
+      border-radius: 6px;
+      font-size: 12px;
+      line-height: 16px;
+      font-weight: 500;
+      padding: 4px 8px;
+      font-family: inherit;
+
+      .icon {
+        width: 15px;
+        height: 15px;
+      }
+    }
+
+    .icon-button.compose-form__upload__delete {
+      padding: 3px;
+      border-radius: 50%;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+    }
+
+    &__warning {
+      position: absolute;
+      z-index: 2;
+      bottom: 0;
+      inset-inline-start: 0;
+      inset-inline-end: 0;
+      padding: 8px;
+
+      .icon-button.active {
+        color: #ffbe2e;
+        background: rgba(0, 0, 0, 75%);
+      }
+    }
   }
 
-  .compose-form__buttons-wrapper {
-    padding: 10px;
-    background: darken($simple-background-color, 8%);
-    border-radius: 0 0 4px 4px;
+  &__footer {
     display: flex;
-    justify-content: space-between;
-    flex: 0 0 auto;
+    flex-direction: column;
+    gap: 12px;
+    padding: 12px;
+    padding-top: 0;
+  }
 
-    .compose-form__buttons {
+  &__submit {
+    display: flex;
+    align-items: center;
+    flex: 1 1 auto;
+    max-width: 100%;
+    overflow: hidden;
+  }
+
+  &__buttons {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    flex: 1 1 auto;
+
+    & > div {
       display: flex;
-      gap: 2px;
-
-      .icon-button {
-        height: 100%;
-      }
-
-      .compose-form__upload-button-icon {
-        line-height: 27px;
-      }
-
-      .compose-form__sensitive-button {
-        display: none;
-
-        &.compose-form__sensitive-button--visible {
-          display: block;
-        }
-
-        .compose-form__sensitive-button__icon {
-          line-height: 27px;
-        }
-      }
     }
 
-    .icon-button,
-    .text-icon-button {
-      box-sizing: content-box;
-      padding: 0 3px;
+    .icon-button {
+      padding: 3px;
     }
 
-    .character-counter__wrapper {
-      align-self: center;
-      margin-inline-end: 4px;
+    .icon-button .icon {
+      width: 18px;
+      height: 18px;
     }
   }
 
-  .compose-form__publish {
+  &__actions {
     display: flex;
-    justify-content: flex-end;
-    min-width: 0;
+    align-items: center;
     flex: 0 0 auto;
+    gap: 12px;
+    flex-wrap: wrap;
 
-    .compose-form__publish-button-wrapper {
-      padding-top: 15px;
+    .button {
+      display: block; // Otherwise text-ellipsis doesn't work
+      font-size: 14px;
+      line-height: normal;
+      font-weight: 700;
+      flex: 1 1 auto;
+      padding: 5px 12px;
+      border-radius: 4px;
     }
+
+    .icon-button {
+      box-sizing: content-box;
+      color: $highlight-text-color;
+
+      &:hover,
+      &:focus,
+      &:active {
+        color: $highlight-text-color;
+      }
+
+      &.disabled {
+        color: $highlight-text-color;
+        opacity: 0.5;
+      }
+
+      &.active {
+        background: $ui-highlight-color;
+        color: $primary-text-color;
+      }
+    }
+  }
+
+  &__poll {
+    display: flex;
+    flex-direction: column;
+    align-self: stretch;
+    gap: 8px;
+
+    .poll__option {
+      padding: 0 12px;
+      gap: 8px;
+
+      &.empty:not(:focus-within) {
+        opacity: 0.5;
+      }
+    }
+
+    .poll__input {
+      width: 17px;
+      height: 17px;
+      border-color: $darker-text-color;
+    }
+
+    &__footer {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      padding-inline-start: 37px;
+      padding-inline-end: 40px;
+
+      &__sep {
+        width: 1px;
+        height: 22px;
+        background: lighten($ui-base-color, 8%);
+        flex: 0 0 auto;
+      }
+    }
+
+    &__select {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+      flex: 1 1 auto;
+      min-width: 0;
+
+      &__label {
+        flex: 0 0 auto;
+        font-size: 11px;
+        font-weight: 500;
+        line-height: 16px;
+        letter-spacing: 0.5px;
+        color: $darker-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+
+      &__value {
+        flex: 0 0 auto;
+        appearance: none;
+        background: transparent;
+        border: none;
+        padding: 0;
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 20px;
+        letter-spacing: 0.1px;
+        color: $highlight-text-color;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+  }
+}
+
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  background: transparent;
+  color: $highlight-text-color;
+  border-radius: 6px;
+  border: 1px solid $highlight-text-color;
+  padding: 4px 8px;
+  font-size: 13px;
+  line-height: normal;
+  font-weight: 400;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  .icon {
+    width: 15px;
+    height: 15px;
+    flex: 0 0 auto;
+  }
+
+  &__label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 auto;
+  }
+
+  &.active {
+    background: $ui-highlight-color;
+    border-color: $ui-highlight-color;
+    color: $primary-text-color;
   }
 }
 
@@ -744,11 +882,14 @@ body > [data-popper-placement] {
   cursor: default;
   font-family: $font-sans-serif, sans-serif;
   font-size: 14px;
-  font-weight: 600;
-  color: $lighter-text-color;
+  font-weight: 400;
+  line-height: normal;
+  color: $darker-text-color;
+  flex: 1 0 auto;
+  text-align: end;
 
   &.character-counter--over {
-    color: $warning-red;
+    color: $error-red;
   }
 }
 
@@ -794,41 +935,6 @@ body > [data-popper-placement] {
   }
 }
 
-.reply-indicator {
-  border-radius: 4px;
-  margin-bottom: 10px;
-  background: $ui-primary-color;
-  padding: 10px;
-  min-height: 23px;
-  overflow-y: auto;
-  flex: 0 2 auto;
-}
-
-.reply-indicator__header {
-  margin-bottom: 5px;
-  overflow: hidden;
-}
-
-.reply-indicator__cancel {
-  float: right;
-  line-height: 24px;
-}
-
-.reply-indicator__display-name {
-  color: $inverted-text-color;
-  display: block;
-  max-width: 100%;
-  line-height: 24px;
-  overflow: hidden;
-  padding-inline-end: 25px;
-  text-decoration: none;
-}
-
-.reply-indicator__display-avatar {
-  float: left;
-  margin-inline-end: 5px;
-}
-
 .status__content--with-action {
   cursor: pointer;
 }
@@ -838,14 +944,15 @@ body > [data-popper-placement] {
 }
 
 .status__content,
+.edit-indicator__content,
 .reply-indicator__content {
   position: relative;
-  font-size: 15px;
-  line-height: 22px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 15px;
+  line-height: 22px;
   padding-top: 2px;
   color: $primary-text-color;
 
@@ -930,6 +1037,174 @@ body > [data-popper-placement] {
   }
 }
 
+.reply-indicator {
+  display: grid;
+  grid-template-columns: 46px minmax(0, 1fr);
+  grid-template-rows: 46px max-content;
+  gap: 0 10px;
+
+  .detailed-status__display-name {
+    margin-bottom: 4px;
+  }
+
+  .detailed-status__display-avatar {
+    grid-column-start: 1;
+    grid-row-start: 1;
+    grid-row-end: span 1;
+  }
+
+  &__main {
+    grid-column-start: 2;
+    grid-row-start: 1;
+    grid-row-end: span 2;
+  }
+
+  .display-name {
+    font-size: 14px;
+    line-height: 16px;
+
+    &__account {
+      display: none;
+    }
+  }
+
+  &__line {
+    grid-column-start: 1;
+    grid-row-start: 2;
+    grid-row-end: span 1;
+    position: relative;
+
+    &::before {
+      display: block;
+      content: '';
+      position: absolute;
+      inset-inline-start: 50%;
+      top: 4px;
+      transform: translateX(-50%);
+      background: lighten($ui-base-color, 8%);
+      width: 2px;
+      height: calc(100% + 32px - 8px); // Account for gap to next element
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    padding: 0;
+    max-height: 4 * 20px;
+    overflow: hidden;
+    color: $darker-text-color;
+  }
+
+  &__attachments {
+    margin-top: 4px;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator {
+  border-radius: 4px 4px 0 0;
+  background: lighten($ui-base-color, 4%);
+  padding: 12px;
+  overflow-y: auto;
+  flex: 0 0 auto;
+  border-bottom: 0.5px solid lighten($ui-base-color, 8%);
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  &__cancel {
+    display: flex;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &__display-name {
+    display: flex;
+    gap: 4px;
+
+    a {
+      color: inherit;
+      text-decoration: none;
+
+      &:hover,
+      &:focus,
+      &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  &__content {
+    color: $secondary-text-color;
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    padding-top: 0 !important;
+    display: -webkit-box;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
+    max-height: 4 * 20px;
+    overflow: hidden;
+
+    a {
+      color: $highlight-text-color;
+    }
+  }
+
+  &__attachments {
+    color: $darker-text-color;
+    font-size: 12px;
+    line-height: 16px;
+    opacity: 0.75;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .icon {
+      width: 18px;
+      height: 18px;
+    }
+  }
+}
+
+.edit-indicator__content,
+.reply-indicator__content {
+  .emojione {
+    width: 18px;
+    height: 18px;
+    margin: -3px 0 0;
+  }
+}
+
 .announcements__item__content {
   word-wrap: break-word;
   overflow-y: auto;
@@ -1458,15 +1733,6 @@ body > [data-popper-placement] {
   line-height: 18px;
 }
 
-.reply-indicator__content {
-  color: $inverted-text-color;
-  font-size: 14px;
-
-  a {
-    color: $lighter-text-color;
-  }
-}
-
 .domain {
   padding: 10px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -1677,7 +1943,6 @@ a .account__avatar {
 }
 
 .status__display-name,
-.reply-indicator__display-name,
 .detailed-status__display-name,
 a.account__display-name {
   &:hover .display-name strong {
@@ -1935,57 +2200,45 @@ a.account__display-name {
 }
 
 .navigation-bar {
-  padding: 15px;
   display: flex;
   align-items: center;
   flex-shrink: 0;
   cursor: default;
   gap: 10px;
-  color: $darker-text-color;
 
-  strong {
-    color: $secondary-text-color;
+  .column > & {
+    padding: 15px;
   }
 
-  a {
-    color: inherit;
-    text-decoration: none;
-  }
+  .account {
+    border-bottom: 0;
+    padding: 0;
+    flex: 1 1 auto;
+    min-width: 0;
 
-  .navigation-bar__actions {
-    position: relative;
+    &__display-name {
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0.15px;
+      font-weight: 500;
 
-    .compose__action-bar .icon-button {
-      pointer-events: auto;
-      transform: scale(1, 1) translate(0, 0);
-      opacity: 1;
-
-      .icon {
-        width: 24px;
-        height: 24px;
+      .display-name__account {
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.1px;
       }
     }
   }
-}
 
-.navigation-bar__profile {
-  display: flex;
-  flex-direction: column;
-  flex: 1 1 auto;
-  line-height: 20px;
-}
+  .icon-button {
+    padding: 8px;
+    color: $secondary-text-color;
+  }
 
-.navigation-bar__profile-account {
-  display: inline;
-  font-weight: 500;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.navigation-bar__profile-edit {
-  display: inline;
-  color: inherit;
-  text-decoration: none;
+  .icon-button .icon {
+    width: 24px;
+    height: 24px;
+  }
 }
 
 .dropdown-animation {
@@ -2163,6 +2416,7 @@ a.account__display-name {
   &__panels {
     display: flex;
     justify-content: center;
+    gap: 16px;
     width: 100%;
     height: 100%;
     min-height: 100vh;
@@ -2195,7 +2449,6 @@ a.account__display-name {
       flex-direction: column;
 
       @media screen and (min-width: $no-gap-breakpoint) {
-        padding: 0 10px;
         max-width: 600px;
       }
     }
@@ -2445,6 +2698,7 @@ $ui-header-height: 55px;
 
   .columns-area__panels {
     min-height: calc(100vh - $ui-header-height);
+    gap: 0;
   }
 
   .columns-area__panels__pane--navigational {
@@ -2844,21 +3098,6 @@ $ui-header-height: 55px;
   }
 }
 
-.compose-form__highlightable {
-  display: flex;
-  flex-direction: column;
-  flex: 0 1 auto;
-  border-radius: 4px;
-  transition: box-shadow 300ms linear;
-  min-height: 0;
-  position: relative;
-
-  &.active {
-    transition: none;
-    box-shadow: 0 0 0 6px rgba(lighten($highlight-text-color, 8%), 0.7);
-  }
-}
-
 .compose-panel {
   width: 285px;
   margin-top: 10px;
@@ -2887,32 +3126,9 @@ $ui-header-height: 55px;
     }
   }
 
-  .navigation-bar {
-    flex: 0 1 48px;
-  }
-
   .compose-form {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    min-height: 310px;
-    padding-bottom: 71px;
-    margin-bottom: -71px;
-  }
-
-  .compose-form__autosuggest-wrapper {
-    overflow-y: auto;
-    background-color: $white;
-    border-radius: 4px 4px 0 0;
-    flex: 0 1 auto;
-  }
-
-  .autosuggest-textarea__textarea {
-    overflow-y: hidden;
-  }
-
-  .compose-form__upload-thumbnail {
-    height: 80px;
+    flex: 1 1 auto;
+    min-height: 0;
   }
 }
 
@@ -2932,6 +3148,10 @@ $ui-header-height: 55px;
     height: 30px;
     width: auto;
   }
+
+  &__logo {
+    margin-bottom: 12px;
+  }
 }
 
 .navigation-panel,
@@ -2963,7 +3183,7 @@ $ui-header-height: 55px;
   position: absolute;
   top: 0;
   inset-inline-start: 0;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   box-sizing: border-box;
   padding: 0;
   display: flex;
@@ -2979,7 +3199,7 @@ $ui-header-height: 55px;
 }
 
 .drawer__inner__mastodon {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
     no-repeat bottom / 100% auto;
   flex: 1;
@@ -3001,24 +3221,20 @@ $ui-header-height: 55px;
   }
 }
 
-.pseudo-drawer {
-  background: lighten($ui-base-color, 13%);
-  font-size: 13px;
-  text-align: start;
-}
-
 .drawer__header {
   flex: 0 0 auto;
   font-size: 16px;
-  background: $ui-base-color;
+  background: darken($ui-base-color, 4%);
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
   border-radius: 4px;
   overflow: hidden;
 
-  a:hover {
-    background: lighten($ui-base-color, 3%);
+  a:hover,
+  a:focus,
+  a:active {
+    background: $ui-base-color;
   }
 }
 
@@ -3228,7 +3444,7 @@ $ui-header-height: 55px;
 
   &--transparent {
     background: transparent;
-    color: $ui-secondary-color;
+    color: $secondary-text-color;
 
     &:hover,
     &:focus,
@@ -4533,10 +4749,7 @@ a.status-card {
 }
 
 .emoji-picker-dropdown__menu {
-  background: $simple-background-color;
   position: relative;
-  box-shadow: var(--dropdown-shadow);
-  border-radius: 4px;
   margin-top: 5px;
   z-index: 2;
 
@@ -4559,11 +4772,12 @@ a.status-card {
 .emoji-picker-dropdown__modifiers__menu {
   position: absolute;
   z-index: 4;
-  top: -4px;
-  inset-inline-start: -8px;
-  background: $simple-background-color;
+  top: -5px;
+  inset-inline-start: -9px;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
   border-radius: 4px;
-  box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+  box-shadow: var(--dropdown-shadow);
   overflow: hidden;
 
   button {
@@ -4576,7 +4790,7 @@ a.status-card {
     &:hover,
     &:focus,
     &:active {
-      background: rgba($ui-secondary-color, 0.4);
+      background: var(--dropdown-border-color);
     }
   }
 
@@ -4645,15 +4859,17 @@ a.status-card {
 }
 
 .upload-progress {
-  padding: 10px;
-  color: $lighter-text-color;
+  color: $darker-text-color;
   overflow: hidden;
   display: flex;
-  gap: 10px;
+  gap: 8px;
+  align-items: center;
+  padding: 0 12px;
 
   .icon {
     width: 24px;
     height: 24px;
+    color: $ui-highlight-color;
   }
 
   span {
@@ -4672,7 +4888,7 @@ a.status-card {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: darken($simple-background-color, 8%);
+  background: darken($ui-base-color, 8%);
   position: relative;
   margin-top: 5px;
 }
@@ -4726,12 +4942,16 @@ a.status-card {
   filter: none;
 }
 
-.privacy-dropdown__dropdown {
-  background: $simple-background-color;
+.privacy-dropdown__dropdown,
+.language-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
+  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -4752,28 +4972,41 @@ a.status-card {
 }
 
 .privacy-dropdown__option {
-  color: $inverted-text-color;
-  padding: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  padding: 8px 12px;
   cursor: pointer;
   display: flex;
+  align-items: center;
+  gap: 12px;
+  border-radius: 4px;
+  color: $primary-text-color;
 
   &:hover,
+  &:active {
+    background: var(--dropdown-border-color);
+  }
+
+  &:focus,
   &.active {
     background: $ui-highlight-color;
     color: $primary-text-color;
     outline: 0;
 
-    .privacy-dropdown__option__content {
+    .privacy-dropdown__option__content,
+    .privacy-dropdown__option__content strong,
+    .privacy-dropdown__option__additional {
       color: $primary-text-color;
-
-      strong {
-        color: $primary-text-color;
-      }
     }
   }
 
-  &.active:hover {
-    background: lighten($ui-highlight-color, 4%);
+  &__additional {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: $darker-text-color;
+    cursor: help;
   }
 }
 
@@ -4781,17 +5014,16 @@ a.status-card {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-inline-end: 10px;
 }
 
 .privacy-dropdown__option__content {
   flex: 1 1 auto;
-  color: $lighter-text-color;
+  color: $darker-text-color;
 
   strong {
+    color: $primary-text-color;
     font-weight: 500;
     display: block;
-    color: $inverted-text-color;
 
     @each $lang in $cjk-langs {
       &:lang(#{$lang}) {
@@ -4803,64 +5035,78 @@ a.status-card {
 
 .language-dropdown {
   &__dropdown {
-    background: $simple-background-color;
-    box-shadow: var(--dropdown-shadow);
-    border-radius: 4px;
-    overflow: hidden;
-    z-index: 2;
-
-    &.top {
-      transform-origin: 50% 100%;
-    }
-
-    &.bottom {
-      transform-origin: 50% 0;
-    }
+    padding: 0;
 
     .emoji-mart-search {
-      padding-inline-end: 10px;
+      padding: 10px;
+      background: var(--dropdown-background-color);
+
+      input {
+        padding: 8px 12px;
+        background: $ui-base-color;
+        border: 1px solid lighten($ui-base-color, 8%);
+        color: $darker-text-color;
+
+        @media screen and (width <= 600px) {
+          font-size: 16px;
+          line-height: 24px;
+          letter-spacing: 0.5px;
+        }
+      }
     }
 
     .emoji-mart-search-icon {
-      inset-inline-end: 10px + 5px;
+      inset-inline-end: 15px;
+      opacity: 1;
+      color: $darker-text-color;
+
+      .icon {
+        width: 18px;
+        height: 18px;
+      }
+
+      &:disabled {
+        opacity: 0.38;
+      }
     }
 
     .emoji-mart-scroll {
       padding: 0 10px 10px;
+      background: var(--dropdown-background-color);
     }
 
     &__results {
       &__item {
         cursor: pointer;
-        color: $inverted-text-color;
+        color: $primary-text-color;
+        font-size: 14px;
+        line-height: 20px;
+        letter-spacing: 0.25px;
         font-weight: 500;
-        padding: 10px;
+        padding: 8px 12px;
         border-radius: 4px;
-        display: flex;
-        gap: 6px;
-        align-items: center;
-
-        &:focus,
-        &:active,
-        &:hover {
-          background: $ui-secondary-color;
-        }
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
 
         &__common-name {
           color: $darker-text-color;
+          font-weight: 400;
         }
 
+        &:active,
+        &:hover {
+          background: var(--dropdown-border-color);
+        }
+
+        &:focus,
         &.active {
           background: $ui-highlight-color;
           color: $primary-text-color;
           outline: 0;
 
           .language-dropdown__dropdown__results__item__common-name {
-            color: $secondary-text-color;
-          }
-
-          &:hover {
-            background: lighten($ui-highlight-color, 4%);
+            color: $primary-text-color;
           }
         }
       }
@@ -4869,9 +5115,13 @@ a.status-card {
 }
 
 .search {
-  margin-bottom: 10px;
+  margin-bottom: 32px;
   position: relative;
 
+  .layout-multiple-columns & {
+    margin-bottom: 10px;
+  }
+
   &__popout {
     box-sizing: border-box;
     display: none;
@@ -4880,6 +5130,7 @@ a.status-card {
     margin-top: -2px;
     width: 100%;
     background: $ui-base-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
     z-index: 99;
@@ -4888,7 +5139,7 @@ a.status-card {
 
     h4 {
       text-transform: uppercase;
-      color: $dark-text-color;
+      color: $darker-text-color;
       font-weight: 500;
       padding: 0 10px;
       margin-bottom: 10px;
@@ -4896,6 +5147,7 @@ a.status-card {
 
     .icon-button {
       padding: 0;
+      color: $darker-text-color;
     }
 
     .icon {
@@ -4911,7 +5163,7 @@ a.status-card {
       }
 
       &__message {
-        color: $dark-text-color;
+        color: $darker-text-color;
         padding: 0 10px;
       }
 
@@ -4967,6 +5219,10 @@ a.status-card {
   }
 
   &.active {
+    .search__input {
+      border-radius: 4px 4px 0 0;
+    }
+
     .search__popout {
       display: block;
     }
@@ -4977,14 +5233,9 @@ a.status-card {
   @include search-input;
 
   display: block;
-  padding: 15px;
-  padding-inline-end: 30px;
-  line-height: 18px;
-  font-size: 16px;
-
-  &::placeholder {
-    color: lighten($darker-text-color, 4%);
-  }
+  padding: 12px 16px;
+  padding-inline-start: 16px + 15px + 8px;
+  line-height: normal;
 
   &::-moz-focus-inner {
     border: 0;
@@ -4995,10 +5246,6 @@ a.status-card {
   &:active {
     outline: 0 !important;
   }
-
-  &:focus {
-    background: lighten($ui-base-color, 4%);
-  }
 }
 
 .search__icon {
@@ -5013,21 +5260,21 @@ a.status-card {
 
   .icon {
     position: absolute;
-    top: 13px;
-    inset-inline-end: 10px;
+    top: 12px + 2px;
+    inset-inline-start: 16px - 2px;
     display: inline-block;
     opacity: 0;
     transition: all 100ms linear;
     transition-property: transform, opacity;
-    width: 24px;
-    height: 24px;
-    color: $secondary-text-color;
+    width: 20px;
+    height: 20px;
+    color: $darker-text-color;
     cursor: default;
     pointer-events: none;
 
     &.active {
       pointer-events: auto;
-      opacity: 0.3;
+      opacity: 1;
     }
   }
 
@@ -5042,16 +5289,10 @@ a.status-card {
 
   .icon-times-circle {
     transform: rotate(0deg);
-    color: $action-button-color;
     cursor: pointer;
 
     &.active {
       transform: rotate(90deg);
-      opacity: 1;
-    }
-
-    &:hover {
-      color: lighten($action-button-color, 7%);
     }
   }
 }
@@ -5658,6 +5899,11 @@ a.status-card {
     }
   }
 
+  .dialog-option {
+    align-items: center;
+    gap: 12px;
+  }
+
   .dialog-option .poll__input {
     border-color: $inverted-text-color;
     color: $ui-secondary-color;
@@ -5666,8 +5912,8 @@ a.status-card {
     justify-content: center;
 
     svg {
-      width: 8px;
-      height: auto;
+      width: 15px;
+      height: 15px;
     }
 
     &:active,
@@ -6865,90 +7111,6 @@ noscript {
   }
 }
 
-@media screen and (width <= 630px) and (height <= 400px) {
-  $duration: 400ms;
-  $delay: 100ms;
-
-  .search {
-    will-change: margin-top;
-    transition: margin-top $duration $delay;
-  }
-
-  .navigation-bar {
-    will-change: padding-bottom;
-    transition: padding-bottom $duration $delay;
-  }
-
-  .navigation-bar {
-    & > a:first-child {
-      will-change: margin-top, margin-inline-start, margin-inline-end, width;
-      transition:
-        margin-top $duration $delay,
-        margin-inline-start $duration ($duration + $delay),
-        margin-inline-end $duration ($duration + $delay);
-    }
-
-    & > .navigation-bar__profile-edit {
-      will-change: margin-top;
-      transition: margin-top $duration $delay;
-    }
-
-    .navigation-bar__actions {
-      & > .icon-button.close {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay,
-          transform $duration $delay;
-      }
-
-      & > .compose__action-bar .icon-button {
-        will-change: opacity transform;
-        transition:
-          opacity $duration * 0.5 $delay + $duration * 0.5,
-          transform $duration $delay;
-      }
-    }
-  }
-
-  .is-composing {
-    .search {
-      margin-top: -50px;
-    }
-
-    .navigation-bar {
-      padding-bottom: 0;
-
-      & > a:first-child {
-        margin: -100px 10px 0 -50px;
-      }
-
-      .navigation-bar__profile {
-        padding-top: 2px;
-      }
-
-      .navigation-bar__profile-edit {
-        position: absolute;
-        margin-top: -60px;
-      }
-
-      .navigation-bar__actions {
-        .icon-button.close {
-          pointer-events: auto;
-          opacity: 1;
-          transform: scale(1, 1) translate(0, 0);
-          bottom: 5px;
-        }
-
-        .compose__action-bar .icon-button {
-          pointer-events: none;
-          opacity: 0;
-          transform: scale(0, 1) translate(100%, 0);
-        }
-      }
-    }
-  }
-}
-
 .embed-modal {
   width: auto;
   max-width: 80vw;
@@ -8910,11 +9072,14 @@ noscript {
 
 .link-footer {
   flex: 0 0 auto;
-  padding: 10px;
   padding-top: 20px;
   z-index: 1;
   font-size: 13px;
 
+  .column & {
+    padding: 15px;
+  }
+
   p {
     color: $dark-text-color;
     margin-bottom: 20px;
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index b6e995787d..8a472d75b1 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -40,13 +40,12 @@
   .compose-form {
     width: 400px;
     margin: 0 auto;
-    padding: 20px 0;
-    margin-top: 40px;
+    padding: 10px 0;
+    padding-bottom: 20px;
     box-sizing: border-box;
 
     @media screen and (width <= 400px) {
       width: 100%;
-      margin-top: 0;
       padding: 20px;
     }
   }
@@ -56,13 +55,15 @@
   width: 400px;
   margin: 0 auto;
   display: flex;
-  font-size: 13px;
-  line-height: 18px;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+  line-height: 20px;
   box-sizing: border-box;
   padding: 20px 0;
   margin-top: 40px;
   margin-bottom: 10px;
-  border-bottom: 1px solid $ui-base-color;
+  border-bottom: 1px solid lighten($ui-base-color, 8%);
 
   @media screen and (width <= 440px) {
     width: 100%;
@@ -71,9 +72,9 @@
   }
 
   .avatar {
-    width: 40px;
-    height: 40px;
-    margin-inline-end: 10px;
+    width: 48px;
+    height: 48px;
+    flex: 0 0 auto;
 
     img {
       width: 100%;
@@ -87,13 +88,14 @@
   .name {
     flex: 1 1 auto;
     color: $secondary-text-color;
-    width: calc(100% - 90px);
 
     .username {
       display: block;
-      font-weight: 500;
+      font-size: 16px;
+      line-height: 24px;
       text-overflow: ellipsis;
       overflow: hidden;
+      color: $primary-text-color;
     }
   }
 
@@ -101,7 +103,7 @@
     display: block;
     font-size: 32px;
     line-height: 40px;
-    margin-inline-start: 10px;
+    flex: 0 0 auto;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index c7247c3a57..fec0c10ddb 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -1,7 +1,6 @@
 .emoji-mart {
   font-size: 13px;
   display: inline-block;
-  color: $inverted-text-color;
 
   &,
   * {
@@ -15,13 +14,13 @@
 }
 
 .emoji-mart-bar {
-  border: 0 solid darken($ui-secondary-color, 8%);
+  border: 0 solid var(--dropdown-border-color);
 
   &:first-child {
     border-bottom-width: 1px;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
-    background: $ui-secondary-color;
+    background: var(--dropdown-border-color);
   }
 
   &:last-child {
@@ -36,7 +35,6 @@
   display: flex;
   justify-content: space-between;
   padding: 0 6px;
-  color: $lighter-text-color;
   line-height: 0;
 }
 
@@ -50,9 +48,10 @@
   cursor: pointer;
   background: transparent;
   border: 0;
+  color: $darker-text-color;
 
   &:hover {
-    color: darken($lighter-text-color, 4%);
+    color: lighten($darker-text-color, 4%);
   }
 }
 
@@ -60,7 +59,7 @@
   color: $highlight-text-color;
 
   &:hover {
-    color: darken($highlight-text-color, 4%);
+    color: lighten($highlight-text-color, 4%);
   }
 
   .emoji-mart-anchor-bar {
@@ -95,7 +94,7 @@
   height: 270px;
   max-height: 35vh;
   padding: 0 6px 6px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   will-change: transform;
 
   &::-webkit-scrollbar-track:hover,
@@ -107,7 +106,7 @@
 .emoji-mart-search {
   padding: 10px;
   padding-inline-end: 45px;
-  background: $simple-background-color;
+  background: var(--dropdown-background-color);
   position: relative;
 
   input {
@@ -118,9 +117,9 @@
     font-family: inherit;
     display: block;
     width: 100%;
-    background: rgba($ui-secondary-color, 0.3);
-    color: $inverted-text-color;
-    border: 1px solid $ui-secondary-color;
+    background: $ui-base-color;
+    color: $darker-text-color;
+    border: 1px solid lighten($ui-base-color, 8%);
     border-radius: 4px;
 
     &::-moz-focus-inner {
@@ -155,11 +154,10 @@
   &:disabled {
     cursor: default;
     pointer-events: none;
-    opacity: 0.3;
   }
 
   svg {
-    fill: $action-button-color;
+    fill: $darker-text-color;
   }
 }
 
@@ -180,7 +178,7 @@
     inset-inline-start: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba($ui-secondary-color, 0.7);
+    background-color: var(--dropdown-border-color);
     border-radius: 100%;
   }
 }
@@ -197,7 +195,7 @@
     width: 100%;
     font-weight: 500;
     padding: 5px 6px;
-    background: $simple-background-color;
+    background: var(--dropdown-background-color);
   }
 }
 
@@ -241,7 +239,7 @@
 
 .emoji-mart-no-results {
   font-size: 14px;
-  color: $light-text-color;
+  color: $dark-text-color;
   text-align: center;
   padding: 5px 6px;
   padding-top: 70px;
diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss
index 0b7220b21d..60e7d62245 100644
--- a/app/javascript/styles/mastodon/modal.scss
+++ b/app/javascript/styles/mastodon/modal.scss
@@ -1,5 +1,5 @@
 .modal-layout {
-  background: $ui-base-color
+  background: darken($ui-base-color, 4%)
     url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-lighter-color)}33"/></svg>')
     repeat-x bottom fixed;
   display: flex;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index 8a26e611ca..939fca3364 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -52,6 +52,8 @@
   &__option {
     position: relative;
     display: flex;
+    align-items: flex-start;
+    gap: 8px;
     padding: 6px 0;
     line-height: 18px;
     cursor: default;
@@ -78,16 +80,22 @@
       box-sizing: border-box;
       width: 100%;
       font-size: 14px;
-      color: $inverted-text-color;
+      color: $secondary-text-color;
       outline: 0;
       font-family: inherit;
-      background: $simple-background-color;
-      border: 1px solid darken($simple-background-color, 14%);
+      background: $ui-base-color;
+      border: 1px solid $darker-text-color;
       border-radius: 4px;
-      padding: 6px 10px;
+      padding: 8px 12px;
 
       &:focus {
-        border-color: $highlight-text-color;
+        border-color: $ui-highlight-color;
+      }
+
+      @media screen and (width <= 600px) {
+        font-size: 16px;
+        line-height: 24px;
+        letter-spacing: 0.5px;
       }
     }
 
@@ -96,26 +104,20 @@
     }
 
     &.editable {
-      display: flex;
       align-items: center;
       overflow: visible;
     }
   }
 
   &__input {
-    display: inline-block;
+    display: block;
     position: relative;
     border: 1px solid $ui-primary-color;
     box-sizing: border-box;
-    width: 18px;
-    height: 18px;
-    margin-inline-end: 10px;
-    top: -1px;
+    width: 17px;
+    height: 17px;
     border-radius: 50%;
-    vertical-align: middle;
-    margin-top: auto;
-    margin-bottom: auto;
-    flex: 0 0 18px;
+    flex: 0 0 auto;
 
     &.checkbox {
       border-radius: 4px;
@@ -159,6 +161,15 @@
     }
   }
 
+  &__option.editable &__input {
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: $ui-primary-color;
+      border-width: 1px;
+    }
+  }
+
   &__number {
     display: inline-block;
     width: 45px;
@@ -209,90 +220,6 @@
   }
 }
 
-.compose-form__poll-wrapper {
-  border-top: 1px solid darken($simple-background-color, 8%);
-
-  ul {
-    padding: 10px;
-  }
-
-  .poll__input {
-    &:active,
-    &:focus,
-    &:hover {
-      border-color: $ui-button-focus-background-color;
-    }
-  }
-
-  .poll__footer {
-    border-top: 1px solid darken($simple-background-color, 8%);
-    padding: 10px;
-    display: flex;
-    align-items: center;
-
-    button,
-    select {
-      flex: 1 1 50%;
-
-      &:focus {
-        border-color: $highlight-text-color;
-      }
-    }
-  }
-
-  .button.button-secondary {
-    font-size: 14px;
-    font-weight: 400;
-    padding: 6px 10px;
-    height: auto;
-    line-height: inherit;
-    color: $action-button-color;
-    border-color: $action-button-color;
-    margin-inline-end: 5px;
-
-    &:hover,
-    &:focus,
-    &.active {
-      border-color: $action-button-color;
-      background-color: $action-button-color;
-      color: $ui-button-color;
-    }
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-
-    .poll__option {
-      flex: 0 0 auto;
-      width: calc(100% - (23px + 6px));
-      margin-inline-end: 6px;
-    }
-  }
-
-  select {
-    appearance: none;
-    box-sizing: border-box;
-    font-size: 14px;
-    color: $inverted-text-color;
-    display: inline-block;
-    width: auto;
-    outline: 0;
-    font-family: inherit;
-    background: $simple-background-color
-      url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
-      no-repeat right 8px center / auto 16px;
-    border: 1px solid darken($simple-background-color, 14%);
-    border-radius: 4px;
-    padding: 6px 10px;
-    padding-inline-end: 30px;
-  }
-
-  .icon-button.disabled {
-    color: darken($simple-background-color, 14%);
-  }
-}
-
 .muted .poll {
   color: $dark-text-color;
 
diff --git a/spec/system/new_statuses_spec.rb b/spec/system/new_statuses_spec.rb
index a3b816b4d5..5a3f1b406b 100644
--- a/spec/system/new_statuses_spec.rb
+++ b/spec/system/new_statuses_spec.rb
@@ -24,7 +24,7 @@ describe 'NewStatuses', :sidekiq_inline do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
@@ -37,7 +37,7 @@ describe 'NewStatuses', :sidekiq_inline do
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.status__content__text', text: status_text)
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index fd02d1120c..126a816bcc 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -19,13 +19,13 @@ describe 'ShareEntrypoint' do
 
   it 'can be used to post a new status' do
     expect(subject).to have_css('div#mastodon-compose')
-    expect(subject).to have_css('.compose-form__publish-button-wrapper > button')
+    expect(subject).to have_css('.compose-form__submit')
 
     status_text = 'This is a new status!'
 
     within('.compose-form') do
       fill_in "What's on your mind?", with: status_text
-      click_on 'Publish!'
+      click_on 'Post'
     end
 
     expect(subject).to have_css('.notification-bar-message', text: 'Post published.')

From 881e8c113c4da503e73a953c8430f71f380cff63 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:46:02 +0100
Subject: [PATCH 429/436] Refactor: fix streaming postgresql and redis typing
 issues (#28747)

---
 streaming/index.js | 135 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 109 insertions(+), 26 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 78b049723f..6945a9ae7d 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -8,7 +8,7 @@ const url = require('url');
 const cors = require('cors');
 const dotenv = require('dotenv');
 const express = require('express');
-const Redis = require('ioredis');
+const { Redis } = require('ioredis');
 const { JSDOM } = require('jsdom');
 const pg = require('pg');
 const dbUrlToConfig = require('pg-connection-string').parse;
@@ -43,13 +43,18 @@ initializeLogLevel(process.env, environment);
  */
 
 /**
- * @param {Object.<string, any>} config
+ * @param {RedisConfiguration} config
+ * @returns {Promise<Redis>}
  */
-const createRedisClient = async (config) => {
-  const { redisParams, redisUrl } = config;
-  // @ts-ignore
-  const client = new Redis(redisUrl, redisParams);
-  // @ts-ignore
+const createRedisClient = async ({ redisParams, redisUrl }) => {
+  let client;
+
+  if (typeof redisUrl === 'string') {
+    client = new Redis(redisUrl, redisParams);
+  } else {
+    client = new Redis(redisParams);
+  }
+
   client.on('error', (err) => logger.error({ err }, 'Redis Client Error!'));
 
   return client;
@@ -87,39 +92,101 @@ const parseJSON = (json, req) => {
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} the configuration for the PostgreSQL connection
+ * Takes an environment variable that should be an integer, attempts to parse
+ * it falling back to a default if not set, and handles errors parsing.
+ * @param {string|undefined} value
+ * @param {number} defaultValue
+ * @param {string} variableName
+ * @returns {number}
+ */
+const parseIntFromEnv = (value, defaultValue, variableName) => {
+  if (typeof value === 'string' && value.length > 0) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+      throw new Error(`Invalid ${variableName} environment variable: ${value}`);
+    }
+    return parsedValue;
+  } else {
+    return defaultValue;
+  }
+};
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {pg.PoolConfig} the configuration for the PostgreSQL connection
  */
 const pgConfigFromEnv = (env) => {
+  /** @type {Record<string, pg.PoolConfig>} */
   const pgConfigs = {
     development: {
-      user:     env.DB_USER || pg.defaults.user,
+      user: env.DB_USER || pg.defaults.user,
       password: env.DB_PASS || pg.defaults.password,
       database: env.DB_NAME || 'mastodon_development',
-      host:     env.DB_HOST || pg.defaults.host,
-      port:     env.DB_PORT || pg.defaults.port,
+      host: env.DB_HOST || pg.defaults.host,
+      port: parseIntFromEnv(env.DB_PORT, pg.defaults.port ?? 5432, 'DB_PORT')
     },
 
     production: {
-      user:     env.DB_USER || 'mastodon',
+      user: env.DB_USER || 'mastodon',
       password: env.DB_PASS || '',
       database: env.DB_NAME || 'mastodon_production',
-      host:     env.DB_HOST || 'localhost',
-      port:     env.DB_PORT || 5432,
+      host: env.DB_HOST || 'localhost',
+      port: parseIntFromEnv(env.DB_PORT, 5432, 'DB_PORT')
     },
   };
 
-  let baseConfig;
+  /**
+   * @type {pg.PoolConfig}
+   */
+  let baseConfig = {};
 
   if (env.DATABASE_URL) {
-    baseConfig = dbUrlToConfig(env.DATABASE_URL);
+    const parsedUrl = dbUrlToConfig(env.DATABASE_URL);
+
+    // The result of dbUrlToConfig from pg-connection-string is not type
+    // compatible with pg.PoolConfig, since parts of the connection URL may be
+    // `null` when pg.PoolConfig expects `undefined`, as such we have to
+    // manually create the baseConfig object from the properties of the
+    // parsedUrl.
+    //
+    // For more information see:
+    // https://github.com/brianc/node-postgres/issues/2280
+    //
+    // FIXME: clean up once brianc/node-postgres#3128 lands
+    if (typeof parsedUrl.password === 'string') baseConfig.password = parsedUrl.password;
+    if (typeof parsedUrl.host === 'string') baseConfig.host = parsedUrl.host;
+    if (typeof parsedUrl.user === 'string') baseConfig.user = parsedUrl.user;
+    if (typeof parsedUrl.port === 'string') {
+      const parsedPort = parseInt(parsedUrl.port, 10);
+      if (isNaN(parsedPort)) {
+        throw new Error('Invalid port specified in DATABASE_URL environment variable');
+      }
+      baseConfig.port = parsedPort;
+    }
+    if (typeof parsedUrl.database === 'string') baseConfig.database = parsedUrl.database;
+    if (typeof parsedUrl.options === 'string') baseConfig.options = parsedUrl.options;
+
+    // The pg-connection-string type definition isn't correct, as parsedUrl.ssl
+    // can absolutely be an Object, this is to work around these incorrect
+    // types, including the casting of parsedUrl.ssl to Record<string, any>
+    if (typeof parsedUrl.ssl === 'boolean') {
+      baseConfig.ssl = parsedUrl.ssl;
+    } else if (typeof parsedUrl.ssl === 'object' && !Array.isArray(parsedUrl.ssl) && parsedUrl.ssl !== null) {
+      /** @type {Record<string, any>} */
+      const sslOptions = parsedUrl.ssl;
+      baseConfig.ssl = {};
+
+      baseConfig.ssl.cert = sslOptions.cert;
+      baseConfig.ssl.key = sslOptions.key;
+      baseConfig.ssl.ca = sslOptions.ca;
+      baseConfig.ssl.rejectUnauthorized = sslOptions.rejectUnauthorized;
+    }
 
     // Support overriding the database password in the connection URL
     if (!baseConfig.password && env.DB_PASS) {
       baseConfig.password = env.DB_PASS;
     }
-  } else {
-    // @ts-ignore
+  } else if (Object.hasOwnProperty.call(pgConfigs, environment)) {
     baseConfig = pgConfigs[environment];
 
     if (env.DB_SSLMODE) {
@@ -136,42 +203,58 @@ const pgConfigFromEnv = (env) => {
         break;
       }
     }
+  } else {
+    throw new Error('Unable to resolve postgresql database configuration.');
   }
 
   return {
     ...baseConfig,
-    max: env.DB_POOL || 10,
+    max: parseIntFromEnv(env.DB_POOL, 10, 'DB_POOL'),
     connectionTimeoutMillis: 15000,
+    // Deliberately set application_name to an empty string to prevent excessive
+    // CPU usage with PG Bouncer. See:
+    // - https://github.com/mastodon/mastodon/pull/23958
+    // - https://github.com/pgbouncer/pgbouncer/issues/349
     application_name: '',
   };
 };
 
 /**
- * @param {Object.<string, any>} env the `process.env` value to read configuration from
- * @returns {Object.<string, any>} configuration for the Redis connection
+ * @typedef RedisConfiguration
+ * @property {import('ioredis').RedisOptions} redisParams
+ * @property {string} redisPrefix
+ * @property {string|undefined} redisUrl
+ */
+
+/**
+ * @param {NodeJS.ProcessEnv} env the `process.env` value to read configuration from
+ * @returns {RedisConfiguration} configuration for the Redis connection
  */
 const redisConfigFromEnv = (env) => {
   // ioredis *can* transparently add prefixes for us, but it doesn't *in some cases*,
   // which means we can't use it. But this is something that should be looked into.
   const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';
 
+  let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
+  let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
+
+  /** @type {import('ioredis').RedisOptions} */
   const redisParams = {
     host: env.REDIS_HOST || '127.0.0.1',
-    port: env.REDIS_PORT || 6379,
-    db: env.REDIS_DB || 0,
+    port: redisPort,
+    db: redisDatabase,
     password: env.REDIS_PASSWORD || undefined,
   };
 
   // redisParams.path takes precedence over host and port.
   if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
-    // @ts-ignore
     redisParams.path = env.REDIS_URL.slice(7);
   }
 
   return {
     redisParams,
     redisPrefix,
-    redisUrl: env.REDIS_URL,
+    redisUrl: typeof env.REDIS_URL === 'string' ? env.REDIS_URL : undefined,
   };
 };
 

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

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

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

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

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

diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index d1873d6dce..d2ac2f8f27 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -66,7 +66,6 @@
   "alert.unexpected.message": "Iets het skeefgeloop.",
   "alert.unexpected.title": "Oeps!",
   "announcement.announcement": "Aankondiging",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Druk {combo} om dit volgende keer oor te slaan",
   "bundle_column_error.error.title": "Ag nee!",
   "bundle_column_error.network.title": "Netwerkfout",
@@ -111,19 +110,12 @@
   "compose_form.lock_disclaimer": "Jou rekening is nie {locked} nie. Enigiemand kan jou volg en sien wat jy vir jou volgers plaas.",
   "compose_form.lock_disclaimer.lock": "gesluit",
   "compose_form.placeholder": "Wat wil jy deel?",
-  "compose_form.poll.add_option": "Voeg ’n keuse by",
   "compose_form.poll.duration": "Duur van peiling",
-  "compose_form.poll.option_placeholder": "Keuse {number}",
-  "compose_form.poll.remove_option": "Verwyder hierdie keuse",
   "compose_form.poll.switch_to_multiple": "Verander peiling om meer as een keuse toe te laat",
   "compose_form.poll.switch_to_single": "Verander die peiling om slegs een keuse toe te laat",
-  "compose_form.publish": "Publiseer",
   "compose_form.publish_form": "Publiseer",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Stoor veranderinge",
   "compose_form.spoiler.marked": "Verwyder inhoudswaarskuwing",
   "compose_form.spoiler.unmarked": "Voeg inhoudswaarskuwing by",
-  "compose_form.spoiler_placeholder": "Skryf jou waarskuwing hier",
   "confirmation_modal.cancel": "Kanselleer",
   "confirmations.block.block_and_report": "Blokkeer en rapporteer",
   "confirmations.block.confirm": "Blokkeer",
@@ -234,7 +226,6 @@
   "navigation_bar.community_timeline": "Plaaslike tydlyn",
   "navigation_bar.compose": "Skep nuwe plasing",
   "navigation_bar.domain_blocks": "Geblokkeerde domeine",
-  "navigation_bar.edit_profile": "Redigeer profiel",
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
   "navigation_bar.personal": "Persoonlik",
@@ -267,14 +258,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Verander privaatheid van plasing",
-  "privacy.direct.long": "Slegs sigbaar vir genoemde gebruikers",
-  "privacy.direct.short": "Slegs genoemde persone",
-  "privacy.private.long": "Slegs sigbaar vir volgelinge",
-  "privacy.private.short": "Slegs volgelinge",
-  "privacy.public.long": "Sigbaar vir almal",
   "privacy.public.short": "Publiek",
-  "privacy.unlisted.long": "Sigbaar vir almal, maar onttrek uit verkennings-kenmerke",
-  "privacy.unlisted.short": "Ongelys",
   "privacy_policy.last_updated": "Laaste bywerking op {date}",
   "privacy_policy.title": "Privaatheidsbeleid",
   "regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 23899b1007..e9d609a1ce 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Amagar audio",
-  "autosuggest_hashtag.per_week": "{count} per semana",
   "boost_modal.combo": "Puetz fer clic en {combo} pa blincar este aviso la proxima vegada",
   "bundle_column_error.copy_stacktrace": "Copiar informe d'error",
   "bundle_column_error.error.body": "La pachina solicitada no podió estar renderizada. Podría deber-se a una error en o nuestro codigo u a un problema de compatibilidat con o navegador.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "La tuya cuenta no ye {locked}. Totz pueden seguir-te pa veyer las tuyas publicacions nomás pa seguidores.",
   "compose_form.lock_disclaimer.lock": "blocau",
   "compose_form.placeholder": "En qué yes pensando?",
-  "compose_form.poll.add_option": "Anyadir una opción",
   "compose_form.poll.duration": "Duración d'a enqüesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Modificar enqüesta pa permitir multiples opcions",
   "compose_form.poll.switch_to_single": "Modificar enqüesta pa permitir una sola opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Alzar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcau como sensible} other {Material marcau como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcau como sensible} other {Material no marcau como sensible}}",
   "compose_form.spoiler.marked": "Texto amagau dimpués de l'alvertencia",
   "compose_form.spoiler.unmarked": "Texto no amagau",
-  "compose_form.spoiler_placeholder": "Alvertencia de conteniu",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Blocar y Denunciar",
   "confirmations.block.confirm": "Blocar",
@@ -345,7 +334,6 @@
   "navigation_bar.compose": "Escribir nueva publicación",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.filters": "Parolas silenciadas",
   "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
@@ -429,14 +417,7 @@
   "poll_button.add_poll": "Anyadir una enqüesta",
   "poll_button.remove_poll": "Eliminar enqüesta",
   "privacy.change": "Achustar privacidat",
-  "privacy.direct.long": "Nomás amostrar a los usuarios mencionaus",
-  "privacy.direct.short": "Nomás contas mencionadas",
-  "privacy.private.long": "Nomás amostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible pa totz",
   "privacy.public.short": "Publico",
-  "privacy.unlisted.long": "Visible pa totz, pero excluyiu d'as funcions d'escubrimiento",
-  "privacy.unlisted.short": "No listau",
   "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
   "privacy_policy.title": "Politica de Privacidat",
   "refresh": "Actualizar",
@@ -590,10 +571,8 @@
   "upload_error.poll": "Puyada de fichers no permitida con enqüestas.",
   "upload_form.audio_description": "Describir pa personas con problemas auditivos",
   "upload_form.description": "Describir pa los usuarios con dificultat visual",
-  "upload_form.description_missing": "Garra descripción anyadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir pa personas con problemas auditivos u visuals",
   "upload_modal.analyzing_picture": "Analisando imachen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c0d07cc648..5f2d151fae 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
-  "autosuggest_hashtag.per_week": "{count} في الأسبوع",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "bundle_column_error.copy_stacktrace": "انسخ تقرير الخطأ",
   "bundle_column_error.error.body": "لا يمكن تقديم الصفحة المطلوبة. قد يكون بسبب خطأ في التعليمات البرمجية، أو مشكلة توافق المتصفح.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "حسابُك غير {locked}. يُمكن لأي شخص مُتابعتك لرؤية (منشورات المتابعين فقط).",
   "compose_form.lock_disclaimer.lock": "مُقفَل",
   "compose_form.placeholder": "فِيمَ تُفكِّر؟",
-  "compose_form.poll.add_option": "إضافة خيار",
   "compose_form.poll.duration": "مُدَّة اِستطلاع الرأي",
-  "compose_form.poll.option_placeholder": "الخيار {number}",
-  "compose_form.poll.remove_option": "إزالة هذا الخيار",
   "compose_form.poll.switch_to_multiple": "تغيِير الاستطلاع للسماح باِخيارات مُتعدِّدة",
   "compose_form.poll.switch_to_single": "تغيِير الاستطلاع للسماح باِخيار واحد فقط",
-  "compose_form.publish": "نشر",
   "compose_form.publish_form": "منشور جديد",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "احفظ التعديلات",
-  "compose_form.sensitive.hide": "{count, plural, one {الإشارة إلى الوَسط كمُحتوى حسّاس} two{الإشارة إلى الوسطان كمُحتويان حسّاسان} other {الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.marked": "{count, plural, one {تمَّ الإشارة إلى الوسط كمُحتوى حسّاس} two{تمَّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {تمَّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {لم تَتِمّ الإشارة إلى الوسط كمُحتوى حسّاس} two{لم تَتِمّ الإشارة إلى الوسطان كمُحتويان حسّاسان} other {لم تَتِمّ الإشارة إلى الوسائط كمُحتويات حسّاسة}}",
   "compose_form.spoiler.marked": "إزالة تحذير المحتوى",
   "compose_form.spoiler.unmarked": "إضافة تحذير للمحتوى",
-  "compose_form.spoiler_placeholder": "اُكتُب تحذيركَ هُنا",
   "confirmation_modal.cancel": "إلغاء",
   "confirmations.block.block_and_report": "حظره والإبلاغ عنه",
   "confirmations.block.confirm": "حظر",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "الإشارات الخاصة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.edit_profile": "عدّل الملف التعريفي",
   "navigation_bar.explore": "استكشف",
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "الكلمات المكتومة",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "إضافة استطلاع للرأي",
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
-  "privacy.direct.long": "مرئي للمستخدمين المذكورين فقط",
-  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
-  "privacy.private.long": "أنشر لمتابعيك فقط",
-  "privacy.private.short": "للمتابِعين فقط",
-  "privacy.public.long": "مرئي للكل",
   "privacy.public.short": "للعامة",
-  "privacy.unlisted.long": "مرئي للجميع، ولكن مِن دون ميزات الاكتشاف",
-  "privacy.unlisted.short": "غير مدرج",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
   "refresh": "أنعِش",
@@ -696,10 +677,8 @@
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
   "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
   "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "لم يُضف وصف",
   "upload_form.edit": "تعديل",
   "upload_form.thumbnail": "غيّر الصورة المصغرة",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "وصف للمعاقين بصريا أو لِذي قِصر السمع",
   "upload_modal.analyzing_picture": "جارٍ فحص الصورة…",
   "upload_modal.apply": "طبّق",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 1467f8891e..479c9c9243 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -66,7 +66,6 @@
   "alert.unexpected.title": "¡Meca!",
   "announcement.announcement": "Anunciu",
   "attachments_list.unprocessed": "(ensin procesar)",
-  "autosuggest_hashtag.per_week": "{count} per selmana",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
@@ -109,13 +108,9 @@
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿En qué pienses?",
-  "compose_form.poll.add_option": "Amestar una opción",
   "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Quitar esta opción",
-  "compose_form.publish": "Espublizar",
+  "compose_form.poll.type": "Estilu",
   "compose_form.publish_form": "Artículu nuevu",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar los cambeos",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.block_and_report": "Bloquiar ya informar",
   "confirmations.block.confirm": "Bloquiar",
@@ -286,7 +281,6 @@
   "navigation_bar.community_timeline": "Llinia de tiempu llocal",
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.edit_profile": "Editar el perfil",
   "navigation_bar.explore": "Esploración",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -346,12 +340,7 @@
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
   "privacy.change": "Configurar la privacidá del artículu",
-  "privacy.direct.long": "Artículu visible namás pa los perfiles mentaos",
-  "privacy.private.long": "Artículu visible namás pa los perfiles siguidores",
-  "privacy.private.short": "Namás pa siguidores",
-  "privacy.public.long": "Tol mundu pue ver l'artículu",
   "privacy.public.short": "Artículu públicu",
-  "privacy.unlisted.long": "Artículu visible pa tol mundu mas escluyíu de les funciones de descubrimientu",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
@@ -368,6 +357,7 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
@@ -492,9 +482,7 @@
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
   "upload_form.audio_description": "Describi'l conteníu pa persones sordes ya/o ciegues",
-  "upload_form.description_missing": "Nun s'amestó la descripción",
   "upload_form.edit": "Editar",
-  "upload_form.undo": "Desaniciar",
   "upload_modal.analyzing_picture": "Analizando la semeya…",
   "upload_modal.apply": "Aplicar",
   "upload_modal.applying": "Aplicando…",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 773af40343..e069515109 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
-  "autosuggest_hashtag.per_week": "{count} за тыдзень",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
   "compose_form.placeholder": "Што здарылася?",
-  "compose_form.poll.add_option": "Дадаць варыянт",
   "compose_form.poll.duration": "Працягласць апытання",
-  "compose_form.poll.option_placeholder": "Варыянт {number}",
-  "compose_form.poll.remove_option": "Выдаліць гэты варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
-  "compose_form.publish": "Апублікаваць",
   "compose_form.publish_form": "Апублікаваць",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Захаваць змены",
-  "compose_form.sensitive.hide": "{count, plural, one {Пазначыць кантэнт як далікатны} other {Пазначыць кантэнт як далікатны}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Кантэнт пазначаны як далікатны} other {Кантэнт пазначаны як далікатны}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Кантэнт не пазначаны як далікатны} other {Кантэнт не пазначаны як далікатны}}",
   "compose_form.spoiler.marked": "Выдаліць папярэджанне аб змесціве",
   "compose_form.spoiler.unmarked": "Дадаць папярэджанне аб змесціве",
-  "compose_form.spoiler_placeholder": "Напішыце сваё папярэджанне тут",
   "confirmation_modal.cancel": "Скасаваць",
   "confirmations.block.block_and_report": "Заблакіраваць і паскардзіцца",
   "confirmations.block.confirm": "Заблакіраваць",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Асабістыя згадванні",
   "navigation_bar.discover": "Даведайцесь",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.edit_profile": "Рэдагаваць профіль",
   "navigation_bar.explore": "Агляд",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Дадаць апытанне",
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
-  "privacy.direct.long": "Паказаць толькі згаданым карыстальнікам",
-  "privacy.direct.short": "Толькі згаданыя людзі",
-  "privacy.private.long": "Паказаць толькі падпісчыкам",
-  "privacy.private.short": "Толькі для падпісчыкаў",
-  "privacy.public.long": "Бачны для ўсіх",
   "privacy.public.short": "Публічны",
-  "privacy.unlisted.long": "Бачна для ўсіх, але не праз магчымасці агляду",
-  "privacy.unlisted.short": "Не ў стужках",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
   "upload_form.audio_description": "Апісанне для людзей з парушэннямі слыху",
   "upload_form.description": "Апісаць для людзей са слабым зрокам",
-  "upload_form.description_missing": "Апісанне адсутнічае",
   "upload_form.edit": "Рэдагаваць",
   "upload_form.thumbnail": "Змяніць мініяцюру",
-  "upload_form.undo": "Выдаліць",
   "upload_form.video_description": "Апісанне для людзей з парушэннямі зроку і слыху",
   "upload_modal.analyzing_picture": "Аналіз выявы…",
   "upload_modal.apply": "Ужыць",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7ee3c868ae..213ac090a7 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
-  "autosuggest_hashtag.per_week": "{count} на седмица",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "bundle_column_error.copy_stacktrace": "Копиране на доклада за грешката",
   "bundle_column_error.error.body": "Заявената страница не може да се изобрази. Това може да е заради грешка в кода ни или проблем със съвместимостта на браузъра.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Какво мислите?",
   "compose_form.poll.add_option": "Добавяне на избор",
   "compose_form.poll.duration": "Времетраене на анкетата",
+  "compose_form.poll.multiple": "Множествен избор",
   "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Премахване на този избор",
+  "compose_form.poll.remove_option": "Премахване на тази възможност",
+  "compose_form.poll.single": "Подберете нещо",
   "compose_form.poll.switch_to_multiple": "Промяна на анкетата, за да се позволят множество възможни избора",
   "compose_form.poll.switch_to_single": "Промяна на анкетата, за да се позволи един възможен избор",
-  "compose_form.publish": "Публикуване",
+  "compose_form.poll.type": "Стил",
+  "compose_form.publish": "Публикация",
   "compose_form.publish_form": "Публикуване",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Запазване на промените",
-  "compose_form.sensitive.hide": "{count, plural, one {Маркиране на мултимедията като деликатна} other {Маркиране на мултимедиите като деликатни}}",
-  "compose_form.sensitive.marked": "{count, plural, one {мултимедия е означена като деликатна} other {мултимедии са означени като деликатни}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедията не е маркирана като деликатна} other {Мултимедиите не са маркирани като деликатни}}",
+  "compose_form.reply": "Отговор",
+  "compose_form.save_changes": "Обновяване",
   "compose_form.spoiler.marked": "Отстраняване на предупреждение за съдържание",
   "compose_form.spoiler.unmarked": "Добавяне на предупреждение за съдържание",
-  "compose_form.spoiler_placeholder": "Тук напишете предупреждението си",
+  "compose_form.spoiler_placeholder": "Предупреждение за съдържание (по избор)",
   "confirmation_modal.cancel": "Отказ",
   "confirmations.block.block_and_report": "Блокиране и докладване",
   "confirmations.block.confirm": "Блокиране",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.edit_profile": "Редактиране на профила",
   "navigation_bar.explore": "Изследване",
   "navigation_bar.favourites": "Любими",
   "navigation_bar.filters": "Заглушени думи",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Анкетиране",
   "poll_button.remove_poll": "Премахване на анкета",
   "privacy.change": "Промяна на поверителността на публикация",
-  "privacy.direct.long": "Видимо само за споменатите потребители",
-  "privacy.direct.short": "Само споменатите хора",
-  "privacy.private.long": "Видимо само за последователите",
-  "privacy.private.short": "Само последователи",
-  "privacy.public.long": "Видимо за всички",
+  "privacy.direct.long": "Всеки споменат в публикацията",
+  "privacy.direct.short": "Определени хора",
+  "privacy.private.long": "Само последователите ви",
+  "privacy.private.short": "Последователи",
+  "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
-  "privacy.unlisted.long": "Видимо за всички, но не чрез възможността за откриване",
-  "privacy.unlisted.short": "Несписъчно",
+  "privacy.unlisted.long": "По-малко алгоритмични фанфари",
+  "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
   "recommended": "Препоръчано",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}м.",
   "relative_time.seconds": "{number}с.",
   "relative_time.today": "днес",
+  "reply_indicator.attachments": "{count, plural, one {# прикаване} other {# прикачвания}}",
   "reply_indicator.cancel": "Отказ",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокиране",
   "report.block_explanation": "Няма да им виждате публикациите. Те няма да могат да виждат публикациите ви или да ви последват. Те ще могат да казват, че са били блокирани.",
   "report.categories.legal": "Правни въпроси",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
-  "upload_form.description_missing": "Няма добавен опис",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
-  "upload_form.undo": "Изтриване",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",
   "upload_modal.analyzing_picture": "Снимков анализ…",
   "upload_modal.apply": "Прилагане",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index fe3d2a627c..508caa2f42 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "ঘোষণা",
   "attachments_list.unprocessed": "(প্রক্রিয়া করা যায়নি)",
   "audio.hide": "অডিও লুকান",
-  "autosuggest_hashtag.per_week": "প্রতি সপ্তাহে {count}",
   "boost_modal.combo": "পরেরবার আপনি {combo} টিপলে এটি আর আসবে না",
   "bundle_column_error.copy_stacktrace": "এরর রিপোর্ট কপি করুন",
   "bundle_column_error.error.body": "অনুরোধ করা পৃষ্ঠাটি রেন্ডার করা যায়নি। এটি আমাদের কোডে একটি বাগ বা ব্রাউজার সামঞ্জস্যের সমস্যার কারণে হতে পারে।",
@@ -142,22 +141,12 @@
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
   "compose_form.placeholder": "আপনি কি ভাবছেন ?",
-  "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
   "compose_form.poll.duration": "ভোটগ্রহনের সময়",
-  "compose_form.poll.option_placeholder": "বিকল্প {number}",
-  "compose_form.poll.remove_option": "এই বিকল্পটি মুছে ফেলুন",
   "compose_form.poll.switch_to_multiple": "একাধিক পছন্দ অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
   "compose_form.poll.switch_to_single": "একটি একক পছন্দের অনুমতি দেওয়ার জন্য পোল পরিবর্তন করুন",
-  "compose_form.publish": "প্রকাশ করুন",
   "compose_form.publish_form": "প্রকাশ করুন",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "পরিবর্তনগুলো প্রকাশ করুন",
-  "compose_form.sensitive.hide": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করতে",
-  "compose_form.sensitive.marked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়েছে",
-  "compose_form.sensitive.unmarked": "এই ছবি বা ভিডিওটি সংবেদনশীল হিসেবে চিহ্নিত করা হয়নি",
   "compose_form.spoiler.marked": "সতর্কতার পিছনে লেখানটি লুকানো আছে",
   "compose_form.spoiler.unmarked": "লেখাটি লুকানো নেই",
-  "compose_form.spoiler_placeholder": "আপনার লেখা দেখার সাবধানবাণী লিখুন",
   "confirmation_modal.cancel": "বাতিল করুন",
   "confirmations.block.block_and_report": "ব্লক করুন এবং রিপোর্ট করুন",
   "confirmations.block.confirm": "ব্লক করুন",
@@ -324,7 +313,6 @@
   "navigation_bar.compose": "নতুন টুট লিখুন",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
   "navigation_bar.explore": "পরিব্রাজন",
   "navigation_bar.favourites": "পছন্দসমূহ",
   "navigation_bar.filters": "বন্ধ করা শব্দ",
@@ -395,12 +383,7 @@
   "poll_button.add_poll": "একটা নির্বাচন যোগ করতে",
   "poll_button.remove_poll": "নির্বাচন বাদ দিতে",
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
-  "privacy.direct.long": "শুধুমাত্র উল্লেখিত ব্যবহারকারীদের কাছে লিখতে",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "শুধুমাত্র আপনার অনুসরণকারীদের লিখতে",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
-  "privacy.unlisted.short": "প্রকাশ্য নয়",
   "refresh": "সতেজ করা",
   "regeneration_indicator.label": "আসছে…",
   "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
@@ -506,7 +489,6 @@
   "upload_form.description": "যারা দেখতে পায়না তাদের জন্য এটা বর্ণনা করতে",
   "upload_form.edit": "সম্পাদন",
   "upload_form.thumbnail": "থাম্বনেল পরিবর্তন করুন",
-  "upload_form.undo": "মুছে ফেলতে",
   "upload_form.video_description": "শ্রবণশক্তি হ্রাস বা চাক্ষুষ প্রতিবন্ধী ব্যক্তিদের জন্য বর্ণনা করুন",
   "upload_modal.analyzing_picture": "চিত্র বিশ্লেষণ করা হচ্ছে…",
   "upload_modal.apply": "প্রয়োগ করুন",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ad6e55c5e1..5e83ab4e6d 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Kemennad",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
-  "autosuggest_hashtag.per_week": "{count} bep sizhun",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
-  "compose_form.poll.add_option": "Ouzhpenniñ un dibab",
   "compose_form.poll.duration": "Pad ar sontadeg",
-  "compose_form.poll.option_placeholder": "Dibab {number}",
-  "compose_form.poll.remove_option": "Lemel an dibab-mañ",
   "compose_form.poll.switch_to_multiple": "Kemmañ ar sontadeg evit aotren meur a zibab",
   "compose_form.poll.switch_to_single": "Kemmañ ar sontadeg evit aotren un dibab hepken",
-  "compose_form.publish": "Embann",
   "compose_form.publish_form": "Embann",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enrollañ ar cheñchamantoù",
-  "compose_form.sensitive.hide": "Merkañ ar media evel kizidik",
-  "compose_form.sensitive.marked": "Merket eo ar media evel kizidik",
-  "compose_form.sensitive.unmarked": "N'eo ket merket ar media evel kizidik",
   "compose_form.spoiler.marked": "Kuzhet eo an destenn a-dreñv ur c'hemenn",
   "compose_form.spoiler.unmarked": "N'eo ket kuzhet an destenn",
-  "compose_form.spoiler_placeholder": "Skrivit ho kemenn diwall amañ",
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.block_and_report": "Berzañ ha Disklêriañ",
   "confirmations.block.confirm": "Stankañ",
@@ -383,7 +372,6 @@
   "navigation_bar.direct": "Menegoù prevez",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.edit_profile": "Kemmañ ar profil",
   "navigation_bar.explore": "Furchal",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
@@ -487,14 +475,7 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an toud",
-  "privacy.direct.long": "Embann evit an implijer·ezed·ien meneget hepken",
-  "privacy.direct.short": "Tud meneget hepken",
-  "privacy.private.long": "Embann evit ar re a heuilh ac'hanon hepken",
-  "privacy.private.short": "Tud koumanantet hepken",
-  "privacy.public.long": "Gwelus d'an holl",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Gwelus gant an holl, met hep arc'hweladur dizoleiñ",
-  "privacy.unlisted.short": "Anlistennet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
   "recommended": "Erbedet",
@@ -667,10 +648,8 @@
   "upload_error.poll": "Pellgargañ restroù n'eo ket aotreet gant sontadegoù.",
   "upload_form.audio_description": "Diskrivañ evit tud a zo kollet o c'hlev",
   "upload_form.description": "Diskrivañ evit tud a zo kollet o gweled",
-  "upload_form.description_missing": "Deskrivadur diank",
   "upload_form.edit": "Kemmañ",
   "upload_form.thumbnail": "Kemmañ ar velvenn",
-  "upload_form.undo": "Dilemel",
   "upload_form.video_description": "Diskrivañ evit tud a zo kollet o gweled pe o c'hlev",
   "upload_modal.analyzing_picture": "O tielfennañ ar skeudenn…",
   "upload_modal.apply": "Arloañ",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 9b6b49c3d6..c978a8b01f 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -66,8 +66,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index c763a32ba8..0d089bf8b8 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anunci",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "bundle_column_error.copy_stacktrace": "Copia l'informe d'error",
   "bundle_column_error.error.body": "No s'ha pogut renderitzar la pàgina sol·licitada. Podria ser per un error en el nostre codi o per un problema de compatibilitat del navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
   "compose_form.placeholder": "Què tens al cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
+  "compose_form.poll.add_option": "Afegiu una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
+  "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
-  "compose_form.poll.remove_option": "Elimina aquesta opció",
+  "compose_form.poll.remove_option": "Treu aquesta opció",
+  "compose_form.poll.single": "Trieu-ne una",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
-  "compose_form.publish": "Tut",
+  "compose_form.poll.type": "Estil",
+  "compose_form.publish": "Publica",
   "compose_form.publish_form": "Nou tut",
-  "compose_form.publish_loud": "Tut!",
-  "compose_form.save_changes": "Desa els canvis",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca mèdia com a sensible} other {Marca mèdia com a sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Contingut marcat com a sensible} other {Contingut marcat com a sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Contingut no marcat com a sensible} other {Contingut no marcat com a sensible}}",
+  "compose_form.reply": "Responeu",
+  "compose_form.save_changes": "Actualitza",
   "compose_form.spoiler.marked": "Elimina l'avís de contingut",
   "compose_form.spoiler.unmarked": "Afegeix avís de contingut",
-  "compose_form.spoiler_placeholder": "Escriu l'avís aquí",
+  "compose_form.spoiler_placeholder": "Avís de contingut (opcional)",
   "confirmation_modal.cancel": "Cancel·la",
   "confirmations.block.block_and_report": "Bloca i denuncia",
   "confirmations.block.confirm": "Bloca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Mencions privades",
   "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.edit_profile": "Edita el perfil",
   "navigation_bar.explore": "Explora",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Paraules silenciades",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Afegeix una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
   "privacy.change": "Canvia la privacitat del tut",
-  "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només gent mencionada",
-  "privacy.private.long": "Visible només per als seguidors",
-  "privacy.private.short": "Només seguidors",
-  "privacy.public.long": "Visible per a tothom",
+  "privacy.direct.long": "Tothom mencionat en aquesta publicació",
+  "privacy.direct.short": "Persones concretes",
+  "privacy.private.long": "Només els vostres seguidors",
+  "privacy.private.short": "Seguidors",
+  "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
-  "privacy.unlisted.long": "Visible per a tothom però exclosa de les funcions de descobriment",
-  "privacy.unlisted.short": "No llistada",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
@@ -715,10 +711,8 @@
   "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
   "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
   "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
-  "upload_form.description_missing": "No s'hi ha afegit cap descripció",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Canvia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
   "upload_modal.analyzing_picture": "S'analitza la imatge…",
   "upload_modal.apply": "Aplica",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index f1cafd1ac4..73910f9b7c 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "بانگەواز",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "شاردنەوەی دەنگ",
-  "autosuggest_hashtag.per_week": "{count} هەرهەفتە",
   "boost_modal.combo": "دەتوانیت دەست بنێی بە سەر {combo} بۆ بازدان لە جاری داهاتوو",
   "bundle_column_error.copy_stacktrace": "ڕاپۆرتی هەڵەی کۆپی بکە",
   "bundle_column_error.error.body": "لاپەڕەی داواکراو نەتوانرا ڕەندەر بکرێت. دەکرێت بەهۆی هەڵەیەکی کۆدەکەمانەوە بێت، یان کێشەی گونجانی وێبگەڕ.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "هەژمێرەکەی لە حاڵەتی {locked}. هەر کەسێک دەتوانێت شوێنت بکەوێت بۆ پیشاندانی بابەتەکانی تەنها دوایخۆی.",
   "compose_form.lock_disclaimer.lock": "قفڵ دراوە",
   "compose_form.placeholder": "چی لە مێشکتدایە?",
-  "compose_form.poll.add_option": "زیادکردنی هەڵبژاردەیەک",
   "compose_form.poll.duration": "ماوەی ڕاپرسی",
-  "compose_form.poll.option_placeholder": "هەڵبژاردن {number}",
-  "compose_form.poll.remove_option": "لابردنی ئەم هەڵبژاردەیە",
   "compose_form.poll.switch_to_multiple": "ڕاپرسی بگۆڕە بۆ ڕێگەدان بە چەند هەڵبژاردنێک",
   "compose_form.poll.switch_to_single": "گۆڕینی ڕاپرسی بۆ ڕێگەدان بە تاکە هەڵبژاردنێک",
-  "compose_form.publish": "بڵاوی بکەوە",
   "compose_form.publish_form": "بڵاوی بکەوە",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "پاشکەوتی گۆڕانکاریەکان",
-  "compose_form.sensitive.hide": "نیشانکردنی میدیا وەک هەستیار",
-  "compose_form.sensitive.marked": "وادەی کۆتایی",
-  "compose_form.sensitive.unmarked": "میدیا وەک هەستیار نیشان نەکراوە",
   "compose_form.spoiler.marked": "دەق لە پشت ئاگاداریدا شاراوەتەوە",
   "compose_form.spoiler.unmarked": "دەق شاراوە نییە",
-  "compose_form.spoiler_placeholder": "ئاگاداریەکەت لێرە بنووسە",
   "confirmation_modal.cancel": "هەڵوەشاندنەوه",
   "confirmations.block.block_and_report": "بلۆک & گوزارشت",
   "confirmations.block.confirm": "بلۆک",
@@ -354,7 +343,6 @@
   "navigation_bar.direct": "ئاماژەی تایبەت",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
   "navigation_bar.explore": "گەڕان",
   "navigation_bar.filters": "وشە کپەکان",
   "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
@@ -439,14 +427,7 @@
   "poll_button.add_poll": "ڕاپرسییەک زیاد بکە",
   "poll_button.remove_poll": "ده‌نگدان بسڕه‌وه‌‌",
   "privacy.change": "ڕێکخستنی تایبەتمەندی توت",
-  "privacy.direct.long": "تەنیا بۆ بەکارهێنەرانی ناوبراو",
-  "privacy.direct.short": "تەنها کەسانی باس کراو",
-  "privacy.private.long": "بینراو تەنها بۆ شوێنکەوتوان",
-  "privacy.private.short": "تەنیا شوێنکەوتووان",
-  "privacy.public.long": "بۆ هەمووان دیارە",
   "privacy.public.short": "گشتی",
-  "privacy.unlisted.long": "بۆ هەمووان دیارە، بەڵام لە تایبەتمەندییەکانی دۆزینەوە دەرچووە",
-  "privacy.unlisted.short": "لە لیست نەکراو",
   "privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
   "privacy_policy.title": "سیاسەتی تایبەتێتی",
   "refresh": "نوێکردنەوە",
@@ -610,10 +591,8 @@
   "upload_error.poll": "فایل و ڕاپرسی پێکەوە ڕێپێنەدراون.",
   "upload_form.audio_description": "پەیامەکەت بۆ نابیستەکان",
   "upload_form.description": "پەیامەکەت بۆ نابیناکان",
-  "upload_form.description_missing": "هیچ وەسفێک زیاد نەکراوە",
   "upload_form.edit": "دەستکاری",
   "upload_form.thumbnail": "گۆڕانی وینۆچکە",
-  "upload_form.undo": "بیسڕەوە",
   "upload_form.video_description": "پەیامەکەت بۆ نابیست و نابیناکان",
   "upload_modal.analyzing_picture": "وێنەکە شی دەکرێتەوە…",
   "upload_modal.apply": "بیسەپێنە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 9f90c3d211..9d0b0306c8 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -45,7 +45,6 @@
   "alert.unexpected.title": "Uups!",
   "announcement.announcement": "Annunziu",
   "attachments_list.unprocessed": "(micca trattata)",
-  "autosuggest_hashtag.per_week": "{count} per settimana",
   "boost_modal.combo": "Pudete appughjà nant'à {combo} per saltà quessa a prussima volta",
   "bundle_column_error.retry": "Pruvà torna",
   "bundle_modal_error.close": "Chjudà",
@@ -80,20 +79,12 @@
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
   "compose_form.placeholder": "À chè pensate?",
-  "compose_form.poll.add_option": "Aghjunghje scelta",
   "compose_form.poll.duration": "Durata di u scandagliu",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Toglie sta scelta",
   "compose_form.poll.switch_to_multiple": "Cambià u scandagliu per accittà parechje scelte",
   "compose_form.poll.switch_to_single": "Cambià u scandagliu per ùn accittà ch'una scelta",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Indicà u media cum'è sensibile} other {Indicà i media cum'è sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media indicatu cum'è sensibile} other {Media indicati cum'è sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media micca indicatu cum'è sensibile} other {Media micca indicati cum'è sensibili}}",
   "compose_form.spoiler.marked": "Testu piattatu daret'à un'avertimentu",
   "compose_form.spoiler.unmarked": "Testu micca piattatu",
-  "compose_form.spoiler_placeholder": "Scrive u vostr'avertimentu quì",
   "confirmation_modal.cancel": "Annullà",
   "confirmations.block.block_and_report": "Bluccà è signalà",
   "confirmations.block.confirm": "Bluccà",
@@ -245,7 +236,6 @@
   "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
-  "navigation_bar.edit_profile": "Mudificà u prufile",
   "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.follows_and_followers": "Abbunati è abbunamenti",
@@ -318,12 +308,7 @@
   "poll_button.add_poll": "Aghjunghje",
   "poll_button.remove_poll": "Toglie u scandagliu",
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
-  "privacy.direct.long": "Mandà solu à quelli chì so mintuvati",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Mustrà solu à l'abbunati",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pubblicu",
-  "privacy.unlisted.short": "Micca listatu",
   "refresh": "Attualizà",
   "regeneration_indicator.label": "Caricamentu…",
   "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
@@ -409,7 +394,6 @@
   "upload_form.description": "Discrizzione per i malvistosi",
   "upload_form.edit": "Mudificà",
   "upload_form.thumbnail": "Cambià vignetta",
-  "upload_form.undo": "Sguassà",
   "upload_form.video_description": "Discrizzione per i ciochi o cechi",
   "upload_modal.analyzing_picture": "Analisi di u ritrattu…",
   "upload_modal.apply": "Affettà",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e18cabcec1..7d91670de0 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "autosuggest_hashtag.per_week": "{count} za týden",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "bundle_column_error.copy_stacktrace": "Zkopírovat zprávu o chybě",
   "bundle_column_error.error.body": "Požadovanou stránku nelze vykreslit. Může to být způsobeno chybou v našem kódu nebo problémem s kompatibilitou prohlížeče.",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky učené pouze pro sledující.",
   "compose_form.lock_disclaimer.lock": "zamčený",
   "compose_form.placeholder": "Co se vám honí hlavou?",
-  "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Doba trvání ankety",
-  "compose_form.poll.option_placeholder": "Volba {number}",
-  "compose_form.poll.remove_option": "Odebrat tuto volbu",
   "compose_form.poll.switch_to_multiple": "Povolit u ankety výběr více voleb",
   "compose_form.poll.switch_to_single": "Povolit u ankety výběr pouze jedné volby",
-  "compose_form.publish": "Zveřejnit",
   "compose_form.publish_form": "Zveřejnit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Uložit změny",
-  "compose_form.sensitive.hide": "{count, plural, one {Označit média za citlivá} few {Označit média za citlivá} many {Označit média za citlivá} other {Označit média za citlivá}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Média jsou označena za citlivá} few {Média jsou označena za citlivá} many {Média jsou označena za citlivá} other {Média jsou označena za citlivá}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Média nejsou označena za citlivá} few {Média nejsou označena za citlivá} many {Média nejsou označena za citlivá} other {Média nejsou označena za citlivá}}",
   "compose_form.spoiler.marked": "Odebrat varování o obsahu",
   "compose_form.spoiler.unmarked": "Přidat varování o obsahu",
-  "compose_form.spoiler_placeholder": "Sem napište vaše varování",
   "confirmation_modal.cancel": "Zrušit",
   "confirmations.block.block_and_report": "Blokovat a nahlásit",
   "confirmations.block.confirm": "Blokovat",
@@ -401,7 +390,6 @@
   "navigation_bar.direct": "Soukromé zmínky",
   "navigation_bar.discover": "Objevit",
   "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.edit_profile": "Upravit profil",
   "navigation_bar.explore": "Prozkoumat",
   "navigation_bar.favourites": "Oblíbené",
   "navigation_bar.filters": "Skrytá slova",
@@ -508,14 +496,7 @@
   "poll_button.add_poll": "Přidat anketu",
   "poll_button.remove_poll": "Odebrat anketu",
   "privacy.change": "Změnit soukromí příspěvku",
-  "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze zmínění lidé",
-  "privacy.private.long": "Viditelný pouze pro sledující",
-  "privacy.private.short": "Pouze sledující",
-  "privacy.public.long": "Viditelný pro všechny",
   "privacy.public.short": "Veřejné",
-  "privacy.unlisted.long": "Viditelný pro všechny, ale vyňat z funkcí objevování",
-  "privacy.unlisted.short": "Neveřejný",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
   "refresh": "Obnovit",
@@ -695,10 +676,8 @@
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "upload_form.audio_description": "Popis pro sluchově postižené",
   "upload_form.description": "Popis pro zrakově postižené",
-  "upload_form.description_missing": "Nebyl přidán popis",
   "upload_form.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
-  "upload_form.undo": "Smazat",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",
   "upload_modal.analyzing_picture": "Analyzuji obrázek…",
   "upload_modal.apply": "Použít",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 04b39904e4..3cd090e186 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
-  "autosuggest_hashtag.per_week": "{count} yr wythnos",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
-  "compose_form.poll.add_option": "Ychwanegu dewis",
   "compose_form.poll.duration": "Cyfnod pleidlais",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Tynnu'r dewis",
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
-  "compose_form.publish": "Cyhoeddi",
   "compose_form.publish_form": "Cyhoeddi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Cadw newidiadau",
-  "compose_form.sensitive.hide": "Marcio cyfryngau fel eu bod yn sensitif",
-  "compose_form.sensitive.marked": "Cyfryngau wedi'u marcio'n sensitif",
-  "compose_form.sensitive.unmarked": "Nid yw'r cyfryngau wedi'u marcio'n sensitif",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
-  "compose_form.spoiler_placeholder": "Ysgrifenwch eich rhybudd yma",
   "confirmation_modal.cancel": "Diddymu",
   "confirmations.block.block_and_report": "Rhwystro ac Adrodd",
   "confirmations.block.confirm": "Blocio",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Crybwylliadau preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau wedi'u blocio",
-  "navigation_bar.edit_profile": "Golygu proffil",
   "navigation_bar.explore": "Darganfod",
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ychwanegu pleidlais",
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
-  "privacy.direct.long": "Dim ond yn weladwy i ddefnyddwyr a grybwyllwyd",
-  "privacy.direct.short": "Dim ond pobl sy wedi'u crybwyll",
-  "privacy.private.long": "Dim ond pobl sy'n ddilynwyr",
-  "privacy.private.short": "Dilynwyr yn unig",
-  "privacy.public.long": "Gweladwy i bawb",
   "privacy.public.short": "Cyhoeddus",
-  "privacy.unlisted.long": "Gweladwy i bawb, ond wedi optio allan o nodweddion darganfod",
-  "privacy.unlisted.short": "Heb ei restru",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
-  "upload_form.description_missing": "Dim disgrifiad wedi'i ychwanegu",
   "upload_form.edit": "Golygu",
   "upload_form.thumbnail": "Newid llun bach",
-  "upload_form.undo": "Dileu",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",
   "upload_modal.analyzing_picture": "Yn dadansoddi llun…",
   "upload_modal.apply": "Gosod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 3bc830ad27..5d6cac69d8 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Bekendtgørelse",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} pr. uge",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
-  "compose_form.poll.add_option": "Tilføj valgmulighed",
+  "compose_form.poll.add_option": "Tilføj mulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
+  "compose_form.poll.multiple": "Multivalg",
   "compose_form.poll.option_placeholder": "Valgmulighed {number}",
   "compose_form.poll.remove_option": "Fjern denne valgmulighed",
+  "compose_form.poll.single": "Vælg én",
   "compose_form.poll.switch_to_multiple": "Ændr afstemning til flervalgstype",
   "compose_form.poll.switch_to_single": "Ændr afstemning til enkeltvalgstype",
-  "compose_form.publish": "Publicér",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Indsend",
   "compose_form.publish_form": "Publicér",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gem ændringer",
-  "compose_form.sensitive.hide": "{count, plural, one {Markér medie som følsomt} other {Markér medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie er markeret som sensitivt} other {Medier er markerede som sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie er ikke market som sensitivt} other {Medier er ikke markerede som sensitive}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Opdatér",
   "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
   "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
-  "compose_form.spoiler_placeholder": "Skriv din advarsel hér",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.block_and_report": "Blokér og Anmeld",
   "confirmations.block.confirm": "Blokér",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.edit_profile": "Redigér profil",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord (mutede)",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun omtalte personer",
-  "privacy.private.long": "Kun synlig for følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.short": "Bestemte personer",
+  "privacy.private.long": "Kun dine følgere",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men med fravalgt visning i opdagelsesfunktioner",
-  "privacy.unlisted.short": "Diskret",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Tavsgøre offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
   "reply_indicator.cancel": "Afbryd",
+  "reply_indicator.poll": "Afstemning",
   "report.block": "Blokér",
   "report.block_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende vil ikke kunne se dine indlæg eller følge dig. Vedkommende vil kunne se, at de er blokeret.",
   "report.categories.legal": "Juridisk",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_form.audio_description": "Beskrivelse til hørehæmmede",
   "upload_form.description": "Beskrivelse til svagtseende",
-  "upload_form.description_missing": "Ingen beskrivelse tilføjet",
   "upload_form.edit": "Redigér",
   "upload_form.thumbnail": "Skift miniature",
-  "upload_form.undo": "Slet",
   "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
   "upload_modal.analyzing_picture": "Analyserer billede…",
   "upload_modal.apply": "Anvend",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 462352750c..a6dd098bb2 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ankündigung",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
-  "autosuggest_hashtag.per_week": "{count} pro Woche",
   "boost_modal.combo": "Mit {combo} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibt’s Neues?",
-  "compose_form.poll.add_option": "Auswahl",
+  "compose_form.poll.add_option": "Auswahl hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
-  "compose_form.poll.option_placeholder": "{number}. Auswahl",
-  "compose_form.poll.remove_option": "Auswahlfeld entfernen",
+  "compose_form.poll.multiple": "Mehrfachauswahl",
+  "compose_form.poll.option_placeholder": "{number}. Auswahlmöglichkeit",
+  "compose_form.poll.remove_option": "Dieses Auswahlfeld entfernen",
+  "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
-  "compose_form.poll.switch_to_single": "Nur Einzelauswahl erlauben",
+  "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
+  "compose_form.poll.type": "Art",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.publish_form": "Neuer Beitrag",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Änderungen speichern",
-  "compose_form.sensitive.hide": "{count, plural, one {Mit einer Inhaltswarnung versehen} other {Mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medien-Datei ist mit einer Inhaltswarnung versehen} other {Medien-Dateien sind mit einer Inhaltswarnung versehen}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medien-Datei ist nicht mit einer Inhaltswarnung versehen} other {Medien-Dateien sind nicht mit einer Inhaltswarnung versehen}}",
+  "compose_form.reply": "Antworten",
+  "compose_form.save_changes": "Aktualisieren",
   "compose_form.spoiler.marked": "Inhaltswarnung entfernen",
   "compose_form.spoiler.unmarked": "Inhaltswarnung hinzufügen",
-  "compose_form.spoiler_placeholder": "Inhaltswarnung",
+  "compose_form.spoiler_placeholder": "Inhaltswarnung (optional)",
   "confirmation_modal.cancel": "Abbrechen",
   "confirmations.block.block_and_report": "Blockieren und melden",
   "confirmations.block.confirm": "Blockieren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private Erwähnungen",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.explore": "Entdecken",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Umfrage erstellen",
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
-  "privacy.direct.long": "Nur für die erwähnten Profile sichtbar",
-  "privacy.direct.short": "Nur erwähnte Profile",
-  "privacy.private.long": "Nur für deine Follower sichtbar",
-  "privacy.private.short": "Nur Follower",
-  "privacy.public.long": "Für alle sichtbar",
+  "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
+  "privacy.direct.short": "Bestimmte Profile",
+  "privacy.private.long": "Nur deine Follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Alle auf und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.long": "Für alle sichtbar, aber nicht über die Suche zu finden",
-  "privacy.unlisted.short": "Nicht gelistet",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} Min.",
   "relative_time.seconds": "{number} Sek.",
   "relative_time.today": "heute",
+  "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
+  "reply_indicator.poll": "Umfrage",
   "report.block": "Blockieren",
   "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
   "report.categories.legal": "Rechtlich",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
   "upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
   "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
-  "upload_form.description_missing": "Keine Beschreibung hinzugefügt",
   "upload_form.edit": "Bearbeiten",
   "upload_form.thumbnail": "Vorschaubild ändern",
-  "upload_form.undo": "Löschen",
   "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
   "upload_modal.analyzing_picture": "Bild wird analysiert …",
   "upload_modal.apply": "Übernehmen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 53e55fa950..068d228906 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -85,7 +85,6 @@
   "announcement.announcement": "Ανακοίνωση",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
-  "autosuggest_hashtag.per_week": "{count} ανά εβδομάδα",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "bundle_column_error.copy_stacktrace": "Αντιγραφή αναφοράς σφάλματος",
   "bundle_column_error.error.body": "Δεν ήταν δυνατή η απόδοση της σελίδας που ζήτησες. Μπορεί να οφείλεται σε σφάλμα στον κώδικά μας ή σε πρόβλημα συμβατότητας του προγράμματος περιήγησης.",
@@ -111,6 +110,7 @@
   "column.direct": "Ιδιωτικές αναφορές",
   "column.directory": "Περιήγηση στα προφίλ",
   "column.domain_blocks": "Αποκλεισμένοι τομείς",
+  "column.favourites": "Αγαπημένα",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
@@ -131,6 +131,9 @@
   "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
   "compose.language.change": "Αλλαγή γλώσσας",
   "compose.language.search": "Αναζήτηση γλωσσών...",
+  "compose.published.body": "Η ανάρτηση δημοσιεύτηκε.",
+  "compose.published.open": "Άνοιγμα",
+  "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
   "compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
   "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
   "compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
@@ -139,20 +142,19 @@
   "compose_form.placeholder": "Τι σκέφτεσαι;",
   "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
+  "compose_form.poll.multiple": "Πολλαπλή επιλογή",
   "compose_form.poll.option_placeholder": "Επιλογή {number}",
   "compose_form.poll.remove_option": "Αφαίρεση επιλογής",
   "compose_form.poll.switch_to_multiple": "Ενημέρωση δημοσκόπησης με πολλαπλές επιλογές",
   "compose_form.poll.switch_to_single": "Ενημέρωση δημοσκόπησης με μοναδική επιλογή",
-  "compose_form.publish": "Δημοσίευση",
+  "compose_form.poll.type": "Στυλ",
+  "compose_form.publish": "Ανάρτηση",
   "compose_form.publish_form": "Δημοσίευση",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Αποθήκευση αλλαγών",
-  "compose_form.sensitive.hide": "{count, plural, one {Επισήμανση πολυμέσου ως ευαίσθητο} other {Επισήμανση πολυμέσων ως ευαίσθητα}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Το πολυμέσο έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα έχουν σημειωθεί ως ευαίσθητα}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Το πολυμέσο δεν έχει σημειωθεί ως ευαίσθητο} other {Τα πολυμέσα δεν έχουν σημειωθεί ως ευαίσθητα}}",
+  "compose_form.reply": "Απάντηση",
+  "compose_form.save_changes": "Ενημέρωση",
   "compose_form.spoiler.marked": "Αφαίρεση προειδοποίηση περιεχομένου",
   "compose_form.spoiler.unmarked": "Προσθήκη προειδοποίησης περιεχομένου",
-  "compose_form.spoiler_placeholder": "Γράψε την προειδοποίησή σου εδώ",
+  "compose_form.spoiler_placeholder": "Προειδοποίηση περιεχομένου (προαιρετική)",
   "confirmation_modal.cancel": "Άκυρο",
   "confirmations.block.block_and_report": "Αποκλεισμός & Αναφορά",
   "confirmations.block.confirm": "Αποκλεισμός",
@@ -184,6 +186,7 @@
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
   "conversation.with": "Με {names}",
+  "copy_icon_button.copied": "Αντιγράφηκε στο πρόχειρο",
   "copypaste.copied": "Αντιγράφηκε",
   "copypaste.copy_to_clipboard": "Αντιγραφή στο πρόχειρο",
   "directory.federated": "Από το γνωστό fediverse",
@@ -380,7 +383,6 @@
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.explore": "Εξερεύνηση",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -450,6 +452,12 @@
   "onboarding.actions.go_to_home": "Πηγαίνετε στην αρχική σας ροή",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
   "onboarding.follows.title": "Δημοφιλή στο Mastodon",
+  "onboarding.profile.note": "Βιογραφικό",
+  "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+  "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
+  "onboarding.profile.title": "Ρύθμιση προφίλ",
+  "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
+  "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",
   "onboarding.share.lead": "Let people know how they can find you on Mastodon!\nΕνημερώστε άλλα άτομα πώς μπορούν να σας βρουν στο Mastodon!",
   "onboarding.share.next_steps": "Πιθανά επόμενα βήματα:",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
@@ -458,6 +466,7 @@
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.publish_status.title": "Κάντε την πρώτη σας δημοσίευση",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
@@ -467,6 +476,7 @@
   "picture_in_picture.restore": "Βάλε το πίσω",
   "poll.closed": "Κλειστή",
   "poll.refresh": "Ανανέωση",
+  "poll.reveal": "Δείτε τα αποτελέσματα",
   "poll.total_people": "{count, plural, one {# άτομο} other {# άτομα}}",
   "poll.total_votes": "{count, plural, one {# ψήφος} other {# ψήφοι}}",
   "poll.vote": "Ψήφισε",
@@ -475,16 +485,14 @@
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
-  "privacy.direct.long": "Δημοσίευση μόνο σε όσους επισημαίνονται",
-  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
-  "privacy.private.long": "Ορατό μόνο για τους ακολούθους",
-  "privacy.private.short": "Μόνο ακόλουθοι",
-  "privacy.public.long": "Ορατό σε όλους",
+  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+  "privacy.direct.short": "Συγκεκριμένα άτομα",
+  "privacy.private.long": "Μόνο οι ακόλουθοί σας",
+  "privacy.private.short": "Ακόλουθοι",
   "privacy.public.short": "Δημόσιο",
-  "privacy.unlisted.long": "Ορατό για όλους, εκτός αυτών που δεν συμμετέχουν σε δυνατότητες ανακάλυψης",
-  "privacy.unlisted.short": "Μη καταχωρημένα",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
+  "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.label": "Φορτώνει…",
   "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
@@ -500,8 +508,10 @@
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
   "reply_indicator.cancel": "Άκυρο",
+  "reply_indicator.poll": "Δημοσκόπηση",
   "report.block": "Αποκλεισμός",
   "report.block_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Δεν θα μπορεί να δει τις αναρτήσεις σου ή να σε ακολουθήσει. Θα μπορεί να δει ότι έχει αποκλειστεί.",
+  "report.categories.legal": "Νομικό περιεχόμενο",
   "report.categories.other": "Άλλες",
   "report.categories.spam": "Ανεπιθύμητα",
   "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
@@ -519,6 +529,8 @@
   "report.placeholder": "Επιπλέον σχόλια",
   "report.reasons.dislike": "Δεν μου αρέσει",
   "report.reasons.dislike_description": "Δεν είναι κάτι που θα ήθελες να δεις",
+  "report.reasons.legal": "Είναι παράνομο",
+  "report.reasons.legal_description": "Πιστεύετε ότι παραβιάζει το νόμο της χώρας σας ή της χώρας του διακομιστή",
   "report.reasons.other": "Είναι κάτι άλλο",
   "report.reasons.other_description": "Το ζήτημα δεν ταιριάζει σε άλλες κατηγορίες",
   "report.reasons.spam": "Είναι σπαμ",
@@ -552,10 +564,12 @@
   "search.search_or_paste": "Αναζήτηση ή εισαγωγή URL",
   "search_popout.quick_actions": "Γρήγορες ενέργειες",
   "search_popout.recent": "Πρόσφατες αναζητήσεις",
+  "search_popout.user": "χρήστης",
   "search_results.accounts": "Προφίλ",
   "search_results.all": "Όλα",
   "search_results.hashtags": "Ετικέτες",
   "search_results.nothing_found": "Δεν βρέθηκε τίποτα με αυτούς τους όρους αναζήτησης",
+  "search_results.see_all": "Δες τα όλα",
   "search_results.statuses": "Αναρτήσεις",
   "search_results.title": "Αναζήτηση για {q}",
   "server_banner.about_active_users": "Άτομα που χρησιμοποιούν αυτόν τον διακομιστή κατά τις τελευταίες 30 ημέρες (Μηνιαία Ενεργοί Χρήστες)",
@@ -566,6 +580,8 @@
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.sign_in": "Σύνδεση",
+  "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+  "sign_in_banner.text": "Συνδεθείτε για να ακολουθήσετε προφίλ ή ετικέτες, αγαπήστε, μοιραστείτε και απαντήστε σε δημοσιεύσεις. Μπορείτε επίσης να αλληλεπιδράσετε από τον λογαριασμό σας σε διαφορετικό διακομιστή.",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -582,6 +598,7 @@
   "status.edited": "Επεξεργάστηκε στις {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Ενσωμάτωσε",
+  "status.favourite": "Αγαπημένα",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.filtered": "Φιλτραρισμένα",
   "status.hide": "Απόκρυψη ανάρτησης",
@@ -646,10 +663,8 @@
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
   "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
-  "upload_form.description_missing": "Δεν προστέθηκε περιγραφή",
   "upload_form.edit": "Επεξεργασία",
   "upload_form.thumbnail": "Αλλαγή μικρογραφίας",
-  "upload_form.undo": "Διαγραφή",
   "upload_form.video_description": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
   "upload_modal.analyzing_picture": "Ανάλυση εικόνας…",
   "upload_modal.apply": "Εφαρμογή",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 37e5efa5ba..2cf1b4dbae 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "Announcement",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
   "compose_form.placeholder": "What's on your mind?",
-  "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "New post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Remove content warning",
   "compose_form.spoiler.unmarked": "Add content warning",
-  "compose_form.spoiler_placeholder": "Write your warning here",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.block_and_report": "Block & Report",
   "confirmations.block.confirm": "Block",
@@ -406,7 +395,6 @@
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Explore",
   "navigation_bar.favourites": "Favourites",
   "navigation_bar.filters": "Muted words",
@@ -524,14 +512,7 @@
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Change post privacy",
-  "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Mentioned people only",
-  "privacy.private.long": "Visible for followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
-  "privacy.unlisted.short": "Unlisted",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
@@ -713,10 +694,8 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
-  "upload_form.description_missing": "No description added",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",
   "upload_modal.analyzing_picture": "Analysing picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 643329ba99..907a918af0 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
-  "autosuggest_hashtag.per_week": "po {count} por semajno",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Via konto ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn afiŝojn nur al la sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
-  "compose_form.poll.add_option": "Aldoni elekteblon",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
-  "compose_form.poll.option_placeholder": "Elekteblo {number}",
-  "compose_form.poll.remove_option": "Forigi ĉi tiu elekteblon",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
-  "compose_form.publish": "Afiŝi",
   "compose_form.publish_form": "Afiŝi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Konservi ŝanĝojn",
-  "compose_form.sensitive.hide": "{count, plural, one {Marki la plurmedio kiel tikla} other {Marki la plurmedioj kiel tiklaj}}",
-  "compose_form.sensitive.marked": "{count, plural, one {La plurmedio estas markita kiel tikla} other {La plurmedioj estas markitaj kiel tiklaj}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {La plurmedio ne estas markita kiel tikla} other {La plurmedioj ne estas markitaj kiel tiklaj}}",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
-  "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie",
   "confirmation_modal.cancel": "Nuligi",
   "confirmations.block.block_and_report": "Bloki kaj raporti",
   "confirmations.block.confirm": "Bloki",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privataj mencioj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
   "navigation_bar.filters": "Silentigitaj vortoj",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
   "privacy.change": "Agordi mesaĝan privatecon",
-  "privacy.direct.long": "Videbla nur al menciitaj uzantoj",
-  "privacy.direct.short": "Nur menciitaj personoj",
-  "privacy.private.long": "Videbla nur al viaj sekvantoj",
-  "privacy.private.short": "Nur abonantoj",
-  "privacy.public.long": "Videbla por ĉiuj",
   "privacy.public.short": "Publika",
-  "privacy.unlisted.long": "Videbla por ĉiuj, sed ekskluzive el la funkcio de esploro",
-  "privacy.unlisted.short": "Nelistigita",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
   "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
   "upload_form.description": "Priskribi por personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
-  "upload_form.description_missing": "Neniu priskribo aldonita",
   "upload_form.edit": "Redakti",
   "upload_form.thumbnail": "Ŝanĝi etigita bildo",
-  "upload_form.undo": "Forigi",
   "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
   "upload_modal.analyzing_picture": "Bilda analizado…",
   "upload_modal.apply": "Apliki",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 7c2e4f0d49..8816f18af6 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser cargada. Podría deberse a un error de programación en nuestro código o a un problema de compatibilidad con el navegador web.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tu cuenta no es {locked}. Todos pueden seguirte para ver tus mensajes marcados como \"Sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "privada",
   "compose_form.placeholder": "¿Qué onda?",
-  "compose_form.poll.add_option": "Agregá una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
+  "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Cambiar encuesta para permitir opciones múltiples",
   "compose_form.poll.switch_to_single": "Cambiar encuesta para permitir una sola opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nuevo mensaje",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar medio como sensible",
-  "compose_form.sensitive.marked": "{count, plural, one {El medio está marcado como sensible} other {Los medios están marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "El medio no está marcado como sensible",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Agregar advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribí tu advertencia acá",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorá",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
-  "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Visible sólo para los seguidores",
-  "privacy.private.short": "Sólo para seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las características de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
@@ -715,10 +708,8 @@
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
   "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
-  "upload_form.description_missing": "No se agregó descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index fab5f6ec96..fdc57ac6d6 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
+  "compose_form.poll.add_option": "Agregar opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.single": "Seleccione uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicación",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "Marcar multimedia como sensible",
-  "compose_form.sensitive.marked": "Material marcado como sensible",
-  "compose_form.sensitive.unmarked": "Material no marcado como sensible",
+  "compose_form.reply": "Respuesta",
+  "compose_form.save_changes": "Actualización",
   "compose_form.spoiler.marked": "Texto oculto tras la advertencia",
   "compose_form.spoiler.unmarked": "Texto no oculto",
-  "compose_form.spoiler_placeholder": "Advertencia de contenido",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo personas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.long": "Todos los mencionados en la publicación",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Sólo tus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en los hashtags, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
+  "privacy.unlisted.long": "Menos fanfares algorítmicos",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquear",
   "report.block_explanation": "No veras sus publicaciones. No podrán ver tus publicaciones ni seguirte. Podrán saber que están bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Subida de archivos no permitida con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.description_missing": "Sin descripción añadida",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Borrar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 0d6149f5f5..2e4ea93177 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe de error",
   "bundle_column_error.error.body": "La página solicitada no pudo ser renderizada. Podría deberse a un error en nuestro código o a un problema de compatibilidad con el navegador.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus publicaciones solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
   "compose_form.placeholder": "¿En qué estás pensando?",
-  "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
-  "compose_form.poll.option_placeholder": "Elección {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
+  "compose_form.poll.multiple": "Selección múltiple",
+  "compose_form.poll.option_placeholder": "Opción {number}",
+  "compose_form.poll.remove_option": "Quitar esta opción",
+  "compose_form.poll.single": "Elige uno",
   "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
   "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "¡{publish}!",
-  "compose_form.save_changes": "Guardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar material como sensible} other {Marcar material como sensible}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material marcado como sensible} other {Material marcado como sensible}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no marcado como sensible} other {Material no marcado como sensible}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
-  "compose_form.spoiler_placeholder": "Escribe aquí tu advertencia",
+  "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear y Reportar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +523,10 @@
   "poll_button.add_poll": "Añadir una encuesta",
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
-  "privacy.direct.long": "Visible solo para usuarios mencionados",
-  "privacy.direct.short": "Sólo cuentas mencionadas",
-  "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Solo seguidores",
-  "privacy.public.long": "Visible para todos",
+  "privacy.direct.short": "Personas específicas",
+  "privacy.private.long": "Solo tus seguidores",
+  "privacy.private.short": "Seguidores",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
@@ -715,10 +708,8 @@
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
   "upload_form.description": "Describir para personas con discapacidad visual",
-  "upload_form.description_missing": "No se ha añadido ninguna descripción",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
   "upload_modal.analyzing_picture": "Analizando imagen…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 26657d402e..5034c25541 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
-  "autosuggest_hashtag.per_week": "{count} nädalas",
   "boost_modal.combo": "Vajutades {combo}, saab selle edaspidi vahele jätta",
   "bundle_column_error.copy_stacktrace": "Kopeeri veateade",
   "bundle_column_error.error.body": "Soovitud lehte ei õnnestunud esitada. See võib olla meie koodiviga või probleem brauseri ühilduvusega.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
+  "compose_form.poll.multiple": "Valikvastustega",
   "compose_form.poll.option_placeholder": "Valik {number}",
   "compose_form.poll.remove_option": "Eemalda see valik",
+  "compose_form.poll.single": "Vali üks",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
+  "compose_form.poll.type": "Stiil",
   "compose_form.publish": "Postita",
   "compose_form.publish_form": "Postita",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvesta muudatused",
-  "compose_form.sensitive.hide": "{count, plural, one {Märgi meedia tundlikuks} other {Märgi meediad tundlikuks}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Meedia on märgitud tundlikuks} other {Meediad on märgitud tundlikuks}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Meedia ei ole tundlikuks märgitud} other {Meediad ei ole märgitud tundlikuks}}",
+  "compose_form.reply": "Vasta",
+  "compose_form.save_changes": "Uuenda",
   "compose_form.spoiler.marked": "Tekst on hoiatuse taha peidetud",
   "compose_form.spoiler.unmarked": "Märgi sisu tundlikuks",
-  "compose_form.spoiler_placeholder": "Kirjuta hoiatus siia",
+  "compose_form.spoiler_placeholder": "Sisuhoiatus (valikuline)",
   "confirmation_modal.cancel": "Katkesta",
   "confirmations.block.block_and_report": "Blokeeri ja teata",
   "confirmations.block.confirm": "Blokeeri",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privaatsed mainimised",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.edit_profile": "Muuda profiili",
   "navigation_bar.explore": "Avasta",
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Vaigistatud sõnad",
@@ -526,14 +524,14 @@
   "poll_button.add_poll": "Lisa küsitlus",
   "poll_button.remove_poll": "Eemalda küsitlus",
   "privacy.change": "Muuda postituse nähtavust",
-  "privacy.direct.long": "Postita ainult mainitud kasutajatele",
-  "privacy.direct.short": "Mainitud inimesed ainult",
-  "privacy.private.long": "Postita ainult jälgijatele",
-  "privacy.private.short": "Jälgijad ainult",
-  "privacy.public.long": "Kõigile nähtav",
+  "privacy.direct.long": "Kõik postituses mainitud",
+  "privacy.direct.short": "Määratud kasutajad",
+  "privacy.private.long": "Ainult jälgijad",
+  "privacy.private.short": "Jälgijad",
+  "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
-  "privacy.unlisted.long": "Kõigile nähtav, aga ei ilmu avastamise vaadetes",
-  "privacy.unlisted.short": "Määramata",
+  "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+  "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
@@ -551,7 +549,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
+  "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
   "reply_indicator.cancel": "Tühista",
+  "reply_indicator.poll": "Küsitlus",
   "report.block": "Blokeeri",
   "report.block_explanation": "Sa ei näe tema postitusi. Tema ei saa näha sinu postitusi ega sind jälgida. Talle on näha, et ta on blokeeritud.",
   "report.categories.legal": "Juriidiline",
@@ -715,10 +715,8 @@
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
-  "upload_form.description_missing": "Kirjeldus puudub",
   "upload_form.edit": "Muuda",
   "upload_form.thumbnail": "Muuda pisipilti",
-  "upload_form.undo": "Kustuta",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",
   "upload_modal.analyzing_picture": "Analüüsime pilti…",
   "upload_modal.apply": "Rakenda",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index c75f697e4c..cee18e7a51 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -25,7 +25,7 @@
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
   "account.domain_blocked": "Ezkutatutako domeinua",
-  "account.edit_profile": "Aldatu profila",
+  "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
@@ -89,7 +89,6 @@
   "announcement.announcement": "Iragarpena",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
-  "autosuggest_hashtag.per_week": "{count} asteko",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "bundle_column_error.copy_stacktrace": "Kopiatu errore-txostena",
   "bundle_column_error.error.body": "Eskatutako orria ezin izan da bistaratu. Kodeko errore bategatik izan daiteke edo nabigatzailearen bateragarritasun arazo bategatik.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren bidalketak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
   "compose_form.placeholder": "Zer duzu buruan?",
-  "compose_form.poll.add_option": "Gehitu aukera bat",
+  "compose_form.poll.add_option": "Gehitu aukera",
   "compose_form.poll.duration": "Inkestaren iraupena",
+  "compose_form.poll.multiple": "Aukera aniza",
   "compose_form.poll.option_placeholder": "{number}. aukera",
   "compose_form.poll.remove_option": "Kendu aukera hau",
+  "compose_form.poll.single": "Hautatu bat",
   "compose_form.poll.switch_to_multiple": "Aldatu inkesta hainbat aukera onartzeko",
   "compose_form.poll.switch_to_single": "Aldatu inkesta aukera bakarra onartzeko",
+  "compose_form.poll.type": "Estiloa",
   "compose_form.publish": "Argitaratu",
   "compose_form.publish_form": "Argitaratu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gorde aldaketak",
-  "compose_form.sensitive.hide": "Markatu multimedia hunkigarri gisa",
-  "compose_form.sensitive.marked": "Multimedia edukia hunkigarri gisa markatu da",
-  "compose_form.sensitive.unmarked": "Multimedia edukia ez da hunkigarri gisa markatu",
+  "compose_form.reply": "Erantzun",
+  "compose_form.save_changes": "Eguneratu",
   "compose_form.spoiler.marked": "Testua abisu batek ezkutatzen du",
   "compose_form.spoiler.unmarked": "Testua ez dago ezkutatuta",
-  "compose_form.spoiler_placeholder": "Idatzi zure abisua hemen",
+  "compose_form.spoiler_placeholder": "Edukiaren abisua (aukerakoa)",
   "confirmation_modal.cancel": "Utzi",
   "confirmations.block.block_and_report": "Blokeatu eta salatu",
   "confirmations.block.confirm": "Blokeatu",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Aipamen pribatuak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.explore": "Arakatu",
   "navigation_bar.favourites": "Gogokoak",
   "navigation_bar.filters": "Mutututako hitzak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Gehitu inkesta bat",
   "poll_button.remove_poll": "Kendu inkesta",
   "privacy.change": "Aldatu bidalketaren pribatutasuna",
-  "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
-  "privacy.direct.short": "Aipatutako jendea soilik",
-  "privacy.private.long": "Bidali jarraitzaileei besterik ez",
-  "privacy.private.short": "Jarraitzaileak soilik",
-  "privacy.public.long": "Guztientzat ikusgai",
+  "privacy.direct.long": "Argitalpen honetan aipatutako denak",
+  "privacy.direct.short": "Jende jakina",
+  "privacy.private.long": "Soilik jarraitzaileak",
+  "privacy.private.short": "Jarraitzaileak",
+  "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
   "privacy.public.short": "Publikoa",
-  "privacy.unlisted.long": "Guztientzat ikusgai, baina ez aurkitzeko ezaugarrietan",
-  "privacy.unlisted.short": "Zerrendatu gabea",
+  "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
+  "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
+  "privacy.unlisted.short": "Deiadar urrikoa",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
   "recommended": "Gomendatua",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "gaur",
+  "reply_indicator.attachments": "{count, plural, one {# eranskin} other {# eranskin}}",
   "reply_indicator.cancel": "Utzi",
+  "reply_indicator.poll": "Inkesta",
   "report.block": "Blokeatu",
   "report.block_explanation": "Ez dituzu bere bidalketak ikusiko. Ezingo dituzte zure bidalketak ikusi eta ez jarraitu. Blokeatu dituzula jakin dezakete.",
   "report.categories.legal": "Juridikoa",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ez da inkestetan fitxategiak igotzea onartzen.",
   "upload_form.audio_description": "Deskribatu entzumen galera duten pertsonentzat",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
-  "upload_form.description_missing": "Ez da deskribapenik gehitu",
   "upload_form.edit": "Editatu",
   "upload_form.thumbnail": "Aldatu koadro txikia",
-  "upload_form.undo": "Ezabatu",
   "upload_form.video_description": "Deskribatu entzumen galera edo ikusmen urritasuna duten pertsonentzat",
   "upload_modal.analyzing_picture": "Irudia aztertzen…",
   "upload_modal.apply": "Aplikatu",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 9f3201ca78..0b078d1ab3 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "اعلامیه",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
-  "autosuggest_hashtag.per_week": "{count} در هفته",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.copy_stacktrace": "رونوشت از گزارش خطا",
   "bundle_column_error.error.body": "صفحهٔ درخواستی نتوانست پرداخت شود. ممکن است به خاطر اشکالی در کدمان یا مشکل سازگاری مرورگر باشد.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "تازه چه خبر؟",
   "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
+  "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
   "compose_form.poll.remove_option": "برداشتن این گزینه",
+  "compose_form.poll.single": "گزینش یکی",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
-  "compose_form.publish": "انتشار",
+  "compose_form.poll.type": "سبک",
+  "compose_form.publish": "فرستادن",
   "compose_form.publish_form": "انتشار",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ذخیرهٔ تغییرات",
-  "compose_form.sensitive.hide": "{count, plural, one {علامت‌گذاری رسانه به عنوان حساس} other {علامت‌گذاری رسانه‌ها به عنوان حساس}}",
-  "compose_form.sensitive.marked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری شد} other {رسانه‌ها به عنوان حساس علامت‌گذاری شدند}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {رسانه به عنوان حساس علامت‌گذاری نشد} other {رسانه‌ها به عنوان حساس علامت‌گذاری نشدند}}",
+  "compose_form.reply": "پاسخ",
+  "compose_form.save_changes": "به‌روز رسانی",
   "compose_form.spoiler.marked": "برداشتن هشدار محتوا",
   "compose_form.spoiler.unmarked": "افزودن هشدار محتوا",
-  "compose_form.spoiler_placeholder": "هشدارتان را این‌جا بنویسید",
+  "compose_form.spoiler_placeholder": "هشدار محتوا (اختیاری)",
   "confirmation_modal.cancel": "لغو",
   "confirmations.block.block_and_report": "انسداد و گزارش",
   "confirmations.block.confirm": "انسداد",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "اشاره‌های خصوصی",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.edit_profile": "ویرایش نمایه",
   "navigation_bar.explore": "کاوش",
   "navigation_bar.favourites": "برگزیده‌ها",
   "navigation_bar.filters": "واژه‌های خموش",
@@ -524,14 +522,14 @@
   "poll_button.add_poll": "افزودن نظرسنجی",
   "poll_button.remove_poll": "برداشتن نظرسنجی",
   "privacy.change": "تغییر محرمانگی فرسته",
-  "privacy.direct.long": "نمایان فقط برای کاربران اشاره شده",
-  "privacy.direct.short": "فقط افراد اشاره شده",
-  "privacy.private.long": "نمایان فقط برای پی‌گیرندگان",
-  "privacy.private.short": "فقط پی‌گیرندگان",
-  "privacy.public.long": "نمایان برای همه",
+  "privacy.direct.long": "هرکسی که در فرسته نام برده شده",
+  "privacy.direct.short": "افراد مشخّص",
+  "privacy.private.long": "تنها پی‌گیرندگانتان",
+  "privacy.private.short": "پی‌گیرندگان",
+  "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
-  "privacy.unlisted.long": "نمایان برای همه، ولی خارج از قابلیت‌های کشف",
-  "privacy.unlisted.short": "فهرست نشده",
+  "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
+  "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
   "recommended": "پیشنهادشده",
@@ -550,6 +548,7 @@
   "relative_time.seconds": "{number} ثانیه",
   "relative_time.today": "امروز",
   "reply_indicator.cancel": "لغو",
+  "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
   "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
   "report.categories.legal": "حقوقی",
@@ -713,10 +712,8 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
-  "upload_form.description_missing": "شرحی افزوده نشده",
   "upload_form.edit": "ویرایش",
   "upload_form.thumbnail": "تغییر بندانگشتی",
-  "upload_form.undo": "حذف",
   "upload_form.video_description": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
   "upload_modal.analyzing_picture": "در حال پردازش تصویر…",
   "upload_modal.apply": "اعمال",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 00df0e537a..7b98f99836 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ilmoitus",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
-  "autosuggest_hashtag.per_week": "{count} viikossa",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "bundle_column_error.copy_stacktrace": "Kopioi virheraportti",
   "bundle_column_error.error.body": "Pyydettyä sivua ei voitu hahmontaa. Se voi johtua virheestä koodissamme tai selaimen yhteensopivuudessa.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
   "compose_form.placeholder": "Mitä mietit?",
-  "compose_form.poll.add_option": "Lisää valinta",
+  "compose_form.poll.add_option": "Lisää vaihtoehto",
   "compose_form.poll.duration": "Äänestyksen kesto",
-  "compose_form.poll.option_placeholder": "Valinta {number}",
-  "compose_form.poll.remove_option": "Poista tämä valinta",
+  "compose_form.poll.multiple": "Monivalinta",
+  "compose_form.poll.option_placeholder": "Vaihtoehto {number}",
+  "compose_form.poll.remove_option": "Poista tämä vaihtoehto",
+  "compose_form.poll.single": "Valitse yksi",
   "compose_form.poll.switch_to_multiple": "Muuta äänestys monivalinnaksi",
   "compose_form.poll.switch_to_single": "Muuta äänestys sallimaan vain yksi valinta",
+  "compose_form.poll.type": "Tyyli",
   "compose_form.publish": "Julkaise",
   "compose_form.publish_form": "Uusi julkaisu",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Tallenna muutokset",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkitse media arkaluonteiseksi} other {Merkitse mediat arkaluonteisiksi}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media on merkitty arkaluonteiseksi} other {Mediat on merkitty arkaluonteisiksi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediaa ei ole merkitty arkaluonteiseksi} other {Medioita ei ole merkitty arkaluonteisiksi}}",
+  "compose_form.reply": "Vastaa",
+  "compose_form.save_changes": "Päivitä",
   "compose_form.spoiler.marked": "Poista sisältövaroitus",
   "compose_form.spoiler.unmarked": "Lisää sisältövaroitus",
-  "compose_form.spoiler_placeholder": "Kirjoita varoituksesi tähän",
+  "compose_form.spoiler_placeholder": "Sisältövaroitus (valinnainen)",
   "confirmation_modal.cancel": "Peruuta",
   "confirmations.block.block_and_report": "Estä ja raportoi",
   "confirmations.block.confirm": "Estä",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Yksityiset maininnat",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.explore": "Selaa",
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
@@ -526,14 +524,13 @@
   "poll_button.add_poll": "Lisää äänestys",
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
-  "privacy.direct.long": "Näkyy vain mainituille käyttäjille",
-  "privacy.direct.short": "Vain mainitut käyttäjät",
-  "privacy.private.long": "Näkyy vain seuraajille",
-  "privacy.private.short": "Vain seuraajat",
-  "privacy.public.long": "Näkyy kaikille",
+  "privacy.direct.long": "Kaikki tässä julkaisussa mainitut",
+  "privacy.direct.short": "Tietyt henkilöt",
+  "privacy.private.long": "Vain seuraajasi",
+  "privacy.private.short": "Seuraajat",
+  "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.unlisted.long": "Näkyy kaikille mutta jää pois löytämisominaisuuksista",
-  "privacy.unlisted.short": "Listaamaton",
+  "privacy.unlisted.additional": "Tämä toimii kuten julkinen, paitsi että julkaisu ei näy livesyötteissä, aihetunnisteissa, selaa-näkymässä tai Mastodon-haussa, vaikka olisit sallinut ne käyttäjätilin laajuisesti.",
   "privacy_policy.last_updated": "Viimeksi päivitetty {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositeltu",
@@ -551,7 +548,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
+  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
+  "reply_indicator.poll": "Kysely",
   "report.block": "Estä",
   "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
   "report.categories.legal": "Lakiasiat",
@@ -715,10 +714,8 @@
   "upload_error.poll": "Tiedoston lataaminen ei ole sallittua äänestyksissä.",
   "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
   "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
-  "upload_form.description_missing": "Kuvausta ei ole lisätty",
   "upload_form.edit": "Muokkaa",
   "upload_form.thumbnail": "Vaihda pikkukuva",
-  "upload_form.undo": "Poista",
   "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
   "upload_modal.analyzing_picture": "Analysoidaan kuvaa…",
   "upload_modal.apply": "Käytä",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 94d13e8d91..a4c5296086 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngerð",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
-  "autosuggest_hashtag.per_week": "{count} um vikuna",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "bundle_column_error.copy_stacktrace": "Avrita feilfráboðan",
   "bundle_column_error.error.body": "Umbidna síðan kann ikki vísast. Tað kann vera orsakað av einum feili í koduni hjá okkum ella tað kann vera orsakað av kaganum, sum tú brúkar.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvat hevur tú í huga?",
   "compose_form.poll.add_option": "Legg valmøguleika afturat",
   "compose_form.poll.duration": "Atkvøðugreiðslutíð",
+  "compose_form.poll.multiple": "Fleiri valmøguleikar",
   "compose_form.poll.option_placeholder": "Valmøguleiki {number}",
-  "compose_form.poll.remove_option": "Strika valmøguleikan",
+  "compose_form.poll.remove_option": "Strika hendan valmøguleikan",
+  "compose_form.poll.single": "Vel ein",
   "compose_form.poll.switch_to_multiple": "Broyt atkvøðugreiðslu til at loyva fleiri svarum",
   "compose_form.poll.switch_to_single": "Broyt atkvøðugreiðslu til einstakt svar",
-  "compose_form.publish": "Legg út",
+  "compose_form.poll.type": "Stílur",
+  "compose_form.publish": "Posta",
   "compose_form.publish_form": "Legg út",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Goym broytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Frámerk tilfar sum viðkvæmt} other {Frámerk tilfar sum viðkvæmt}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tilfarið er frámerkt sum viðkvæmt} other {Tilfarið er frámerkt sum viðkvæmt}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Tilfarið er ikki merkt sum viðkvæmt} other {Tilfarið er ikki merkt sum viðkvæmt}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Dagfør",
   "compose_form.spoiler.marked": "Ávaring um at strika innihald",
   "compose_form.spoiler.unmarked": "Skriva ávaring um innihald",
-  "compose_form.spoiler_placeholder": "Skriva tína ávaring her",
+  "compose_form.spoiler_placeholder": "Innihaldsávaring (valfrí)",
   "confirmation_modal.cancel": "Strika",
   "confirmations.block.block_and_report": "Banna og melda",
   "confirmations.block.confirm": "Banna",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privatar umrøður",
   "navigation_bar.discover": "Uppdaga",
   "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.edit_profile": "Broyt vanga",
   "navigation_bar.explore": "Rannsaka",
   "navigation_bar.favourites": "Dámdir postar",
   "navigation_bar.filters": "Doyvd orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Legg atkvøðugreiðslu afturat",
   "poll_button.remove_poll": "Strika atkvøðugreiðslu",
   "privacy.change": "Broyt privatverju av posti",
-  "privacy.direct.long": "Bert sjónligt hjá nevndum brúkarum",
-  "privacy.direct.short": "Bert nevnd fólk",
-  "privacy.private.long": "Bert sjónligt hjá fylgjarum",
-  "privacy.private.short": "Einans fylgjarar",
-  "privacy.public.long": "Sjónligt hjá øllum",
+  "privacy.direct.long": "Øll, sum eru nevnd í postinum",
+  "privacy.direct.short": "Ávís fólk",
+  "privacy.private.long": "Einans tey, ið fylgja tær",
+  "privacy.private.short": "Fylgjarar",
+  "privacy.public.long": "Øll í og uttanfyri Mastodon",
   "privacy.public.short": "Alment",
-  "privacy.unlisted.long": "Sjónligur fyri øll, men ikki gjøgnum uppdagingarhentleikarnar",
-  "privacy.unlisted.short": "Ikki listað",
+  "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
+  "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+  "privacy.unlisted.short": "Stillur almenningur",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
   "recommended": "Viðmælt",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
   "reply_indicator.cancel": "Ógilda",
+  "reply_indicator.poll": "Atkvøðugreiðsla",
   "report.block": "Blokera",
   "report.block_explanation": "Tú fer ikki at síggja postarnar hjá teimum. Tey kunnu ikki síggja tínar postar ella fylgja tær. Tey síggja, at tey eru blokeraði.",
   "report.categories.legal": "Løgfrøðisligt",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
   "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
   "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
-  "upload_form.description_missing": "Lýsing vantar",
   "upload_form.edit": "Rætta",
   "upload_form.thumbnail": "Broyt smámynd",
-  "upload_form.undo": "Strika",
   "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Ger virkið",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f2d99412d2..66a7da6d15 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos publications privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "À quoi pensez-vous?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Changer le sondage pour n'autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Publier",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer média comme sensible} other {Marquer médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l'avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Changer la confidentialité des messages",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement pour vos abonné·e·s",
-  "privacy.private.short": "Abonné·e·s seulement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyants",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 774702f98c..2d0fa3b7dd 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "autosuggest_hashtag.per_week": "{count} par semaine",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre pour voir vos messages réservés à vos abonné⋅e⋅s.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
-  "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
-  "compose_form.poll.option_placeholder": "Choix {number}",
-  "compose_form.poll.remove_option": "Supprimer ce choix",
   "compose_form.poll.switch_to_multiple": "Changer le sondage pour autoriser plusieurs choix",
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
-  "compose_form.publish": "Publier",
   "compose_form.publish_form": "Nouvelle publication",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Enregistrer les modifications",
-  "compose_form.sensitive.hide": "{count, plural, one {Marquer le média comme sensible} other {Marquer les médias comme sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Le média est marqué comme sensible} other {Les médias sont marqués comme sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Le média n’est pas marqué comme sensible} other {Les médias ne sont pas marqués comme sensibles}}",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
   "compose_form.spoiler.unmarked": "Ajouter un avertissement de contenu",
-  "compose_form.spoiler_placeholder": "Écrivez votre avertissement ici",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.block_and_report": "Bloquer et signaler",
   "confirmations.block.confirm": "Bloquer",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.explore": "Explorer",
   "navigation_bar.favourites": "Favoris",
   "navigation_bar.filters": "Mots masqués",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
-  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Personnes mentionnées uniquement",
-  "privacy.private.long": "Visible uniquement par vos abonnés",
-  "privacy.private.short": "Abonnés uniquement",
-  "privacy.public.long": "Visible pour tous",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible pour tous, mais sans fonctionnalités de découverte",
-  "privacy.unlisted.short": "Non listé",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
@@ -715,10 +696,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyant·e·s",
-  "upload_form.description_missing": "Description manquante",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
-  "upload_form.undo": "Supprimer",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",
   "upload_modal.analyzing_picture": "Analyse de l’image en cours…",
   "upload_modal.apply": "Appliquer",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index ea42ef91c0..d5f22d2ee1 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
-  "autosuggest_hashtag.per_week": "{count} yn ’e wike",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "bundle_column_error.copy_stacktrace": "Flaterrapport kopiearje",
   "bundle_column_error.error.body": "De opfrege side koe net werjûn wurde. It kin wêze troch in flater yn ús koade, of in probleem mei browserkompatibiliteit.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Jo account is net {locked}. Elkenien kin jo folgje en kin de berjochten sjen dy’t jo allinnich oan jo folgers rjochte hawwe.",
   "compose_form.lock_disclaimer.lock": "beskoattele",
   "compose_form.placeholder": "Wat wolle jo kwyt?",
-  "compose_form.poll.add_option": "Kar tafoegje",
   "compose_form.poll.duration": "Doer fan de enkête",
-  "compose_form.poll.option_placeholder": "Kar {number}",
-  "compose_form.poll.remove_option": "Dizze kar fuortsmite",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
-  "compose_form.publish": "Publisearje",
   "compose_form.publish_form": "Publisearje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wizigingen bewarje",
-  "compose_form.sensitive.hide": "{count, plural, one {Media as gefoelich markearje} other {Media as gefoelich markearje}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media as gefoelich markearre} other {Media as gefoelich markearre}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is net as gefoelich markearre} other {Media is net as gefoelich markearre}}",
   "compose_form.spoiler.marked": "Ynhâldswarskôging fuortsmite",
   "compose_form.spoiler.unmarked": "Ynhâldswarskôging tafoegje",
-  "compose_form.spoiler_placeholder": "Warskôgingstekst",
   "confirmation_modal.cancel": "Annulearje",
   "confirmations.block.block_and_report": "Blokkearje en rapportearje",
   "confirmations.block.confirm": "Blokkearje",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Priveefermeldingen",
   "navigation_bar.discover": "Untdekke",
   "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.edit_profile": "Profyl bewurkje",
   "navigation_bar.explore": "Ferkenne",
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Negearre wurden",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Poll tafoegje",
   "poll_button.remove_poll": "Enkête fuortsmite",
   "privacy.change": "Sichtberheid fan berjocht oanpasse",
-  "privacy.direct.long": "Allinnich sichtber foar fermelde brûkers",
-  "privacy.direct.short": "Allinnich fermelde minsken",
-  "privacy.private.long": "Allinnich sichtber foar folgers",
-  "privacy.private.short": "Allinnich folgers",
-  "privacy.public.long": "Sichtber foar elkenien",
   "privacy.public.short": "Iepenbier",
-  "privacy.unlisted.long": "Foar elkenien sichtber, mar net ûnder trends, hashtags en op iepenbiere tiidlinen",
-  "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
@@ -715,10 +696,8 @@
   "upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Gjin omskriuwing tafoege",
   "upload_form.edit": "Bewurkje",
   "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
-  "upload_form.undo": "Fuortsmite",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ofbylding analysearje…",
   "upload_modal.apply": "Tapasse",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index f0f9c55549..855a27d057 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Fógra",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
-  "autosuggest_hashtag.per_week": "{count} sa seachtain",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
@@ -127,19 +126,12 @@
   "compose_form.lock_disclaimer": "Níl an cuntas seo {locked}. Féadfaidh duine ar bith tú a leanúint agus na postálacha atá dírithe agat ar do lucht leanúna amháin a fheiceáil.",
   "compose_form.lock_disclaimer.lock": "faoi ghlas",
   "compose_form.placeholder": "Cad atá ag tarlú?",
-  "compose_form.poll.add_option": "Cuir rogha isteach",
   "compose_form.poll.duration": "Achar suirbhéanna",
-  "compose_form.poll.option_placeholder": "Rogha {number}",
-  "compose_form.poll.remove_option": "Bain an rogha seo",
   "compose_form.poll.switch_to_multiple": "Athraigh suirbhé chun cead a thabhairt do ilrogha",
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
-  "compose_form.publish": "Foilsigh",
   "compose_form.publish_form": "Foilsigh\n",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sábháil",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
   "compose_form.spoiler.unmarked": "Cuir rabhadh ábhair",
-  "compose_form.spoiler_placeholder": "Scríobh do rabhadh anseo",
   "confirmation_modal.cancel": "Cealaigh",
   "confirmations.block.block_and_report": "Bac ⁊ Tuairiscigh",
   "confirmations.block.confirm": "Bac",
@@ -325,7 +317,6 @@
   "navigation_bar.compose": "Cum postáil nua",
   "navigation_bar.discover": "Faigh amach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
-  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
   "navigation_bar.explore": "Féach thart",
   "navigation_bar.filters": "Focail bhalbhaithe",
   "navigation_bar.follow_requests": "Iarratais leanúnaí",
@@ -401,12 +392,7 @@
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
-  "privacy.private.short": "Leantóirí amháin",
-  "privacy.public.long": "Infheicthe do chách",
   "privacy.public.short": "Poiblí",
-  "privacy.unlisted.short": "Neamhliostaithe",
   "privacy_policy.title": "Polasaí príobháideachais",
   "refresh": "Athnuaigh",
   "regeneration_indicator.label": "Ag lódáil…",
@@ -529,7 +515,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "Cuir in eagar",
-  "upload_form.undo": "Scrios",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Ag anailísiú íomhá…",
   "upload_modal.apply": "Cuir i bhFeidhm",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 11d83d6ceb..0c7ef79cd8 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
-  "autosuggest_hashtag.per_week": "{count} san t-seachdain",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "bundle_column_error.copy_stacktrace": "Dèan lethbhreac de aithris na mearachd",
   "bundle_column_error.error.body": "Cha b’ urrainn dhuinn an duilleag a dh’iarr thu a reandaradh. Dh’fhaoidte gu bheil buga sa chòd againn no duilgheadas co-chòrdalachd leis a’ bhrabhsair.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Chan eil an cunntas agad {locked}. ’S urrainn do dhuine sam bith ’gad leantainn is na postaichean agad a tha ag amas air an luchd-leantainn agad a-mhàin a shealltainn.",
   "compose_form.lock_disclaimer.lock": "glaiste",
   "compose_form.placeholder": "Dè tha air d’ aire?",
-  "compose_form.poll.add_option": "Cuir roghainn ris",
   "compose_form.poll.duration": "Faide a’ chunntais-bheachd",
-  "compose_form.poll.option_placeholder": "Roghainn {number}",
-  "compose_form.poll.remove_option": "Thoir an roghainn seo air falbh",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
-  "compose_form.publish": "Foillsich",
   "compose_form.publish_form": "Post ùr",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sàbhail na h-atharraichean",
-  "compose_form.sensitive.hide": "{count, plural, one {Cuir comharra gu bheil am meadhan frionasach} two {Cuir comharra gu bheil na meadhanan frionasach} few {Cuir comharra gu bheil na meadhanan frionasach} other {Cuir comharra gu bheil na meadhanan frionasach}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Tha comharra ris a’ mheadhan gu bheil e frionasach} two {Tha comharra ris na meadhanan gu bheil iad frionasach} few {Tha comharra ris na meadhanan gu bheil iad frionasach} other {Tha comharra ris na meadhanan gu bheil iad frionasach}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Chan eil comharra ris a’ mheadhan gun robh e frionasach} two {Chan eil comharra ris na meadhanan gun robh iad frionasach} few {Chan eil comharra ris na meadhanan gun robh iad frionasach} other {Chan eil comharra ris na meadhanan gun robh iad frionasach}}",
   "compose_form.spoiler.marked": "Thoir air falbh an rabhadh susbainte",
   "compose_form.spoiler.unmarked": "Cuir rabhadh susbainte ris",
-  "compose_form.spoiler_placeholder": "Sgrìobh an rabhadh agad an-seo",
   "confirmation_modal.cancel": "Sguir dheth",
   "confirmations.block.block_and_report": "Bac ⁊ dèan gearan",
   "confirmations.block.confirm": "Bac",
@@ -402,7 +391,6 @@
   "navigation_bar.direct": "Iomraidhean prìobhaideach",
   "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.edit_profile": "Deasaich a’ phròifil",
   "navigation_bar.explore": "Rùraich",
   "navigation_bar.favourites": "Annsachdan",
   "navigation_bar.filters": "Faclan mùchte",
@@ -509,14 +497,7 @@
   "poll_button.add_poll": "Cuir cunntas-bheachd ris",
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
-  "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
-  "privacy.private.long": "Chan fhaic ach na daoine a tha ’gad leantainn seo",
-  "privacy.private.short": "Luchd-leantainn a-mhàin",
-  "privacy.public.long": "Chì a h-uile duine e",
   "privacy.public.short": "Poblach",
-  "privacy.unlisted.long": "Chì a h-uile duine e ach cha nochd e ann an gleusan rùrachaidh",
-  "privacy.unlisted.short": "Falaichte o liostaichean",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
   "refresh": "Ath-nuadhaich",
@@ -696,10 +677,8 @@
   "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
   "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
   "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
-  "upload_form.description_missing": "Cha deach tuairisgeul a chur ris",
   "upload_form.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
-  "upload_form.undo": "Sguab às",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
   "upload_modal.analyzing_picture": "A’ sgrùdadh an deilbh…",
   "upload_modal.apply": "Cuir an sàs",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e857b69554..ffd01a547d 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "bundle_column_error.copy_stacktrace": "Copiar informe do erro",
   "bundle_column_error.error.body": "Non se puido mostrar a páxina solicitada. Podería deberse a un problema no código, ou incompatiblidade co navegador.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "A túa conta non está {locked}. Todas poden seguirte para ollar os teus toots só para seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueada",
   "compose_form.placeholder": "Que contas?",
-  "compose_form.poll.add_option": "Engadir unha opción",
   "compose_form.poll.duration": "Duración da enquisa",
-  "compose_form.poll.option_placeholder": "Opción {number}",
-  "compose_form.poll.remove_option": "Eliminar esta opción",
   "compose_form.poll.switch_to_multiple": "Mudar a enquisa para permitir múltiples escollas",
   "compose_form.poll.switch_to_single": "Mudar a enquisa para permitir unha soa opción",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Gardar cambios",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca multimedia como sensible} other {Marca multimedia como sensibles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedia marcado como sensible} other {Multimedia marcados como sensibles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedia non marcado como sensible} other {Multimedia non marcado como sensible}}",
   "compose_form.spoiler.marked": "Retirar o aviso sobre o contido",
   "compose_form.spoiler.unmarked": "Engadir aviso sobre o contido",
-  "compose_form.spoiler_placeholder": "Escribe o teu aviso aquí",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Mencións privadas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Descubrir",
   "navigation_bar.favourites": "Favoritas",
   "navigation_bar.filters": "Palabras silenciadas",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Engadir unha enquisa",
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
-  "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só persoas mencionadas",
-  "privacy.private.long": "Só para persoas que te seguen",
-  "privacy.private.short": "Só para seguidoras",
-  "privacy.public.long": "Visible por todas",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible por todas, pero excluída da sección descubrir",
-  "privacy.unlisted.short": "Sen listar",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
   "upload_form.audio_description": "Describir para persoas con problemas auditivos",
   "upload_form.description": "Describir para persoas cegas ou con problemas visuais",
-  "upload_form.description_missing": "Sen descrición",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar a miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
   "upload_modal.analyzing_picture": "Estase a analizar a imaxe…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 6758457273..d88a8c49c3 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "הכרזה",
   "attachments_list.unprocessed": "(לא מעובד)",
   "audio.hide": "השתק",
-  "autosuggest_hashtag.per_week": "{count} לשבוע",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.copy_stacktrace": "העתקת הודעת שגיאה",
   "bundle_column_error.error.body": "הדף המבוקש אינו זמין. זה עשוי להיות באג בקוד או בעייה בתאימות הדפדפן.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
   "compose_form.placeholder": "על מה את.ה חושב.ת?",
-  "compose_form.poll.add_option": "הוסיפו בחירה",
+  "compose_form.poll.add_option": "הוספת אפשרות",
   "compose_form.poll.duration": "משך הסקר",
-  "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
-  "compose_form.poll.remove_option": "הסר בחירה זו",
+  "compose_form.poll.multiple": "בחירה מרובה",
+  "compose_form.poll.option_placeholder": "אפשרות {number}",
+  "compose_form.poll.remove_option": "הסרת אפשרות זו",
+  "compose_form.poll.single": "נא לבחור",
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
-  "compose_form.publish": "פרסום",
+  "compose_form.poll.type": "סוג משאל",
+  "compose_form.publish": "הודעה",
   "compose_form.publish_form": "לפרסם",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "שמירת שינויים",
-  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
-  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
+  "compose_form.reply": "תגובה",
+  "compose_form.save_changes": "עדכון",
   "compose_form.spoiler.marked": "הסר אזהרת תוכן",
   "compose_form.spoiler.unmarked": "הוסף אזהרת תוכן",
-  "compose_form.spoiler_placeholder": "כתוב את האזהרה שלך כאן",
+  "compose_form.spoiler_placeholder": "אזהרת תוכן (לא חובה)",
   "confirmation_modal.cancel": "ביטול",
   "confirmations.block.block_and_report": "לחסום ולדווח",
   "confirmations.block.confirm": "לחסום",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "הודעות פרטיות",
   "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.edit_profile": "עריכת פרופיל",
   "navigation_bar.explore": "סיור",
   "navigation_bar.favourites": "חיבובים",
   "navigation_bar.filters": "מילים מושתקות",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "הוספת סקר",
   "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
-  "privacy.direct.long": "רק למשתמשים מאוזכרים (mentioned)",
-  "privacy.direct.short": "למאוזכרים בלבד",
-  "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "לעוקבים בלבד",
-  "privacy.public.long": "גלוי לכל",
+  "privacy.direct.long": "כל המוזכרים בהודעה",
+  "privacy.direct.short": "א.נשים מסוימים",
+  "privacy.private.long": "לעוקביך בלבד",
+  "privacy.private.short": "עוקבים",
+  "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי תגלית",
-  "privacy.unlisted.short": "לא רשום (לא לפיד הכללי)",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
@@ -551,7 +547,9 @@
   "relative_time.minutes": "{number} דקות",
   "relative_time.seconds": "{number} שניות",
   "relative_time.today": "היום",
+  "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
   "reply_indicator.cancel": "ביטול",
+  "reply_indicator.poll": "משאל",
   "report.block": "לחסום",
   "report.block_explanation": "לא ניתן יהיה לראות את ההודעות שלהן. הן לא יוכלו לראות את ההודעות שלך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
   "report.categories.legal": "חוקי",
@@ -715,10 +713,8 @@
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
   "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.description_missing": "לא הוסף תיאור",
   "upload_form.edit": "עריכה",
   "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
-  "upload_form.undo": "ביטול",
   "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
   "upload_modal.analyzing_picture": "מנתח תמונה…",
   "upload_modal.apply": "החל",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 412159bef9..42f4ca4efa 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -83,7 +83,6 @@
   "announcement.announcement": "घोषणा",
   "attachments_list.unprocessed": "(असंसाधित)",
   "audio.hide": "हाईड ऑडियो",
-  "autosuggest_hashtag.per_week": "{count} हर सप्ताह",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",
@@ -138,22 +137,12 @@
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "विकल्प जोड़े",
   "compose_form.poll.duration": "चुनाव की अवधि",
-  "compose_form.poll.option_placeholder": "कुल विकल्प {number}",
-  "compose_form.poll.remove_option": "इस विकल्प को हटाएँ",
   "compose_form.poll.switch_to_multiple": "कई विकल्पों की अनुमति देने के लिए पोल बदलें",
   "compose_form.poll.switch_to_single": "एक ही विकल्प के लिए अनुमति देने के लिए पोल बदलें",
-  "compose_form.publish": "पब्लिश",
   "compose_form.publish_form": "पब्लिश",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनों को सहेजें",
-  "compose_form.sensitive.hide": "मीडिया को संवेदनशील के रूप में चिह्नित करें",
-  "compose_form.sensitive.marked": "मीडिया संवेदनशील के रूप में चिह्नित है",
-  "compose_form.sensitive.unmarked": "मीडिया संवेदनशील के रूप में चिह्नित नहीं है",
   "compose_form.spoiler.marked": "चेतावनी के पीछे टेक्स्ट छिपा है",
   "compose_form.spoiler.unmarked": "टेक्स्ट छिपा नहीं है",
-  "compose_form.spoiler_placeholder": "अपनी चेतावनी यहाँ लिखें",
   "confirmation_modal.cancel": "रद्द करें",
   "confirmations.block.block_and_report": "ब्लॉक एवं रिपोर्ट",
   "confirmations.block.confirm": "ब्लॉक",
@@ -370,7 +359,6 @@
   "navigation_bar.direct": "निजी संदेश",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
   "navigation_bar.explore": "अन्वेषण करें",
   "navigation_bar.favourites": "पसंदीदा",
   "navigation_bar.filters": "वारित शब्द",
@@ -440,13 +428,7 @@
   "poll.vote": "वोट",
   "poll.voted": "आपने इसी उत्तर का चुनाव किया है।",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सब को दिखाई देगा",
   "privacy.public.short": "सार्वजनिक",
-  "privacy.unlisted.short": "अनलिस्टेड",
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
   "regeneration_indicator.label": "लोड हो रहा है...",
@@ -531,7 +513,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "संशोधन करें",
-  "upload_form.undo": "मिटाए",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.apply": "लागू करें",
   "upload_modal.edit_media": "मीडिया में संशोधन करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index c535f1affc..cada365fc8 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -88,7 +88,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} tjedno",
   "boost_modal.combo": "Možete pritisnuti {combo} kako biste preskočili ovo sljedeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izvješće o pogrešci",
   "bundle_column_error.error.body": "Zaraženu stranicu nije moguće prikazati. To bi moglo biti zbog pogreške u našem kodu ili problema s kompatibilnošću preglednika.",
@@ -140,22 +139,12 @@
   "compose_form.lock_disclaimer": "Vaš račun nije {locked}. Svatko Vas može pratiti kako bi vidjeli objave namijenjene Vašim pratiteljima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "Što ti je na umu?",
-  "compose_form.poll.add_option": "Dodaj opciju",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Opcija {number}",
-  "compose_form.poll.remove_option": "Ukloni ovu opciju",
   "compose_form.poll.switch_to_multiple": "Omogući višestruki odabir opcija ankete",
   "compose_form.poll.switch_to_single": "Omogući odabir samo jedne opcije ankete",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spremi promjene",
-  "compose_form.sensitive.hide": "Označi medijski sadržaj kao osjetljiv",
-  "compose_form.sensitive.marked": "Medijski sadržaj označen je kao osjetljiv",
-  "compose_form.sensitive.unmarked": "Medijski sadržaj nije označen kao osjetljiv",
   "compose_form.spoiler.marked": "Tekst je skriven iza upozorenja",
   "compose_form.spoiler.unmarked": "Tekst nije skriven",
-  "compose_form.spoiler_placeholder": "Ovdje upišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -346,7 +335,6 @@
   "navigation_bar.direct": "Privatna spominjanja",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Favoriti",
   "navigation_bar.filters": "Utišane riječi",
@@ -415,13 +403,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Podesi privatnost toota",
-  "privacy.direct.long": "Vidljivo samo spomenutim korisnicima",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Vidljivo samo pratiteljima",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Vidljivo svima",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.short": "Neprikazano",
   "privacy_policy.last_updated": "Zadnje ažurirannje {date}",
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
   "recommended": "Preporučeno",
@@ -561,10 +543,8 @@
   "upload_error.poll": "Prijenos datoteka nije dopušten kod anketa.",
   "upload_form.audio_description": "Opišite za ljude sa slabim sluhom",
   "upload_form.description": "Opišite za ljude sa slabim vidom",
-  "upload_form.description_missing": "Bez opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promijeni pretpregled",
-  "upload_form.undo": "Obriši",
   "upload_form.video_description": "Opišite za ljude sa slabim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiza slike…",
   "upload_modal.apply": "Primijeni",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0d50e36feb..31bca5652b 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
-  "autosuggest_hashtag.per_week": "{count} hetente",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "bundle_column_error.copy_stacktrace": "Hibajelentés másolása",
   "bundle_column_error.error.body": "A kért lap nem jeleníthető meg. Ez lehet, hogy kódhiba, vagy böngészőkompatibitási hiba.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt bejegyzéseket.",
   "compose_form.lock_disclaimer.lock": "zárolva",
   "compose_form.placeholder": "Mi jár a fejedben?",
-  "compose_form.poll.add_option": "Lehetőség hozzáadása",
+  "compose_form.poll.add_option": "Opció hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
-  "compose_form.poll.option_placeholder": "{number}. lehetőség",
-  "compose_form.poll.remove_option": "Lehetőség eltávolítása",
+  "compose_form.poll.multiple": "Több választás",
+  "compose_form.poll.option_placeholder": "Opció {number}",
+  "compose_form.poll.remove_option": "Opció eltávolítása",
+  "compose_form.poll.single": "Egy választása",
   "compose_form.poll.switch_to_multiple": "Szavazás megváltoztatása több választásosra",
   "compose_form.poll.switch_to_single": "Szavazás megváltoztatása egyetlen választásosra",
-  "compose_form.publish": "Közzététel",
+  "compose_form.poll.type": "Stílus",
+  "compose_form.publish": "Bejegyzés",
   "compose_form.publish_form": "Új bejegyzés",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Módosítások mentése",
-  "compose_form.sensitive.hide": "{count, plural, one {Média kényesnek jelölése} other {Média kényesnek jelölése}}",
-  "compose_form.sensitive.marked": "{count, plural, one {A médiát kényesnek jelölték} other {A médiát kényesnek jelölték}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {A médiát nem jelölték kényesnek} other {A médiát nem jelölték kényesnek}}",
+  "compose_form.reply": "Válasz",
+  "compose_form.save_changes": "Frissítés",
   "compose_form.spoiler.marked": "Tartalmi figyelmeztetés eltávolítása",
   "compose_form.spoiler.unmarked": "Tartalmi figyelmeztetés hozzáadása",
-  "compose_form.spoiler_placeholder": "Írd ide a figyelmeztetést",
+  "compose_form.spoiler_placeholder": "Tartalom figyelmeztetés (opcionális)",
   "confirmation_modal.cancel": "Mégsem",
   "confirmations.block.block_and_report": "Letiltás és jelentés",
   "confirmations.block.confirm": "Letiltás",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Letiltott tartományok",
-  "navigation_bar.edit_profile": "Profil szerkesztése",
   "navigation_bar.explore": "Felfedezés",
   "navigation_bar.favourites": "Kedvencek",
   "navigation_bar.filters": "Némított szavak",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Új szavazás",
   "poll_button.remove_poll": "Szavazás eltávolítása",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
-  "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Csak megemlítetteknek",
-  "privacy.private.long": "Csak követőknek látható",
-  "privacy.private.short": "Csak követők",
-  "privacy.public.long": "Mindenki számára látható",
+  "privacy.direct.long": "Mindenki, akit a bejegyzésben említettek",
+  "privacy.direct.short": "Adott személyek",
+  "privacy.private.long": "Csak a követők",
+  "privacy.private.short": "Követők",
+  "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
-  "privacy.unlisted.long": "Mindenki számára látható, de kimarad a felfedezős funkciókból",
-  "privacy.unlisted.short": "Listázatlan",
+  "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírcsatornákban vagy hashtagokban, felfedezésben vagy a Mastodon keresésben, még akkor sem, ha az egész fiókra bejelentkezetünk.",
+  "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+  "privacy.unlisted.short": "Csendes nyilvánosság",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
+  "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
   "reply_indicator.cancel": "Mégsem",
+  "reply_indicator.poll": "Szavazás",
   "report.block": "Letiltás",
   "report.block_explanation": "Nem fogod látni a bejegyzéseit. Nem fogja tudni megnézni a bejegyzéseidet és nem fog tudni követni sem. Azt is meg fogja tudni mondani, hogy letiltottad.",
   "report.categories.legal": "Jogi információk",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
   "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
   "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
-  "upload_form.description_missing": "Nincs leírás megadva",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Bélyegkép megváltoztatása",
-  "upload_form.undo": "Törlés",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
   "upload_modal.analyzing_picture": "Kép elemzése…",
   "upload_modal.apply": "Alkalmaz",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 835105218d..6ddcfcdb21 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,6 @@
   "alert.unexpected.title": "Վա՜յ",
   "announcement.announcement": "Յայտարարութիւններ",
   "audio.hide": "Թաքցնել աուդիոն",
-  "autosuggest_hashtag.per_week": "շաբաթը՝ {count}",
   "boost_modal.combo": "Կարող ես սեղմել {combo}՝ սա յաջորդ անգամ բաց թողնելու համար",
   "bundle_column_error.error.title": "Օ՜, ոչ։",
   "bundle_column_error.network.title": "Ցանցի սխալ",
@@ -117,22 +116,12 @@
   "compose_form.lock_disclaimer": "Քո հաշիւը {locked} չէ։ Իւրաքանչիւրութիւն ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսուած գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
   "compose_form.placeholder": "Ի՞նչ կայ մտքիդ",
-  "compose_form.poll.add_option": "Աւելացնել տարբերակ",
   "compose_form.poll.duration": "Հարցման տեւողութիւնը",
-  "compose_form.poll.option_placeholder": "Տարբերակ {number}",
-  "compose_form.poll.remove_option": "Հեռացնել այս տարբերակը",
   "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
   "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
-  "compose_form.publish": "Հրապարակել",
   "compose_form.publish_form": "Հրապարակել",
-  "compose_form.publish_loud": "Հրապարակե՜լ",
-  "compose_form.save_changes": "Պահպանել փոփոխութիւնները",
-  "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
-  "compose_form.sensitive.marked": "Մեդիան նշուած է որպէս դիւրազգաց",
-  "compose_form.sensitive.unmarked": "Մեդիան նշուած չէ որպէս դիւրազգաց",
   "compose_form.spoiler.marked": "Տեքստը թաքցուած է զգուշացման ետեւում",
   "compose_form.spoiler.unmarked": "Տեքստը թաքցուած չէ",
-  "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ",
   "confirmation_modal.cancel": "Չեղարկել",
   "confirmations.block.block_and_report": "Արգելափակել եւ բողոքել",
   "confirmations.block.confirm": "Արգելափակել",
@@ -325,7 +314,6 @@
   "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.edit_profile": "Խմբագրել հաշիւը",
   "navigation_bar.explore": "Բացայայտել",
   "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
@@ -414,13 +402,7 @@
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
-  "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
-  "privacy.private.short": "Միայն հետեւողները",
-  "privacy.public.long": "Տեսանելի բոլորին",
   "privacy.public.short": "Հրապարակային",
-  "privacy.unlisted.short": "Ծածուկ",
   "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
   "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
   "refresh": "Թարմացնել",
@@ -556,7 +538,6 @@
   "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.thumbnail": "Փոխել պատկերակը",
-  "upload_form.undo": "Յետարկել",
   "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a660eb77ff..14b75a17f4 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -56,7 +56,6 @@
   "alert.unexpected.message": "Ocurreva un error inexpectate.",
   "announcement.announcement": "Annuncio",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per septimana",
   "bundle_column_error.network.title": "Error de rete",
   "bundle_column_error.retry": "Tentar novemente",
   "bundle_column_error.return": "Retornar al initio",
@@ -90,15 +89,9 @@
   "compose_form.direct_message_warning_learn_more": "Apprender plus",
   "compose_form.lock_disclaimer": "Tu conto non es {locked}. Quicunque pote sequer te pro vider tu messages solo pro sequitores.",
   "compose_form.lock_disclaimer.lock": "blocate",
-  "compose_form.poll.add_option": "Adder un option",
-  "compose_form.poll.remove_option": "Remover iste option",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Nove message",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar le cambiamentos",
   "compose_form.spoiler.marked": "Remover advertimento de contento",
   "compose_form.spoiler.unmarked": "Adder advertimento de contento",
-  "compose_form.spoiler_placeholder": "Scribe tu advertimento hic",
   "confirmation_modal.cancel": "Cancellar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Deler",
@@ -217,7 +210,6 @@
   "navigation_bar.direct": "Mentiones private",
   "navigation_bar.discover": "Discoperir",
   "navigation_bar.domain_blocks": "Dominios blocate",
-  "navigation_bar.edit_profile": "Modificar profilo",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Parolas silentiate",
   "navigation_bar.lists": "Listas",
@@ -252,8 +244,6 @@
   "poll.closed": "Claudite",
   "poll.reveal": "Vider le resultatos",
   "privacy.change": "Cambiar privacitate del message",
-  "privacy.private.long": "Visibile solmente pro sequitores",
-  "privacy.public.long": "Visibile pro totos",
   "privacy.public.short": "Public",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
@@ -307,7 +297,6 @@
   "tabs_bar.notifications": "Notificationes",
   "timeline_hint.resources.statuses": "Messages ancian",
   "trends.trending_now": "Ora in tendentias",
-  "upload_form.undo": "Deler",
   "upload_modal.choose_image": "Seliger un imagine",
   "upload_modal.detect_text": "Deteger texto ab un pictura",
   "video.close": "Clauder le video",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 5af20a97f7..1670d616fb 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -82,7 +82,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} per minggu",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
@@ -134,22 +133,12 @@
   "compose_form.lock_disclaimer": "Akun Anda tidak {locked}. Semua orang dapat mengikuti Anda untuk melihat kiriman khusus untuk pengikut Anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
   "compose_form.placeholder": "Apa yang ada di pikiran Anda?",
-  "compose_form.poll.add_option": "Tambahkan pilihan",
   "compose_form.poll.duration": "Durasi japat",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Hapus opsi ini",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
-  "compose_form.publish": "Terbitkan",
   "compose_form.publish_form": "Terbitkan",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, other {Tandai media sebagai sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Media ini ditandai sebagai sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Media ini tidak ditandai sebagai sensitif}}",
   "compose_form.spoiler.marked": "Hapus peringatan tentang isi konten",
   "compose_form.spoiler.unmarked": "Tambahkan peringatan tentang isi konten",
-  "compose_form.spoiler_placeholder": "Peringatan konten",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Blokir & Laporkan",
   "confirmations.block.confirm": "Blokir",
@@ -364,7 +353,6 @@
   "navigation_bar.compose": "Tulis toot baru",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.edit_profile": "Ubah profil",
   "navigation_bar.explore": "Jelajahi",
   "navigation_bar.filters": "Kata yang dibisukan",
   "navigation_bar.follow_requests": "Permintaan mengikuti",
@@ -454,14 +442,7 @@
   "poll_button.add_poll": "Tambah japat",
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Ubah privasi kiriman",
-  "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Orang yang disebutkan saja",
-  "privacy.private.long": "Kirim kiriman hanya kepada pengikut",
-  "privacy.private.short": "Pengikut saja",
-  "privacy.public.long": "Terlihat oleh semua",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Terlihat oleh semua, tapi jangan tampilkan di fitur jelajah",
-  "privacy.unlisted.short": "Tak Terdaftar",
   "privacy_policy.last_updated": "Terakhir diperbarui {date}",
   "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
@@ -615,10 +596,8 @@
   "upload_error.poll": "Unggah berkas tak diizinkan di japat ini.",
   "upload_form.audio_description": "Penjelasan untuk orang dengan gangguan pendengaran",
   "upload_form.description": "Deskripsikan untuk mereka yang tidak bisa melihat dengan jelas",
-  "upload_form.description_missing": "Tidak ada deskripsi yang ditambahkan",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Undo",
   "upload_form.video_description": "Penjelasan untuk orang dengan gangguan pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Analisis gambar…",
   "upload_modal.apply": "Terapkan",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 8579fc89c6..5188d137e3 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Proclamation",
   "attachments_list.unprocessed": "(íntractat)",
   "audio.hide": "Celar audio",
-  "autosuggest_hashtag.per_week": "{count} per semane",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",
@@ -146,22 +145,21 @@
   "compose_form.lock_disclaimer": "Tui conto ne es {locked}. Quicunc posse sequer te por vider tui postas solmen por sequitores.",
   "compose_form.lock_disclaimer.lock": "cludet",
   "compose_form.placeholder": "Quo es in tui spiritu?",
-  "compose_form.poll.add_option": "Adjunter un option",
+  "compose_form.poll.add_option": "Adjunter option",
   "compose_form.poll.duration": "Duration del balotation",
+  "compose_form.poll.multiple": "Selection multiplic",
   "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.remove_option": "Remover ti-ci option",
+  "compose_form.poll.single": "Selecter un",
   "compose_form.poll.switch_to_multiple": "Changea li balotation por permisser multiplic selectiones",
   "compose_form.poll.switch_to_single": "Changea li balotation por permisser un singul selection",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postar",
   "compose_form.publish_form": "Nov posta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Conservar changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar medie quam sensitiv} other {Marcar medie quam sensitiv}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medie es marcat quam sensitiv} other {Medie es marcat quam sensitiv}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medie ne es marcat quam sensitiv} other {Medie ne es marcat quam sensitiv}}",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Actualisar",
   "compose_form.spoiler.marked": "Remover avise pri li contenete",
   "compose_form.spoiler.unmarked": "Adjunter avise pri li contenete",
-  "compose_form.spoiler_placeholder": "Scri tui avise ci",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Bloccar & Raportar",
   "confirmations.block.confirm": "Bloccar",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Privat mentiones",
   "navigation_bar.discover": "Decovrir",
   "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.edit_profile": "Redacter profil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "Silentiat paroles",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Adjunter un balotation",
   "poll_button.remove_poll": "Remover balotation",
   "privacy.change": "Changear li privatie del posta",
-  "privacy.direct.long": "Visibil solmen a mentionat usatores",
-  "privacy.direct.short": "Solmen persones mentionat",
-  "privacy.private.long": "Visibil solmen por sequitores",
-  "privacy.private.short": "Solmen sequitores",
-  "privacy.public.long": "Visibil a omnes",
+  "privacy.direct.short": "Specific persones",
+  "privacy.private.long": "Solmen tui sequitores",
+  "privacy.private.short": "Sequitores",
+  "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visibil por omnes, ma excludet de functiones de decovrition",
-  "privacy.unlisted.short": "Delistat",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
@@ -715,10 +709,8 @@
   "upload_error.poll": "On ne es permisset cargar medie con balotationes.",
   "upload_form.audio_description": "Descrir por persones qui es surd o ne audi bon",
   "upload_form.description": "Descrir por persones qui es ciec o have mal vision",
-  "upload_form.description_missing": "Null descrition adjuntet",
   "upload_form.edit": "Redacter",
   "upload_form.thumbnail": "Changear previsual image",
-  "upload_form.undo": "Deleter",
   "upload_form.video_description": "Descrir por persones qui es surd, ciec, ne audi bon, o have mal vision",
   "upload_modal.analyzing_picture": "Analisant image…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index f163567f17..a4f7268422 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -107,8 +107,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "relative_time.full.just_now": "kịta",
   "relative_time.just_now": "kịta",
   "relative_time.today": "taa",
@@ -142,7 +140,6 @@
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "Hichapụ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Họrọ onyonyo",
   "upload_progress.label": "Uploading…"
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 233b768457..a9dd32c06c 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Anunco",
   "attachments_list.unprocessed": "(neprocedita)",
   "audio.hide": "Celez audio",
-  "autosuggest_hashtag.per_week": "{count} dum singla semano",
   "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "bundle_column_error.copy_stacktrace": "Kopierorraporto",
   "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
   "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Insertez selekto",
   "compose_form.poll.duration": "Votpostoduro",
-  "compose_form.poll.option_placeholder": "Selektato {number}",
-  "compose_form.poll.remove_option": "Efacez ca selektajo",
   "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
   "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
-  "compose_form.publish": "Publikigez",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sparez chanji",
-  "compose_form.sensitive.hide": "{count, plural,one {Markizez medii quale privata} other {Markizez medii quale privata}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medii markizesis quale privata} other {Medii markizesis quale privata}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markizesis quale privata} other {Medii ne markizesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Averto di kontenajo",
   "confirmation_modal.cancel": "Anulez",
   "confirmations.block.block_and_report": "Restriktez e Raportizez",
   "confirmations.block.confirm": "Restriktez",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "Privata mencioni",
   "navigation_bar.discover": "Deskovrez",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Modifikar profilo",
   "navigation_bar.explore": "Explorez",
   "navigation_bar.favourites": "Favoriziti",
   "navigation_bar.filters": "Silencigita vorti",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Insertez votposto",
   "poll_button.remove_poll": "Efacez votposto",
   "privacy.change": "Aranjar privateso di mesaji",
-  "privacy.direct.long": "Sendar nur a mencionata uzeri",
-  "privacy.direct.short": "Mencionita personi nur",
-  "privacy.private.long": "Sendar nur a sequanti",
-  "privacy.private.short": "Sequanti nur",
-  "privacy.public.long": "Videbla da omnu",
   "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Videbla da omnu ma voluntala ne inkluzas deskovrotraiti",
-  "privacy.unlisted.short": "Ne enlistigota",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
   "recommended": "Rekomendata",
@@ -708,10 +689,8 @@
   "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
   "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
   "upload_form.description": "Deskriptez por personi kun vidnekapableso",
-  "upload_form.description_missing": "Deskriptajo ne insertesis",
   "upload_form.edit": "Modifikez",
   "upload_form.thumbnail": "Chanjez imajeto",
-  "upload_form.undo": "Desfacar",
   "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
   "upload_modal.analyzing_picture": "Analizas imajo…",
   "upload_modal.apply": "Aplikez",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index fb839503e9..dfece102bb 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
-  "autosuggest_hashtag.per_week": "{count} á viku",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "bundle_column_error.copy_stacktrace": "Afrita villuskýrslu",
   "bundle_column_error.error.body": "Umbeðna síðau var ekki hægt að myndgera. Það gæti verið vegna villu í kóðanum okkar eða vandamáls með samhæfni vafra.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Hvað liggur þér á hjarta?",
   "compose_form.poll.add_option": "Bæta við valkosti",
   "compose_form.poll.duration": "Tímalengd könnunar",
+  "compose_form.poll.multiple": "Margir valkostir",
   "compose_form.poll.option_placeholder": "Valkostur {number}",
   "compose_form.poll.remove_option": "Fjarlægja þennan valkost",
+  "compose_form.poll.single": "Veldu eitt",
   "compose_form.poll.switch_to_multiple": "Breyta könnun svo hægt sé að hafa marga valkosti",
   "compose_form.poll.switch_to_single": "Breyta könnun svo hægt sé að hafa einn stakan valkost",
+  "compose_form.poll.type": "Stíll",
   "compose_form.publish": "Birta",
   "compose_form.publish_form": "Birta",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Vista breytingar",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkja mynd sem viðkvæma} other {Merkja myndir sem viðkvæmar}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mynd er merkt sem viðkvæm} other {Myndir eru merktar sem viðkvæmar}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mynd er ekki merkt sem viðkvæm} other {Myndir eru ekki merktar sem viðkvæmar}}",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppfæra",
   "compose_form.spoiler.marked": "Fjarlægja aðvörun vegna efnis",
   "compose_form.spoiler.unmarked": "Bæta við aðvörun vegna efnis",
-  "compose_form.spoiler_placeholder": "Skrifaðu aðvörunina þína hér",
+  "compose_form.spoiler_placeholder": "Aðvörun vegna efnis (valkvætt)",
   "confirmation_modal.cancel": "Hætta við",
   "confirmations.block.block_and_report": "Útiloka og kæra",
   "confirmations.block.confirm": "Útiloka",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Einkaspjall",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.edit_profile": "Breyta notandasniði",
   "navigation_bar.explore": "Kanna",
   "navigation_bar.favourites": "Eftirlæti",
   "navigation_bar.filters": "Þögguð orð",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Bæta við könnun",
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
-  "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Aðeins fólk sem minnst er á",
-  "privacy.private.long": "Senda einungis á fylgjendur",
-  "privacy.private.short": "Einungis fylgjendur",
-  "privacy.public.long": "Sýnilegt fyrir alla",
+  "privacy.direct.long": "Allir sem minnst er á í færslunni",
+  "privacy.direct.short": "Tilteknir aðilar",
+  "privacy.private.long": "Einungis þeir sem fylgjast með þér",
+  "privacy.private.short": "Fylgjendur",
+  "privacy.public.long": "Hver sem er, á og utan Mastodon",
   "privacy.public.short": "Opinbert",
-  "privacy.unlisted.long": "Sýnilegt öllum, en ekki tekið með í uppgötvunareiginleikum",
-  "privacy.unlisted.short": "Óskráð",
+  "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
+  "privacy.unlisted.long": "Minni stælar í reikniritum",
+  "privacy.unlisted.short": "Hljóðlátt opinbert",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
   "recommended": "Mælt með",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
+  "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
   "reply_indicator.cancel": "Hætta við",
+  "reply_indicator.poll": "Könnun",
   "report.block": "Útiloka",
   "report.block_explanation": "Þú munt ekki sjá færslurnar þeirra. Þeir munu ekki geta séð færslurnar þínar eða fylgst með þér. Þeir munu ekki geta séð að lokað sé á þá.",
   "report.categories.legal": "Lagalegt",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
   "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
   "upload_form.description": "Lýstu þessu fyrir sjónskerta",
-  "upload_form.description_missing": "Engri lýsingu bætt við",
   "upload_form.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
-  "upload_form.undo": "Eyða",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",
   "upload_modal.analyzing_picture": "Greini mynd…",
   "upload_modal.apply": "Virkja",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4fb4d88cbc..920b80d5a6 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
-  "autosuggest_hashtag.per_week": "{count} a settimana",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "bundle_column_error.copy_stacktrace": "Copia rapporto sull'errore",
   "bundle_column_error.error.body": "Impossibile rendedrizzare la pagina richiesta. Potrebbe dipendere da un bug nel nostro codice o da un problema di compatibilità di un browser.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
-  "compose_form.poll.add_option": "Aggiungi una scelta",
+  "compose_form.poll.add_option": "Aggiungi opzione",
   "compose_form.poll.duration": "Durata del sondaggio",
-  "compose_form.poll.option_placeholder": "Scelta {number}",
-  "compose_form.poll.remove_option": "Rimuovi questa scelta",
+  "compose_form.poll.multiple": "Scelta multipla",
+  "compose_form.poll.option_placeholder": "Opzione {number}",
+  "compose_form.poll.remove_option": "Rimuovi questa opzione",
+  "compose_form.poll.single": "Scegli uno",
   "compose_form.poll.switch_to_multiple": "Modifica il sondaggio per consentire scelte multiple",
   "compose_form.poll.switch_to_single": "Modifica il sondaggio per consentire una singola scelta",
+  "compose_form.poll.type": "Stile",
   "compose_form.publish": "Pubblica",
   "compose_form.publish_form": "Nuovo post",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salva le modifiche",
-  "compose_form.sensitive.hide": "{count, plural, one {Segna media come sensibile} other {Segna media come sensibili}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Il media è contrassegnato come sensibile} other {I media sono contrassegnati come sensibili}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Il media non è contrassegnato come sensibile} other {I media non sono contrassegnati come sensibili}}",
+  "compose_form.reply": "Rispondi",
+  "compose_form.save_changes": "Aggiorna",
   "compose_form.spoiler.marked": "Rimuovi l'avviso del contenuto",
   "compose_form.spoiler.unmarked": "Aggiungi l'avviso del contenuto",
-  "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
+  "compose_form.spoiler_placeholder": "Contenuto sensibile (facoltativo)",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menzioni private",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.edit_profile": "Modifica il profilo",
   "navigation_bar.explore": "Esplora",
   "navigation_bar.favourites": "Preferiti",
   "navigation_bar.filters": "Parole silenziate",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Aggiungi un sondaggio",
   "poll_button.remove_poll": "Rimuovi il sondaggio",
   "privacy.change": "Modifica privacy del post",
-  "privacy.direct.long": "Visibile solo per gli utenti menzionati",
-  "privacy.direct.short": "Solo persone menzionate",
-  "privacy.private.long": "Visibile solo ai seguaci",
-  "privacy.private.short": "Solo seguaci",
-  "privacy.public.long": "Visibile a tutti",
+  "privacy.direct.long": "Tutti quelli menzioniati nel post",
+  "privacy.direct.short": "Persone specifiche",
+  "privacy.private.long": "Solo i tuoi follower",
+  "privacy.private.short": "Follower",
+  "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
-  "privacy.unlisted.long": "Visibile a tutti, ma escluso dalle funzioni di scoperta",
-  "privacy.unlisted.short": "Non elencato",
+  "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
+  "privacy.unlisted.long": "Meno fanfare algoritmiche",
+  "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
   "recommended": "Consigliato",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
+  "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
   "reply_indicator.cancel": "Annulla",
+  "reply_indicator.poll": "Sondaggio",
   "report.block": "Blocca",
   "report.block_explanation": "Non visualizzerai i suoi post. Non potrà vedere i tuoi post o seguirti. Potrà sapere di esser stato bloccato.",
   "report.categories.legal": "Informazioni legali",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
   "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
   "upload_form.description": "Descrizione per ipovedenti",
-  "upload_form.description_missing": "Nessuna descrizione aggiunta",
   "upload_form.edit": "Modifica",
   "upload_form.thumbnail": "Cambia la miniatura",
-  "upload_form.undo": "Elimina",
   "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
   "upload_modal.analyzing_picture": "Analizzando l'immagine…",
   "upload_modal.apply": "Applica",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index e7aafe852a..e0cc96d571 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "お知らせ",
   "attachments_list.unprocessed": "(未処理)",
   "audio.hide": "音声を閉じる",
-  "autosuggest_hashtag.per_week": "{count} 回 / 週",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.copy_stacktrace": "エラーレポートをコピー",
   "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
   "compose_form.placeholder": "今なにしてる？",
-  "compose_form.poll.add_option": "追加",
   "compose_form.poll.duration": "アンケート期間",
-  "compose_form.poll.option_placeholder": "項目 {number}",
-  "compose_form.poll.remove_option": "この項目を削除",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
-  "compose_form.publish": "投稿",
   "compose_form.publish_form": "投稿",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "変更を保存",
-  "compose_form.sensitive.hide": "メディアを閲覧注意にする",
-  "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています",
-  "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません",
   "compose_form.spoiler.marked": "本文は警告の後ろに隠されます",
   "compose_form.spoiler.unmarked": "本文は隠されていません",
-  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.block_and_report": "ブロックし通報",
   "confirmations.block.confirm": "ブロック",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "非公開の返信",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.edit_profile": "プロフィールを編集",
   "navigation_bar.explore": "探索する",
   "navigation_bar.favourites": "お気に入り",
   "navigation_bar.filters": "フィルター設定",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "指定された相手のみ閲覧可",
-  "privacy.direct.short": "指定された相手のみ",
-  "privacy.private.long": "フォロワーのみ閲覧可",
-  "privacy.private.short": "フォロワーのみ",
-  "privacy.public.long": "誰でも閲覧可",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "誰でも閲覧可、サイレント",
-  "privacy.unlisted.short": "非収載",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
   "recommended": "おすすめ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "説明を追加していません",
   "upload_form.edit": "編集",
   "upload_form.thumbnail": "サムネイルを変更",
-  "upload_form.undo": "削除",
   "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",
   "upload_modal.analyzing_picture": "画像を解析中…",
   "upload_modal.apply": "適用",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9d977e9331..8628cb38a2 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -36,7 +36,6 @@
   "admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
   "alert.unexpected.title": "უპს!",
-  "autosuggest_hashtag.per_week": "კვირაში {count}",
   "boost_modal.combo": "შეგიძლიათ დააჭიროთ {combo}-ს რათა შემდეგ ჯერზე გამოტოვოთ ეს",
   "bundle_column_error.retry": "სცადეთ კიდევ ერთხელ",
   "bundle_modal_error.close": "დახურვა",
@@ -68,11 +67,8 @@
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
   "compose_form.placeholder": "რაზე ფიქრობ?",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "მედია მონიშნულია მგრძნობიარედ",
-  "compose_form.sensitive.unmarked": "მედია არაა მონიშნული მგრძნობიარედ",
   "compose_form.spoiler.marked": "გაფრთხილების უკან ტექსტი დამალულია",
   "compose_form.spoiler.unmarked": "ტექსტი არაა დამალული",
-  "compose_form.spoiler_placeholder": "თქვენი გაფრთხილება დაწერეთ აქ",
   "confirmation_modal.cancel": "უარყოფა",
   "confirmations.block.confirm": "ბლოკი",
   "confirmations.block.message": "დარწმუნებული ხართ, გსურთ დაბლოკოთ {name}?",
@@ -171,7 +167,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
-  "navigation_bar.edit_profile": "შეცვალე პროფილი",
   "navigation_bar.filters": "გაჩუმებული სიტყვები",
   "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
   "navigation_bar.lists": "სიები",
@@ -211,12 +206,7 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
-  "privacy.direct.long": "დაიპოსტოს მხოლოდ დასახელებულ მომხმარებლებთან",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "დაიპოსტოს მხოლოდ მიმდევრებთან",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "საჯარო",
-  "privacy.unlisted.short": "ჩამოუთვლელი",
   "regeneration_indicator.label": "იტვირთება…",
   "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
@@ -279,7 +269,6 @@
   "upload_button.label": "მედიის დამატება",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "აღწერილობა ვიზუალურად უფასურისთვის",
-  "upload_form.undo": "გაუქმება",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "იტვირთება...",
   "video.close": "ვიდეოს დახურვა",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 08c70a9405..d9388c7048 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "Ayhuh!",
   "announcement.announcement": "Ulɣu",
   "audio.hide": "Ffer amesli",
-  "autosuggest_hashtag.per_week": "{count} i yimalas",
   "boost_modal.combo": "Tzemreḍ ad tetekkiḍ ɣef {combo} akken ad tessurfeḍ aya tikelt-nniḍen",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
@@ -99,20 +98,10 @@
   "compose_form.lock_disclaimer": "Amiḍan-ik·im ur yelli ara {locked}. Menwala yezmer ad k·kem-yeḍfeṛ akken ad iẓer acu tbeṭṭuḍ akked yimeḍfaṛen-ik·im.",
   "compose_form.lock_disclaimer.lock": "yettwacekkel",
   "compose_form.placeholder": "D acu i itezzin deg wallaɣ?",
-  "compose_form.poll.add_option": "Rnu afran",
   "compose_form.poll.duration": "Tanzagt n tefrant",
-  "compose_form.poll.option_placeholder": "Afran {number}",
-  "compose_form.poll.remove_option": "Sfeḍ afran-agi",
-  "compose_form.publish": "Suffeɣ",
   "compose_form.publish_form": "Suffeɣ",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sekles ibeddilen",
-  "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
-  "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Amidya ur yettwacreḍ ara d anafri} other {Imidyaten ur ttwacreḍen ara d inafriyen}}",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
-  "compose_form.spoiler_placeholder": "Aru alɣu-inek·inem da",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
@@ -284,7 +273,6 @@
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
-  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.explore": "Snirem",
   "navigation_bar.favourites": "Imenyafen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
@@ -359,12 +347,7 @@
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Seggem tabaḍnit n yizen",
-  "privacy.direct.long": "Bḍu gar yimseqdacen i tbedreḍ kan",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Bḍu i yimeḍfaṛen-ik kan",
-  "privacy.private.short": "Imeḍfaṛen kan",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.short": "War tabdert",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
@@ -472,7 +455,6 @@
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
   "upload_form.thumbnail": "Beddel tugna",
-  "upload_form.undo": "Kkes",
   "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 97b1991803..1f6cc78a57 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -64,7 +64,6 @@
   "alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
   "alert.unexpected.title": "Өй!",
   "announcement.announcement": "Хабарландыру",
-  "autosuggest_hashtag.per_week": "{count} аптасына",
   "boost_modal.combo": "Келесіде өткізіп жіберу үшін басыңыз {combo}",
   "bundle_column_error.retry": "Қайтадан көріңіз",
   "bundle_modal_error.close": "Жабу",
@@ -99,19 +98,12 @@
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
   "compose_form.placeholder": "Не бөліскіңіз келеді?",
-  "compose_form.poll.add_option": "Жауап қос",
   "compose_form.poll.duration": "Сауалнама мерзімі",
-  "compose_form.poll.option_placeholder": "Жауап {number}",
-  "compose_form.poll.remove_option": "Бұл жауапты өшір",
   "compose_form.poll.switch_to_multiple": "Бірнеше жауап таңдайтындай қылу",
   "compose_form.poll.switch_to_single": "Тек бір жауап таңдайтындай қылу",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Сезімтал ретінде белгіле",
-  "compose_form.sensitive.marked": "Медиа нәзік деп белгіленген",
-  "compose_form.sensitive.unmarked": "Медиа нәзік деп белгіленбеген",
   "compose_form.spoiler.marked": "Мәтін ескертумен жасырылған",
   "compose_form.spoiler.unmarked": "Мәтін жасырылмаған",
-  "compose_form.spoiler_placeholder": "Ескертуіңізді осында жазыңыз",
   "confirmation_modal.cancel": "Қайтып алу",
   "confirmations.block.block_and_report": "Блок және Шағым",
   "confirmations.block.confirm": "Бұғаттау",
@@ -250,7 +242,6 @@
   "navigation_bar.compose": "Жаңа жазба бастау",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
-  "navigation_bar.edit_profile": "Профиль түзету",
   "navigation_bar.filters": "Үнсіз сөздер",
   "navigation_bar.follow_requests": "Жазылуға сұранғандар",
   "navigation_bar.follows_and_followers": "Жазылымдар және оқырмандар",
@@ -311,12 +302,7 @@
   "poll_button.add_poll": "Сауалнама қосу",
   "poll_button.remove_poll": "Сауалнаманы өшіру",
   "privacy.change": "Құпиялылықты реттеу",
-  "privacy.direct.long": "Аталған адамдарға ғана көрінетін жазба",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Тек оқырмандарға арналған жазба",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Ашық",
-  "privacy.unlisted.short": "Тізімсіз",
   "refresh": "Жаңарту",
   "regeneration_indicator.label": "Жүктеу…",
   "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
@@ -399,7 +385,6 @@
   "upload_form.description": "Көру қабілеті нашар адамдар үшін сипаттаңыз",
   "upload_form.edit": "Түзету",
   "upload_form.thumbnail": "Суретті өзгерту",
-  "upload_form.undo": "Өшіру",
   "upload_form.video_description": "Есту немесе көру қабілеті нашар адамдарға сипаттама беріңіз",
   "upload_modal.analyzing_picture": "Суретті анализ жасау…",
   "upload_modal.apply": "Қолдану",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 473690070f..396aebbdf2 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -91,10 +91,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 70ce6611d6..eae7f8faea 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -68,7 +68,7 @@
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
   "account.unendorse": "프로필에 추천하지 않기",
-  "account.unfollow": "팔로우 해제",
+  "account.unfollow": "언팔로우",
   "account.unmute": "@{name} 뮤트 해제",
   "account.unmute_notifications_short": "알림 뮤트 해제",
   "account.unmute_short": "뮤트 해제",
@@ -89,7 +89,6 @@
   "announcement.announcement": "공지사항",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
-  "autosuggest_hashtag.per_week": "주간 {count}회",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "bundle_column_error.copy_stacktrace": "에러 리포트 복사하기",
   "bundle_column_error.error.body": "요청한 페이지를 렌더링 할 수 없습니다. 저희의 코드에 버그가 있거나, 브라우저 호환성 문제일 수 있습니다.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
   "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
-  "compose_form.poll.option_placeholder": "{number}번 항목",
+  "compose_form.poll.multiple": "다중 선택",
+  "compose_form.poll.option_placeholder": "{option}번째 항목",
   "compose_form.poll.remove_option": "이 항목 삭제",
+  "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
+  "compose_form.poll.type": "형식",
   "compose_form.publish": "게시",
   "compose_form.publish_form": "새 게시물",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "변경사항 저장",
-  "compose_form.sensitive.hide": "미디어를 민감함으로 설정하기",
-  "compose_form.sensitive.marked": "미디어가 열람주의로 설정되어 있습니다",
-  "compose_form.sensitive.unmarked": "미디어가 열람주의로 설정 되어 있지 않습니다",
+  "compose_form.reply": "답장",
+  "compose_form.save_changes": "수정",
   "compose_form.spoiler.marked": "열람주의 제거",
   "compose_form.spoiler.unmarked": "열람 주의 문구 추가",
-  "compose_form.spoiler_placeholder": "경고 문구를 여기에 작성하세요",
+  "compose_form.spoiler_placeholder": "열람 주의 (옵션)",
   "confirmation_modal.cancel": "취소",
   "confirmations.block.block_and_report": "차단하고 신고하기",
   "confirmations.block.confirm": "차단",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "개인적인 멘션",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.edit_profile": "프로필 수정",
   "navigation_bar.explore": "둘러보기",
   "navigation_bar.favourites": "좋아요",
   "navigation_bar.filters": "뮤트한 단어",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "설문 추가",
   "poll_button.remove_poll": "설문 제거",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
-  "privacy.direct.long": "언급된 사용자만 볼 수 있음",
-  "privacy.direct.short": "멘션한 사람들만",
-  "privacy.private.long": "팔로워에게만 공개",
-  "privacy.private.short": "팔로워 전용",
-  "privacy.public.long": "모두가 볼 수 있음",
+  "privacy.direct.long": "이 게시물에서 언급된 모두",
+  "privacy.direct.short": "특정 인물",
+  "privacy.private.long": "내 팔로워들에게만",
+  "privacy.private.short": "팔로워",
+  "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
-  "privacy.unlisted.long": "모두가 볼 수 있지만, 발견하기 기능에서는 제외됨",
-  "privacy.unlisted.short": "미등재",
+  "privacy.unlisted.additional": "공개와 똑같지만 게시물이 라이브 피드나 해시태그, 발견하기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
+  "privacy.unlisted.long": "더 적은 알고리즘 팡파레",
+  "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
   "recommended": "추천함",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
+  "reply_indicator.attachments": "{count, plural, one {#} other {#}}개의 첨부파일",
   "reply_indicator.cancel": "취소",
+  "reply_indicator.poll": "투표",
   "report.block": "차단",
   "report.block_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 당신의 게시물을 보거나 팔로우 할 수 없습니다. 해당 계정은 자신이 차단되었다는 사실을 알 수 있습니다.",
   "report.categories.legal": "법적인 문제",
@@ -715,10 +716,8 @@
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
   "upload_form.audio_description": "청각 장애인을 위한 설명",
   "upload_form.description": "시각장애인을 위한 설명",
-  "upload_form.description_missing": "설명이 추가되지 않음",
   "upload_form.edit": "수정",
   "upload_form.thumbnail": "썸네일 변경",
-  "upload_form.undo": "삭제",
   "upload_form.video_description": "청각, 시각 장애인을 위한 설명",
   "upload_modal.analyzing_picture": "사진 분석 중…",
   "upload_modal.apply": "적용",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 7d8603cae1..4a0fd671db 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "Daxuyanî",
   "attachments_list.unprocessed": "(bêpêvajo)",
   "audio.hide": "Dengê veşêre",
-  "autosuggest_hashtag.per_week": "Her hefte {count}",
   "boost_modal.combo": "Ji bo derbas bî carekî din de pêlê {combo} bike",
   "bundle_column_error.copy_stacktrace": "Rapora çewtiyê jê bigire",
   "bundle_column_error.error.body": "Rûpela xwestî nehate pêşkêşkirin. Dibe ku ew ji ber şaşetiyeke koda me, an jî pirsgirêkeke lihevhatina gerokê be.",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "Ajimêrê te ne {locked}. Herkes dikare te bişopîne da ku şandiyên te yên tenê ji şopînerên re têne xuyakirin bibînin.",
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
-  "compose_form.poll.add_option": "Hilbijartinekî tevlî bike",
   "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.option_placeholder": "{number} Hilbijêre",
-  "compose_form.poll.remove_option": "Vê hilbijarê rake",
   "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
   "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
-  "compose_form.publish": "Biweşîne",
   "compose_form.publish_form": "Biweşîne",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guhertinan tomar bike",
-  "compose_form.sensitive.hide": "{count, plural, one {Medya wekî hestiyar nîşan bide} other {Medya wekî hestiyar nîşan bide}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya wekî hestiyar hate nîşan} other {Medya wekî hestiyar nîşan}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya wekî hestiyar nehatiye nîşan} other {Medya wekî hestiyar nehatiye nîşan}}",
   "compose_form.spoiler.marked": "Hişyariya naverokê rake",
   "compose_form.spoiler.unmarked": "Hişyariya naverokê tevlî bike",
-  "compose_form.spoiler_placeholder": "Li vir hişyariya xwe binivîse",
   "confirmation_modal.cancel": "Dev jê berde",
   "confirmations.block.block_and_report": "Asteng bike & ragihîne",
   "confirmations.block.confirm": "Asteng bike",
@@ -351,7 +340,6 @@
   "navigation_bar.direct": "Qalkirinên taybet",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.edit_profile": "Profîlê serrast bike",
   "navigation_bar.explore": "Vekole",
   "navigation_bar.filters": "Peyvên bêdengkirî",
   "navigation_bar.follow_requests": "Daxwazên şopandinê",
@@ -437,14 +425,7 @@
   "poll_button.add_poll": "Rapirsîyek zêde bike",
   "poll_button.remove_poll": "Rapirsî yê rake",
   "privacy.change": "Nepênîtiya şandiyan biguherîne",
-  "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Tenê kesên qalkirî",
-  "privacy.private.long": "Tenê bo şopîneran xuyabar e",
-  "privacy.private.short": "Tenê şopîneran",
-  "privacy.public.long": "Ji bo hemûyan xuyabar e",
   "privacy.public.short": "Gelemperî",
-  "privacy.unlisted.long": "Ji bo hemûyan xuyabar e, lê ji taybetmendiyên vekolînê veqetiya ye",
-  "privacy.unlisted.short": "Nelîstekirî",
   "privacy_policy.last_updated": "Rojanekirina dawî {date}",
   "privacy_policy.title": "Politîka taybetiyê",
   "refresh": "Nû bike",
@@ -608,10 +589,8 @@
   "upload_error.poll": "Di rapirsîyan de mafê barkirina pelan nayê dayîn.",
   "upload_form.audio_description": "Ji bona kesên kêm dibihîsin re pênase bike",
   "upload_form.description": "Ji bona astengdarên dîtinê re vebêje",
-  "upload_form.description_missing": "Ti danasîn nehatiye tevlîkirin",
   "upload_form.edit": "Serrast bike",
   "upload_form.thumbnail": "Wêneyê biçûk biguherîne",
-  "upload_form.undo": "Jê bibe",
   "upload_form.video_description": "Ji bo kesên kerr û lalan pênase bike",
   "upload_modal.analyzing_picture": "Wêne tê analîzkirin…",
   "upload_modal.apply": "Bisepîne",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 8f384fe125..e42f50aeff 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -45,7 +45,6 @@
   "alert.unexpected.message": "Gwall anwaytyadow re dharva.",
   "alert.unexpected.title": "Oups!",
   "announcement.announcement": "Deklaryans",
-  "autosuggest_hashtag.per_week": "{count} an seythen",
   "boost_modal.combo": "Hwi a yll gwaska {combo} dhe woheles hemma an nessa tro",
   "bundle_column_error.retry": "Assayewgh arta",
   "bundle_modal_error.close": "Degea",
@@ -80,20 +79,12 @@
   "compose_form.lock_disclaimer": "Nyns yw agas akont {locked}. Piwpynag a yll agas holya dhe weles agas postow holyoryon-hepken.",
   "compose_form.lock_disclaimer.lock": "Alhwedhys",
   "compose_form.placeholder": "Pyth eus yn agas brys?",
-  "compose_form.poll.add_option": "Keworra dewis",
   "compose_form.poll.duration": "Duryans sondyans",
-  "compose_form.poll.option_placeholder": "Dewis {number}",
-  "compose_form.poll.remove_option": "Dilea'n dewis ma",
   "compose_form.poll.switch_to_multiple": "Chanjya sondyans dhe asa lies dewis",
   "compose_form.poll.switch_to_single": "Chanjya sondyans dhe asa unn dewis hepken",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "{count, plural, one {Merkya myski vel tender} other {Merkya myski vel tender}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Myski merkys vel tender} other {Myski merkys vel tender}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Nyns yw myski merkys vel tender} other {Nyns yw myski merkys vel tender}}",
   "compose_form.spoiler.marked": "Dilea gwarnyans dalgh",
   "compose_form.spoiler.unmarked": "Keworra gwarnyans dalgh",
-  "compose_form.spoiler_placeholder": "Skrifewgh agas gwarnyans omma",
   "confirmation_modal.cancel": "Hedhi",
   "confirmations.block.block_and_report": "Lettya & Reportya",
   "confirmations.block.confirm": "Lettya",
@@ -244,7 +235,6 @@
   "navigation_bar.compose": "Komposya post nowydh",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
-  "navigation_bar.edit_profile": "Golegi profil",
   "navigation_bar.filters": "Geryow tawhes",
   "navigation_bar.follow_requests": "Govynnow holya",
   "navigation_bar.follows_and_followers": "Holyansow ha holyoryon",
@@ -316,12 +306,7 @@
   "poll_button.add_poll": "Keworra sondyans",
   "poll_button.remove_poll": "Dilea sondyans",
   "privacy.change": "Chanjya privetter an post",
-  "privacy.direct.long": "Gweladow dhe'n dhevnydhyoryon menegys hepken",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Gweladow dhe holyoryon hepken",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Poblek",
-  "privacy.unlisted.short": "Anrelys",
   "refresh": "Daskarga",
   "regeneration_indicator.label": "Ow karga…",
   "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
@@ -407,7 +392,6 @@
   "upload_form.description": "Deskrifewgh rag tus dhallek",
   "upload_form.edit": "Golegi",
   "upload_form.thumbnail": "Chanjya avenik",
-  "upload_form.undo": "Dilea",
   "upload_form.video_description": "Deskrifa rag tus vodharek po dallek",
   "upload_modal.analyzing_picture": "Ow tytratya skeusen…",
   "upload_modal.apply": "Gweytha",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 3e5747ba8b..698b3da4c3 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -34,9 +34,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "clausum",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "Barrire",
   "compose_form.publish_form": "Barrire",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmations.block.confirm": "Impedire",
@@ -116,9 +114,6 @@
   "poll_button.add_poll": "Addere electionem",
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Coram publico",
   "privacy.public.short": "Coram publico",
   "relative_time.full.just_now": "nunc",
   "relative_time.just_now": "nunc",
@@ -153,7 +148,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people who are hard of hearing",
   "upload_form.edit": "Recolere",
-  "upload_form.undo": "Oblitterare",
   "upload_progress.label": "Uploading…",
   "video.mute": "Confutare soni"
 }
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 8fde687427..ba99f5cd30 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonder audio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tu kuento no esta {locked}. Todos pueden segirte para ver tus publikasyones solo para suivantes.",
   "compose_form.lock_disclaimer.lock": "serrado",
   "compose_form.placeholder": "Ke haber?",
-  "compose_form.poll.add_option": "Adjusta opsyon",
   "compose_form.poll.duration": "Durasion de anketa",
-  "compose_form.poll.option_placeholder": "Opsyon {number}",
-  "compose_form.poll.remove_option": "Kita esta opsyon",
   "compose_form.poll.switch_to_multiple": "Trokar anketa para permeter a eskojer mas ke una opsyon",
   "compose_form.poll.switch_to_single": "Trokar anketa para permeter a eskojer solo una opsyon",
-  "compose_form.publish": "Publika",
   "compose_form.publish_form": "Mueva publikasyon",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guadra trokamientos",
-  "compose_form.sensitive.hide": "{count, plural, one {Marka material komo sensivle} other {Marka material komo sensivle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Material markado komo sensivle} other {Material markado komo sensivle}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Material no markado komo sensivle} other {Material no markado komo sensivle}}",
   "compose_form.spoiler.marked": "Kita avertensya de kontenido",
   "compose_form.spoiler.unmarked": "Adjusta avertensya de kontenido",
-  "compose_form.spoiler_placeholder": "Eskrive tu avertensya aki",
   "confirmation_modal.cancel": "Anula",
   "confirmations.block.block_and_report": "Bloka i raporta",
   "confirmations.block.confirm": "Bloka",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Enmentaduras privadas",
   "navigation_bar.discover": "Diskuvre",
   "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.edit_profile": "Edita profil",
   "navigation_bar.explore": "Eksplorar",
   "navigation_bar.favourites": "Te plazen",
   "navigation_bar.filters": "Biervos silensiados",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "Adjusta anketa",
   "poll_button.remove_poll": "Kita anketa",
   "privacy.change": "Troka privasita de publikasyon",
-  "privacy.direct.long": "Vizivle solo para utilizadores enmentados",
-  "privacy.direct.short": "Solo personas enmentadas",
-  "privacy.private.long": "Vizivle solo para suivantes",
-  "privacy.private.short": "Solo suivantes",
-  "privacy.public.long": "Vizivle para todos",
   "privacy.public.short": "Publiko",
-  "privacy.unlisted.long": "Vizivle para todos, ama eskluido de las fonksiones de diskuvrimyento",
-  "privacy.unlisted.short": "No listado",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
@@ -708,10 +689,8 @@
   "upload_error.poll": "No se permite kargar dosyas kon anketas.",
   "upload_form.audio_description": "Deskrive para personas sodras o kon problemes auditivos",
   "upload_form.description": "Deskrive para personas siegas o kon problemes vizuales",
-  "upload_form.description_missing": "No adjustates deskripsion",
   "upload_form.edit": "Edita",
   "upload_form.thumbnail": "Troka minyatura",
-  "upload_form.undo": "Efasa",
   "upload_form.video_description": "Deskrive para personas sodras, kon problemes auditivos, siegas o kon problemes vizuales",
   "upload_modal.analyzing_picture": "Analizando imaje…",
   "upload_modal.apply": "Aplika",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 623ff2248f..14fa09e973 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Skelbimas",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
-  "autosuggest_hashtag.per_week": "{count} per savaitę",
   "boost_modal.combo": "Gali paspausti {combo}, kad praleisti kitą kartą",
   "bundle_column_error.copy_stacktrace": "Kopijuoti klaidos ataskaitą",
   "bundle_column_error.error.body": "Užklausos puslapio nepavyko atvaizduoti. Tai gali būti dėl mūsų kodo klaidos arba naršyklės suderinamumo problemos.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "Kas tavo mintyse?",
   "compose_form.poll.add_option": "Pridėti pasirinkimą",
   "compose_form.poll.duration": "Apklausos trukmė",
+  "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} pasirinkimas",
   "compose_form.poll.remove_option": "Pašalinti šį pasirinkimą",
+  "compose_form.poll.single": "Pasirinkti vieną",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Pakeisti apklausą, kad būtų galima pasirinkti vieną variantą",
+  "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Išsaugoti pakeitimus",
-  "compose_form.sensitive.hide": "{count, plural, one {Žymėti mediją kaip jautrią} few {Žymėti medijas kaip jautrias} many {Žymėti medijo kaip jautrio} other {Žymėti medijų kaip jautrių}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medija pažymėta kaip jautri} few {Medijos pažymėtos kaip jautrios} many {Medijo pažymėta kaip jautrio} other {Medijų pažymėtų kaip jautrių}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medija nepažymėta kaip jautri} few {Medijos nepažymėtos kaip jautrios} many {Medijo nepažymėta kaip jautrio} other {Medijų nepažymėtų kaip jautrių}}",
+  "compose_form.reply": "Atsakyti",
+  "compose_form.save_changes": "Atnaujinti",
   "compose_form.spoiler.marked": "Pašalinti turinio įspėjimą",
   "compose_form.spoiler.unmarked": "Pridėti turinio įspėjimą",
-  "compose_form.spoiler_placeholder": "Rašyk savo įspėjimą čia",
+  "compose_form.spoiler_placeholder": "Turinio įspėjimas (pasirinktinis)",
   "confirmation_modal.cancel": "Atšaukti",
   "confirmations.block.block_and_report": "Blokuoti ir pranešti",
   "confirmations.block.confirm": "Blokuoti",
@@ -342,6 +341,7 @@
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "Uždaryti",
+  "lists.new.create": "Pridėti sąrašą",
   "loading_indicator.label": "Kraunama…",
   "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta, nes persikėlei į {movedToAccount}.",
@@ -356,7 +356,6 @@
   "navigation_bar.direct": "Privatūs paminėjimai",
   "navigation_bar.discover": "Atrasti",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Redaguoti profilį",
   "navigation_bar.explore": "Naršyti",
   "navigation_bar.favourites": "Mėgstamiausi",
   "navigation_bar.filters": "Nutylėti žodžiai",
@@ -466,14 +465,15 @@
   "poll_button.add_poll": "Pridėti apklausą",
   "poll_button.remove_poll": "Šalinti apklausą",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visiems matomas",
+  "privacy.direct.long": "Visus, paminėtus įraše",
+  "privacy.direct.short": "Konkretūs žmonės",
+  "privacy.private.long": "Tik sekėjams",
+  "privacy.private.short": "Sekėjai",
+  "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
   "privacy.public.short": "Viešas",
-  "privacy.unlisted.long": "Matomas visiems, bet atsisakyta atradimo funkcijų",
-  "privacy.unlisted.short": "Neįtrauktas į sąrašą",
+  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
+  "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
@@ -485,7 +485,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
   "reply_indicator.cancel": "Atšaukti",
+  "reply_indicator.poll": "Apklausa",
   "report.block": "Blokuoti",
   "report.categories.legal": "Legalus",
   "report.categories.other": "Kita",
@@ -579,9 +581,7 @@
   "units.short.thousand": "{count} tūkst.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Nėra pridėto aprašymo",
   "upload_form.edit": "Redaguoti",
-  "upload_form.undo": "Ištrinti",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "Pasirinkti vaizdą",
   "upload_modal.description_placeholder": "Greita rudoji lapė peršoka tinginį šunį",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index c06a1d9368..b4426b4c45 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Paziņojums",
   "attachments_list.unprocessed": "(neapstrādāti)",
   "audio.hide": "Slēpt audio",
-  "autosuggest_hashtag.per_week": "{count} nedēļā",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var tev piesekot un redzēt tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas tev padomā?",
-  "compose_form.poll.add_option": "Pievienot izvēli",
   "compose_form.poll.duration": "Aptaujas ilgums",
-  "compose_form.poll.option_placeholder": "Izvēle Nr. {number}",
-  "compose_form.poll.remove_option": "Noņemt šo izvēli",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
-  "compose_form.publish": "Publicēt",
   "compose_form.publish_form": "Jauns ieraksts",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Saglabāt izmaiņas",
-  "compose_form.sensitive.hide": "{count, plural, one {Atzīmēt multividi kā sensitīvu} other {Atzīmēt multivides kā sensitīvas}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multivide ir atzīmēta kā sensitīva} other {Multivides ir atzīmētas kā sensitīvas}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multivide nav atzīmēta kā sensitīva} other {Multivides nav atzīmētas kā sensitīvas}}",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
   "compose_form.spoiler.unmarked": "Pievienot satura brīdinājumu",
-  "compose_form.spoiler_placeholder": "Ieraksti savu brīdinājumu šeit",
   "confirmation_modal.cancel": "Atcelt",
   "confirmations.block.block_and_report": "Bloķēt un ziņot",
   "confirmations.block.confirm": "Bloķēt",
@@ -403,7 +392,6 @@
   "navigation_bar.direct": "Privāti pieminēti",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "navigation_bar.edit_profile": "Rediģēt profilu",
   "navigation_bar.explore": "Pārlūkot",
   "navigation_bar.favourites": "Izlase",
   "navigation_bar.filters": "Apklusinātie vārdi",
@@ -510,14 +498,7 @@
   "poll_button.add_poll": "Pievienot aptauju",
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ieraksta privātumu",
-  "privacy.direct.long": "Redzama tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai minētie cilvēki",
-  "privacy.private.long": "Redzama tikai sekotājiem",
-  "privacy.private.short": "Tikai sekotājiem",
-  "privacy.public.long": "Redzams visiem",
   "privacy.public.short": "Publiska",
-  "privacy.unlisted.long": "Redzams visiem, bet izslēgts no satura atklāšanas funkcijām",
-  "privacy.unlisted.short": "Neiekļautie",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "refresh": "Atsvaidzināt",
@@ -697,10 +678,8 @@
   "upload_error.poll": "Datņu augšupielādes aptaujās nav atļautas.",
   "upload_form.audio_description": "Pievieno aprakstu cilvēkiem ar dzirdes zudumu",
   "upload_form.description": "Pievieno aprakstu vājredzīgajiem",
-  "upload_form.description_missing": "Apraksts nav pievienots",
   "upload_form.edit": "Rediģēt",
   "upload_form.thumbnail": "Nomainīt sīktēlu",
-  "upload_form.undo": "Dzēst",
   "upload_form.video_description": "Pievieno aprakstu cilvēkiem ar dzirdes vai redzes traucējumiem",
   "upload_modal.analyzing_picture": "Analizē attēlu…",
   "upload_modal.apply": "Pielietot",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index bdef3f4a5f..f7080842b7 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -48,7 +48,6 @@
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.unexpected.message": "Неочекувана грешка.",
   "alert.unexpected.title": "Упс!",
-  "autosuggest_hashtag.per_week": "{count} неделно",
   "boost_modal.combo": "Кликни {combo} за да го прескокниш ова нареден пат",
   "bundle_column_error.retry": "Обидете се повторно",
   "bundle_modal_error.close": "Затвори",
@@ -76,14 +75,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "заклучен",
   "compose_form.placeholder": "Што имате на ум?",
-  "compose_form.poll.add_option": "Додај избор",
   "compose_form.poll.duration": "Времетрање на анкета",
-  "compose_form.poll.option_placeholder": "Избери {number}",
-  "compose_form.poll.remove_option": "Избриши избор",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.hide": "Обележи медиа како сензитивна",
-  "compose_form.sensitive.marked": "Медиата е обележана како сензитивна",
-  "compose_form.sensitive.unmarked": "Медиата не е обележана како сензитивна",
   "compose_form.spoiler.marked": "Текстот е сокриен зад предупредување",
   "compose_form.spoiler.unmarked": "Текстот не е сокриен",
   "confirmation_modal.cancel": "Откажи",
@@ -182,7 +175,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.filters": "Замолќени зборови",
   "navigation_bar.follow_requests": "Следи покани",
   "navigation_bar.follows_and_followers": "Следења и следбеници",
@@ -229,12 +221,7 @@
   "poll_button.add_poll": "Додадете нова анкета",
   "poll_button.remove_poll": "Избришете анкета",
   "privacy.change": "Штеловај статус на приватност",
-  "privacy.direct.long": "Објави само на спомнати корисници",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Објави само на следбеници",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.short": "Необјавено",
   "refresh": "Освежи",
   "regeneration_indicator.label": "Вчитување…",
   "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 11636646b2..0059dd333b 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -60,7 +60,6 @@
   "announcement.announcement": "അറിയിപ്പ്",
   "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
   "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
-  "autosuggest_hashtag.per_week": "ആഴ്ച തോറും {count}",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
   "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
@@ -102,17 +101,12 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
   "compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
-  "compose_form.poll.add_option": "ഒരു ചോയ്‌സ് ചേർക്കുക",
   "compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
-  "compose_form.poll.option_placeholder": "ചോയ്‌സ് {number}",
-  "compose_form.poll.remove_option": "ഈ ഡിവൈസ് മാറ്റുക",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{പ്രസിദ്ധീകരിക്കുക}!",
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
-  "compose_form.spoiler_placeholder": "നിങ്ങളുടെ മുന്നറിയിപ്പ് ഇവിടെ എഴുതുക",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
   "confirmations.block.block_and_report": "തടയുകയും റിപ്പോർട്ടും ചെയ്യുക",
   "confirmations.block.confirm": "തടയുക",
@@ -244,7 +238,6 @@
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
@@ -302,10 +295,6 @@
   "poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
@@ -372,7 +361,6 @@
   "upload_form.description": "കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ",
   "upload_form.edit": "തിരുത്തുക",
   "upload_form.thumbnail": "ലഘുചിത്രം മാറ്റുക",
-  "upload_form.undo": "ഇല്ലാതാക്കുക",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "ചിത്രം വിശകലനം ചെയ്യുന്നു…",
   "upload_modal.apply": "പ്രയോഗിക്കുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 7f5b7d6524..20231f0bbf 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -73,7 +73,6 @@
   "alert.unexpected.message": "एक अनपेक्षित त्रुटी आली.",
   "alert.unexpected.title": "अरेरे!",
   "announcement.announcement": "घोषणा",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताह",
   "bundle_column_error.retry": "पुन्हा प्रयत्न करा",
   "bundle_modal_error.close": "बंद करा",
   "bundle_modal_error.message": "हा घटक लोड करतांना काहीतरी चुकले आहे.",
@@ -99,9 +98,6 @@
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.placeholder": "आपल्या मनात काय आहे?",
-  "compose_form.poll.add_option": "नवीन पर्याय",
-  "compose_form.poll.option_placeholder": "निवड {number}",
-  "compose_form.poll.remove_option": "हा पर्याय काढा",
   "compose_form.publish_form": "Publish",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
@@ -228,10 +224,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 50a48db1ea..8c1ff63376 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -86,7 +86,6 @@
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(belum diproses)",
   "audio.hide": "Sembunyikan audio",
-  "autosuggest_hashtag.per_week": "{count} seminggu",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
   "bundle_column_error.copy_stacktrace": "Salin laporan ralat",
   "bundle_column_error.error.body": "Halaman yang diminta gagal dipaparkan. Ini mungkin disebabkan oleh pepijat dalam kod kami, atau masalah keserasian pelayar.",
@@ -143,22 +142,12 @@
   "compose_form.lock_disclaimer": "Akaun anda tidak {locked}. Sesiapa pun boleh mengikuti anda untuk melihat hantaran pengikut-sahaja anda.",
   "compose_form.lock_disclaimer.lock": "dikunci",
   "compose_form.placeholder": "Apakah yang sedang anda fikirkan?",
-  "compose_form.poll.add_option": "Tambah pilihan",
   "compose_form.poll.duration": "Tempoh undian",
-  "compose_form.poll.option_placeholder": "Pilihan {number}",
-  "compose_form.poll.remove_option": "Buang pilihan ini",
   "compose_form.poll.switch_to_multiple": "Ubah kepada membenarkan aneka undian",
   "compose_form.poll.switch_to_single": "Ubah kepada undian pilihan tunggal",
-  "compose_form.publish": "Terbit",
   "compose_form.publish_form": "Terbit",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Simpan perubahan",
-  "compose_form.sensitive.hide": "{count, plural, one {Tandakan media sbg sensitif} other {Tandakan media sbg sensitif}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media telah ditanda sbg sensitif} other {Media telah ditanda sbg sensitif}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media tidak ditanda sbg sensitif} other {Media tidak ditanda sbg sensitif}}",
   "compose_form.spoiler.marked": "Buang amaran kandungan",
   "compose_form.spoiler.unmarked": "Tambah amaran kandungan",
-  "compose_form.spoiler_placeholder": "Tulis amaran anda di sini",
   "confirmation_modal.cancel": "Batal",
   "confirmations.block.block_and_report": "Sekat & Lapor",
   "confirmations.block.confirm": "Sekat",
@@ -399,7 +388,6 @@
   "navigation_bar.direct": "Sebutan peribadi",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
-  "navigation_bar.edit_profile": "Sunting profil",
   "navigation_bar.explore": "Teroka",
   "navigation_bar.favourites": "Kegemaran",
   "navigation_bar.filters": "Perkataan yang dibisukan",
@@ -506,14 +494,7 @@
   "poll_button.add_poll": "Tambah undian",
   "poll_button.remove_poll": "Buang undian",
   "privacy.change": "Ubah privasi hantaran",
-  "privacy.direct.long": "Hanya boleh dilihat oleh pengguna disebut",
-  "privacy.direct.short": "Orang yang disebut sahaja",
-  "privacy.private.long": "Hanya boleh dilihat oleh pengikut",
-  "privacy.private.short": "Pengikut sahaja",
-  "privacy.public.long": "Kelihatan untuk semua",
   "privacy.public.short": "Awam",
-  "privacy.unlisted.long": "Terpapar untuk semua, tetapi menarik diri daripada ciri penemuan",
-  "privacy.unlisted.short": "Tidak tersenarai",
   "privacy_policy.last_updated": "Dikemaskini {date}",
   "privacy_policy.title": "Dasar Privasi",
   "refresh": "Muat semula",
@@ -693,10 +674,8 @@
   "upload_error.poll": "Tidak boleh memuat naik fail bersama undian.",
   "upload_form.audio_description": "Jelaskan untuk orang yang ada masalah pendengaran",
   "upload_form.description": "Jelaskan untuk orang yang ada masalah penglihatan",
-  "upload_form.description_missing": "Tiada keterangan ditambah",
   "upload_form.edit": "Sunting",
   "upload_form.thumbnail": "Ubah gambar kecil",
-  "upload_form.undo": "Padam",
   "upload_form.video_description": "Jelaskan untuk orang yang ada masalah pendengaran atau penglihatan",
   "upload_modal.analyzing_picture": "Menganalisis gambar…",
   "upload_modal.apply": "Guna",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 3ca03b616a..396a72ac45 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -87,7 +87,6 @@
   "announcement.announcement": "ကြေငြာချက်",
   "attachments_list.unprocessed": "(မလုပ်ဆောင်ရသေး)",
   "audio.hide": "အသံပိတ်မည်",
-  "autosuggest_hashtag.per_week": "တစ်ပတ်လျှင် {count}\n",
   "boost_modal.combo": "ဤအရာကို နောက်တစ်ကြိမ်ကျော်ရန် {combo} ကိုနှိပ်နိုင်သည်။",
   "bundle_column_error.copy_stacktrace": "စာကူးရာတွင်ပြဿနာရှိသည်",
   "bundle_column_error.error.body": "ဤစာမျက်နှာကို ဖော်ပြရာတွင် ပြဿနာရှိနေသည်",
@@ -144,22 +143,12 @@
   "compose_form.lock_disclaimer": "သင့်အကောင့်ကို {သော့ခတ်မထားပါ}။ သင့်နောက်လိုက်-သီးသန့်ပို့စ်များကို ကြည့်ရှုရန် မည်သူမဆို သင့်အား လိုက်ကြည့်နိုင်ပါသည်။",
   "compose_form.lock_disclaimer.lock": "သော့ခတ်ထားမယ်",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "ရွေးချယ်မှုထပ်မံပေါင်းထည့်ပါ",
   "compose_form.poll.duration": "စစ်တမ်းကြာချိန်",
-  "compose_form.poll.option_placeholder": "ရွေးချယ်မှု {number}\n",
-  "compose_form.poll.remove_option": "ဤရွေးချယ်မှုကို ဖယ်ထုတ်ပါ",
   "compose_form.poll.switch_to_multiple": "စစ်တမ်းတွင်တစ်ခုထပ်ပိုသောဆန္ဒပြုချက်လက်ခံမည်",
   "compose_form.poll.switch_to_single": "စစ်တမ်းတွင် တစ်ခုကိုသာရွေးချယ်ခွင့်ပြုမည်",
-  "compose_form.publish": "ပို့စ်တင်မည်",
   "compose_form.publish_form": "ပို့စ်တင်မည်",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "ပြောင်းလဲမှုများကို သိမ်းဆည်းပါ",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "သတိပေးစာကိုဤနေရာတွင်ရေးပါ",
   "confirmation_modal.cancel": "ပယ်ဖျက်မည်",
   "confirmations.block.block_and_report": "ဘလော့ပြီး တိုင်ကြားမည်",
   "confirmations.block.confirm": "ဘလော့မည်",
@@ -405,7 +394,6 @@
   "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
   "navigation_bar.discover": "ရှာဖွေပါ",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ကိုယ်ရေးမှတ်တမ်းပြင်ဆင်မည်",
   "navigation_bar.explore": "စူးစမ်းရန်",
   "navigation_bar.favourites": "Favorites",
   "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
@@ -519,14 +507,7 @@
   "poll_button.add_poll": "စစ်တမ်းကောက်မည်",
   "poll_button.remove_poll": "စစ်တမ်းပယ်ဖျက်မည်",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "မန်းရှင်းခေါ်သူသီးသန့်",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "ဖော်လိုးလုပ်သူသီးသန့်",
-  "privacy.private.short": "စောင့်ကြည့်သူများသာ",
-  "privacy.public.long": "အားလုံး မြင်နိုင်သည်",
   "privacy.public.short": "အများကိုပြမည်",
-  "privacy.unlisted.long": "အားလုံးမြင်နိုင်သော်လည်း ရှာဖွေမှုများမှ ဖယ်ထုတ်ထားသည်",
-  "privacy.unlisted.short": "စာရင်းမသွင်းထားပါ",
   "privacy_policy.last_updated": "နောက်ဆုံး ပြင်ဆင်ခဲ့သည့်ရက်စွဲ {date}",
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "recommended": "အကြံပြုသည်",
@@ -708,10 +689,8 @@
   "upload_error.poll": "စစ်တမ်းနှင့်အတူဖိုင်များတင်ခွင့်မပြုပါ",
   "upload_form.audio_description": "အကြားအာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_form.description": "အမြင်အာရုံချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
-  "upload_form.description_missing": "ဖော်ပြချက် မထည့်ပါ",
   "upload_form.edit": "ပြင်ရန်",
   "upload_form.thumbnail": "ပုံသေးကို ပြောင်းပါ",
-  "upload_form.undo": "ဖျက်ရန်",
   "upload_form.video_description": "အမြင်အာရုံနှင့်အကြားအာရုံ ချို့ယွင်းသော ခက်ခဲသောသူများအတွက် ဖော်ပြထားသည်",
   "upload_modal.analyzing_picture": "ပုံအား ပိုင်းခြားစိတ်ဖြာနေသည်...",
   "upload_modal.apply": "သုံးပါ",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 229d4f4718..86e24a15fb 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -69,12 +69,5 @@
   "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
   "compose.language.search": "भाषाहरू खोज्नुहोस्...",
   "compose_form.direct_message_warning_learn_more": "थप जान्नुहोस्",
-  "compose_form.poll.add_option": "विकल्प थप्नुहोस्",
-  "compose_form.poll.remove_option": "यो विकल्प हटाउनुहोस्",
-  "compose_form.publish_form": "नयाँ पोस्ट",
-  "compose_form.save_changes": "परिवर्तनहरू सेभ गर्नुहोस",
-  "compose_form.sensitive.hide": "{count, plural, one {संवेदनशील मिडियाको रूपमा चिन्ह लगाउनुहोस्} other {संवेदनशील मिडियाहरूको रूपमा चिन्ह लगाउनुहोस्}}",
-  "compose_form.sensitive.marked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छ} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छ}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {मिडियालाई संवेदनशील रूपमा चिन्ह लगाइएको छैन} other {मिडियाहरूलाई संवेदनशील रूपमा चिन्ह लगाइएको छैन}}",
-  "compose_form.spoiler_placeholder": "यहाँ आफ्नो चेतावनी लेख्नुहोस्"
+  "compose_form.publish_form": "नयाँ पोस्ट"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 86617d4a54..e38f8fd0ba 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Mededeling",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
-  "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.copy_stacktrace": "Foutrapportage kopiëren",
   "bundle_column_error.error.body": "De opgevraagde pagina kon niet worden weergegeven. Dit kan het gevolg zijn van een fout in onze broncode, of van een compatibiliteitsprobleem met je webbrowser.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de berichten zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "vergrendeld",
   "compose_form.placeholder": "Wat wil je kwijt?",
-  "compose_form.poll.add_option": "Keuze toevoegen",
+  "compose_form.poll.add_option": "Optie toevoegen",
   "compose_form.poll.duration": "Duur van de peiling",
-  "compose_form.poll.option_placeholder": "Keuze {number}",
-  "compose_form.poll.remove_option": "Deze keuze verwijderen",
+  "compose_form.poll.multiple": "Meerkeuze",
+  "compose_form.poll.option_placeholder": "Optie {number}",
+  "compose_form.poll.remove_option": "Deze optie verwijderen",
+  "compose_form.poll.single": "Kies een",
   "compose_form.poll.switch_to_multiple": "Peiling wijzigen om meerdere keuzes toe te staan",
   "compose_form.poll.switch_to_single": "Peiling wijzigen om een enkele keuze toe te staan",
-  "compose_form.publish": "Toot",
+  "compose_form.poll.type": "Stijl",
+  "compose_form.publish": "Plaatsen",
   "compose_form.publish_form": "Nieuw bericht",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Wijzigingen opslaan",
-  "compose_form.sensitive.hide": "{count, plural, one {Media als gevoelig markeren} other {Media als gevoelig markeren}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is als gevoelig gemarkeerd} other {Media is als gevoelig gemarkeerd}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is niet als gevoelig gemarkeerd} other {Media is niet als gevoelig gemarkeerd}}",
+  "compose_form.reply": "Reageren",
+  "compose_form.save_changes": "Bijwerken",
   "compose_form.spoiler.marked": "Inhoudswaarschuwing verwijderen",
   "compose_form.spoiler.unmarked": "Inhoudswaarschuwing toevoegen",
-  "compose_form.spoiler_placeholder": "Waarschuwingstekst",
+  "compose_form.spoiler_placeholder": "Waarschuwing inhoud (optioneel)",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.block_and_report": "Blokkeren en rapporteren",
   "confirmations.block.confirm": "Blokkeren",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Privéberichten",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
-  "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.explore": "Verkennen",
   "navigation_bar.favourites": "Favorieten",
   "navigation_bar.filters": "Filters",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
-  "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Privébericht",
-  "privacy.private.long": "Alleen aan volgers tonen",
-  "privacy.private.short": "Alleen volgers",
-  "privacy.public.long": "Voor iedereen zichtbaar",
+  "privacy.direct.long": "Iedereen genoemd in de post",
+  "privacy.direct.short": "Specifieke mensen",
+  "privacy.private.long": "Alleen jouw volgers",
+  "privacy.private.short": "Volgers",
+  "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
-  "privacy.unlisted.short": "Minder openbaar",
+  "privacy.unlisted.additional": "Dit is vergelijkbaar met publiek, behalve dat de post niet zal verschijnen in live feeds of hashtags, verkennen of Mastodon zoeken, zelfs als je gekozen hebt voor account-breed.",
+  "privacy.unlisted.long": "Minder algoritmische fanfare",
+  "privacy.unlisted.short": "Stil publiek",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
   "recommended": "Aanbevolen",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
+  "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
   "reply_indicator.cancel": "Annuleren",
+  "reply_indicator.poll": "Peiling",
   "report.block": "Blokkeren",
   "report.block_explanation": "Je kunt diens berichten niet zien. Je kunt door diegene niet gevolgd worden en jouw berichten zijn onzichtbaar. Diegene kan zien dat die door jou is geblokkeerd.",
   "report.categories.legal": "Juridisch",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
   "upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
   "upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
-  "upload_form.description_missing": "Geen omschrijving toegevoegd",
   "upload_form.edit": "Bewerken",
   "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
-  "upload_form.undo": "Verwijderen",
   "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
   "upload_modal.analyzing_picture": "Afbeelding analyseren…",
   "upload_modal.apply": "Toepassen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index ec2ff82144..9bb4f59197 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjering",
   "attachments_list.unprocessed": "(ubehandla)",
   "audio.hide": "Gøym lyd",
-  "autosuggest_hashtag.per_week": "{count} per veke",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den etterspurde sida kan ikke hentast fram. Det kan skuldast ein feil i koden vår eller eit kompatibilitetsproblem.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Kontoen din er ikkje {locked}. Kven som helst kan fylgja deg for å sjå innlegga dine.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Kva har du på hjarta?",
-  "compose_form.poll.add_option": "Legg til eit val",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Varigheit for rundspørjing",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Fjern dette valet",
+  "compose_form.poll.multiple": "Flervalg",
+  "compose_form.poll.option_placeholder": "Valg {number}",
+  "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre rundspørjinga til å tillate fleire val",
   "compose_form.poll.switch_to_single": "Endre rundspørjinga til å tillate berre eitt val",
-  "compose_form.publish": "Legg ut",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Legg ut",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringar",
-  "compose_form.sensitive.hide": "{count, plural, one {Marker mediet som ømtolig} other {Marker media som ømtolige}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediet er markert som ømtolig} other {Media er markerte som ømtolige}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediet er ikkje markert som ømtolig} other {Media er ikkje markerte som ømtolige}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innhaldsåtvaring",
   "compose_form.spoiler.unmarked": "Legg til innhaldsåtvaring",
-  "compose_form.spoiler_placeholder": "Skriv åtvaringa di her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker & rapporter",
   "confirmations.block.confirm": "Blokker",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favorittar",
   "navigation_bar.filters": "Målbundne ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Lag ei rundspørjing",
   "poll_button.remove_poll": "Fjern rundspørjing",
   "privacy.change": "Endre personvernet på innlegg",
-  "privacy.direct.long": "Synleg kun for omtala brukarar",
-  "privacy.direct.short": "Kun nemnde personar",
-  "privacy.private.long": "Kun synleg for fylgjarar",
-  "privacy.private.short": "Kun fylgjarar",
-  "privacy.public.long": "Synleg for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentleg",
-  "privacy.unlisted.long": "Synleg for alle, men blir ikkje vist i oppdagsfunksjonar",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du vil ikkje kunne sjå innlegga deira. Dei vil ikkje kunne sjå innlegga dine eller fylgje deg. Dei kan sjå at dei er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
   "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
   "upload_form.description": "Skildre for blinde og svaksynte",
-  "upload_form.description_missing": "Inga skildring er lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Bytt miniatyrbilete",
-  "upload_form.undo": "Slett",
   "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
   "upload_modal.analyzing_picture": "Analyserer bilete…",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 50da3bb2be..8da9853bee 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Kunngjøring",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
-  "autosuggest_hashtag.per_week": "{count} per uke",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "bundle_column_error.copy_stacktrace": "Kopier feilrapport",
   "bundle_column_error.error.body": "Den forespurte siden kan ikke gjengis. Den kan skyldes en feil i vår kode eller et kompatibilitetsproblem med nettleseren.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hva har du på hjertet?",
-  "compose_form.poll.add_option": "Legg til et valg",
+  "compose_form.poll.add_option": "Legg til alternativ",
   "compose_form.poll.duration": "Avstemningens varighet",
+  "compose_form.poll.multiple": "Flervalg",
   "compose_form.poll.option_placeholder": "Valg {number}",
   "compose_form.poll.remove_option": "Fjern dette valget",
+  "compose_form.poll.single": "Velg en",
   "compose_form.poll.switch_to_multiple": "Endre avstemning til å tillate flere valg",
   "compose_form.poll.switch_to_single": "Endre avstemning til å tillate ett valg",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish": "Publiser",
   "compose_form.publish_form": "Publiser",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lagre endringer",
-  "compose_form.sensitive.hide": "{count, plural,one {Merk media som følsomt} other {Merk medier som følsomme}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Mediet er merket som følsomt}other {Mediene er merket som følsomme}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Mediet er ikke merket som følsomt}other {Mediene er ikke merket som følsomme}}",
+  "compose_form.reply": "Svar",
+  "compose_form.save_changes": "Oppdater",
   "compose_form.spoiler.marked": "Fjern innholdsvarsel",
   "compose_form.spoiler.unmarked": "Legg til innholdsvarsel",
-  "compose_form.spoiler_placeholder": "Skriv advarselen din her",
+  "compose_form.spoiler_placeholder": "Innholdsadvarsel (valgfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blokker og rapporter",
   "confirmations.block.confirm": "Blokkèr",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
-  "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.explore": "Utforsk",
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Stilnede ord",
@@ -525,14 +523,14 @@
   "poll_button.add_poll": "Legg til en avstemning",
   "poll_button.remove_poll": "Fjern avstemningen",
   "privacy.change": "Juster synlighet",
-  "privacy.direct.long": "Post kun til nevnte brukere",
-  "privacy.direct.short": "Kun nevnte personer",
-  "privacy.private.long": "Post kun til følgere",
-  "privacy.private.short": "Kun følgere",
-  "privacy.public.long": "Synlig for alle",
+  "privacy.direct.long": "Alle nevnt i innlegget",
+  "privacy.direct.short": "Spesifikke folk",
+  "privacy.private.long": "Bare følgerne dine",
+  "privacy.private.short": "Følgere",
+  "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Synlig for alle, men vises ikke i oppdagsfunksjoner",
-  "privacy.unlisted.short": "Uoppført",
+  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
   "recommended": "Anbefalt",
@@ -550,7 +548,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
+  "reply_indicator.poll": "Avstemming",
   "report.block": "Blokker",
   "report.block_explanation": "Du kommer ikke til å se innleggene deres. De vil ikke kunne se innleggene dine eller følge deg. De vil kunne se at de er blokkert.",
   "report.categories.legal": "Juridisk",
@@ -714,10 +714,8 @@
   "upload_error.poll": "Filopplasting er ikke tillatt for avstemninger.",
   "upload_form.audio_description": "Beskriv det for folk med hørselstap",
   "upload_form.description": "Beskriv for synshemmede",
-  "upload_form.description_missing": "Ingen beskrivelse lagt til",
   "upload_form.edit": "Rediger",
   "upload_form.thumbnail": "Endre miniatyrbilde",
-  "upload_form.undo": "Angre",
   "upload_form.video_description": "Beskriv det for folk med hørselstap eller synshemminger",
   "upload_modal.analyzing_picture": "Analyserer bildet …",
   "upload_modal.apply": "Bruk",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1ecfbcaf06..8660a3bc05 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -80,7 +80,6 @@
   "announcement.announcement": "Anóncia",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
-  "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
   "bundle_column_error.error.title": "Oh non !",
@@ -131,22 +130,12 @@
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
   "compose_form.placeholder": "A de qué pensatz ?",
-  "compose_form.poll.add_option": "Ajustar una causida",
   "compose_form.poll.duration": "Durada del sondatge",
-  "compose_form.poll.option_placeholder": "Opcion {number}",
-  "compose_form.poll.remove_option": "Levar aquesta opcion",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
-  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish} !",
-  "compose_form.save_changes": "Salvar los cambiaments",
-  "compose_form.sensitive.hide": "Marcar coma sensible",
-  "compose_form.sensitive.marked": "Lo mèdia es marcat coma sensible",
-  "compose_form.sensitive.unmarked": "Lo mèdia es pas marcat coma sensible",
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
-  "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.block_and_report": "Blocar e senhalar",
   "confirmations.block.confirm": "Blocar",
@@ -359,7 +348,6 @@
   "navigation_bar.direct": "Mencions privadas",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
-  "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favorits",
   "navigation_bar.filters": "Mots ignorats",
@@ -457,14 +445,7 @@
   "poll_button.add_poll": "Ajustar un sondatge",
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
-  "privacy.direct.long": "Mostrar pas qu’a las personas mencionadas",
-  "privacy.direct.short": "Sonque per las personas mencionadas",
-  "privacy.private.long": "Mostrar pas qu’a vòstres seguidors",
-  "privacy.private.short": "Sonque pels seguidors",
-  "privacy.public.long": "Visiblas per totes",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Visible per totes mas desactivat per las foncionalitats de descobèrta",
-  "privacy.unlisted.short": "Pas-listat",
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
@@ -621,10 +602,8 @@
   "upload_error.poll": "Lo mandadís de fichièr es pas autorizat pels sondatges.",
   "upload_form.audio_description": "Descriure per las personas amb pèrdas auditivas",
   "upload_form.description": "Descripcion pels mal vesents",
-  "upload_form.description_missing": "Cap de descripcion pas aponduda",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar la vinheta",
-  "upload_form.undo": "Suprimir",
   "upload_form.video_description": "Descriure per las personas amb pèrdas auditivas o mal vesent",
   "upload_modal.analyzing_picture": "Analisi de l’imatge…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 132b695cda..de085cf985 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -67,9 +67,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.publish": "ਪ੍ਰਕਾਸ਼ਨ ਕਰੋ",
   "compose_form.publish_form": "Publish",
-  "compose_form.save_changes": "ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
   "compose_form.spoiler.unmarked": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ ਜੋੜੋ",
   "confirmation_modal.cancel": "ਰੱਦ ਕਰੋ",
@@ -188,7 +186,6 @@
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.discover": "ਖੋਜ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
-  "navigation_bar.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "navigation_bar.explore": "ਪੜਚੋਲ ਕਰੋ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
   "navigation_bar.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
@@ -238,8 +235,6 @@
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
-  "privacy.direct.short": "ਸਿੱਧਾ ਲੋਕਾਂ ਦਾ ਜ਼ਿਕਰ ਕਰੋ",
-  "privacy.private.short": "ਸਿਰਫ਼ ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
@@ -327,7 +322,6 @@
   "upload_form.audio_description": "ਬੋਲ਼ੇ ਜਾਂ ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.description": "ਅੰਨ੍ਹੇ ਜਾਂ ਦੇਖਣ ਲਈ ਮੁਸ਼ਕਲ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵੇ",
   "upload_form.edit": "ਸੋਧ",
-  "upload_form.undo": "ਹਟਾਓ",
   "upload_form.video_description": "ਬੋਲ਼ੇ, ਸੁਣਨ ਵਿੱਚ ਮੁਸ਼ਕਿਲ, ਅੰਨ੍ਹੇ ਜਾਂ ਘੱਟ ਨਿਗ੍ਹਾ ਵਾਲੇ ਲੋਕਾਂ ਲਈ ਵੇਰਵਾ",
   "upload_modal.apply": "ਲਾਗੂ ਕਰੋ",
   "upload_modal.applying": "ਲਾਗੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 35dbc6661d..2eaeeaab55 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Ogłoszenie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
-  "autosuggest_hashtag.per_week": "{count} co tydzień",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.copy_stacktrace": "Skopiuj raport o błędzie",
   "bundle_column_error.error.body": "Nie można zrenderować żądanej strony. Może to być spowodowane błędem w naszym kodzie lub problemami z kompatybilnością przeglądarki.",
@@ -148,20 +147,19 @@
   "compose_form.placeholder": "Co chodzi ci po głowie?",
   "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
+  "compose_form.poll.multiple": "Wielokrotny wybór",
   "compose_form.poll.option_placeholder": "Opcja {number}",
   "compose_form.poll.remove_option": "Usuń tę opcję",
+  "compose_form.poll.single": "Wybierz jedną",
   "compose_form.poll.switch_to_multiple": "Pozwól na wybranie wielu opcji",
   "compose_form.poll.switch_to_single": "Pozwól na wybranie tylko jednej opcji",
+  "compose_form.poll.type": "Styl",
   "compose_form.publish": "Opublikuj",
   "compose_form.publish_form": "Opublikuj",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Zapisz zmiany",
-  "compose_form.sensitive.hide": "{count, plural, one {Oznacz treść multimedialną jako wrażliwą} other {Oznacz treści multimedialne jako wrażliwe}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Treść multimedialna jest oznaczona jako wrażliwa} other {Treści multimedialne są oznaczone jako wrażliwe}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Treść multimedialna nie jest oznaczona jako wrażliwa} other {Treści multimedialne nie są oznaczone jako wrażliwe}}",
+  "compose_form.reply": "Odpowiedz",
+  "compose_form.save_changes": "Aktualizuj",
   "compose_form.spoiler.marked": "Usuń ostrzeżenie o treści",
   "compose_form.spoiler.unmarked": "Dodaj ostrzeżenie o treści",
-  "compose_form.spoiler_placeholder": "Wpisz ostrzeżenie tutaj",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.block_and_report": "Zablokuj i zgłoś",
   "confirmations.block.confirm": "Zablokuj",
@@ -408,7 +406,6 @@
   "navigation_bar.direct": "Prywatne wzmianki",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
-  "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.explore": "Odkrywaj",
   "navigation_bar.favourites": "Ulubione",
   "navigation_bar.filters": "Wyciszone słowa",
@@ -526,14 +523,11 @@
   "poll_button.add_poll": "Dodaj głosowanie",
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
-  "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspomniane osoby",
-  "privacy.private.long": "Widoczny tylko dla osób, które Cię obserwują",
-  "privacy.private.short": "Tylko obserwujący",
-  "privacy.public.long": "Widoczne dla każdego",
+  "privacy.direct.short": "Konkretni ludzie",
+  "privacy.private.long": "Tylko ci, którzy cię obserwują",
+  "privacy.private.short": "Obserwujący",
+  "privacy.public.long": "Ktokolwiek na i poza Mastodonem",
   "privacy.public.short": "Publiczny",
-  "privacy.unlisted.long": "Widoczne dla każdego, z wyłączeniem funkcji odkrywania",
-  "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
@@ -715,10 +709,8 @@
   "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
   "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
   "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
-  "upload_form.description_missing": "Nie dodano opisu",
   "upload_form.edit": "Edytuj",
   "upload_form.thumbnail": "Zmień miniaturę",
-  "upload_form.undo": "Usuń",
   "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
   "upload_modal.analyzing_picture": "Analizowanie obrazu…",
   "upload_modal.apply": "Zastosuj",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b8e18e1229..bb009239d4 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Comunicados",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "No que você está pensando?",
   "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração da enquete",
+  "compose_form.poll.multiple": "Múltipla escolha",
   "compose_form.poll.option_placeholder": "Opção {number}",
-  "compose_form.poll.remove_option": "Remover opção",
+  "compose_form.poll.remove_option": "Remover esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
-  "compose_form.publish": "Publicar",
+  "compose_form.poll.type": "Estilo",
+  "compose_form.publish": "Publicação",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvar alterações",
-  "compose_form.sensitive.hide": "{count, plural, one {Marcar mídia como sensível} other {Marcar mídias como sensível}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mídia marcada como sensível} other {Mídias marcadas como sensível}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mídia não está marcada como sensível} other {Mídias não estão marcadas como sensível}}",
+  "compose_form.reply": "Resposta",
+  "compose_form.save_changes": "Atualização",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
-  "compose_form.spoiler_placeholder": "Aviso de Conteúdo aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras filtradas",
@@ -526,14 +524,12 @@
   "poll_button.add_poll": "Adicionar enquete",
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
-  "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
-  "privacy.unlisted.short": "Não-listado",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -552,6 +548,7 @@
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Enquete",
   "report.block": "Bloquear",
   "report.block_explanation": "Você não verá suas publicações. Ele não poderá ver suas publicações ou segui-lo, e será capaz de perceber que está bloqueado.",
   "report.categories.legal": "Jurídico",
@@ -715,10 +712,8 @@
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
   "upload_form.audio_description": "Descrever para deficientes auditivos",
   "upload_form.description": "Descrever para deficientes visuais",
-  "upload_form.description_missing": "Sem descrição",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Excluir",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
   "upload_modal.analyzing_picture": "Analisando imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a6d0ffee9a..22bb1bbfd2 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "autosuggest_hashtag.per_week": "{count} por semana",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
-  "compose_form.poll.add_option": "Adicionar uma opção",
+  "compose_form.poll.add_option": "Adicionar opção",
   "compose_form.poll.duration": "Duração do inquérito",
+  "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
   "compose_form.poll.remove_option": "Eliminar esta opção",
+  "compose_form.poll.single": "Escolha uma",
   "compose_form.poll.switch_to_multiple": "Alterar o inquérito para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar o inquérito para permitir uma única resposta",
+  "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Guardar alterações",
-  "compose_form.sensitive.hide": "Marcar media como sensível",
-  "compose_form.sensitive.marked": "Media marcada como sensível",
-  "compose_form.sensitive.unmarked": "Media não está marcada como sensível",
+  "compose_form.reply": "Responder",
+  "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
   "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
-  "compose_form.spoiler_placeholder": "Escreva o seu aviso aqui",
+  "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.block_and_report": "Bloquear e Denunciar",
   "confirmations.block.confirm": "Bloquear",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
-  "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Palavras silenciadas",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Adicionar votação",
   "poll_button.remove_poll": "Remover sondagem",
   "privacy.change": "Ajustar a privacidade da publicação",
-  "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas mencionadas",
-  "privacy.private.long": "Apenas para os seguidores",
-  "privacy.private.short": "Apenas seguidores",
-  "privacy.public.long": "Visível para todos",
+  "privacy.direct.long": "Todos os mencionados na publicação",
+  "privacy.direct.short": "Pessoas específicas",
+  "privacy.private.long": "Apenas os seus seguidores",
+  "privacy.private.short": "Seguidores",
+  "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visível para todos, mas não incluir em funcionalidades de divulgação",
-  "privacy.unlisted.short": "Não listar",
+  "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+  "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
   "reply_indicator.cancel": "Cancelar",
+  "reply_indicator.poll": "Sondagem",
   "report.block": "Bloquear",
   "report.block_explanation": "Não verá as publicações deles. Eles não serão capazes de ver suas publicações ou de o seguir. Eles vão conseguir saber que estão bloqueados.",
   "report.categories.legal": "Legal",
@@ -715,10 +716,8 @@
   "upload_error.poll": "O carregamento de ficheiros não é permitido em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
-  "upload_form.description_missing": "Nenhuma descrição adicionada",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
-  "upload_form.undo": "Eliminar",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
   "upload_modal.analyzing_picture": "A analizar imagem…",
   "upload_modal.apply": "Aplicar",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 88dbfa4b8e..e6d881a986 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Anunț",
   "attachments_list.unprocessed": "(neprocesate)",
   "audio.hide": "Ascunde audio",
-  "autosuggest_hashtag.per_week": "{count} pe săptămână",
   "boost_modal.combo": "Poți apăsa {combo} pentru a sări peste asta data viitoare",
   "bundle_column_error.copy_stacktrace": "Copiază raportul de eroare",
   "bundle_column_error.error.body": "Pagina solicitată nu a putut fi randată. Ar putea fi cauzată de o eroare în codul nostru sau de o problemă de compatibilitate cu browser-ul.",
@@ -131,22 +130,12 @@
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine se poate abona la tine pentru a îți vedea postările numai pentru abonați.",
   "compose_form.lock_disclaimer.lock": "privat",
   "compose_form.placeholder": "La ce te gândești?",
-  "compose_form.poll.add_option": "Adaugă o opțiune",
   "compose_form.poll.duration": "Durata sondajului",
-  "compose_form.poll.option_placeholder": "Opțiunea {number}",
-  "compose_form.poll.remove_option": "Elimină acestă opțiune",
   "compose_form.poll.switch_to_multiple": "Modifică sondajul pentru a permite mai multe opțiuni",
   "compose_form.poll.switch_to_single": "Modifică sondajul pentru a permite o singură opțiune",
-  "compose_form.publish": "Publică",
   "compose_form.publish_form": "Publică",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Salvează modificările",
-  "compose_form.sensitive.hide": "{count, plural, one {Marchează conținutul media ca fiind sensibil} few {Marchează conținuturile media ca fiind sensibile} other {Marchează conținuturile media ca fiind sensibile}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Conținutul media este marcat ca fiind sensibil} other {Conținuturile media sunt marcate ca fiind sensibile}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Conținutul media nu este marcat ca fiind sensibil} other {Conținuturile media nu sunt marcate ca fiind sensibile}}",
   "compose_form.spoiler.marked": "Elimină avertismentul privind conținutul",
   "compose_form.spoiler.unmarked": "Adaugă un avertisment privind conținutul",
-  "compose_form.spoiler_placeholder": "Scrie avertismentul aici",
   "confirmation_modal.cancel": "Anulează",
   "confirmations.block.block_and_report": "Blochează și raportează",
   "confirmations.block.confirm": "Blochează",
@@ -365,7 +354,6 @@
   "navigation_bar.compose": "Compune o nouă postare",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
-  "navigation_bar.edit_profile": "Modifică profilul",
   "navigation_bar.explore": "Explorează",
   "navigation_bar.filters": "Cuvinte ignorate",
   "navigation_bar.follow_requests": "Cereri de abonare",
@@ -461,14 +449,7 @@
   "poll_button.add_poll": "Adaugă un sondaj",
   "poll_button.remove_poll": "Elimină sondajul",
   "privacy.change": "Modifică confidențialitatea postării",
-  "privacy.direct.long": "Vizibil doar pentru utilizatorii menționați",
-  "privacy.direct.short": "Doar persoane menționate",
-  "privacy.private.long": "Vizibil doar pentru abonați",
-  "privacy.private.short": "Doar abonați",
-  "privacy.public.long": "Vizibil pentru toți",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Vizibil pentru toți dar fără funcții de descoperire",
-  "privacy.unlisted.short": "Nelistat",
   "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
   "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
@@ -641,10 +622,8 @@
   "upload_error.poll": "Încărcarea fișierului nu este permisă cu sondaje.",
   "upload_form.audio_description": "Descrie pentru persoanele cu deficiență a auzului",
   "upload_form.description": "Adaugă o descriere pentru persoanele cu deficiențe de vedere",
-  "upload_form.description_missing": "Nicio descriere adăugată",
   "upload_form.edit": "Modifică",
   "upload_form.thumbnail": "Schimbă miniatura",
-  "upload_form.undo": "Șterge",
   "upload_form.video_description": "Adaugă o descriere pentru persoanele cu deficiențe vizuale sau auditive",
   "upload_modal.analyzing_picture": "Se analizează imaginea…",
   "upload_modal.apply": "Aplică",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index a8ff90cc00..eefa9c7298 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
-  "autosuggest_hashtag.per_week": "{count} / неделю",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "не закрыта",
   "compose_form.placeholder": "О чём думаете?",
-  "compose_form.poll.add_option": "Добавить вариант",
   "compose_form.poll.duration": "Продолжительность опроса",
-  "compose_form.poll.option_placeholder": "Вариант {number}",
-  "compose_form.poll.remove_option": "Убрать этот вариант",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сохранить",
-  "compose_form.sensitive.hide": "{count, plural, one {Отметить медифайл как деликатный} other {Отметить медифайлы как деликатные}}",
-  "compose_form.sensitive.marked": "Медиа{count, plural, =1 {файл отмечен} other {файлы отмечены}} как «деликатного характера»",
-  "compose_form.sensitive.unmarked": "Медиа{count, plural, =1 {файл не отмечен} other {файлы не отмечены}} как «деликатного характера»",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Текст предупреждения",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.block_and_report": "Заблокировать и пожаловаться",
   "confirmations.block.confirm": "Заблокировать",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Личные упоминания",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
-  "navigation_bar.edit_profile": "Изменить профиль",
   "navigation_bar.explore": "Обзор",
   "navigation_bar.favourites": "Избранные",
   "navigation_bar.filters": "Игнорируемые слова",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Добавить опрос",
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
-  "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Только упомянутые",
-  "privacy.private.long": "Показать только подписчикам",
-  "privacy.private.short": "Для подписчиков",
-  "privacy.public.long": "Виден всем",
   "privacy.public.short": "Публичный",
-  "privacy.unlisted.long": "Виден всем, но не через функции обзора",
-  "privacy.unlisted.short": "Скрытый",
   "privacy_policy.last_updated": "Последнее обновление {date}",
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
@@ -715,10 +696,8 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
-  "upload_form.description_missing": "Описание не добавлено",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
-  "upload_form.undo": "Отменить",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
   "upload_modal.analyzing_picture": "Обработка изображения…",
   "upload_modal.apply": "Применить",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 051ec5d6f8..469930c3ed 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -77,7 +77,6 @@
   "announcement.announcement": "उद्घोषणा",
   "attachments_list.unprocessed": "(अप्रकृतम्)",
   "audio.hide": "ध्वनिं प्रच्छादय",
-  "autosuggest_hashtag.per_week": "{count} प्रतिसप्ताहे",
   "boost_modal.combo": "{combo} अत्र स्प्रष्टुं शक्यते, त्यक्तुमेतमन्यस्मिन् समये",
   "bundle_column_error.copy_stacktrace": "त्रुट्यावेदनं प्रतिलिपिङ्कुरु",
   "bundle_column_error.error.body": "अनुरोधितं पृष्ठं प्रतिपादयितुं न शक्यते। अस्माकं कोडि दोषस्य कारणेन, अथवा ब्राउजर् संगततायास्समस्यायाः कारणेन भवितुमर्हति।",
@@ -129,22 +128,12 @@
   "compose_form.lock_disclaimer": "तव लेखा न प्रवेष्टुमशक्या {locked} । कोऽप्यनुसर्ता ते केवलमनुसर्तृृणां कृते स्थितानि पत्राणि द्रष्टुं शक्नोति ।",
   "compose_form.lock_disclaimer.lock": "अवरुद्धः",
   "compose_form.placeholder": "मनसि ते किमस्ति?",
-  "compose_form.poll.add_option": "मतमपरं युज्यताम्",
   "compose_form.poll.duration": "मतदान-समयावधिः",
-  "compose_form.poll.option_placeholder": "मतम् {number}",
-  "compose_form.poll.remove_option": "मतमेतन्नश्यताम्",
   "compose_form.poll.switch_to_multiple": "मतदानं परिवर्तयित्वा बहुवैकल्पिकमतदानं क्रियताम्",
   "compose_form.poll.switch_to_single": "मतदानं परिवर्तयित्वा निर्विकल्पमतदानं क्रियताम्",
-  "compose_form.publish": "प्रकाशीकुरु",
   "compose_form.publish_form": "प्रकाशीकुरु",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "परिवर्तनानि रक्ष",
-  "compose_form.sensitive.hide": "संवेदनशीलसामग्रीत्यङ्यताम्",
-  "compose_form.sensitive.marked": "संवेदनशीलसामग्रीत्यङ्कितम्",
-  "compose_form.sensitive.unmarked": "संवेदनशीलसामग्रीति नाङ्कितम्",
   "compose_form.spoiler.marked": "प्रच्छान्नाक्षरं विद्यते",
   "compose_form.spoiler.unmarked": "अप्रच्छन्नाक्षरं विद्यते",
-  "compose_form.spoiler_placeholder": "प्रत्यादेशस्ते लिख्यताम्",
   "confirmation_modal.cancel": "नश्यताम्",
   "confirmations.block.block_and_report": "अवरुध्य आविद्यताम्",
   "confirmations.block.confirm": "निषेधः",
@@ -357,7 +346,6 @@
   "navigation_bar.direct": "गोपनीयरूपेण उल्लिखितानि",
   "navigation_bar.discover": "आविष्कुरु",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "प्रोफैलं सम्पाद्यताम्",
   "navigation_bar.explore": "अन्विच्छ",
   "navigation_bar.filters": "मूकीकृतानि पदानि",
   "navigation_bar.follow_requests": "अनुसरणानुरोधाः",
@@ -453,14 +441,7 @@
   "poll_button.add_poll": "निर्वाचनं योजय",
   "poll_button.remove_poll": "निर्वाचनं मार्जय",
   "privacy.change": "पत्रस्य गोपनीयतां परिवर्तय",
-  "privacy.direct.long": "केवलमुल्लिखितोभोक्तृभ्यो दृश्यते",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "केवलं येऽनुसरन्ति त्वां तेभ्यो दृश्यते",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "सर्वेभ्यो दृश्यते",
   "privacy.public.short": "सार्वजनिकम्",
-  "privacy.unlisted.long": "सर्वेभ्यो दृश्यते किन्तु आविष्कारविशेषताभ्योऽन्तरभूतं नास्ति",
-  "privacy.unlisted.short": "असूचीकृतम्",
   "privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
   "privacy_policy.title": "गोपनीयतानीतिः",
   "refresh": "नवीकुरु",
@@ -572,7 +553,6 @@
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.undo": "मार्जय",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "Uploading…"
 }
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 89e951f77d..90b663aea7 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -60,7 +60,6 @@
   "alert.unexpected.title": "Oh!",
   "announcement.announcement": "Annùntziu",
   "audio.hide": "Cua s'àudio",
-  "autosuggest_hashtag.per_week": "{count} a sa chida",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
   "bundle_column_error.error.title": "Oh, no!",
   "bundle_column_error.network.title": "Faddina de connessione",
@@ -100,22 +99,12 @@
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
   "compose_form.placeholder": "A ite ses pensende?",
-  "compose_form.poll.add_option": "Agiunghe unu sèberu",
   "compose_form.poll.duration": "Longària de su sondàgiu",
-  "compose_form.poll.option_placeholder": "Optzione {number}",
-  "compose_form.poll.remove_option": "Boga custa optzione",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
-  "compose_form.publish": "Pùblica",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sarva is modìficas",
-  "compose_form.sensitive.hide": "{count, plural, one {Marca elementu multimediale comente a sensìbile} other {Marca elementos multimediales comente sensìbiles}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Elementu multimediale marcadu comente a sensìbile} other {Elementos multimediales marcados comente a sensìbiles}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Elementu multimediale non marcadu comente a sensìbile} other {Elementos multimediales non marcados comente a sensìbiles}}",
   "compose_form.spoiler.marked": "Boga avisu de cuntenutu",
   "compose_form.spoiler.unmarked": "Agiunghe avisu de cuntenutu",
-  "compose_form.spoiler_placeholder": "Iscrie s'avisu tuo inoghe",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Bloca e signala",
   "confirmations.block.confirm": "Bloca",
@@ -287,7 +276,6 @@
   "navigation_bar.compose": "Cumpone una publicatzione noa",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
-  "navigation_bar.edit_profile": "Modìfica profilu",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
@@ -364,12 +352,7 @@
   "poll_button.add_poll": "Agiunghe unu sondàgiu",
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
-  "privacy.direct.long": "Visìbile isceti pro is persones mentovadas",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Visìbile isceti pro chie ti sighit",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "Pùblicu",
-  "privacy.unlisted.short": "Esclùidu de sa lista",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
   "regeneration_indicator.label": "Carrighende…",
@@ -473,7 +456,6 @@
   "upload_form.description": "Descritzione pro persones cun problemas visuales",
   "upload_form.edit": "Modìfica",
   "upload_form.thumbnail": "Càmbia sa miniadura",
-  "upload_form.undo": "Cantzella",
   "upload_form.video_description": "Descritzione pro persones cun pèrdida auditiva o problemas visuales",
   "upload_modal.analyzing_picture": "Analizende immàgine…",
   "upload_modal.apply": "Àplica",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 0378cd2926..b7563022a9 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -74,7 +74,6 @@
   "announcement.announcement": "Annooncement",
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
-  "autosuggest_hashtag.per_week": "{count} a week",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",
   "bundle_column_error.copy_stacktrace": "Copy error report",
   "bundle_column_error.error.body": "The requestit page cuidnae be rennert. Hit cuid be doon tae a bug in wir code, or a brooser compatability issue.",
@@ -125,22 +124,12 @@
   "compose_form.lock_disclaimer": "Yer accoont isnae {locked}. Awbody kin follae ye for tae luik at yer follaer-ainly posts.",
   "compose_form.lock_disclaimer.lock": "lockit",
   "compose_form.placeholder": "Whit's on yer mind?",
-  "compose_form.poll.add_option": "Pit in a chyce",
   "compose_form.poll.duration": "Poll lenth",
-  "compose_form.poll.option_placeholder": "Chyce {number}",
-  "compose_form.poll.remove_option": "Tak oot this chyce",
   "compose_form.poll.switch_to_multiple": "Chynge poll tae alloo multiple chyces",
   "compose_form.poll.switch_to_single": "Chynge poll tae alloo fir a single chyce",
-  "compose_form.publish": "Publish",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save chynges",
-  "compose_form.sensitive.hide": "{count, plural, one {Mairk media as sensitive} other {Mairk media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is mairkit as sensitive} other {Media is mairkit as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media isnae mairkit as sensitive} other {Media isnae mairkit as sensitive}}",
   "compose_form.spoiler.marked": "Tak aff the content warnin",
   "compose_form.spoiler.unmarked": "Pit on a content warnin",
-  "compose_form.spoiler_placeholder": "Scrieve yer warnin in here",
   "confirmation_modal.cancel": "Stap",
   "confirmations.block.block_and_report": "Dingie & Clype",
   "confirmations.block.confirm": "Dingie",
@@ -341,7 +330,6 @@
   "navigation_bar.compose": "Scrieve new post",
   "navigation_bar.discover": "Fin",
   "navigation_bar.domain_blocks": "Dingied domains",
-  "navigation_bar.edit_profile": "Edit profile",
   "navigation_bar.explore": "Splore",
   "navigation_bar.filters": "Wheesht wirds",
   "navigation_bar.follow_requests": "Follae requests",
@@ -425,14 +413,7 @@
   "poll_button.add_poll": "Dae a poll",
   "poll_button.remove_poll": "Tak doon poll",
   "privacy.change": "Chynge post privacy",
-  "privacy.direct.long": "Ainly menshied uisers kin see this",
-  "privacy.direct.short": "Menshied fowk ainly",
-  "privacy.private.long": "Ainly follaers kin see this",
-  "privacy.private.short": "Ainly follaers",
-  "privacy.public.long": "Awbody kin see this",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Aw kin see this, but optit-oot o discovery features",
-  "privacy.unlisted.short": "No listit",
   "privacy_policy.last_updated": "Last updatit {date}",
   "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
@@ -583,10 +564,8 @@
   "upload_error.poll": "File upload isnae allooed wi polls.",
   "upload_form.audio_description": "Describe fir fowk wi hearin loss",
   "upload_form.description": "Describe fir thaim wi visual impairments",
-  "upload_form.description_missing": "Nae description addit",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Chynge thoomnail",
-  "upload_form.undo": "Delete",
   "upload_form.video_description": "Describe fir fowk wi hearin loss or wi visual impairment",
   "upload_modal.analyzing_picture": "Analyzin picture…",
   "upload_modal.apply": "Apply",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index c2d2a41cc5..1b2eb17633 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -53,7 +53,6 @@
   "alert.unexpected.title": "අපොයි!",
   "announcement.announcement": "නිවේදනය",
   "audio.hide": "හඬපටය සඟවන්න",
-  "autosuggest_hashtag.per_week": "සතියකට {count}",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "bundle_column_error.copy_stacktrace": "දෝෂ වාර්තාවේ පිටපතක්",
   "bundle_column_error.error.title": "අපොයි!",
@@ -102,19 +101,12 @@
   "compose_form.encryption_warning": "මාස්ටඩන් වෙත පළ කරන දෑ අන්ත සංකේතනයෙන් ආරක්‍ෂා නොවේ. මාස්ටඩන් හරහා කිසිදු සංවේදී තොරතුරක් බෙදා නොගන්න.",
   "compose_form.lock_disclaimer.lock": "අගුළු දමා ඇත",
   "compose_form.placeholder": "ඔබගේ සිතුවිලි මොනවාද?",
-  "compose_form.poll.add_option": "තේරීමක් යොදන්න",
   "compose_form.poll.duration": "මත විමසීමේ කාලය",
-  "compose_form.poll.option_placeholder": "තේරීම {number}",
-  "compose_form.poll.remove_option": "මෙම ඉවත් කරන්න",
   "compose_form.poll.switch_to_multiple": "තේරීම් කිහිපයකට මත විමසුම වෙනස් කරන්න",
   "compose_form.poll.switch_to_single": "තනි තේරීමකට මත විමසුම වෙනස් කරන්න",
-  "compose_form.publish": "ප්‍රකාශනය",
   "compose_form.publish_form": "නව ලිපිය",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "වෙනස්කම් සුරකින්න",
   "compose_form.spoiler.marked": "අන්තර්ගත අවවාදය ඉවත් කරන්න",
   "compose_form.spoiler.unmarked": "අන්තර්ගත අවවාදයක් එක් කරන්න",
-  "compose_form.spoiler_placeholder": "අවවාදය මෙහි ලියන්න",
   "confirmation_modal.cancel": "අවලංගු",
   "confirmations.block.block_and_report": "අවහිර කර වාර්තා කරන්න",
   "confirmations.block.confirm": "අවහිර",
@@ -269,7 +261,6 @@
   "navigation_bar.compose": "නව ලිපියක් ලියන්න",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
-  "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
   "navigation_bar.explore": "ගවේශනය",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",
@@ -335,11 +326,6 @@
   "poll_button.add_poll": "මත විමසුමක් අරඹන්න",
   "poll_button.remove_poll": "මත විමසුම ඉවතලන්න",
   "privacy.change": "ලිපියේ රහස්‍යතාව සංශෝධනය",
-  "privacy.direct.long": "සඳහන් කළ අයට දිස්වෙයි",
-  "privacy.direct.short": "සඳහන් කළ අයට පමණි",
-  "privacy.private.long": "අනුගාමිකයින්ට දිස්වේ",
-  "privacy.private.short": "අනුගාමිකයින් පමණි",
-  "privacy.public.long": "සැමට දිස්වෙයි",
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
   "refresh": "නැවුම් කරන්න",
@@ -481,10 +467,8 @@
   "upload_error.poll": "මත විමසුම් සමඟ ගොනු යෙදීමට ඉඩ නොදේ.",
   "upload_form.audio_description": "නොඇසෙන අය සඳහා විස්තර කරන්න",
   "upload_form.description": "දෘශ්‍යාබාධිතයන් සඳහා විස්තර කරන්න",
-  "upload_form.description_missing": "සවිස්තරයක් නැත",
   "upload_form.edit": "සංස්කරණය",
   "upload_form.thumbnail": "සිඟිති රුව වෙනස් කරන්න",
-  "upload_form.undo": "මකන්න",
   "upload_form.video_description": "ශ්‍රවණාබාධ හෝ දෘශ්‍යාබාධිත පුද්ගලයන් සඳහා විස්තර කරන්න",
   "upload_modal.analyzing_picture": "පින්තූරය විශ්ලේෂණය කරමින්…",
   "upload_modal.apply": "යොදන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3e41a2035a..5b1203aeea 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skry zvuk",
-  "autosuggest_hashtag.per_week": "{count} týždenne",
   "boost_modal.combo": "Nabudúce môžeš kliknúť {combo} pre preskočenie",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
   "compose_form.placeholder": "Čo máš na mysli?",
-  "compose_form.poll.add_option": "Pridaj voľbu",
   "compose_form.poll.duration": "Trvanie ankety",
-  "compose_form.poll.option_placeholder": "Voľba {number}",
-  "compose_form.poll.remove_option": "Odstráň túto voľbu",
   "compose_form.poll.switch_to_multiple": "Zmeň anketu pre povolenie viacerých možností",
   "compose_form.poll.switch_to_single": "Zmeň anketu na takú s jedinou voľbou",
-  "compose_form.publish": "Zverejni",
   "compose_form.publish_form": "Zverejniť",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ulož zmeny",
-  "compose_form.sensitive.hide": "Označ médiá ako chúlostivé",
-  "compose_form.sensitive.marked": "Médiálny obsah je označený ako chúlostivý",
-  "compose_form.sensitive.unmarked": "Médiálny obsah nieje označený ako chúlostivý",
   "compose_form.spoiler.marked": "Text je ukrytý za varovaním",
   "compose_form.spoiler.unmarked": "Text nieje ukrytý",
-  "compose_form.spoiler_placeholder": "Sem napíš tvoje varovanie",
   "confirmation_modal.cancel": "Zruš",
   "confirmations.block.block_and_report": "Zablokuj a nahlás",
   "confirmations.block.confirm": "Blokuj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Súkromné spomenutia",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
-  "navigation_bar.edit_profile": "Uprav profil",
   "navigation_bar.explore": "Objavuj",
   "navigation_bar.favourites": "Obľúbené",
   "navigation_bar.filters": "Filtrované slová",
@@ -525,14 +513,7 @@
   "poll_button.add_poll": "Pridaj anketu",
   "poll_button.remove_poll": "Odstráň anketu",
   "privacy.change": "Uprav súkromie príspevku",
-  "privacy.direct.long": "Pošli iba spomenutým užívateľom",
-  "privacy.direct.short": "Iba spomenutým ľudom",
-  "privacy.private.long": "Pošli iba následovateľom",
-  "privacy.private.short": "Iba pre sledujúcich",
-  "privacy.public.long": "Viditeľné pre všetkých",
   "privacy.public.short": "Verejné",
-  "privacy.unlisted.long": "Viditeľné pre všetkých, ale odmietnuté funkcie zisťovania",
-  "privacy.unlisted.short": "Verejne, ale nezobraziť v osi",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Zásady súkromia",
   "recommended": "Odporúčané",
@@ -714,10 +695,8 @@
   "upload_error.poll": "Nahrávanie súborov pri anketách nieje možné.",
   "upload_form.audio_description": "Popíš, pre ľudí so stratou sluchu",
   "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.description_missing": "Nepridaný žiadny popis",
   "upload_form.edit": "Uprav",
   "upload_form.thumbnail": "Zmeniť miniatúru",
-  "upload_form.undo": "Vymaž",
   "upload_form.video_description": "Popíš, pre ľudí so stratou sluchu, alebo očným znevýhodnením",
   "upload_modal.analyzing_picture": "Analyzujem obrázok…",
   "upload_modal.apply": "Použi",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index b3998b9110..559b05db72 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
-  "autosuggest_hashtag.per_week": "{count} na teden",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljate?",
-  "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbira {number}",
-  "compose_form.poll.remove_option": "Odstrani to izbiro",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Shrani spremembe",
-  "compose_form.sensitive.hide": "{count, plural,one {Označi medij kot občutljiv} two {Označi medija kot občutljiva} other {Označi medije kot občutljive}}",
-  "compose_form.sensitive.marked": "{count, plural,one {Medij je označen kot občutljiv} two {Medija sta označena kot občutljiva} other {Mediji so označeni kot občutljivi}}",
-  "compose_form.sensitive.unmarked": "{count, plural,one {Medij ni označen kot občutljiv} two {Medija nista označena kot občutljiva} other {Mediji niso označeni kot občutljivi}}",
   "compose_form.spoiler.marked": "Odstrani opozorilo o vsebini",
   "compose_form.spoiler.unmarked": "Dodaj opozorilo o vsebini",
-  "compose_form.spoiler_placeholder": "Tukaj napišite opozorilo",
   "confirmation_modal.cancel": "Prekliči",
   "confirmations.block.block_and_report": "Blokiraj in prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Zasebne omembe",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Razišči",
   "navigation_bar.favourites": "Priljubljeni",
   "navigation_bar.filters": "Utišane besede",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketo",
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Spremeni zasebnost objave",
-  "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Samo omenjeni",
-  "privacy.private.long": "Vidno samo sledilcem",
-  "privacy.private.short": "Samo sledilci",
-  "privacy.public.long": "Vidno vsem",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
-  "privacy.unlisted.short": "Ni prikazano",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.description_missing": "Noben opis ni dodan",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Spremeni sličico",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osebe z okvaro sluha in/ali vida",
   "upload_modal.analyzing_picture": "Analiziranje slike …",
   "upload_modal.apply": "Uveljavi",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index f45266c845..bfc674248b 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Lajmërim",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
-  "autosuggest_hashtag.per_week": "{count} për javë",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "bundle_column_error.copy_stacktrace": "Kopjo raportim gabimi",
   "bundle_column_error.error.body": "Faqja e kërkuar s’u vizatua dot. Kjo mund të vijë nga një e metë në kodin tonë, ose nga një problem përputhshmërie i shfletuesit.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
   "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
-  "compose_form.poll.add_option": "Shtoni një zgjedhje",
+  "compose_form.poll.add_option": "Shtoni mundësi",
   "compose_form.poll.duration": "Kohëzgjatje pyetësori",
-  "compose_form.poll.option_placeholder": "Zgjedhja {number}",
-  "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
+  "compose_form.poll.multiple": "Shumë zgjedhje",
+  "compose_form.poll.option_placeholder": "Mundësia {number}",
+  "compose_form.poll.remove_option": "Hiqe këtë mundësi",
+  "compose_form.poll.single": "Zgjidhni një",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
-  "compose_form.publish": "Botoje",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Postim",
   "compose_form.publish_form": "Publikoje",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Ruaji ndryshimet",
-  "compose_form.sensitive.hide": "{count, plural, one {Vëri shenjë medias si rezervat} other {Vëru shenjë mediave si rezervat}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medias i është vënë shenjë rezervat} other {Mediave u është vënë shenjë si rezervat}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media s’ka shenjë si rezervat} other {Mediat s’kanë shenja si rezervat}}",
+  "compose_form.reply": "Përgjigjuni",
+  "compose_form.save_changes": "Përditësoje",
   "compose_form.spoiler.marked": "Hiq sinjalizim lënde",
   "compose_form.spoiler.unmarked": "Shtoni sinjalizim lënde",
-  "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
+  "compose_form.spoiler_placeholder": "Sinjalizim lënde (opsional)",
   "confirmation_modal.cancel": "Anuloje",
   "confirmations.block.block_and_report": "Bllokojeni & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Përmendje private",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
-  "navigation_bar.edit_profile": "Përpunoni profilin",
   "navigation_bar.explore": "Eksploroni",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Shtoni një pyetësor",
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
-  "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "Vetëm për personat e përmendur",
-  "privacy.private.long": "I dukshëm vetëm për ndjekës",
-  "privacy.private.short": "Vetëm ndjekës",
-  "privacy.public.long": "I dukshëm për të tërë",
+  "privacy.direct.long": "Gjithkënd i përmendur te postimi",
+  "privacy.direct.short": "Persona të veçantë",
+  "privacy.private.long": "Vetëm ndjekësit tuaj",
+  "privacy.private.short": "Ndjekës",
+  "privacy.public.long": "Cilido që hyn e del në Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "I dukshëm për të tërë, por lënë jashtë nga veçoritë e zbulimit",
-  "privacy.unlisted.short": "Jo në lista",
+  "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
+  "privacy.unlisted.long": "Më pak fanfara algoritmike",
+  "privacy.unlisted.short": "Publik i qetë",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
   "recommended": "E rekomanduar",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
+  "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
   "reply_indicator.cancel": "Anuloje",
+  "reply_indicator.poll": "Pyetësor",
   "report.block": "Bllokoje",
   "report.block_explanation": "S’do të shihni postime prej tyre. S’do të jenë në gjendje të shohin postimet tuaja, apo t’ju ndjekin. Do të jenë në gjendje të shohin se janë bllokuar.",
   "report.categories.legal": "Ligjore",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
   "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
-  "upload_form.description_missing": "S’u shtua përshkrim",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
-  "upload_form.undo": "Fshije",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
   "upload_modal.analyzing_picture": "Po analizohet fotoja…",
   "upload_modal.apply": "Aplikoje",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 77c262e957..b0348748a6 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Najava",
   "attachments_list.unprocessed": "(neobrađeno)",
   "audio.hide": "Sakrij audio",
-  "autosuggest_hashtag.per_week": "{count} nedeljno",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da vas prati i da vidi vaše objave namenjene samo za vaše pratioce.",
   "compose_form.lock_disclaimer.lock": "zaključan",
   "compose_form.placeholder": "O čemu razmišljate?",
-  "compose_form.poll.add_option": "Dodajte izbor",
   "compose_form.poll.duration": "Trajanje ankete",
-  "compose_form.poll.option_placeholder": "Izbor {number}",
-  "compose_form.poll.remove_option": "Ukloni ovaj izbor",
   "compose_form.poll.switch_to_multiple": "Promenite anketu da biste omogućili više izbora",
   "compose_form.poll.switch_to_single": "Promenite anketu da biste omogućili jedan izbor",
-  "compose_form.publish": "Objavi",
   "compose_form.publish_form": "Objavi",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Sačuvaj promene",
-  "compose_form.sensitive.hide": "{count, plural, one {Označi multimediju kao osetljivu} few {Označi multimediju kao osetljivu} other {Označi multimediju kao osetljivu}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Multimedija je označena kao osetljiva} few {Multimedija je označena kao osetljiva} other {Multimedija je označena kao osetljiva}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Multimedija nije označena kao osetljiva} few {Multimedija nije označena kao osetljiva} other {Multimedija nije označena kao osetljiva}}",
   "compose_form.spoiler.marked": "Ukloni upozorenje o sadržaju",
   "compose_form.spoiler.unmarked": "Dodaj upozorenje o sadržaju",
-  "compose_form.spoiler_placeholder": "Ovde napišite upozorenje",
   "confirmation_modal.cancel": "Otkaži",
   "confirmations.block.block_and_report": "Blokiraj i prijavi",
   "confirmations.block.confirm": "Blokiraj",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Privatna pominjanja",
   "navigation_bar.discover": "Otkrij",
   "navigation_bar.domain_blocks": "Blokirani domeni",
-  "navigation_bar.edit_profile": "Uredi profil",
   "navigation_bar.explore": "Istraži",
   "navigation_bar.favourites": "Omiljeno",
   "navigation_bar.filters": "Ignorisane reči",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Dodaj anketu",
   "poll_button.remove_poll": "Ukloni anketu",
   "privacy.change": "Promeni privatnost objave",
-  "privacy.direct.long": "Vidljivo samo pomenutim korisnicima",
-  "privacy.direct.short": "Samo pomenute osobe",
-  "privacy.private.long": "Vidljivo samo pratiocima",
-  "privacy.private.short": "Samo pratioci",
-  "privacy.public.long": "Vidljivo za sve",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Vidljivo svima, ali isključeno iz funkcija otkrivanja",
-  "privacy.unlisted.short": "Neizlistano",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Otpremanje datoteka nije dozvoljeno kod anketa.",
   "upload_form.audio_description": "Dodajte opis za osobe sa oštećenim sluhom",
   "upload_form.description": "Dodajte opis za osobe sa oštećenim vidom",
-  "upload_form.description_missing": "Nema dodatog opisa",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Promeni sličicu",
-  "upload_form.undo": "Izbriši",
   "upload_form.video_description": "Opišite za osobe sa oštećenim sluhom ili vidom",
   "upload_modal.analyzing_picture": "Analiziranje slike…",
   "upload_modal.apply": "Primeni",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 85e7567bf4..4e4956e1a2 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Најава",
   "attachments_list.unprocessed": "(необрађено)",
   "audio.hide": "Сакриј аудио",
-  "autosuggest_hashtag.per_week": "{count} недељно",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
   "compose_form.placeholder": "О чему размишљате?",
-  "compose_form.poll.add_option": "Додајте избор",
+  "compose_form.poll.add_option": "Додај опцију",
   "compose_form.poll.duration": "Трајање анкете",
-  "compose_form.poll.option_placeholder": "Избор {number}",
-  "compose_form.poll.remove_option": "Уклони овај избор",
+  "compose_form.poll.multiple": "Вишеструки избор",
+  "compose_form.poll.option_placeholder": "Опција {number}",
+  "compose_form.poll.remove_option": "Уклони ову опцију",
+  "compose_form.poll.single": "Одаберите једно",
   "compose_form.poll.switch_to_multiple": "Промените анкету да бисте омогућили више избора",
   "compose_form.poll.switch_to_single": "Промените анкету да бисте омогућили један избор",
+  "compose_form.poll.type": "Стил",
   "compose_form.publish": "Објави",
   "compose_form.publish_form": "Нова објава",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Сачувај промене",
-  "compose_form.sensitive.hide": "{count, plural, one {Означи мултимедију као осетљиву} few {Означи мултимедију као осетљиву} other {Означи мултимедију као осетљиву}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Мултимедија је означена као осетљива} few {Мултимедија је означена као осетљива} other {Мултимедија је означена као осетљива}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Мултимедија није означена као осетљива} few {Мултимедија није означена као осетљива} other {Мултимедија није означена као осетљива}}",
+  "compose_form.reply": "Одговори",
+  "compose_form.save_changes": "Ажурирај",
   "compose_form.spoiler.marked": "Уклони упозорење о садржају",
   "compose_form.spoiler.unmarked": "Додај упозорење о садржају",
-  "compose_form.spoiler_placeholder": "Овде напишите упозорење",
+  "compose_form.spoiler_placeholder": "Упозорење о садржају (опционо)",
   "confirmation_modal.cancel": "Откажи",
   "confirmations.block.block_and_report": "Блокирај и пријави",
   "confirmations.block.confirm": "Блокирај",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "Приватна помињања",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Блокирани домени",
-  "navigation_bar.edit_profile": "Уреди профил",
   "navigation_bar.explore": "Истражи",
   "navigation_bar.favourites": "Омиљено",
   "navigation_bar.filters": "Игнорисане речи",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "Додај анкету",
   "poll_button.remove_poll": "Уклони анкету",
   "privacy.change": "Промени приватност објаве",
-  "privacy.direct.long": "Видљиво само поменутим корисницима",
-  "privacy.direct.short": "Само поменуте особе",
-  "privacy.private.long": "Видљиво само пратиоцима",
-  "privacy.private.short": "Само пратиоци",
-  "privacy.public.long": "Видљиво за све",
+  "privacy.direct.long": "Сви поменути у објави",
+  "privacy.direct.short": "Одређени људи",
+  "privacy.private.long": "Само ваши пратиоци",
+  "privacy.private.short": "Пратиоци",
+  "privacy.public.long": "Било ко на Mastodon-у и ван њега",
   "privacy.public.short": "Јавно",
-  "privacy.unlisted.long": "Видљиво свима, али искључено из функција откривања",
-  "privacy.unlisted.short": "Неизлистано",
+  "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
+  "privacy.unlisted.long": "Мање алгоритамских фанфара",
+  "privacy.unlisted.short": "Тиха јавност",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
   "recommended": "Препоручено",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} мин.",
   "relative_time.seconds": "{number} сек.",
   "relative_time.today": "данас",
+  "reply_indicator.attachments": "{count, plural, one {# прилог} few {# прилога} other {# прилога}}",
   "reply_indicator.cancel": "Откажи",
+  "reply_indicator.poll": "Анкета",
   "report.block": "Блокирај",
   "report.block_explanation": "Нећете видети објаве корисника. Ни он неће видети Ваше објаве нити ће моћи да Вас прати. Такође ће моћи да сазна да је блокиран.",
   "report.categories.legal": "Правни",
@@ -715,10 +716,8 @@
   "upload_error.poll": "Отпремање датотека није дозвољено код анкета.",
   "upload_form.audio_description": "Додајте опис за особе са оштећеним слухом",
   "upload_form.description": "Додајте опис за особе са оштећеним видом",
-  "upload_form.description_missing": "Нема додатог описа",
   "upload_form.edit": "Уреди",
   "upload_form.thumbnail": "Промени сличицу",
-  "upload_form.undo": "Избриши",
   "upload_form.video_description": "Опишите за особе са оштећеним слухом или видом",
   "upload_modal.analyzing_picture": "Анализирање слике…",
   "upload_modal.apply": "Примени",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index d3ca776bd9..d6e6555b53 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
-  "autosuggest_hashtag.per_week": "{count} per vecka",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
@@ -146,22 +145,18 @@
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig för att se dina inlägg som endast är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Vad tänker du på?",
-  "compose_form.poll.add_option": "Lägg till ett val",
+  "compose_form.poll.add_option": "Lägg till alternativ",
   "compose_form.poll.duration": "Varaktighet för omröstning",
-  "compose_form.poll.option_placeholder": "Val {number}",
-  "compose_form.poll.remove_option": "Ta bort detta val",
+  "compose_form.poll.option_placeholder": "Alternativ {number}",
   "compose_form.poll.switch_to_multiple": "Ändra enkät för att tillåta flera val",
   "compose_form.poll.switch_to_single": "Ändra enkät för att tillåta ett enda val",
-  "compose_form.publish": "Publicera",
+  "compose_form.poll.type": "Stil",
   "compose_form.publish_form": "Publicera",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Spara ändringar",
-  "compose_form.sensitive.hide": "Markera media som känsligt",
-  "compose_form.sensitive.marked": "Media har markerats som känsligt",
-  "compose_form.sensitive.unmarked": "Media är inte markerat som känsligt",
+  "compose_form.reply": "Svara",
+  "compose_form.save_changes": "Uppdatera",
   "compose_form.spoiler.marked": "Texten är dold bakom en varning",
   "compose_form.spoiler.unmarked": "Texten är inte dold",
-  "compose_form.spoiler_placeholder": "Skriv din varning här",
+  "compose_form.spoiler_placeholder": "Innehållsvarning (valfritt)",
   "confirmation_modal.cancel": "Avbryt",
   "confirmations.block.block_and_report": "Blockera & rapportera",
   "confirmations.block.confirm": "Blockera",
@@ -408,7 +403,6 @@
   "navigation_bar.direct": "Privata nämningar",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
-  "navigation_bar.edit_profile": "Redigera profil",
   "navigation_bar.explore": "Utforska",
   "navigation_bar.favourites": "Favoriter",
   "navigation_bar.filters": "Tystade ord",
@@ -524,14 +518,10 @@
   "poll_button.add_poll": "Lägg till en omröstning",
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Ändra inläggsintegritet",
-  "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Endast omnämnda personer",
-  "privacy.private.long": "Endast synligt för följare",
-  "privacy.private.short": "Endast följare",
-  "privacy.public.long": "Synlig för alla",
+  "privacy.private.long": "Endast dina följare",
+  "privacy.private.short": "Följare",
+  "privacy.public.long": "Alla på och utanför Mastodon",
   "privacy.public.short": "Publik",
-  "privacy.unlisted.long": "Synlig för alla, men visas inte i upptäcksfunktioner",
-  "privacy.unlisted.short": "Olistad",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
@@ -550,6 +540,7 @@
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "idag",
   "reply_indicator.cancel": "Ångra",
+  "reply_indicator.poll": "Omröstning",
   "report.block": "Blockera",
   "report.block_explanation": "Du kommer inte se hens inlägg. Hen kommer inte kunna se dina inlägg eller följa dig. Hen kommer kunna se att hen är blockerad.",
   "report.categories.legal": "Juridisk",
@@ -713,10 +704,8 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
-  "upload_form.description_missing": "Beskrivning saknas",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
-  "upload_form.undo": "Radera",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",
   "upload_modal.analyzing_picture": "Analyserar bild…",
   "upload_modal.apply": "Verkställ",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index abbdf9b7da..42164f656b 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -93,8 +93,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 5290e13ff4..6210c3d0b1 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -66,7 +66,6 @@
   "announcement.announcement": "அறிவிப்பு",
   "attachments_list.unprocessed": "(செயலாக்கப்படாதது)",
   "audio.hide": "ஆடியோவை மறை",
-  "autosuggest_hashtag.per_week": "ஒவ்வொரு வாரம் {count}",
   "boost_modal.combo": "நீங்கள் இதை அடுத்தமுறை தவிர்க்க {combo} வை அழுத்தவும்",
   "bundle_column_error.error.title": "அடடே!",
   "bundle_column_error.network.body": "இந்தப் பக்கத்தைத் திறக்கும்பொழுது ஒரு பிழை ஏற்பட்டுவிட்டது. இது உங்கள் இணைய தொடர்பில் அல்லது இப்பத்தின் வழங்க்கியில் ஏற்பட்டுள்ள ஒரு தற்காலிக பிரச்சணையாக இருக்கலாம்.",
@@ -120,22 +119,12 @@
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு {locked} செய்யப்படவில்லை. உங்கள் பதிவுகளை யார் வேண்டுமானாலும் பின்தொடர்ந்து காணலாம்.",
   "compose_form.lock_disclaimer.lock": "பூட்டப்பட்டது",
   "compose_form.placeholder": "உங்கள் மனதில் என்ன இருக்கிறது?",
-  "compose_form.poll.add_option": "தேர்வை சேர்",
   "compose_form.poll.duration": "கருத்துக்கணிப்பின் கால அளவு",
-  "compose_form.poll.option_placeholder": "தேர்வு எண் {number}",
-  "compose_form.poll.remove_option": "இந்தத் தேர்வை அகற்று",
   "compose_form.poll.switch_to_multiple": "பல தேர்வுகளை அனுமதிக்குமாறு மாற்று",
   "compose_form.poll.switch_to_single": "ஒரே ஒரு தேர்வை மட்டும் அனுமதிக்குமாறு மாற்று",
-  "compose_form.publish": "வெளியிடு",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "மாற்றங்களை சேமி",
-  "compose_form.sensitive.hide": "அனைவருக்கும் ஏற்றப் படம் இல்லை எனக் குறியிடு",
-  "compose_form.sensitive.marked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்பட்டுள்ளது",
-  "compose_form.sensitive.unmarked": "இப்படம் அனைவருக்கும் ஏற்றதல்ல எனக் குறியிடப்படவில்லை",
   "compose_form.spoiler.marked": "எச்சரிக்கையின் பின்னால் பதிவு மறைக்கப்பட்டுள்ளது",
   "compose_form.spoiler.unmarked": "பதிவு மறைக்கப்படவில்லை",
-  "compose_form.spoiler_placeholder": "உங்கள் எச்சரிக்கையை இங்கு எழுதவும்",
   "confirmation_modal.cancel": "ரத்து",
   "confirmations.block.block_and_report": "தடுத்துப் புகாரளி",
   "confirmations.block.confirm": "தடு",
@@ -283,7 +272,6 @@
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
-  "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
   "navigation_bar.filters": "முடக்கப்பட்ட வார்த்தைகள்",
   "navigation_bar.follow_requests": "கோரிக்கைகளை பின்பற்றவும்",
   "navigation_bar.follows_and_followers": "பின்பற்றல்கள் மற்றும் பின்பற்றுபவர்கள்",
@@ -344,12 +332,7 @@
   "poll_button.add_poll": "வாக்கெடுப்பைச் சேர்க்கவும்",
   "poll_button.remove_poll": "வாக்கெடுப்பை அகற்று",
   "privacy.change": "நிலை தனியுரிமை",
-  "privacy.direct.long": "குறிப்பிடப்பட்ட பயனர்களுக்கு மட்டுமே இடுகையிடவும்",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "பின்தொடர்பவர்களுக்கு மட்டுமே இடுகை",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "பொது",
-  "privacy.unlisted.short": "பட்டியலிடப்படாத",
   "refresh": "புதுப்பி",
   "regeneration_indicator.label": "சுமையேற்றம்…",
   "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
@@ -432,7 +415,6 @@
   "upload_form.description": "பார்வையற்ற விவரிக்கவும்",
   "upload_form.edit": "தொகு",
   "upload_form.thumbnail": "சிறுபடத்தை மாற்ற",
-  "upload_form.undo": "நீக்கு",
   "upload_form.video_description": "செவித்திறன் மற்றும் பார்வைக் குறைபாடு உள்ளவர்களுக்காக விளக்குக‌",
   "upload_modal.analyzing_picture": "படம் ஆராயப்படுகிறது…",
   "upload_modal.apply": "உபயோகி",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 7c1956d95b..b1a242c751 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -79,8 +79,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 3c231871fa..24a67247c0 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -64,16 +64,10 @@
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
   "compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
-  "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
   "compose_form.poll.duration": "ఎన్నిక వ్యవధి",
-  "compose_form.poll.option_placeholder": "ఎంపిక {number}",
-  "compose_form.poll.remove_option": "ఈ ఎంపికను తొలగించు",
   "compose_form.publish_form": "Publish",
-  "compose_form.sensitive.marked": "మీడియా సున్నితమైనదిగా గుర్తించబడింది",
-  "compose_form.sensitive.unmarked": "మీడియా సున్నితమైనదిగా గుర్తించబడలేదు",
   "compose_form.spoiler.marked": "హెచ్చరిక వెనుక పాఠ్యం దాచబడింది",
   "compose_form.spoiler.unmarked": "పాఠ్యం దాచబడలేదు",
-  "compose_form.spoiler_placeholder": "ఇక్కడ మీ హెచ్చరికను రాయండి",
   "confirmation_modal.cancel": "రద్దు చెయ్యి",
   "confirmations.block.confirm": "బ్లాక్ చేయి",
   "confirmations.block.message": "మీరు ఖచ్చితంగా {name}ని బ్లాక్ చేయాలనుకుంటున్నారా?",
@@ -186,7 +180,6 @@
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
-  "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
   "navigation_bar.filters": "మ్యూట్ చేయబడిన పదాలు",
   "navigation_bar.follow_requests": "అనుసరించడానికి అభ్యర్ధనలు",
   "navigation_bar.lists": "జాబితాలు",
@@ -240,12 +233,7 @@
   "poll_button.add_poll": "ఒక ఎన్నికను చేర్చు",
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
-  "privacy.direct.long": "పేర్కొన్న వినియోగదారులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "అనుచరులకు మాత్రమే పోస్ట్ చేయి",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ప్రజా",
-  "privacy.unlisted.short": "జాబితా చేయబడనిది",
   "regeneration_indicator.label": "లోడ్ అవుతోంది…",
   "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.just_now": "ఇప్పుడు",
@@ -308,7 +296,6 @@
   "upload_button.label": "మీడియాను జోడించండి (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "దృష్టి లోపమున్న వారి కోసం వివరించండి",
-  "upload_form.undo": "తొలగించు",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_progress.label": "అప్లోడ్ అవుతోంది...",
   "video.close": "వీడియోని మూసివేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 65f27ef061..4437afa78c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "ประกาศ",
   "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
   "audio.hide": "ซ่อนเสียง",
-  "autosuggest_hashtag.per_week": "{count} ต่อสัปดาห์",
   "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
   "bundle_column_error.error.body": "ไม่สามารถแสดงผลหน้าที่ขอ ข้อผิดพลาดอาจเป็นเพราะข้อบกพร่องในโค้ดของเรา หรือปัญหาความเข้ากันได้ของเบราว์เซอร์",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
-  "compose_form.poll.add_option": "เพิ่มตัวเลือก",
   "compose_form.poll.duration": "ระยะเวลาการสำรวจความคิดเห็น",
-  "compose_form.poll.option_placeholder": "ตัวเลือก {number}",
-  "compose_form.poll.remove_option": "เอาตัวเลือกนี้ออก",
   "compose_form.poll.switch_to_multiple": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตหลายตัวเลือก",
   "compose_form.poll.switch_to_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
-  "compose_form.publish": "เผยแพร่",
   "compose_form.publish_form": "โพสต์ใหม่",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "บันทึกการเปลี่ยนแปลง",
-  "compose_form.sensitive.hide": "{count, plural, other {ทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.marked": "{count, plural, other {มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {ไม่มีการทำเครื่องหมายสื่อว่าละเอียดอ่อน}}",
   "compose_form.spoiler.marked": "เอาคำเตือนเนื้อหาออก",
   "compose_form.spoiler.unmarked": "เพิ่มคำเตือนเนื้อหา",
-  "compose_form.spoiler_placeholder": "เขียนคำเตือนของคุณที่นี่",
   "confirmation_modal.cancel": "ยกเลิก",
   "confirmations.block.block_and_report": "ปิดกั้นแล้วรายงาน",
   "confirmations.block.confirm": "ปิดกั้น",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
-  "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.explore": "สำรวจ",
   "navigation_bar.favourites": "รายการโปรด",
   "navigation_bar.filters": "คำที่ซ่อนอยู่",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
-  "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
-  "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
-  "privacy.private.short": "ผู้ติดตามเท่านั้น",
-  "privacy.public.long": "ปรากฏแก่ทั้งหมด",
   "privacy.public.short": "สาธารณะ",
-  "privacy.unlisted.long": "ปรากฏแก่ทั้งหมด แต่เลือกไม่รับคุณลักษณะการค้นพบ",
-  "privacy.unlisted.short": "ไม่อยู่ในรายการ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
@@ -715,10 +696,8 @@
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
   "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
-  "upload_form.description_missing": "ไม่ได้เพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
-  "upload_form.undo": "ลบ",
   "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index e85db817b9..6811c158d4 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Duyuru",
   "attachments_list.unprocessed": "(işlenmemiş)",
   "audio.hide": "Sesi gizle",
-  "autosuggest_hashtag.per_week": "Haftada {count}",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "bundle_column_error.copy_stacktrace": "Hata raporunu kopyala",
   "bundle_column_error.error.body": "İstenen sayfa gösterilemiyor. Bu durum kodumuzdaki bir hatadan veya tarayıcı uyum sorunundan kaynaklanıyor olabilir.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Hesabın {locked} değil. Yalnızca takipçilere özel gönderilerini görüntülemek için herkes seni takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
   "compose_form.placeholder": "Aklında ne var?",
-  "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
-  "compose_form.poll.option_placeholder": "{number}.seçenek",
-  "compose_form.poll.remove_option": "Bu seçeneği kaldır",
   "compose_form.poll.switch_to_multiple": "Birden çok seçeneğe izin vermek için anketi değiştir",
   "compose_form.poll.switch_to_single": "Tek bir seçeneğe izin vermek için anketi değiştir",
-  "compose_form.publish": "Gönder",
   "compose_form.publish_form": "Gönder",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Değişiklikleri kaydet",
-  "compose_form.sensitive.hide": "{count, plural, one {Medyayı hassas olarak işaretle} other {Medyayı hassas olarak işaretle}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Medya hassas olarak işaretlendi} other {Medya hassas olarak işaretlendi}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Medya hassas olarak işaretlenmemiş} other {Medya hassas olarak işaretlenmemiş}}",
   "compose_form.spoiler.marked": "Metin uyarının arkasına gizlenir",
   "compose_form.spoiler.unmarked": "Metin gizli değil",
-  "compose_form.spoiler_placeholder": "Uyarınızı buraya yazın",
   "confirmation_modal.cancel": "İptal",
   "confirmations.block.block_and_report": "Engelle ve Bildir",
   "confirmations.block.confirm": "Engelle",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Özel değinmeler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
-  "navigation_bar.edit_profile": "Profili düzenle",
   "navigation_bar.explore": "Keşfet",
   "navigation_bar.favourites": "Favorilerin",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Bir anket ekleyin",
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
-  "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Sadece bahsedilen kişiler",
-  "privacy.private.long": "Sadece takipçiler için görünür",
-  "privacy.private.short": "Sadece takipçiler",
-  "privacy.public.long": "Herkese açık",
   "privacy.public.short": "Herkese açık",
-  "privacy.unlisted.long": "Keşfet harici herkese açık",
-  "privacy.unlisted.short": "Listelenmemiş",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
   "upload_form.description": "Görme engelliler için açıklama",
-  "upload_form.description_missing": "Açıklama eklenmedi",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
-  "upload_form.undo": "Sil",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
   "upload_modal.analyzing_picture": "Resim analiz ediliyor…",
   "upload_modal.apply": "Uygula",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 47fe60bd25..17de9884e7 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -76,7 +76,6 @@
   "announcement.announcement": "Игълан",
   "attachments_list.unprocessed": "(чимал)",
   "audio.hide": "Аудионы яшерү",
-  "autosuggest_hashtag.per_week": "{count} атнага",
   "boost_modal.combo": "Сез баса аласыз {combo} киләсе тапкыр моны сагыну өчен",
   "bundle_column_error.copy_stacktrace": "Күчереп алу хата турында Отчет",
   "bundle_column_error.error.body": "Соралган бит күрсәтелә алмый. Бу безнең кодтагы хата яки браузерга туры килү проблемасы аркасында булырга мөмкин.",
@@ -128,22 +127,12 @@
   "compose_form.lock_disclaimer": "Сезнең хисап түгел {locked}. Апуәрбер теләгән кеше сезнең язма өчен иярә ала.",
   "compose_form.lock_disclaimer.lock": "бикле",
   "compose_form.placeholder": "What is on your mind?",
-  "compose_form.poll.add_option": "Сайлау өстәгез",
   "compose_form.poll.duration": "Сораштыру озынлыгы",
-  "compose_form.poll.option_placeholder": "Сайлау {number}",
-  "compose_form.poll.remove_option": "бетерү",
   "compose_form.poll.switch_to_multiple": "Берничә вариантны чишү өчен сораштыруны Үзгәртегез",
   "compose_form.poll.switch_to_single": "Бердәнбер сайлау өчен сораштыруны Үзгәртегез",
-  "compose_form.publish": "Бастыру",
   "compose_form.publish_form": "Бастыру",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Үзгәрешләрне саклау",
-  "compose_form.sensitive.hide": "{count, plural, one {Медианы сизгер итеп билгеләгез} other {Медианы сизгер итеп билгеләгез}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Ташучы сизгер дип язылган} other {Ташучы сизгер дип язылган}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медиа сизгер буларак билгеле түгел} other {Медиа сизгер буларак билгеле түгел}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "Кисәтүегезне монда языгыз",
   "confirmation_modal.cancel": "Баш тарту",
   "confirmations.block.block_and_report": "Блоклау һәм шикаять итү",
   "confirmations.block.confirm": "Блоклау",
@@ -322,7 +311,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Хосусый искә алулар",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Профильны үзгәртү",
   "navigation_bar.explore": "Күзәтү",
   "navigation_bar.lists": "Исемлекләр",
   "navigation_bar.logout": "Чыгу",
@@ -376,9 +364,6 @@
   "poll_button.add_poll": "Сораштыруны өстәү",
   "poll_button.remove_poll": "Сораштыруны бетерү",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Һәркемгә ачык",
   "privacy.public.short": "Һәркемгә ачык",
   "privacy_policy.last_updated": "Соңгы яңарту {date}",
   "privacy_policy.title": "Хосусыйлык Сәясәте",
@@ -478,9 +463,7 @@
   "units.short.thousand": "{count}М",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.description_missing": "Тасвирлама өстәлмәде",
   "upload_form.edit": "Үзгәртү",
-  "upload_form.undo": "Бетерү",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.analyzing_picture": "Рәсемгә анализ ясау…",
   "upload_modal.apply": "Куллан",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 6bb5ba0ebf..9dc3b5c1f9 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -76,8 +76,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 5ec0da599b..38e5f9cfbd 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "audio.hide": "Сховати аудіо",
-  "autosuggest_hashtag.per_week": "{count} на тиждень",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "bundle_column_error.copy_stacktrace": "Копіювати звіт про помилку",
   "bundle_column_error.error.body": "Неможливо показати запитану сторінку. Це може бути спричинено помилкою у нашому коді, або через проблему сумісності з браузером.",
@@ -146,22 +145,13 @@
   "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
-  "compose_form.poll.add_option": "Додати варіант",
+  "compose_form.poll.add_option": "Додати опцію",
   "compose_form.poll.duration": "Тривалість опитування",
-  "compose_form.poll.option_placeholder": "Варіант {number}",
-  "compose_form.poll.remove_option": "Видалити цей варіант",
   "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
-  "compose_form.publish": "Опублікувати",
   "compose_form.publish_form": "Новий допис",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Зберегти зміни",
-  "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Медіа позначене делікатним} other {Медіа позначені делікатними}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Медіа не позначене делікатним} other {Медіа не позначені делікатними}}",
   "compose_form.spoiler.marked": "Прибрати попередження про вміст",
   "compose_form.spoiler.unmarked": "Додати попередження про вміст",
-  "compose_form.spoiler_placeholder": "Напишіть своє попередження тут",
   "confirmation_modal.cancel": "Скасувати",
   "confirmations.block.block_and_report": "Заблокувати та поскаржитися",
   "confirmations.block.confirm": "Заблокувати",
@@ -408,7 +398,6 @@
   "navigation_bar.direct": "Особисті згадки",
   "navigation_bar.discover": "Дослідити",
   "navigation_bar.domain_blocks": "Заблоковані домени",
-  "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Уподобане",
   "navigation_bar.filters": "Приховані слова",
@@ -526,14 +515,7 @@
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
-  "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Лише згадані люди",
-  "privacy.private.long": "Показати тільки підписникам",
-  "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Видимий для всіх",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
-  "privacy.unlisted.short": "Прихований",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
   "recommended": "Рекомендовано",
@@ -715,10 +697,8 @@
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
-  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
-  "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
   "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 563b2dedf8..fee2cc3a98 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -72,7 +72,6 @@
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
   "alert.unexpected.title": "ا رے!",
   "announcement.announcement": "اعلان",
-  "autosuggest_hashtag.per_week": "{count} فی ہفتہ",
   "boost_modal.combo": "آئیندہ یہ نہ دیکھنے کیلئے آپ {combo} دبا سکتے ہیں",
   "bundle_column_error.error.title": "اوف، نہیں!",
   "bundle_column_error.network.title": "نیٹ ورک کی خرابی",
@@ -115,22 +114,12 @@
   "compose_form.lock_disclaimer": "آپ کا اکاؤنٹ {locked} نہیں ہے. کوئی بھی آپ کے مخصوص برائے پیروکار ٹوٹ دیکھنے کی خاطر آپ کی پیروی کر سکتا ہے.",
   "compose_form.lock_disclaimer.lock": "مقفل",
   "compose_form.placeholder": "آپ کیا سوچ رہے ہیں؟",
-  "compose_form.poll.add_option": "انتخاب شامل کریں",
   "compose_form.poll.duration": "مدتِ رائے",
-  "compose_form.poll.option_placeholder": "انتخاب {number}",
-  "compose_form.poll.remove_option": "یہ انتخاب ہٹا دیں",
   "compose_form.poll.switch_to_multiple": "متعدد انتخاب کی اجازت دینے کے لیے پول تبدیل کریں",
   "compose_form.poll.switch_to_single": "کسی ایک انتخاب کے لیے پول تبدیل کریں",
-  "compose_form.publish": "اشاعت کردہ",
   "compose_form.publish_form": "اشاعت کریں",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "تبدیلیاں محفوظ کریں",
-  "compose_form.sensitive.hide": "وسائل کو حساس نشاندہ کریں",
-  "compose_form.sensitive.marked": "وسائل حساس نشاندہ ہے",
-  "compose_form.sensitive.unmarked": "{count, plural, one {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے} other {میڈیا کو حساس کے طور پر نشان زد نہیں کیا گیا ہے}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
-  "compose_form.spoiler_placeholder": "اپنی وارننگ یہاں لکھیں",
   "confirmation_modal.cancel": "منسوخ",
   "confirmations.block.block_and_report": "شکایت کریں اور بلاک کریں",
   "confirmations.block.confirm": "بلاک",
@@ -242,7 +231,6 @@
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
   "navigation_bar.filters": "خاموش کردہ الفاظ",
   "navigation_bar.follow_requests": "پیروی کی درخواستیں",
   "navigation_bar.follows_and_followers": "پیروی کردہ اور پیروکار",
@@ -281,10 +269,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
-  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 8eeee42a5e..8f231c8c77 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -75,7 +75,6 @@
   "announcement.announcement": "E'lonlar",
   "attachments_list.unprocessed": "(qayta ishlanmagan)",
   "audio.hide": "Audioni yashirish",
-  "autosuggest_hashtag.per_week": "{count} haftasiga",
   "boost_modal.combo": "Keyingi safar buni oʻtkazib yuborish uchun {combo} tugmasini bosishingiz mumkin",
   "bundle_column_error.copy_stacktrace": "Xato hisobotini nusxalash",
   "bundle_column_error.error.body": "Soʻralgan sahifani koʻrsatib boʻlmadi. Buning sababi bizning kodimizdagi xato yoki brauzer mosligi muammosi bo'lishi mumkin.",
@@ -126,22 +125,12 @@
   "compose_form.lock_disclaimer": "Hisobingiz {locked}. Faqat obunachilarga moʻljallangan postlaringizni koʻrish uchun har kim sizni kuzatishi mumkin.",
   "compose_form.lock_disclaimer.lock": "yopilgan",
   "compose_form.placeholder": "Xalolizda nima?",
-  "compose_form.poll.add_option": "Tanlov qo'shing",
   "compose_form.poll.duration": "So‘rov muddati",
-  "compose_form.poll.option_placeholder": "Tanlov {number}",
-  "compose_form.poll.remove_option": "Olib tashlash",
   "compose_form.poll.switch_to_multiple": "Bir nechta tanlovga ruxsat berish uchun so'rovnomani o'zgartirish",
   "compose_form.poll.switch_to_single": "Yagona tanlovga ruxsat berish uchun so‘rovnomani o‘zgartirish",
-  "compose_form.publish": "Nashr qilish",
   "compose_form.publish_form": "Nashr qilish",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "O‘zgarishlarni saqlash",
-  "compose_form.sensitive.hide": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Mediani sezgir deb belgilang} other {Medialarni sezgir deb belgilang}}",
   "compose_form.spoiler.marked": "Kontent ogohlantirishini olib tashlang",
   "compose_form.spoiler.unmarked": "Kontent haqida ogohlantirish qo'shing",
-  "compose_form.spoiler_placeholder": "Sharhingizni bu erga yozing",
   "confirmation_modal.cancel": "Bekor qilish",
   "confirmations.block.block_and_report": "Bloklash va hisobot berish",
   "confirmations.block.confirm": "Bloklash",
@@ -336,7 +325,6 @@
   "navigation_bar.compose": "Yangi post yozing",
   "navigation_bar.discover": "Kashf qilish",
   "navigation_bar.domain_blocks": "Bloklangan domenlar",
-  "navigation_bar.edit_profile": "Profilni tahrirlash",
   "navigation_bar.explore": "O‘rganish",
   "navigation_bar.filters": "E'tiborga olinmagan so'zlar",
   "navigation_bar.followed_tags": "Kuzatilgan hashtaglar",
@@ -368,8 +356,6 @@
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
   "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
   "report.target": "Report {target}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index c623caa3fb..73a11b9573 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "Có gì mới?",
   "attachments_list.unprocessed": "(chưa xử lí)",
   "audio.hide": "Ẩn âm thanh",
-  "autosuggest_hashtag.per_week": "{count} mỗi tuần",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "bundle_column_error.copy_stacktrace": "Sao chép báo lỗi",
   "bundle_column_error.error.body": "Không thể hiện trang này. Đây có thể là một lỗi trong mã lập trình của chúng tôi, hoặc là vấn đề tương thích của trình duyệt.",
@@ -146,22 +145,12 @@
   "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi và xem tút riêng tư của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
-  "compose_form.poll.add_option": "Thêm lựa chọn",
   "compose_form.poll.duration": "Hết hạn vào",
-  "compose_form.poll.option_placeholder": "Lựa chọn {number}",
-  "compose_form.poll.remove_option": "Xóa lựa chọn này",
   "compose_form.poll.switch_to_multiple": "Có thể chọn nhiều lựa chọn",
   "compose_form.poll.switch_to_single": "Chỉ cho phép chọn duy nhất một lựa chọn",
-  "compose_form.publish": "Đăng",
   "compose_form.publish_form": "Đăng",
-  "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Lưu thay đổi",
-  "compose_form.sensitive.hide": "{count, plural, other {Đánh dấu nội dung nhạy cảm}}",
-  "compose_form.sensitive.marked": "{count, plural, other {Nội dung này nhạy cảm}}",
-  "compose_form.sensitive.unmarked": "{count, plural, other {Nội dung này bình thường}}",
   "compose_form.spoiler.marked": "Hủy nội dung ẩn",
   "compose_form.spoiler.unmarked": "Tạo nội dung ẩn",
-  "compose_form.spoiler_placeholder": "Lời dẫn cho nội dung ẩn",
   "confirmation_modal.cancel": "Hủy bỏ",
   "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
@@ -408,7 +397,6 @@
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
-  "navigation_bar.edit_profile": "Sửa hồ sơ",
   "navigation_bar.explore": "Xu hướng",
   "navigation_bar.favourites": "Lượt thích",
   "navigation_bar.filters": "Bộ lọc từ ngữ",
@@ -526,14 +514,7 @@
   "poll_button.add_poll": "Tạo bình chọn",
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Chọn kiểu tút",
-  "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
-  "privacy.direct.short": "Nhắn riêng",
-  "privacy.private.long": "Dành riêng cho người theo dõi",
-  "privacy.private.short": "Chỉ người theo dõi",
-  "privacy.public.long": "Hiển thị với mọi người",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Công khai nhưng ẩn trên bảng tin",
-  "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
   "recommended": "Đề xuất",
@@ -715,10 +696,8 @@
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
   "upload_form.audio_description": "Mô tả cho người mất thính giác",
   "upload_form.description": "Mô tả cho người khiếm thị",
-  "upload_form.description_missing": "Chưa thêm mô tả",
   "upload_form.edit": "Biên tập",
   "upload_form.thumbnail": "Đổi ảnh thumbnail",
-  "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
   "upload_modal.apply": "Áp dụng",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 008a9636db..a585838cd2 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -22,7 +22,6 @@
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
-  "autosuggest_hashtag.per_week": "{count} ⵙ ⵉⵎⴰⵍⴰⵙⵙ",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
@@ -44,9 +43,7 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ⵉⵜⵜⵓⵔⴳⵍ",
   "compose_form.placeholder": "ⵎⴰⵢⴷ ⵉⵍⵍⴰⵏ ⴳ ⵉⵅⴼ ⵏⵏⴽ?",
-  "compose_form.poll.option_placeholder": "ⴰⵙⵜⵜⴰⵢ {number}",
   "compose_form.publish_form": "Publish",
-  "compose_form.publish_loud": "{publish}!",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "confirmation_modal.cancel": "ⵙⵔ",
@@ -129,7 +126,6 @@
   "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
   "navigation_bar.lists": "ⵜⵉⵍⴳⴰⵎⵉⵏ",
   "navigation_bar.logout": "ⴼⴼⵖ",
@@ -161,8 +157,6 @@
   "poll_button.add_poll": "ⵔⵏⵓ ⵢⴰⵏ ⵢⵉⴷⵣ",
   "poll_button.remove_poll": "ⵙⵙⵉⵜⵢ ⵉⴷⵣ",
   "privacy.change": "Adjust status privacy",
-  "privacy.direct.short": "Direct",
-  "privacy.private.short": "Followers-only",
   "privacy.public.short": "ⵜⴰⴳⴷⵓⴷⴰⵏⵜ",
   "regeneration_indicator.label": "ⴰⵣⴷⴰⵎ…",
   "relative_time.days": "{number}ⴰⵙ",
@@ -211,7 +205,6 @@
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
   "upload_form.edit": "ⵙⵏⴼⵍ",
-  "upload_form.undo": "ⴽⴽⵙ",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
   "upload_modal.choose_image": "ⴷⵖⵔ ⵜⴰⵡⵍⴰⴼⵜ",
   "upload_progress.label": "Uploading…",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 720e4331b3..9b55e51b1f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "autosuggest_hashtag.per_week": "每星期 {count} 条",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "bundle_column_error.copy_stacktrace": "复制错误报告",
   "bundle_column_error.error.body": "请求的页面无法渲染，可能是代码出现错误或浏览器存在兼容性问题。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "想写什么？",
   "compose_form.poll.add_option": "添加选项",
   "compose_form.poll.duration": "投票期限",
+  "compose_form.poll.multiple": "多选",
   "compose_form.poll.option_placeholder": "选项 {number}",
-  "compose_form.poll.remove_option": "移除此选项",
+  "compose_form.poll.remove_option": "删除此选项",
+  "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
+  "compose_form.poll.type": "样式",
   "compose_form.publish": "发布",
   "compose_form.publish_form": "发布",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "保存更改",
-  "compose_form.sensitive.hide": "标记媒体为敏感内容",
-  "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
-  "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
+  "compose_form.reply": "回复",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
-  "compose_form.spoiler_placeholder": "写下你的警告",
+  "compose_form.spoiler_placeholder": "内容警告 (可选)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私下提及",
   "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
-  "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "忽略的关键词",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
-  "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "仅提到的人",
-  "privacy.private.long": "仅对关注者可见",
-  "privacy.private.short": "仅关注者可见",
-  "privacy.public.long": "所有人可见",
+  "privacy.direct.long": "帖子中提到的每个人",
+  "privacy.direct.short": "具体的人",
+  "privacy.private.long": "仅限您的关注者",
+  "privacy.private.short": "关注者",
+  "privacy.public.long": "所有Mastodon内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.long": "所有人可见，但不在探索功能出现",
-  "privacy.unlisted.short": "不公开",
+  "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
+  "privacy.unlisted.long": "减少算法影响",
+  "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
   "recommended": "推荐",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分钟前",
   "relative_time.seconds": "{number} 秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "屏蔽",
   "report.block_explanation": "你将无法看到他们的嘟文。他们也将无法看到你的嘟文或关注你。他们将能够判断出他们被屏蔽了。",
   "report.categories.legal": "法律义务",
@@ -715,10 +716,8 @@
   "upload_error.poll": "投票中不允许上传文件。",
   "upload_form.audio_description": "为听障人士添加文字描述",
   "upload_form.description": "为视觉障碍人士添加文字说明",
-  "upload_form.description_missing": "未添加描述",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
-  "upload_form.undo": "删除",
   "upload_form.video_description": "为听障人士和视障人士添加文字描述",
   "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index cd0845b6e2..5890c4df4b 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "每週 {count} 次",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",
@@ -146,22 +145,22 @@
   "compose_form.lock_disclaimer": "你的用戶狀態沒有{locked}，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "鎖定",
   "compose_form.placeholder": "你在想甚麼？",
-  "compose_form.poll.add_option": "新增選擇",
+  "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選擇",
-  "compose_form.poll.remove_option": "移除此選擇",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
+  "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為限定單一選項",
+  "compose_form.poll.type": "風格",
   "compose_form.publish": "發佈",
   "compose_form.publish_form": "發佈",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "標記媒體為敏感內容",
-  "compose_form.sensitive.marked": "媒體被標示為敏感",
-  "compose_form.sensitive.unmarked": "媒體沒有被標示為敏感",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "文字被警告隱藏",
   "compose_form.spoiler.unmarked": "文字沒有被隱藏",
-  "compose_form.spoiler_placeholder": "敏感警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (選用)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私人提及",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
-  "navigation_bar.edit_profile": "修改個人資料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "靜音詞彙",
@@ -526,14 +524,15 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整私隱設定",
-  "privacy.direct.long": "只有提及的使用者能看到",
-  "privacy.direct.short": "僅限提及的人",
-  "privacy.private.long": "只有你的關注者能看到",
-  "privacy.private.short": "僅限追隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "帖文提及的人",
+  "privacy.direct.short": "特定的人",
+  "privacy.private.long": "只有你的追蹤者",
+  "privacy.private.short": "追蹤者",
+  "privacy.public.long": "Mastodon 內外的任何人",
   "privacy.public.short": "公共",
-  "privacy.unlisted.long": "對所有人可見，但不包括探索功能",
-  "privacy.unlisted.short": "公開",
+  "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
+  "privacy.unlisted.long": "較少用演算法宣傳",
+  "privacy.unlisted.short": "半公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
   "recommended": "推薦",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number}分鐘前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, one {# 附件} other {# 附件}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "你將不會看到他們的帖文。他們將無法看到你的帖文或追隨你。他們將發現自己被封鎖了。",
   "report.categories.legal": "法律",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許在投票上傳檔案。",
   "upload_form.audio_description": "簡單描述內容給聽障人士",
   "upload_form.description": "為視覺障礙人士添加文字說明",
-  "upload_form.description_missing": "沒有加入描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "簡單描述給聽障或視障人士",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cc8b583120..c365e67e07 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -89,7 +89,6 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未經處理）",
   "audio.hide": "隱藏音訊",
-  "autosuggest_hashtag.per_week": "{count} / 週",
   "boost_modal.combo": "下次您可以按 {combo} 跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
@@ -148,20 +147,20 @@
   "compose_form.placeholder": "正在想些什麼嗎？",
   "compose_form.poll.add_option": "新增選項",
   "compose_form.poll.duration": "投票期限",
-  "compose_form.poll.option_placeholder": "第 {number} 個選項",
+  "compose_form.poll.multiple": "多選",
+  "compose_form.poll.option_placeholder": "選項 {number}",
   "compose_form.poll.remove_option": "移除此選項",
+  "compose_form.poll.single": "選擇一個",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
-  "compose_form.publish": "嘟出去",
+  "compose_form.poll.type": "投票方式",
+  "compose_form.publish": "發嘟",
   "compose_form.publish_form": "嘟出去",
-  "compose_form.publish_loud": "{publish}！",
-  "compose_form.save_changes": "儲存變更",
-  "compose_form.sensitive.hide": "{count, plural, other {將媒體標記為敏感內容}}",
-  "compose_form.sensitive.marked": "此媒體被標記為敏感內容",
-  "compose_form.sensitive.unmarked": "此媒體未被標記為敏感內容",
+  "compose_form.reply": "回覆",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除內容警告",
   "compose_form.spoiler.unmarked": "新增內容警告",
-  "compose_form.spoiler_placeholder": "請於此處填寫內容警告訊息",
+  "compose_form.spoiler_placeholder": "內容警告 (可選的)",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "封鎖並檢舉",
   "confirmations.block.confirm": "封鎖",
@@ -408,7 +407,6 @@
   "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "已封鎖網域",
-  "navigation_bar.edit_profile": "編輯個人檔案",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
@@ -526,13 +524,14 @@
   "poll_button.add_poll": "建立投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
-  "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "僅限提及者",
-  "privacy.private.long": "只有跟隨您的使用者能看到",
-  "privacy.private.short": "僅限跟隨者",
-  "privacy.public.long": "對所有人可見",
+  "privacy.direct.long": "此嘟文提及之所有人",
+  "privacy.direct.short": "指定使用者",
+  "privacy.private.long": "只有跟隨您的人能看到",
+  "privacy.private.short": "跟隨者",
+  "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
-  "privacy.unlisted.long": "對所有人可見，但選擇退出探索功能",
+  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+  "privacy.unlisted.long": "悄然無聲",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
@@ -551,7 +550,9 @@
   "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
+  "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
   "reply_indicator.cancel": "取消",
+  "reply_indicator.poll": "投票",
   "report.block": "封鎖",
   "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
   "report.categories.legal": "合法性",
@@ -715,10 +716,8 @@
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_form.audio_description": "為聽障人士增加文字說明",
   "upload_form.description": "為視障人士增加文字說明",
-  "upload_form.description_missing": "沒有任何描述",
   "upload_form.edit": "編輯",
   "upload_form.thumbnail": "更改預覽圖",
-  "upload_form.undo": "刪除",
   "upload_form.video_description": "為聽障或視障人士增加文字說明",
   "upload_modal.analyzing_picture": "正在分析圖片…",
   "upload_modal.apply": "套用",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b9a3135448..9c8456a05f 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1546,6 +1546,9 @@ bg:
     errors:
       limit_reached: Ограничението на различни реакции е достигнат
       unrecognized_emoji: не е разпознато емоджи
+  redirects:
+    prompt: Ако вярвате на тази връзка, то щракнете на нея, за да продължите.
+    title: Напускате %{instance}.
   relationships:
     activity: Дейност на акаунта
     confirm_follow_selected_followers: Наистина ли искате да последвате избраните последователи?
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 44688577a9..444d0e2c5f 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1646,7 +1646,7 @@ eu:
     back: Itzuli Mastodon-era
     delete: Kontuaren ezabaketa
     development: Garapena
-    edit_profile: Aldatu profila
+    edit_profile: Editatu profila
     export: Datuen esportazioa
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
@@ -1860,9 +1860,9 @@ eu:
     seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
     signed_in_as: 'Saioa honela hasita:'
   verification:
-    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code>-etiketa bat ere erabil dezakezu orrialdearen goiburuan, baina HTMLak eskuragarri egon behar du JavaScript exekutatu gabe.
+    extra_instructions_html: <strong>Aholkua:</strong> webguneko esteka ikusezina izan daiteke. Muina <code>rel="me"</code> da, erabiltzaileak sortutako edukia duten webguneetan beste inor zure burutzat aurkeztea eragozten duena. <code>a</code> beharrean <code>esteka</code> motako etiketa bat ere erabil dezakezu orriaren goiburuan, baina HTMLak erabilgarri egon behar du JavaScript exekutatu gabe.
     here_is_how: Hemen duzu nola
-    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
+    hint_html: "<strong>Mastodonen nortasun-egiaztapena guztiontzat da.</strong> Web estandar irekietan oinarritua, orain eta betiko doan. Behar duzun guztia jendeak ezagutzen duen webgune pertsonal bat da. Mastodon profiletik webgune honetara estekatzen duzunean, webguneak Mastodon profilera estekatzen duela egiaztatuko dugu eta adierazle bat erakutsiko du."
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
     verified_links: Zure lotura egiaztatuak
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0514772c1d..bb3368dd9e 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -406,6 +406,7 @@ fa:
           silence: محدود
           suspend: تعلیق
         title: مسدودسازی دامین تازه
+      no_domain_block_selected: هیچ انسداد دامنه‌ای تغییر نکرد زیرا هیچ‌کدامشان انتخاب نشده بودند
       not_permitted: شما مجاز به انجام این عملیات نیستید
       obfuscate: مبهم‌سازی نام دامنهٔ
       obfuscate_hint: در صورت به کار افتاده بودن اعلام فهرست محدودیت‌های دامنه، نام دامنه در فهرست را به صورت جزیی مبهم می‌کند
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 9b505e5f92..b67de192f2 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -38,6 +38,9 @@ hi:
       upload_check_privacy_error_object_storage:
         action: अधिक जानकारी हेतु यहां क्लिक करें।
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
+  redirects:
+    prompt: अगर आपको इस लिंक पर भरोसा है तो आगे बढ़ने के लिए इसे क्लिक करें
+    title: आप इस %{instance} को छोड़ने वाले हैं
   relationships:
     follow_failure: चुने हुए अकाउंट्स में से कुछ को फ़ॉलो नहीं किया जा सकता
   sessions:
@@ -50,3 +53,9 @@ hi:
   time:
     formats:
       with_time_zone: "%b %d, %Y, %H:%M %Z"
+  user_mailer:
+    failed_2fa:
+      details: 'आपके साइन इन प्रयासों के डिटेल ये रहे:'
+      explanation: किसी ने आपके अकाउंट पर साइन इन करने का प्रयास किया लेकिन दूसरा प्रमाणीकरण विकल्प गलत दिया।
+      further_actions_html: अगर ये आप नहीं थे, तो हम अनुरोध करते हैं कि आप तुरंत %{action} लें क्योंकि ये शायद खतरे में है।
+      subject: दूसरा फैक्टर सत्यापन नाकाम रहा
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 8cbbb64c97..545da69d9c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1547,7 +1547,8 @@ hu:
       limit_reached: A különböző reakciók száma elérte a határértéket
       unrecognized_emoji: nem ismert emodzsi
   redirects:
-    prompt: Ha megbízunk ebben a hivatkozásban, kattintsunk rá a folytatáshoz.
+    prompt: Ha megbízol ebben a hivatkozásban, kattints rá a folytatáshoz.
+    title: Épp elhagyni készülöd a %{instance} kiszolgálót.
   relationships:
     activity: Fiók aktivitás
     confirm_follow_selected_followers: Biztos, hogy követni akarod a kiválasztott követőket?
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index c77a8f802d..a8287da533 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1546,6 +1546,9 @@ ie:
     errors:
       limit_reached: Límite de diferent reactiones atinget
       unrecognized_emoji: ne es un reconosset emoji
+  redirects:
+    prompt: Si tu fide ti ligament, clicca it por continuar.
+    title: Tu exea de %{instance}.
   relationships:
     activity: Activitá de conto
     confirm_follow_selected_followers: Esque tu vermen vole sequer selectet sequitores?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2051e30aee..6880f64c5e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1520,6 +1520,9 @@ ja:
     errors:
       limit_reached: リアクションの種類が上限に達しました
       unrecognized_emoji: は絵文字として認識されていません
+  redirects:
+    prompt: リンク先を確かめ、信用できる場合のみリンクをクリックしてください。
+    title: "%{instance} から別のサーバーに移動します。"
   relationships:
     activity: 活動
     confirm_follow_selected_followers: 選択したフォロワーをフォローしてもよろしいですか？
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 72e63e47d3..7fe60541e6 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1449,7 +1449,7 @@ zh-TW:
       title: 新的跟隨請求
     mention:
       action: 回覆
-      body: "%{name} 於嘟文中提及您:"
+      body: "%{name} 於嘟文中提及您："
       subject: "%{name} 於嘟文中提及您"
       title: 新的提及
     poll:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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