From a1ca52ed8f89022b484d83a80d77a8037713dc10 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:43:24 +0200
Subject: [PATCH 01/10] Update dependency @types/react to v18.3.24 (#35888)

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 674741de08..3c43fc456d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4286,12 +4286,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^18.2.7":
-  version: 18.3.23
-  resolution: "@types/react@npm:18.3.23"
+  version: 18.3.24
+  resolution: "@types/react@npm:18.3.24"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/49331800b76572eb2992a5c44801dbf8c612a5f99c8f4e4200f06c7de6f3a6e9455c661784a6c5469df96fa45622cb4a9d0982c44e6a0d5719be5f2ef1f545ed
+  checksum: 10c0/9e188fa8e50f172cf647fc48fea2e04d88602afff47190b697de281a8ac88df9ee059864757a2a438ff599eaf9276d9a9e0e60585e88f7d57f01a2e4877d37ec
   languageName: node
   linkType: hard
 

From d85743576cc60e059172235173579ae56d8c11e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:46:10 +0200
Subject: [PATCH 02/10] Update dependency vite-plugin-svgr to v4.5.0 (#35885)

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

diff --git a/yarn.lock b/yarn.lock
index 3c43fc456d..8303ee7369 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3293,7 +3293,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.1.0, @rollup/pluginutils@npm:^5.1.3":
+"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.1.0, @rollup/pluginutils@npm:^5.2.0":
   version: 5.2.0
   resolution: "@rollup/pluginutils@npm:5.2.0"
   dependencies:
@@ -13854,15 +13854,15 @@ __metadata:
   linkType: hard
 
 "vite-plugin-svgr@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "vite-plugin-svgr@npm:4.3.0"
+  version: 4.5.0
+  resolution: "vite-plugin-svgr@npm:4.5.0"
   dependencies:
-    "@rollup/pluginutils": "npm:^5.1.3"
+    "@rollup/pluginutils": "npm:^5.2.0"
     "@svgr/core": "npm:^8.1.0"
     "@svgr/plugin-jsx": "npm:^8.1.0"
   peerDependencies:
     vite: ">=2.6.0"
-  checksum: 10c0/a73f10d319f72cd8c16bf9701cf18170f2300f98c72c6bf939565de0b1e93916bd70c6f5a446dc034b4405c72d382655c7c16be4bd1cbf35bbcde5febf7aeffc
+  checksum: 10c0/3e1959fec626bb4f5a8ec13ff15bc40ffbc1c0ff38149bebe3f37dc2d67ed1f276f129ff7983e06946cf712e19996affd9d6868aa7d20d8921d1fe4449109b55
   languageName: node
   linkType: hard
 

From 61a21d6a36da8212bd408f120b48d5df2d974ac6 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Mon, 25 Aug 2025 06:54:47 +0000
Subject: [PATCH 03/10] Add crossorigin back to inert css (regression? of
 #30687) (#35876)

---
 app/views/layouts/application.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 15d08b3fcb..f5318d6c2d 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -30,7 +30,7 @@
     = vite_react_refresh_tag
     = vite_polyfills_tag
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = vite_stylesheet_tag 'styles/entrypoints/inert.scss', media: 'all', id: 'inert-style'
+    = vite_stylesheet_tag 'styles/entrypoints/inert.scss', media: 'all', id: 'inert-style', crossorigin: 'anonymous'
     = vite_typescript_tag 'common.ts', crossorigin: 'anonymous'
 
     = vite_preload_file_tag "mastodon/locales/#{I18n.locale}.json"

From b771fc08805998fa74d06845ef0cdc4ad7446eea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 08:54:53 +0200
Subject: [PATCH 04/10] New Crowdin Translations (automated) (#35878)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  3 +-
 app/javascript/mastodon/locales/cs.json    | 11 +++++-
 app/javascript/mastodon/locales/da.json    | 17 ++++++---
 app/javascript/mastodon/locales/de.json    |  4 ++-
 app/javascript/mastodon/locales/el.json    |  4 ++-
 app/javascript/mastodon/locales/es-AR.json |  4 ++-
 app/javascript/mastodon/locales/es-MX.json | 10 +++---
 app/javascript/mastodon/locales/es.json    |  4 ++-
 app/javascript/mastodon/locales/fa.json    |  1 +
 app/javascript/mastodon/locales/fi.json    | 12 ++++++-
 app/javascript/mastodon/locales/fil.json   |  6 ++++
 app/javascript/mastodon/locales/fo.json    |  4 ++-
 app/javascript/mastodon/locales/he.json    | 14 ++++++--
 app/javascript/mastodon/locales/is.json    |  4 ++-
 app/javascript/mastodon/locales/it.json    | 14 ++++++--
 app/javascript/mastodon/locales/ko.json    | 19 +++++++++-
 app/javascript/mastodon/locales/nan.json   | 17 ++++++++-
 app/javascript/mastodon/locales/pt-PT.json | 31 ++++++++++++++++-
 app/javascript/mastodon/locales/sv.json    |  3 +-
 app/javascript/mastodon/locales/tr.json    |  4 ++-
 app/javascript/mastodon/locales/uk.json    |  3 +-
 app/javascript/mastodon/locales/vi.json    |  4 ++-
 app/javascript/mastodon/locales/zh-CN.json | 10 +++++-
 app/javascript/mastodon/locales/zh-HK.json |  4 ++-
 app/javascript/mastodon/locales/zh-TW.json |  4 ++-
 config/locales/ca.yml                      |  1 +
 config/locales/cs.yml                      |  1 +
 config/locales/fi.yml                      |  1 +
 config/locales/he.yml                      |  1 +
 config/locales/it.yml                      |  1 +
 config/locales/ko.yml                      |  1 +
 config/locales/nan.yml                     | 40 +++++++++++++++++++++-
 config/locales/pt-PT.yml                   |  1 +
 33 files changed, 226 insertions(+), 32 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index f090b1bb0d..eac9d13820 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -977,5 +977,6 @@
   "visibility_modal.quote_followers": "Només seguidors",
   "visibility_modal.quote_label": "Canvieu qui us pot citar",
   "visibility_modal.quote_nobody": "Ningú",
-  "visibility_modal.quote_public": "Qualsevol"
+  "visibility_modal.quote_public": "Qualsevol",
+  "visibility_modal.save": "Desa"
 }
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index d69b66aa4d..9be02f046d 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Otevřít domovskou časovou osu",
   "keyboard_shortcuts.hotkey": "Klávesová zkratka",
   "keyboard_shortcuts.legend": "Zobrazit tuto legendu",
+  "keyboard_shortcuts.load_more": "Zvýraznit tlačítko „Načíst více“",
   "keyboard_shortcuts.local": "Otevřít místní časovou osu",
   "keyboard_shortcuts.mention": "Zmínit autora",
   "keyboard_shortcuts.muted": "Otevřít seznam skrytých uživatelů",
@@ -738,11 +739,17 @@
   "privacy.private.short": "Sledující",
   "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",
   "privacy.public.short": "Veřejné",
+  "privacy.quote.anyone": "{visibility}, kdokoliv může citovat",
+  "privacy.quote.disabled": "{visibility}, citování je zakázáno",
+  "privacy.quote.limited": "{visibility}, citování je omezené",
   "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
   "privacy.unlisted.long": "Méně algoritmických fanfár",
   "privacy.unlisted.short": "Ztišené veřejné",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
+  "quote_error.poll": "Citování není u dotazníků povoleno.",
+  "quote_error.unauthorized": "Nemáte oprávnění citovat tento příspěvek.",
+  "quote_error.upload": "Není povoleno citovat s přílohami.",
   "recommended": "Doporučeno",
   "refresh": "Obnovit",
   "regeneration_indicator.please_stand_by": "Počkej prosím.",
@@ -944,6 +951,7 @@
   "upload_button.label": "Přidat obrázky, video nebo audio soubor",
   "upload_error.limit": "Byl překročen limit nahraných souborů.",
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
+  "upload_error.quote": "Nahrávání souboru není povoleno s citacemi.",
   "upload_form.drag_and_drop.instructions": "Chcete-li zvednout přílohu, stiskněte mezerník nebo enter. Při přetažení použijte klávesnicové šipky k přesunutí mediální přílohy v libovolném směru. Stiskněte mezerník nebo enter pro vložení přílohy do nové pozice, nebo stiskněte Esc pro ukončení.",
   "upload_form.drag_and_drop.on_drag_cancel": "Přetažení bylo zrušeno. Příloha {item} byla vrácena.",
   "upload_form.drag_and_drop.on_drag_end": "Příloha {item} byla vrácena.",
@@ -978,5 +986,6 @@
   "visibility_modal.quote_followers": "Pouze sledující",
   "visibility_modal.quote_label": "Změňte, kdo může citovat",
   "visibility_modal.quote_nobody": "Nikdo",
-  "visibility_modal.quote_public": "Kdokoliv"
+  "visibility_modal.quote_public": "Kdokoliv",
+  "visibility_modal.save": "Uložit"
 }
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 63e655ab0d..9f5e229102 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -292,7 +292,7 @@
   "domain_pill.your_handle": "Dit handle:",
   "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.",
   "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
-  "dropdown.empty": "Vælg en indstillingsmulighed",
+  "dropdown.empty": "Vælg en indstilling",
   "embed.instructions": "Indlejr dette indlæg på din hjemmeside ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Åbn hjem-tidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
   "keyboard_shortcuts.legend": "Vis dette symbol",
+  "keyboard_shortcuts.load_more": "Fokusér knappen \"Indlæs flere\"",
   "keyboard_shortcuts.local": "Åbn lokal tidslinje",
   "keyboard_shortcuts.mention": "Omtal forfatter",
   "keyboard_shortcuts.muted": "Åbn listen over skjulte brugere",
@@ -738,12 +739,18 @@
   "privacy.private.short": "Følgere",
   "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
+  "privacy.quote.anyone": "{visibility}, alle kan citere",
+  "privacy.quote.disabled": "{visibility}, citering deaktiveret",
+  "privacy.quote.limited": "{visibility}, citering begrænset",
   "privacy.unlisted.additional": "Dette svarer til offentlig, bortset fra at indlægget ikke vises i live-feeds eller hashtags, udforsk eller Mastodon-søgning, selvom du har tilvalgt dette for kontoen.",
   "privacy.unlisted.long": "Færre algoritmiske fanfarer",
   "privacy.unlisted.short": "Offentlig (stille)",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
-  "quote_error.unauthorized": "Du er ikke autoriseret til at citere dette indlæg.",
+  "quote_error.poll": "Citering ikke tilladt i afstemninger.",
+  "quote_error.quote": "Kun ét citat ad gangen er tilladt.",
+  "quote_error.unauthorized": "Man har ikke tilladelse til at citere dette indlæg.",
+  "quote_error.upload": "Citering ikke tilladt ved medievedhæftninger.",
   "recommended": "Anbefalet",
   "refresh": "Genindlæs",
   "regeneration_indicator.please_stand_by": "Vent venligst.",
@@ -945,6 +952,7 @@
   "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
   "upload_error.limit": "Grænse for filupload nået.",
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
+  "upload_error.quote": "Fil-upload ikke tilladt i citater.",
   "upload_form.drag_and_drop.instructions": "For at opsamle en medievedhæftning, tryk på Mellemrum eller Retur. Mens der trækkes, benyt piletasterne til at flytte medievedhæftningen i en given retning. Tryk på Mellemrum eller Retur igen for at slippe medievedhæftningen på den nye position, eller tryk på Escape for at afbryde.",
   "upload_form.drag_and_drop.on_drag_cancel": "Træk blev afbrudt. Medievedhæftningen {item} blev sluppet.",
   "upload_form.drag_and_drop.on_drag_end": "Medievedhæftningen {item} er sluppet.",
@@ -973,11 +981,12 @@
   "visibility_modal.helper.direct_quoting": "Private omtaler kan ikke citeres.",
   "visibility_modal.helper.privacy_editing": "Publicerede indlægs synlighed kan ikke ændres.",
   "visibility_modal.helper.private_quoting": "Indlæg kun for følgere kan ikke citeres.",
-  "visibility_modal.helper.unlisted_quoting": "Når man citeres af andre, skjules deres indlæg også på tendenstidslinjer.",
+  "visibility_modal.helper.unlisted_quoting": "Når folk citerer dig, vil deres indlæg også blive skjult fra trendtidslinjer.",
   "visibility_modal.instructions": "Styr, hvem der kan interagere med dette indlæg. Globale indstillinger findes under <link>Præferencer > Andet</link>.",
   "visibility_modal.privacy_label": "Fortrolighed",
   "visibility_modal.quote_followers": "Kun følgere",
   "visibility_modal.quote_label": "Ændr hvem der kan citere",
   "visibility_modal.quote_nobody": "Ingen",
-  "visibility_modal.quote_public": "Alle"
+  "visibility_modal.quote_public": "Alle",
+  "visibility_modal.save": "Gem"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index bc5bda3b18..6d45d2b7c0 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Startseite öffnen",
   "keyboard_shortcuts.hotkey": "Tastenkürzel",
   "keyboard_shortcuts.legend": "Tastenkombinationen anzeigen",
+  "keyboard_shortcuts.load_more": "Schaltfläche „Mehr laden“ fokussieren",
   "keyboard_shortcuts.local": "Lokale Timeline öffnen",
   "keyboard_shortcuts.mention": "Profil erwähnen",
   "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Nur Follower",
   "visibility_modal.quote_label": "Ändern, wer zitieren darf",
   "visibility_modal.quote_nobody": "Niemand",
-  "visibility_modal.quote_public": "Alle"
+  "visibility_modal.quote_public": "Alle",
+  "visibility_modal.save": "Speichern"
 }
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 38c380f97b..7ff515b3f3 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας",
   "keyboard_shortcuts.hotkey": "Συντόμευση",
   "keyboard_shortcuts.legend": "Εμφάνιση αυτού του οδηγού",
+  "keyboard_shortcuts.load_more": "Εστίαση στο κουμπί \"Φόρτωση περισσότερων\"",
   "keyboard_shortcuts.local": "Άνοιγμα τοπικής ροής",
   "keyboard_shortcuts.mention": "Επισήμανση συγγραφέα",
   "keyboard_shortcuts.muted": "Άνοιγμα λίστας αποσιωπημένων χρηστών",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Μόνο ακόλουθοι",
   "visibility_modal.quote_label": "Αλλάξτε ποιός μπορεί να κάνει παράθεση",
   "visibility_modal.quote_nobody": "Κανένας",
-  "visibility_modal.quote_public": "Οποιοσδήποτε"
+  "visibility_modal.quote_public": "Οποιοσδήποτε",
+  "visibility_modal.save": "Αποθήκευση"
 }
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 02c6a40862..bb181ea449 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Abrir línea temporal principal",
   "keyboard_shortcuts.hotkey": "Atajo",
   "keyboard_shortcuts.legend": "Mostrar este texto",
+  "keyboard_shortcuts.load_more": "Focalizar el botón «Cargar más»",
   "keyboard_shortcuts.local": "Abrirlínea temporal local",
   "keyboard_shortcuts.mention": "Mencionar al autor",
   "keyboard_shortcuts.muted": "Abrir lista de usuarios silenciados",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Solo para seguidores",
   "visibility_modal.quote_label": "Cambiá quién puede citar",
   "visibility_modal.quote_nobody": "Ninguna cuenta",
-  "visibility_modal.quote_public": "Cualquier cuenta"
+  "visibility_modal.quote_public": "Cualquier cuenta",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 7525653493..a704ab5a72 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Abrir cronología principal",
   "keyboard_shortcuts.hotkey": "Tecla de acceso rápido",
   "keyboard_shortcuts.legend": "Mostrar esta leyenda",
+  "keyboard_shortcuts.load_more": "Enfoque en el botón \"Cargar más\"",
   "keyboard_shortcuts.local": "Abrir cronología local",
   "keyboard_shortcuts.mention": "Mencionar al autor",
   "keyboard_shortcuts.muted": "Abrir la lista de usuarios silenciados",
@@ -739,16 +740,16 @@
   "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
   "privacy.quote.anyone": "{visibility}, cualquiera puede citar",
-  "privacy.quote.disabled": "{visibility}, citas deshabilitadas",
+  "privacy.quote.disabled": "{visibility}, citas desactivadas",
   "privacy.quote.limited": "{visibility}, citas limitadas",
   "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 las etiquetas, 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",
-  "quote_error.poll": "No es posible citar encuestas.",
+  "quote_error.poll": "No se permite citar encuestas.",
   "quote_error.quote": "Solo se permite una cita a la vez.",
-  "quote_error.unauthorized": "No tienes permiso para citar esta publicación.",
+  "quote_error.unauthorized": "No estás autorizado a citar esta publicación.",
   "quote_error.upload": "No se permite citar con archivos multimedia.",
   "recommended": "Recomendado",
   "refresh": "Actualizar",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Solo seguidores",
   "visibility_modal.quote_label": "Cambia quién puede citarte",
   "visibility_modal.quote_nobody": "Nadie",
-  "visibility_modal.quote_public": "Cualquiera"
+  "visibility_modal.quote_public": "Cualquiera",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 10e3860503..1d70f64888 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Abrir cronología principal",
   "keyboard_shortcuts.hotkey": "Tecla rápida",
   "keyboard_shortcuts.legend": "Mostrar esta leyenda",
+  "keyboard_shortcuts.load_more": "Poner el foco en el botón \"Cargar más\"",
   "keyboard_shortcuts.local": "Abrir cronología local",
   "keyboard_shortcuts.mention": "Mencionar autor",
   "keyboard_shortcuts.muted": "Abrir lista de usuarios silenciados",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Sólo seguidores",
   "visibility_modal.quote_label": "Cambia quién puede citarte",
   "visibility_modal.quote_nobody": "Nadie",
-  "visibility_modal.quote_public": "Cualquiera"
+  "visibility_modal.quote_public": "Cualquiera",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index afd75c9905..b361b740c1 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -880,6 +880,7 @@
   "status.mute_conversation": "خموشاندن گفت‌وگو",
   "status.open": "گسترش این فرسته",
   "status.pin": "سنجاق به نمایه",
+  "status.quote": "نقل‌قول",
   "status.quote.cancel": "لغو نقل",
   "status.quote_error.filtered": "نهفته بنا بر یکی از پالایه‌هایتان",
   "status.quote_error.not_available": "فرسته در دسترس نیست",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 34f14ab03d..0b9c33ffcc 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Avaa kotiaikajana",
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
+  "keyboard_shortcuts.load_more": "Kohdista ”Lataa lisää” -painikkeeseen",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
   "keyboard_shortcuts.mention": "Mainitse tekijä",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
@@ -738,11 +739,18 @@
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
+  "privacy.quote.anyone": "{visibility}, kuka vain voi lainata",
+  "privacy.quote.disabled": "{visibility}, lainaukset poissa käytöstä",
+  "privacy.quote.limited": "{visibility}, lainauksia rajoitettu",
   "privacy.unlisted.additional": "Tämä toimii muuten kuin julkinen, mutta julkaisut eivät näy livesyöte-, aihetunniste- tai selausnäkymissä eivätkä Mastodonin hakutuloksissa, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
   "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
   "privacy.unlisted.short": "Vaivihkaisesti julkinen",
   "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
+  "quote_error.poll": "Äänestysten lainaaminen ei ole sallittua.",
+  "quote_error.quote": "Vain yksi lainaus kerrallaan on sallittu.",
+  "quote_error.unauthorized": "Sinulla ei ole valtuuksia lainata tätä julkaisua.",
+  "quote_error.upload": "Medialiitteiden lainaaminen ei ole sallittua.",
   "recommended": "Suositellaan",
   "refresh": "Päivitä",
   "regeneration_indicator.please_stand_by": "Ole valmiina.",
@@ -944,6 +952,7 @@
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",
   "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
+  "upload_error.quote": "Tiedostojen lähettäminen ei ole sallittua lainauksissa.",
   "upload_form.drag_and_drop.instructions": "Valitse medialiite painamalla välilyöntiä tai enteriä. Vetäessäsi käytä nuolinäppäimiä siirtääksesi medialiitettä vastaavaan suuntaan. Paina välilyöntiä tai enteriä uudelleen pudottaaksesi medialiitteen uuteen kohtaansa, tai peru siirto painamalla escape-näppäintä.",
   "upload_form.drag_and_drop.on_drag_cancel": "Veto peruttiin. Medialiitettä {item} ei siirretty.",
   "upload_form.drag_and_drop.on_drag_end": "Medialiite {item} pudotettiin.",
@@ -978,5 +987,6 @@
   "visibility_modal.quote_followers": "Vain seuraajat",
   "visibility_modal.quote_label": "Vaihda, kuka voi lainata",
   "visibility_modal.quote_nobody": "Ei kukaan",
-  "visibility_modal.quote_public": "Kuka tahansa"
+  "visibility_modal.quote_public": "Kuka tahansa",
+  "visibility_modal.save": "Tallenna"
 }
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 9948fe9c4a..c2d685745e 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -132,12 +132,14 @@
   "compose_form.reply": "Tumugon",
   "compose_form.spoiler.marked": "Tanggalin ang babala sa nilalaman",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
+  "compose_form.spoiler_placeholder": "Babala sa nilalaman (hindi kinailangan)",
   "confirmation_modal.cancel": "Pagpaliban",
   "confirmations.block.confirm": "Harangan",
   "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
+  "content_warning.hide": "Itago ang post",
   "content_warning.show_more": "Magpakita ng higit pa",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
   "conversation.open": "Tingnan ang pag-uusap",
@@ -260,6 +262,8 @@
   "notification.mentioned_you": "Binanggit ka ni {name}",
   "notification.moderation-warning.learn_more": "Matuto nang higit pa",
   "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
+  "notification.reblog": "Pinalakas ang iyong post ni {name}",
+  "notification.reblog.name_and_others_with_link": "Pinalakas ang iyong post ni/ng {name} at <a>{count, plural,one {# iba pa} other {# na iba pa}}</a>",
   "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
   "notification_requests.accept": "Tanggapin",
   "notification_requests.maximize": "Palakihin",
@@ -347,6 +351,7 @@
   "search_results.see_all": "Ipakita lahat",
   "server_banner.server_stats": "Katayuan ng serbiro:",
   "status.block": "Harangan si @{name}",
+  "status.cannot_reblog": "Hindi maaring mapalakas ang post na ito",
   "status.delete": "Tanggalin",
   "status.direct": "Palihim na banggitin si/ang @{name}",
   "status.direct_indicator": "Palihim na banggit",
@@ -359,6 +364,7 @@
   "status.mention": "Banggitin ang/si @{name}",
   "status.more": "Higit pa",
   "status.read_more": "Basahin ang higit pa",
+  "status.reblogged_by": "Pinapalakas ni/ng {name}",
   "status.reblogs.empty": "Wala pang nagpalakas ng post na ito. Kung may sinumang nagpalakas, makikita sila rito.",
   "status.remove_favourite": "Tanggalin sa mga paborito",
   "status.reply": "Tumugon",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index bf99601459..fecd8e3155 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Lat heimatíðarlinju upp",
   "keyboard_shortcuts.hotkey": "Snarknappur",
   "keyboard_shortcuts.legend": "Vís henda tekstin",
+  "keyboard_shortcuts.load_more": "Fokusera á \"Tak meira niður\" knøttin",
   "keyboard_shortcuts.local": "Lat lokala tíðarlinju upp",
   "keyboard_shortcuts.mention": "Nevn rithøvund",
   "keyboard_shortcuts.muted": "Lat upp lista við doyvdum brúkarum",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Einans fylgjarar",
   "visibility_modal.quote_label": "Broyt hvør kann sitera",
   "visibility_modal.quote_nobody": "Eingin",
-  "visibility_modal.quote_public": "Ein og hvør"
+  "visibility_modal.quote_public": "Ein og hvør",
+  "visibility_modal.save": "Goym"
 }
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 5c0c1235b4..18a1ac2d8a 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "פתיחת ציר זמן אישי",
   "keyboard_shortcuts.hotkey": "מקש קיצור",
   "keyboard_shortcuts.legend": "הצגת מקרא",
+  "keyboard_shortcuts.load_more": "התמקדות בכפתור \"טען עוד\"",
   "keyboard_shortcuts.local": "פתיחת ציר זמן קהילתי",
   "keyboard_shortcuts.mention": "לאזכר את המחבר.ת",
   "keyboard_shortcuts.muted": "פתיחת רשימת משתמשים מושתקים",
@@ -738,11 +739,18 @@
   "privacy.private.short": "עוקבים",
   "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
+  "privacy.quote.anyone": "{visibility}, הציטוט מותר לכל",
+  "privacy.quote.disabled": "{visibility}, האפשרות לציטוט מכובה",
+  "privacy.quote.limited": "{visibility}, האפשרות לציטוט מוגבלת",
   "privacy.unlisted.additional": "ההתנהגות דומה להודעה ציבורית, מלבד שההודעה לא תופיע בפיד החי המקומי או בתגיות, תגליות או חיפוש מסטודון, אפילו אם ביקשת שהחשבון כולו יהיה פומבי.",
   "privacy.unlisted.long": "פחות חשיפה לאלגוריתמים",
   "privacy.unlisted.short": "ציבורי שקט",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
+  "quote_error.poll": "לא ניתן לכלול משאל כאשר מחברים הודעת ציטוט.",
+  "quote_error.quote": "רק ציטוט אחד מותר בכל הודעה.",
+  "quote_error.unauthorized": "אין לך הרשאה לצטט את ההודעה הזו.",
+  "quote_error.upload": "ציטוט הכולל מדיה אינו אפשרי.",
   "recommended": "מומלץ",
   "refresh": "רענון",
   "regeneration_indicator.please_stand_by": "נא להמתין.",
@@ -872,7 +880,7 @@
   "status.filter": "סנן הודעה זו",
   "status.history.created": "{name} יצר/ה {date}",
   "status.history.edited": "{name} ערך/ה {date}",
-  "status.load_more": "עוד",
+  "status.load_more": "טען עוד",
   "status.media.open": "לחץ לפתיחה",
   "status.media.show": "לחץ להצגה",
   "status.media_hidden": "מדיה מוסתרת",
@@ -944,6 +952,7 @@
   "upload_button.label": "הוספת מדיה",
   "upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
+  "upload_error.quote": "לא ניתן להעלות קובץ כאשר מחברים הודעת ציטוט.",
   "upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
   "upload_form.drag_and_drop.on_drag_cancel": "הגרירה בוטלה. קובץ המדיה {item} נעזב.",
   "upload_form.drag_and_drop.on_drag_end": "קובץ המדיה {item} נעזב.",
@@ -978,5 +987,6 @@
   "visibility_modal.quote_followers": "לעוקבים בלבד",
   "visibility_modal.quote_label": "הגדרת הרשאה לציטוט הודעותיך",
   "visibility_modal.quote_nobody": "אף אחד",
-  "visibility_modal.quote_public": "כולם"
+  "visibility_modal.quote_public": "כולם",
+  "visibility_modal.save": "שמירה"
 }
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index afc5541b6a..0911dd8f26 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Opna heimatímalínu",
   "keyboard_shortcuts.hotkey": "Flýtilykill",
   "keyboard_shortcuts.legend": "Birta þessa skýringu",
+  "keyboard_shortcuts.load_more": "Gera \"Hlaða inn meiru\"-hnappinn virkan",
   "keyboard_shortcuts.local": "Opna staðværa tímalínu",
   "keyboard_shortcuts.mention": "Minnast á höfund",
   "keyboard_shortcuts.muted": "Opna lista yfir þaggaða notendur",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Einungis fylgjendur",
   "visibility_modal.quote_label": "Breyttu því hver getur tilvitnað",
   "visibility_modal.quote_nobody": "Enginn",
-  "visibility_modal.quote_public": "Hver sem er"
+  "visibility_modal.quote_public": "Hver sem er",
+  "visibility_modal.save": "Vista"
 }
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 1caa373d62..5b4b73d9d8 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Apre la cronologia domestica",
   "keyboard_shortcuts.hotkey": "Tasto di scelta rapida",
   "keyboard_shortcuts.legend": "Mostra questa legenda",
+  "keyboard_shortcuts.load_more": "Evidenzia il pulsante \"Carica altro\"",
   "keyboard_shortcuts.local": "Apre la cronologia locale",
   "keyboard_shortcuts.mention": "Menziona l'autore",
   "keyboard_shortcuts.muted": "Apre l'elenco degli utenti silenziati",
@@ -738,11 +739,18 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
+  "privacy.quote.anyone": "{visibility}, chiunque può citare",
+  "privacy.quote.disabled": "{visibility}, citazioni disabilitate",
+  "privacy.quote.limited": "{visibility}, citazioni limitate",
   "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",
+  "quote_error.poll": "Nei sondaggi non sono consentite le citazioni.",
+  "quote_error.quote": "È consentita una sola citazione alla volta.",
+  "quote_error.unauthorized": "Non sei autorizzato a citare questo post.",
+  "quote_error.upload": "Le citazioni non sono consentite con gli allegati multimediali.",
   "recommended": "Consigliato",
   "refresh": "Ricarica",
   "regeneration_indicator.please_stand_by": "Si prega di rimanere in attesa.",
@@ -906,7 +914,7 @@
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
   "status.report": "Segnala @{name}",
-  "status.revoke_quote": "Rimuovi la mia citazione dal post di @{name}",
+  "status.revoke_quote": "Rimuovi il mio post da quello di @{name}",
   "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
   "status.show_less_all": "Mostra meno per tutti",
@@ -944,6 +952,7 @@
   "upload_button.label": "Aggiungi un file immagine, video o audio",
   "upload_error.limit": "Limite di caricamento dei file superato.",
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
+  "upload_error.quote": "Caricamento file non consentito con le citazioni.",
   "upload_form.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
   "upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
   "upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",
@@ -978,5 +987,6 @@
   "visibility_modal.quote_followers": "Solo i seguaci",
   "visibility_modal.quote_label": "Cambia chi può citare",
   "visibility_modal.quote_nobody": "Nessuno",
-  "visibility_modal.quote_public": "Chiunque"
+  "visibility_modal.quote_public": "Chiunque",
+  "visibility_modal.save": "Salva"
 }
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 310c701c71..b74ad36ab9 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -482,6 +482,7 @@
   "keyboard_shortcuts.home": "홈 타임라인 열기",
   "keyboard_shortcuts.hotkey": "핫키",
   "keyboard_shortcuts.legend": "이 개요 표시",
+  "keyboard_shortcuts.load_more": "\"더 보기\" 버튼에 포커스",
   "keyboard_shortcuts.local": "로컬 타임라인 열기",
   "keyboard_shortcuts.mention": "작성자에게 멘션",
   "keyboard_shortcuts.muted": "뮤트된 사용자 목록 열기",
@@ -661,6 +662,7 @@
   "notifications.column_settings.mention": "멘션:",
   "notifications.column_settings.poll": "설문 결과:",
   "notifications.column_settings.push": "푸시 알림",
+  "notifications.column_settings.quote": "인용:",
   "notifications.column_settings.reblog": "부스트:",
   "notifications.column_settings.show": "컬럼에 표시",
   "notifications.column_settings.sound": "효과음 재생",
@@ -736,11 +738,15 @@
   "privacy.private.short": "팔로워",
   "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
+  "privacy.quote.anyone": "{visibility}, 누구나 인용 가능",
+  "privacy.quote.disabled": "{visibility}, 인용 비활성화",
+  "privacy.quote.limited": "{visibility}, 제한된 인용",
   "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
   "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
+  "quote_error.unauthorized": "이 글을 인용할 권한이 없습니다.",
   "recommended": "추천함",
   "refresh": "새로고침",
   "regeneration_indicator.please_stand_by": "잠시 기다려주세요.",
@@ -847,9 +853,11 @@
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_domain": "{domain}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
+  "status.all_disabled": "부스트와 인용이 비활성화되었습니다",
   "status.block": "@{name} 차단",
   "status.bookmark": "북마크",
   "status.cancel_reblog_private": "부스트 취소",
+  "status.cannot_quote": "작성자가 이 게시물의 인용을 비활성화했습니다",
   "status.cannot_reblog": "이 게시물은 부스트 할 수 없습니다",
   "status.context.load_new_replies": "새 답글 보기",
   "status.context.loading": "추가 답글 확인중",
@@ -878,6 +886,8 @@
   "status.mute_conversation": "대화 뮤트",
   "status.open": "상세 정보 표시",
   "status.pin": "고정",
+  "status.quote": "인용",
+  "status.quote.cancel": "인용 취소",
   "status.quote_error.filtered": "필터에 의해 가려짐",
   "status.quote_error.not_available": "게시물 사용 불가",
   "status.quote_error.pending_approval": "게시물 대기중",
@@ -956,5 +966,12 @@
   "video.skip_forward": "앞으로 건너뛰기",
   "video.unmute": "음소거 해제",
   "video.volume_down": "음량 감소",
-  "video.volume_up": "음량 증가"
+  "video.volume_up": "음량 증가",
+  "visibility_modal.button_title": "공개범위 설정",
+  "visibility_modal.privacy_label": "공개범위",
+  "visibility_modal.quote_followers": "팔로워 전용",
+  "visibility_modal.quote_label": "누가 인용할 수 있는지",
+  "visibility_modal.quote_nobody": "아무도 못 하게",
+  "visibility_modal.quote_public": "아무나",
+  "visibility_modal.save": "저장"
 }
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index da133ef612..93c6f7eabd 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Phah開tshù ê時間線",
   "keyboard_shortcuts.hotkey": "快速key",
   "keyboard_shortcuts.legend": "顯示tsit篇說明",
+  "keyboard_shortcuts.load_more": "Kā焦點suá kàu「載入其他」ê鈕仔",
   "keyboard_shortcuts.local": "Phah開本站ê時間線",
   "keyboard_shortcuts.mention": "提起作者",
   "keyboard_shortcuts.muted": "Phah開消音ê用者列單",
@@ -738,11 +739,18 @@
   "privacy.private.short": "跟tuè lí ê",
   "privacy.public.long": "逐ê lâng（無論佇Mastodon以內á是以外）",
   "privacy.public.short": "公開ê",
+  "privacy.quote.anyone": "{visibility}，ta̍k ê lâng lóng ē當引用",
+  "privacy.quote.disabled": "{visibility}，停止引用PO文",
+  "privacy.quote.limited": "{visibility}，PO文引用受限",
   "privacy.unlisted.additional": "Tse ê行為kap公開相siâng，m̄-koh 就算lí佇口座設定phah開有關ê公開功能，PO文mā bē顯示佇即時ê動態、hashtag、探索kap Mastodon ê搜尋結果。",
   "privacy.unlisted.long": "減少演算法ê宣傳",
   "privacy.unlisted.short": "恬靜ê公開",
   "privacy_policy.last_updated": "上尾更新tī：{date}",
   "privacy_policy.title": "隱私權政策",
+  "quote_error.poll": "有投票ê PO文bē當引用。",
+  "quote_error.quote": "Tsi̍t改kan-ta ē當引用tsi̍t篇PO文。",
+  "quote_error.unauthorized": "Lí bô權利引用tsit篇PO文。",
+  "quote_error.upload": "有媒體附件ê PO文無允准引用。",
   "recommended": "推薦",
   "refresh": "Koh更新",
   "regeneration_indicator.please_stand_by": "請sió等leh。",
@@ -849,9 +857,11 @@
   "status.admin_account": "Phah開 @{name} ê管理界面",
   "status.admin_domain": "Phah開 {domain} ê管理界面",
   "status.admin_status": "Tī管理界面內底看tsit篇PO文",
+  "status.all_disabled": "轉送kap引用停止使用",
   "status.block": "封鎖 @{name}",
   "status.bookmark": "冊籤",
   "status.cancel_reblog_private": "取消轉送",
+  "status.cannot_quote": "作者有停止別lâng引用tsit篇PO文",
   "status.cannot_reblog": "Tsit篇PO文bē當轉送",
   "status.context.load_new_replies": "有新ê回應",
   "status.context.loading": "Leh檢查其他ê回應",
@@ -879,6 +889,8 @@
   "status.mute": "消音 @{name}",
   "status.mute_conversation": "Kā對話消音",
   "status.open": "Kā PO文展開",
+  "status.quote": "引用",
+  "status.quote.cancel": "取消引用",
   "status.quote_error.filtered": "Lí所設定ê過濾器kā tse khàm起來",
   "status.quote_error.not_available": "鋪文bē當看",
   "status.quote_error.pending_approval": "鋪文當咧送",
@@ -886,6 +898,7 @@
   "status.quote_error.pending_approval_popout.title": "Leh送引文？請sió等leh",
   "status.quote_policy_change": "改通引用ê lâng",
   "status.quote_post_author": "引用 @{name} ê PO文ah",
+  "status.quote_private": "私人PO文bē當引用",
   "status.read_more": "讀詳細",
   "status.reblog": "轉送",
   "status.reblog_private": "照原PO ê通看見ê範圍轉送",
@@ -937,6 +950,7 @@
   "upload_button.label": "加圖片、影片á是聲音檔",
   "upload_error.limit": "超過檔案傳起去ê限制",
   "upload_error.poll": "Bô允準佇投票ê時kā檔案傳起去。",
+  "upload_error.quote": "引用PO文bē當kā檔案傳起去。",
   "upload_form.drag_and_drop.instructions": "Nā beh選媒體附件，請tshi̍h空白key á是Enter key。Giú ê時，請用方向key照指定ê方向suá媒體附件。Beh khǹg媒體附件佇伊ê新位置，請koh tshi̍h空白key á是Enter key，或者tshi̍h Esc key來取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "Suá位取消ah，媒體附件 {item} khǹg落來ah。",
   "upload_form.drag_and_drop.on_drag_end": "媒體附件 {item} khǹg落來ah。",
@@ -971,5 +985,6 @@
   "visibility_modal.quote_followers": "Kan-ta hōo跟tuè ê lâng",
   "visibility_modal.quote_label": "改通引用ê lâng",
   "visibility_modal.quote_nobody": "無半位",
-  "visibility_modal.quote_public": "Ta̍k ê lâng"
+  "visibility_modal.quote_public": "Ta̍k ê lâng",
+  "visibility_modal.save": "儲存"
 }
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index fd9d259751..08d279eb11 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -292,6 +292,7 @@
   "domain_pill.your_handle": "O teu identificador:",
   "domain_pill.your_server": "A tua casa digital, onde se encontram todas as tuas publicações. Não gostas deste? Muda de servidor a qualquer momento e leva também os teus seguidores.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É possível encontrares utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+  "dropdown.empty": "Selecione uma opção",
   "embed.instructions": "Incorpora esta publicação no teu site copiando o código abaixo.",
   "embed.preview": "Eis o aspeto que terá:",
   "emoji_button.activity": "Atividade",
@@ -482,6 +483,7 @@
   "keyboard_shortcuts.home": "abrir a cronologia na página inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "mostrar esta legenda",
+  "keyboard_shortcuts.load_more": "Focar botão \"Carregar mais\"",
   "keyboard_shortcuts.local": "abrir a cronologia local",
   "keyboard_shortcuts.mention": "mencionar o autor",
   "keyboard_shortcuts.muted": "abrir a lista dos utilizadores ocultados",
@@ -737,11 +739,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility}, qualquer pessoa pode citar",
+  "privacy.quote.disabled": "{visibility}, citações desativadas",
+  "privacy.quote.limited": "{visibility}, citações limitadas",
   "privacy.unlisted.additional": "Este comportamento é exatamente igual ao do público, exceto que a publicação não aparecerá em cronologias, nas etiquetas, ao explorar ou na pesquisa do Mastodon, mesmo que tenhas optado por participar em toda a tua 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",
+  "quote_error.poll": "Não é permitido citar sondagens.",
+  "quote_error.quote": "Apenas é permitida uma citação de cada vez.",
+  "quote_error.unauthorized": "Não está autorizado a citar esta publicação.",
+  "quote_error.upload": "Não é permitida a citação com anexos de multimédia.",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
   "regeneration_indicator.please_stand_by": "Aguarda um momento.",
@@ -848,9 +857,11 @@
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
+  "status.all_disabled": "Impulsos e citações estão desativados",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Retirar impulso",
+  "status.cannot_quote": "O autor desativou as citações nesta publicação",
   "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
   "status.context.load_new_replies": "Novas respostas disponíveis",
   "status.context.loading": "A verificar por mais respostas",
@@ -879,12 +890,16 @@
   "status.mute_conversation": "Ocultar conversa",
   "status.open": "Expandir esta publicação",
   "status.pin": "Afixar no perfil",
+  "status.quote": "Citação",
+  "status.quote.cancel": "Cancelar citação",
   "status.quote_error.filtered": "Oculto devido a um dos seus filtros",
   "status.quote_error.not_available": "Publicação indisponível",
   "status.quote_error.pending_approval": "Publicação pendente",
   "status.quote_error.pending_approval_popout.body": "As citações partilhadas no Fediverso podem demorar algum tempo a ser exibidas, uma vez que diferentes servidores têm protocolos diferentes.",
   "status.quote_error.pending_approval_popout.title": "Citação pendente? Mantenha a calma",
+  "status.quote_policy_change": "Alterar quem pode citar",
   "status.quote_post_author": "Citou uma publicação de @{name}",
+  "status.quote_private": "Publicações privadas não podem ser citadas",
   "status.read_more": "Ler mais",
   "status.reblog": "Impulsionar",
   "status.reblog_private": "Impulsionar com a visibilidade original",
@@ -937,6 +952,7 @@
   "upload_button.label": "Adicionar imagens, um vídeo ou um ficheiro de som",
   "upload_error.limit": "Limite de envio de ficheiros excedido.",
   "upload_error.poll": "Não é permitido o envio de ficheiros em sondagens.",
+  "upload_error.quote": "Carregamento de ficheiros não é permitido com citações.",
   "upload_form.drag_and_drop.instructions": "Para escolher um anexo multimédia, prima espaço ou enter. Enquanto arrasta, utilize as teclas de setas para mover o anexo multimédia em qualquer direção. Prima espaço ou enter novamente para largar o anexo multimédia na sua nova posição ou prima escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo multimédia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo multimédia {item} foi descartado.",
@@ -959,5 +975,18 @@
   "video.skip_forward": "Saltar para a frente",
   "video.unmute": "Ativar som",
   "video.volume_down": "Diminuir volume",
-  "video.volume_up": "Aumentar volume"
+  "video.volume_up": "Aumentar volume",
+  "visibility_modal.button_title": "Definir visibilidade",
+  "visibility_modal.header": "Visibilidade e interação",
+  "visibility_modal.helper.direct_quoting": "Menções privadas não podem ser citadas.",
+  "visibility_modal.helper.privacy_editing": "Publicações publicadas não podem alterar a sua visibilidade.",
+  "visibility_modal.helper.private_quoting": "Publicações apenas para seguidores não podem ser citadas.",
+  "visibility_modal.helper.unlisted_quoting": "Quando as pessoas o citarem, as publicações delas serão também ocultadas das tendências.",
+  "visibility_modal.instructions": "Controle quem pode interagir com esta publicação. As configurações globais podem ser encontradas em <link>Preferências > Outros</link>.",
+  "visibility_modal.privacy_label": "Privacidade",
+  "visibility_modal.quote_followers": "Apenas seguidores",
+  "visibility_modal.quote_label": "Altere quem pode citar",
+  "visibility_modal.quote_nobody": "Ninguém",
+  "visibility_modal.quote_public": "Todos",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 883920af75..27c5ed093c 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -974,5 +974,6 @@
   "visibility_modal.quote_followers": "Endast följare",
   "visibility_modal.quote_label": "Ändra vem som kan citera",
   "visibility_modal.quote_nobody": "Ingen",
-  "visibility_modal.quote_public": "Alla"
+  "visibility_modal.quote_public": "Alla",
+  "visibility_modal.save": "Spara"
 }
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index b1de3fe39c..d51907847a 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -944,6 +944,7 @@
   "upload_button.label": "Resim, video veya ses dosyası ekleyin",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
+  "upload_error.quote": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
   "upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
   "upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",
@@ -978,5 +979,6 @@
   "visibility_modal.quote_followers": "Sadece takipçiler",
   "visibility_modal.quote_label": "Kimin alıntı yapabileceğini değiştirin",
   "visibility_modal.quote_nobody": "Kimseden",
-  "visibility_modal.quote_public": "Herkesten"
+  "visibility_modal.quote_public": "Herkesten",
+  "visibility_modal.save": "Kaydet"
 }
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index c8f7b7e415..e8bad3bf65 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -925,5 +925,6 @@
   "visibility_modal.quote_followers": "Тільки для підписників",
   "visibility_modal.quote_label": "Змінити хто може цитувати",
   "visibility_modal.quote_nobody": "Ніхто",
-  "visibility_modal.quote_public": "Будь-хто"
+  "visibility_modal.quote_public": "Будь-хто",
+  "visibility_modal.save": "Зберегти"
 }
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 31aa2ba9c8..bbe9db1fa0 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -483,6 +483,7 @@
   "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.load_more": "Mở nút \"Tải thêm\"",
   "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",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "Chỉ người theo dõi",
   "visibility_modal.quote_label": "Thay đổi người có thể trích dẫn",
   "visibility_modal.quote_nobody": "Không ai",
-  "visibility_modal.quote_public": "Bất cứ ai"
+  "visibility_modal.quote_public": "Bất cứ ai",
+  "visibility_modal.save": "Lưu"
 }
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index de072f9cdc..429d882e3e 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -241,6 +241,7 @@
   "confirmations.remove_from_followers.message": "{name} 将停止关注您。您确定要继续吗？",
   "confirmations.remove_from_followers.title": "移除关注者？",
   "confirmations.revoke_quote.confirm": "移除嘟文",
+  "confirmations.revoke_quote.message": "此操作无法撤销。",
   "confirmations.revoke_quote.title": "移除嘟文？",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
@@ -494,6 +495,7 @@
   "keyboard_shortcuts.unfocus": "取消输入/搜索",
   "keyboard_shortcuts.up": "在列表中让光标上移",
   "learn_more_link.got_it": "明白了",
+  "learn_more_link.learn_more": "了解更多",
   "lightbox.close": "关闭",
   "lightbox.next": "下一个",
   "lightbox.previous": "上一个",
@@ -939,5 +941,11 @@
   "video.skip_forward": "前进",
   "video.unmute": "恢复提醒",
   "video.volume_down": "音量减小",
-  "video.volume_up": "提高音量"
+  "video.volume_up": "提高音量",
+  "visibility_modal.button_title": "设置可见性",
+  "visibility_modal.privacy_label": "隐私",
+  "visibility_modal.quote_label": "更改谁可以引用",
+  "visibility_modal.quote_nobody": "没有人",
+  "visibility_modal.quote_public": "任何人",
+  "visibility_modal.save": "保存"
 }
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 91daf7ba9c..0383dfb940 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -377,6 +377,7 @@
   "keyboard_shortcuts.home": "開啟個人時間軸",
   "keyboard_shortcuts.hotkey": "快速鍵",
   "keyboard_shortcuts.legend": "顯示這個說明",
+  "keyboard_shortcuts.load_more": "將焦點移至「讀取更多」按鈕",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
   "keyboard_shortcuts.muted": "開啟靜音名單",
@@ -744,5 +745,6 @@
   "video.pause": "暫停",
   "video.play": "播放",
   "video.volume_down": "調低音量",
-  "video.volume_up": "調高音量"
+  "video.volume_up": "調高音量",
+  "visibility_modal.save": "儲存"
 }
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 3585ce1be0..c847d79b6e 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "開啟首頁時間軸",
   "keyboard_shortcuts.hotkey": "快速鍵",
   "keyboard_shortcuts.legend": "顯示此說明選單",
+  "keyboard_shortcuts.load_more": "將焦點移至「讀取更多」按鈕",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
   "keyboard_shortcuts.muted": "開啟靜音使用者列表",
@@ -986,5 +987,6 @@
   "visibility_modal.quote_followers": "僅限跟隨者",
   "visibility_modal.quote_label": "變更可以引用的人",
   "visibility_modal.quote_nobody": "沒有人",
-  "visibility_modal.quote_public": "所有人"
+  "visibility_modal.quote_public": "所有人",
+  "visibility_modal.save": "儲存"
 }
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 819dbc6729..f4ce7885e7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1887,6 +1887,7 @@ ca:
       public: Tothom
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Menció privada
       private: Només seguidors
       private_long: Mostra només als seguidors
       public: Públic
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index d4f030afda..035fdc79aa 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2000,6 +2000,7 @@ cs:
       public: Všichni
     title: "%{name}: „%{quote}“"
     visibilities:
+      direct: Soukromá zmínka
       private: Pouze pro sledující
       private_long: Zobrazit pouze sledujícím
       public: Veřejné
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 98aa0a6a39..44eaa4083f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1914,6 +1914,7 @@ fi:
       public: Kaikki
     title: "%{name}: ”%{quote}”"
     visibilities:
+      direct: Yksityismaininta
       private: Vain seuraajat
       private_long: Näytä vain seuraajille
       public: Julkinen
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 777726d604..09c52d7427 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2000,6 +2000,7 @@ he:
       public: כולם
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: אזכור פרטי
       private: לעוקבים בלבד
       private_long: להצגה לעוקבים בלבד
       public: פומבי
diff --git a/config/locales/it.yml b/config/locales/it.yml
index cd6973db50..882dff662e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1916,6 +1916,7 @@ it:
       public: Tutti
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Menzione privata
       private: Mostra solo ai tuoi seguaci
       private_long: Mostra solo ai seguaci
       public: Pubblico
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d4b84e996d..3dded160c0 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1873,6 +1873,7 @@ ko:
       public: 모두
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: 개인 멘션
       private: 비공개
       private_long: 팔로워에게만 공개됩니다
       public: 공개
diff --git a/config/locales/nan.yml b/config/locales/nan.yml
index 51d365229b..3ac5c2f267 100644
--- a/config/locales/nan.yml
+++ b/config/locales/nan.yml
@@ -386,7 +386,7 @@ nan:
       software: 軟體
       sources: 註冊ê源頭
       space: 空間ê使用
-      title: Le-jí-páng (dashboard)
+      title: La-jí-báng (dashboard)
       top_languages: 上tsia̍p出現ê語言
       top_servers: 上tsia̍p活動ê服侍器
       website: 網站
@@ -762,6 +762,44 @@ nan:
         manage_invites_description: 允准用者瀏覽kap停止使用邀請連結
         manage_reports: 管理檢舉
         manage_reports_description: 允准用者審查檢舉kap執行對in ê管理ê動作。
+        manage_roles: 管理角色
+        manage_roles_description: 允准用者管理kap分配比in khah kē ê角色
+        manage_rules: 管理規則
+        manage_rules_description: 允准用者改服侍器ê規則
+        manage_settings: 管理設定
+        manage_settings_description: 允准用者改站ê設定
+        manage_taxonomies: 管理分類
+        manage_taxonomies_description: 允准用者審核趨勢內容，kap更新hashtag ê設定
+        manage_user_access: 管理用者ê接近使用
+        manage_user_access_description: 允准用者停止其他用者ê兩階段驗證，改in ê電子phue地址，kap重頭設定in ê密碼
+        manage_users: 管理用者
+        manage_users_description: 允准用者看其他ê用者ê詳細，kap執行tuì in ê管理行動
+        manage_webhooks: 管理 Webhooks
+        manage_webhooks_description: 允許用者kā管理ê事件設定 webhooks
+        view_audit_log: 看審核ê日誌
+        view_audit_log_description: 允准用者看tsit ê服侍器ê管理行動ê歷史
+        view_dashboard: 看La-jí-báng (Dashboard)
+        view_dashboard_description: 允准用者接近使用tsit ê la-jí-báng kap tsē-tsē指標
+        view_devops: DevOps
+        view_devops_description: 允准用者接近使用Sidekiq kap pgHero ê la-jí-báng
+      title: 角色
+    rules:
+      add_new: 加添規則
+      add_translation: 加添翻譯
+      delete: Thâi掉
+      description_html: 雖bóng大部份ê lóng講有讀kap同意使用規則，m̄-koh攏無讀了，直到發生問題ê時。<strong>提供in列單ē當hōo tsi̍t kái看服侍器ê規則khah快。</strong>請試kā個別ê規則寫kah短koh簡單，m̄-kú m̄通kā in拆做tsē-tsē分開ê項目。
+      edit: 編輯規則
+      empty: Iáu bē定義服侍器ê規則。
+      move_down: Suá khah落來
+      move_up: Suá khah起去
+      title: 服侍器規則
+      translation: 翻譯
+      translations: 翻譯
+      translations_explanation: Lí ē當（但是無必要）加添tsiah-ê規則ê翻譯。若無翻譯版，預設ê值ē顯示。請一直確認任何提供ê翻譯kap預設ê仝步。
+    settings:
+      about:
+        manage_rules: 管理服侍器ê規則
+        preamble: 提供關係服侍器án-nuá運作kap管理，以及資金源頭ê詳細資訊。
     statuses:
       language: 語言
     trends:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index e0cb9d095a..466ecf0dd6 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1914,6 +1914,7 @@ pt-PT:
       public: Todos
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Menção privada
       private: Só para seguidores
       private_long: Mostrar só aos seguidores
       public: Público

From 94ad088482769c0b8019dafd18e102eeafa8ad6f Mon Sep 17 00:00:00 2001
From: diondiondion <mail@diondiondion.com>
Date: Mon, 25 Aug 2025 11:12:46 +0200
Subject: [PATCH 05/10] Fix broken custom radio buttons & checkboxes in modals
 (#35891)

---
 .../styles/mastodon/components.scss           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 4e60cb8a64..ce87275e87 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5668,9 +5668,20 @@ a.status-card {
     z-index: 9999;
   }
 
-  &__label.disabled {
-    cursor: default;
-    opacity: 0.5;
+  &__label {
+    cursor: pointer;
+    display: block;
+
+    > span {
+      display: block;
+      font-weight: 500;
+      margin-bottom: 8px;
+    }
+
+    &.disabled {
+      cursor: default;
+      opacity: 0.5;
+    }
   }
 
   &__button {
@@ -5988,17 +5999,6 @@ a.status-card {
   }
 }
 
-.modal-root label {
-  cursor: pointer;
-  display: block;
-
-  > span {
-    display: block;
-    font-weight: 500;
-    margin-bottom: 8px;
-  }
-}
-
 .video-modal .video-player {
   max-height: 80vh;
   max-width: 100vw;

From 25602429722bd4527ed51f13e954c9a304cf17bb Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Aug 2025 14:21:28 +0200
Subject: [PATCH 06/10] Add `quotes_count` to statuses stats (#35832)

---
 app/javascript/mastodon/api_types/statuses.ts |  1 +
 .../components/status/reblog_button.tsx       | 14 ++++++++--
 .../picture_in_picture/components/footer.tsx  |  5 +++-
 .../status/components/detailed_status.tsx     | 20 ++++++++++++++
 app/javascript/mastodon/locales/en.json       |  1 +
 app/javascript/testing/factories.ts           |  1 +
 app/models/quote.rb                           | 27 +++++++++++++++++++
 app/models/status.rb                          |  4 +++
 app/models/status_stat.rb                     | 15 +++++++----
 app/serializers/rest/status_serializer.rb     |  4 +++
 ...0084312_add_quotes_count_to_status_stat.rb |  7 +++++
 db/schema.rb                                  |  3 ++-
 lib/mastodon/cli/cache.rb                     |  1 +
 13 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/20250820084312_add_quotes_count_to_status_stat.rb

diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
index d588950118..00418a13d2 100644
--- a/app/javascript/mastodon/api_types/statuses.ts
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -96,6 +96,7 @@ export interface ApiStatusJSON {
   replies_count: number;
   reblogs_count: number;
   favorites_count: number;
+  quotes_count: number;
   edited_at?: string;
 
   favorited?: boolean;
diff --git a/app/javascript/mastodon/components/status/reblog_button.tsx b/app/javascript/mastodon/components/status/reblog_button.tsx
index 936d5506e7..2ebedf781f 100644
--- a/app/javascript/mastodon/components/status/reblog_button.tsx
+++ b/app/javascript/mastodon/components/status/reblog_button.tsx
@@ -160,7 +160,12 @@ export const StatusReblogButton: FC<ReblogButtonProps> = ({
         )}
         icon='retweet'
         iconComponent={iconComponent}
-        counter={counters ? (status.get('reblogs_count') as number) : undefined}
+        counter={
+          counters
+            ? (status.get('reblogs_count') as number) +
+              (status.get('quotes_count') as number)
+            : undefined
+        }
         active={isReblogged}
       />
     </Dropdown>
@@ -283,7 +288,12 @@ export const LegacyReblogButton: FC<ReblogButtonProps> = ({
       icon='retweet'
       iconComponent={iconComponent}
       onClick={!disabled ? handleClick : undefined}
-      counter={counters ? (status.get('reblogs_count') as number) : undefined}
+      counter={
+        counters
+          ? (status.get('reblogs_count') as number) +
+            (status.get('quotes_count') as number)
+          : undefined
+      }
     />
   );
 };
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
index 24c88f9505..919a41cbae 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
@@ -233,7 +233,10 @@ export const Footer: React.FC<{
         icon='retweet'
         iconComponent={reblogIconComponent}
         onClick={handleReblogClick}
-        counter={status.get('reblogs_count') as number}
+        counter={
+          (status.get('reblogs_count') as number) +
+          (status.get('quotes_count') as number)
+        }
       />
 
       <IconButton
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index ec6aa003e2..16e070728b 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -127,6 +127,7 @@ export const DetailedStatus: React.FC<{
   let media;
   let applicationLink;
   let reblogLink;
+  let quotesLink;
   let attachmentAspectRatio;
 
   if (properStatus.get('media_attachments').getIn([0, 'type']) === 'video') {
@@ -279,6 +280,23 @@ export const DetailedStatus: React.FC<{
     );
   }
 
+  if (['private', 'direct'].includes(status.get('visibility') as string)) {
+    quotesLink = '';
+  } else {
+    quotesLink = (
+      <span className='detailed-status__link'>
+        <span className='detailed-status__quotes'>
+          <AnimatedNumber value={status.get('quotes_count')} />
+        </span>
+        <FormattedMessage
+          id='status.quotes'
+          defaultMessage='{count, plural, one {quote} other {quotes}}'
+          values={{ count: status.get('quotes_count') }}
+        />
+      </span>
+    );
+  }
+
   const favouriteLink = (
     <Link
       to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
@@ -420,6 +438,8 @@ export const DetailedStatus: React.FC<{
           <div className='detailed-status__meta__line'>
             {reblogLink}
             {reblogLink && <>·</>}
+            {quotesLink}
+            {quotesLink && <>·</>}
             {favouriteLink}
           </div>
         </div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 63c96173cd..0657f9efeb 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -900,6 +900,7 @@
   "status.quote_policy_change": "Change who can quote",
   "status.quote_post_author": "Quoted a post by @{name}",
   "status.quote_private": "Private posts cannot be quoted",
+  "status.quotes": "{count, plural, one {quote} other {quotes}}",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
diff --git a/app/javascript/testing/factories.ts b/app/javascript/testing/factories.ts
index c379d55c0d..f86aa772dc 100644
--- a/app/javascript/testing/factories.ts
+++ b/app/javascript/testing/factories.ts
@@ -68,6 +68,7 @@ export const statusFactory: FactoryFunction<ApiStatusJSON> = ({
   url: 'https://example.com/status/1',
   replies_count: 0,
   reblogs_count: 0,
+  quotes_count: 0,
   favorites_count: 0,
   account: accountFactory(),
   media_attachments: [],
diff --git a/app/models/quote.rb b/app/models/quote.rb
index fea812924c..ad5c9509ea 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -40,6 +40,10 @@ class Quote < ApplicationRecord
   validates :approval_uri, absence: true, if: -> { quoted_account&.local? }
   validate :validate_visibility
 
+  after_create_commit :increment_counter_caches!
+  after_destroy_commit :decrement_counter_caches!
+  after_update_commit :update_counter_caches!
+
   def accept!
     update!(state: :accepted)
   end
@@ -84,4 +88,27 @@ class Quote < ApplicationRecord
   def set_activity_uri
     self.activity_uri = [ActivityPub::TagManager.instance.uri_for(account), '/quote_requests/', SecureRandom.uuid].join
   end
+
+  def increment_counter_caches!
+    return unless acceptable?
+
+    quoted_status&.increment_count!(:quotes_count)
+  end
+
+  def decrement_counter_caches!
+    return unless acceptable?
+
+    quoted_status&.decrement_count!(:quotes_count)
+  end
+
+  def update_counter_caches!
+    return if legacy? || !state_previously_changed?
+
+    if acceptable?
+      quoted_status&.increment_count!(:quotes_count)
+    else
+      # TODO: are there cases where this would not be correct?
+      quoted_status&.decrement_count!(:quotes_count)
+    end
+  end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index c99a1f8df5..e933c92cae 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -301,6 +301,10 @@ class Status < ApplicationRecord
     status_stat&.favourites_count || 0
   end
 
+  def quotes_count
+    status_stat&.quotes_count || 0
+  end
+
   # Reblogs count received from an external instance
   def untrusted_reblogs_count
     status_stat&.untrusted_reblogs_count unless local?
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
index 14a02071a7..24129cf311 100644
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@@ -5,14 +5,15 @@
 # Table name: status_stats
 #
 #  id                         :bigint(8)        not null, primary key
-#  status_id                  :bigint(8)        not null
-#  replies_count              :bigint(8)        default(0), not null
-#  reblogs_count              :bigint(8)        default(0), not null
 #  favourites_count           :bigint(8)        default(0), not null
-#  created_at                 :datetime         not null
-#  updated_at                 :datetime         not null
+#  quotes_count               :bigint(8)        default(0), not null
+#  reblogs_count              :bigint(8)        default(0), not null
+#  replies_count              :bigint(8)        default(0), not null
 #  untrusted_favourites_count :bigint(8)
 #  untrusted_reblogs_count    :bigint(8)
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  status_id                  :bigint(8)        not null
 #
 
 class StatusStat < ApplicationRecord
@@ -34,6 +35,10 @@ class StatusStat < ApplicationRecord
     [attributes['favourites_count'], 0].max
   end
 
+  def quotes_count
+    [attributes['quotes_count'], 0].max
+  end
+
   private
 
   def clamp_untrusted_counts
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index c7c58ee14a..db06714980 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -99,6 +99,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.untrusted_favourites_count || relationships&.attributes_map&.dig(object.id, :favourites_count) || object.favourites_count
   end
 
+  def quotes_count
+    relationships&.attributes_map&.dig(object.id, :quotes_count) || object.quotes_count
+  end
+
   def favourited
     if relationships
       relationships.favourites_map[object.id] || false
diff --git a/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb b/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb
new file mode 100644
index 0000000000..b72274b9eb
--- /dev/null
+++ b/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddQuotesCountToStatusStat < ActiveRecord::Migration[8.0]
+  def change
+    add_column :status_stats, :quotes_count, :bigint, null: false, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b01ffcf5fb..81b0fe7ccc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_08_19_100545) do
+ActiveRecord::Schema[8.0].define(version: 2025_08_20_084312) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -1103,6 +1103,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_08_19_100545) do
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "untrusted_favourites_count"
     t.bigint "untrusted_reblogs_count"
+    t.bigint "quotes_count", default: 0, null: false
     t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
   end
 
diff --git a/lib/mastodon/cli/cache.rb b/lib/mastodon/cli/cache.rb
index cfb6cba1ff..9f66cd4937 100644
--- a/lib/mastodon/cli/cache.rb
+++ b/lib/mastodon/cli/cache.rb
@@ -63,6 +63,7 @@ module Mastodon::CLI
         status_stat.replies_count    = status.replies.not_direct_visibility.count
         status_stat.reblogs_count    = status.reblogs.count
         status_stat.favourites_count = status.favourites.count
+        status_stat.quotes_count     = status.quotes.accepted.count
 
         status_stat.save if status_stat.changed?
       end

From d8c07be0214db16eb1f2fe1ce8c053b08b2a6fe6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Aug 2025 14:25:35 +0200
Subject: [PATCH 07/10] =?UTF-8?q?Fix=20Edit=20as=20well=20as=20=E2=80=9CDe?=
 =?UTF-8?q?lete=20&=20Redraft=E2=80=9D=20on=20a=20poll=20not=20inserting?=
 =?UTF-8?q?=20empty=20option=20(#35892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/actions/compose.js  | 17 +++++++++++------
 app/javascript/mastodon/actions/statuses.js | 13 +++++++++----
 app/javascript/mastodon/reducers/compose.js | 14 ++++++++++++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 41b2336bc2..e358489756 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -97,12 +97,17 @@ export const ensureComposeIsVisible = (getState) => {
 };
 
 export function setComposeToStatus(status, text, spoiler_text) {
-  return{
-    type: COMPOSE_SET_STATUS,
-    status,
-    text,
-    spoiler_text,
-  };
+  return (dispatch, getState) => {
+    const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
+
+    dispatch({
+      type: COMPOSE_SET_STATUS,
+      status,
+      text,
+      spoiler_text,
+      maxOptions,
+    });
+  }
 }
 
 export function changeCompose(text) {
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 42d0c1c0f1..58728936b7 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -89,10 +89,15 @@ export function fetchStatusFail(id, error, skipLoading) {
 }
 
 export function redraft(status, raw_text) {
-  return {
-    type: REDRAFT,
-    status,
-    raw_text,
+  return (dispatch, getState) => {
+    const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
+
+    dispatch({
+      type: REDRAFT,
+      status,
+      raw_text,
+      maxOptions,
+    });
   };
 }
 
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index bb4ce9ce11..7f9fc9eeaa 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -526,8 +526,13 @@ export const composeReducer = (state = initialState, action) => {
       }
 
       if (action.status.get('poll')) {
+        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        if (options.size < action.maxOptions) {
+          options = options.push('');
+        }
+
         map.set('poll', ImmutableMap({
-          options: ImmutableList(action.status.get('poll').options.map(x => x.title)),
+          options: options,
           multiple: action.status.get('poll').multiple,
           expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
         }));
@@ -558,8 +563,13 @@ export const composeReducer = (state = initialState, action) => {
       }
 
       if (action.status.get('poll')) {
+        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        if (options.size < action.maxOptions) {
+          options = options.push('');
+        }
+
         map.set('poll', ImmutableMap({
-          options: ImmutableList(action.status.get('poll').options.map(x => x.title)),
+          options: options,
           multiple: action.status.get('poll').multiple,
           expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
         }));

From 012450e87d8000cbd5020cad17befc868b66e90c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Aug 2025 14:30:37 +0200
Subject: [PATCH 08/10] Consolidate labels for quote policy settings (#35893)

---
 .../mastodon/features/ui/components/visibility_modal.tsx    | 6 +++---
 app/javascript/mastodon/locales/en.json                     | 6 +++---
 config/locales/en.yml                                       | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/visibility_modal.tsx b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
index 4200cc4d41..9cb69a904f 100644
--- a/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
@@ -39,7 +39,7 @@ const messages = defineMessages({
   },
   quoteNobody: {
     id: 'visibility_modal.quote_nobody',
-    defaultMessage: 'No one',
+    defaultMessage: 'Just me',
   },
 });
 
@@ -302,7 +302,7 @@ const QuotePolicyHelper: FC<{
       <p className='visibility-dropdown__helper'>
         <FormattedMessage
           id='visibility_modal.helper.private_quoting'
-          defaultMessage="Follower-only posts can't be quoted."
+          defaultMessage="Follower-only posts authored on Mastodon can't be quoted by others."
         />
       </p>
     );
@@ -313,7 +313,7 @@ const QuotePolicyHelper: FC<{
       <p className='visibility-dropdown__helper'>
         <FormattedMessage
           id='visibility_modal.helper.direct_quoting'
-          defaultMessage="Private mentions can't be quoted."
+          defaultMessage="Private mentions authored on Mastodon can't be quoted by others."
         />
       </p>
     );
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 0657f9efeb..79a01a02f2 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -979,15 +979,15 @@
   "video.volume_up": "Volume up",
   "visibility_modal.button_title": "Set visibility",
   "visibility_modal.header": "Visibility and interaction",
-  "visibility_modal.helper.direct_quoting": "Private mentions can't be quoted.",
+  "visibility_modal.helper.direct_quoting": "Private mentions authored on Mastodon can't be quoted by others.",
   "visibility_modal.helper.privacy_editing": "Published posts cannot change their visibility.",
-  "visibility_modal.helper.private_quoting": "Follower-only posts can't be quoted.",
+  "visibility_modal.helper.private_quoting": "Follower-only posts authored on Mastodon can't be quoted by others.",
   "visibility_modal.helper.unlisted_quoting": "When people quote you, their post will also be hidden from trending timelines.",
   "visibility_modal.instructions": "Control who can interact with this post. Global settings can be found under <link>Preferences > Other</link>.",
   "visibility_modal.privacy_label": "Privacy",
   "visibility_modal.quote_followers": "Followers only",
   "visibility_modal.quote_label": "Change who can quote",
-  "visibility_modal.quote_nobody": "No one",
+  "visibility_modal.quote_nobody": "Just me",
   "visibility_modal.quote_public": "Anyone",
   "visibility_modal.save": "Save"
 }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1c56fcfd82..a653a2108a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1910,9 +1910,9 @@ en:
       ownership: Someone else's post cannot be pinned
       reblog: A boost cannot be pinned
     quote_policies:
-      followers: Only your followers
-      nobody: Nobody
-      public: Everyone
+      followers: Followers only
+      nobody: Just me
+      public: Anyone
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Private mention

From 7a76f71d9970759f262fce1ac578af4ae61fd2c5 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Aug 2025 15:08:37 +0200
Subject: [PATCH 09/10] =?UTF-8?q?Ensure=20quote=20policy=20is=20displayed?=
 =?UTF-8?q?=20as=20=E2=80=9CJust=20me=E2=80=9D=20when=20disabled=20because?=
 =?UTF-8?q?=20of=20visibility=20(#35894)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/actions/compose.js                   | 5 +++--
 .../mastodon/features/ui/components/visibility_modal.tsx     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index e358489756..96c0c43c74 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -221,6 +221,7 @@ export function submitCompose(successCallback) {
       });
     }
 
+    const visibility = getState().getIn(['compose', 'privacy']);
     api().request({
       url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
       method: statusId === null ? 'post' : 'put',
@@ -231,11 +232,11 @@ export function submitCompose(successCallback) {
         media_attributes,
         sensitive: getState().getIn(['compose', 'sensitive']),
         spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
-        visibility: getState().getIn(['compose', 'privacy']),
+        visibility: visibility,
         poll: getState().getIn(['compose', 'poll'], null),
         language: getState().getIn(['compose', 'language']),
         quoted_status_id: getState().getIn(['compose', 'quoted_status_id']),
-        quote_approval_policy: getState().getIn(['compose', 'quote_policy']),
+        quote_approval_policy: visibility === 'private' || visibility === 'direct' ? 'nobody' : getState().getIn(['compose', 'quote_policy']),
       },
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
diff --git a/app/javascript/mastodon/features/ui/components/visibility_modal.tsx b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
index 9cb69a904f..2341fd9f3a 100644
--- a/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
@@ -253,7 +253,7 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
                 items={quoteItems}
                 onChange={handleQuotePolicyChange}
                 classPrefix='visibility-dropdown'
-                current={quotePolicy}
+                current={disableQuotePolicy ? 'nobody' : quotePolicy}
                 title={intl.formatMessage(messages.buttonTitle)}
                 disabled={disableQuotePolicy}
                 id={quoteDropdownId}

From 7aba79ade9bfeb86105aa575bc7156acef78f7da Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Aug 2025 16:33:25 +0200
Subject: [PATCH 10/10] Fix `quotes_count` attribute on `Status` not being
 serialized (#35895)

---
 app/serializers/rest/status_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index db06714980..ed90b7c724 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -8,7 +8,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
              :uri, :url, :replies_count, :reblogs_count,
-             :favourites_count, :edited_at
+             :favourites_count, :quotes_count, :edited_at
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?