Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.

.nvmrc

@@ -1 +1 @@
-22.18
+22.19

Gemfile.lock

@@ -172,7 +172,7 @@ GEM
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -615,7 +615,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.6.1)
+    pg (1.6.2)
     pghero (3.7.0)
       activerecord (>= 7.1)
     playwright-ruby-client (1.54.1)

app/controllers/settings/preferences/posting_defaults_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Settings::Preferences::PostingDefaultsController < Settings::Preferences::BaseController
+  private
+
+  def after_update_redirect_path
+    settings_preferences_posting_defaults_path
+  end
+end

app/javascript/mastodon/components/status/reblog_button.tsx

@@ -23,8 +23,8 @@ import {
   useAppSelector,
 } from '@/mastodon/store';
 import { isFeatureEnabled } from '@/mastodon/utils/environment';
-import FormatQuote from '@/material-icons/400-24px/format_quote.svg?react';
+import FormatQuote from '@/material-icons/400-24px/format_quote-fill.svg?react';
-import FormatQuoteOff from '@/material-icons/400-24px/format_quote_off.svg?react';
+import FormatQuoteOff from '@/material-icons/400-24px/format_quote_off-fill.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
@@ -44,7 +44,7 @@ const messages = defineMessages({
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
   quote_cannot: {
     id: 'status.cannot_quote',
-    defaultMessage: 'Author has disabled quoting on this post',
+    defaultMessage: 'Quotes are disabled on this post',
   },
   quote_followers_only: {
     id: 'status.quote_followers_only',

app/javascript/mastodon/features/notifications/components/notification.jsx

@@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import FormatQuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
+import FormatQuoteIcon from '@/material-icons/400-24px/format_quote-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';

app/javascript/mastodon/features/notifications_v2/components/notification_quote.tsx

@@ -1,6 +1,6 @@
 import { FormattedMessage } from 'react-intl';
 
-import FormatQuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
+import FormatQuoteIcon from '@/material-icons/400-24px/format_quote-fill.svg?react';
 import type { NotificationGroupQuote } from 'mastodon/models/notification_group';
 
 import type { LabelRenderer } from './notification_group_with_status';

app/javascript/mastodon/features/status/components/card.jsx

@@ -37,18 +37,20 @@ const getHostname = url => {
 
 const domParser = new DOMParser();
 
-const addAutoPlay = html => {
+const handleIframeUrl = (html, url, providerName) => {
   const document = domParser.parseFromString(html, 'text/html').documentElement;
   const iframe = document.querySelector('iframe');
+  const startTime = new URL(url).searchParams.get('t')
 
   if (iframe) {
-    if (iframe.src.indexOf('?') !== -1) {
+    const iframeUrl = new URL(iframe.src)
-      iframe.src += '&';
-    } else {
-      iframe.src += '?';
-    }
 
-    iframe.src += 'autoplay=1&auto_play=1';
+    iframeUrl.searchParams.set('autoplay', 1)
+    iframeUrl.searchParams.set('auto_play', 1)
+
+    if (startTime && providerName === "YouTube") iframeUrl.searchParams.set('start', startTime)
+
+    iframe.src = iframeUrl.href
 
     // DOM parser creates html/body elements around original HTML fragment,
     // so we need to get innerHTML out of the body and not the entire document
@@ -114,7 +116,7 @@ export default class Card extends PureComponent {
 
   renderVideo () {
     const { card } = this.props;
-    const content = { __html: addAutoPlay(card.get('html')) };
+    const content = { __html: handleIframeUrl(card.get('html'), card.get('url'), card.get('provider_name')) };
 
     return (
       <div

app/javascript/mastodon/features/ui/components/visibility_modal.tsx

@@ -89,6 +89,24 @@ const selectStatusPolicy = createAppSelector(
   },
 );
 
+const selectDisablePublicVisibilities = createAppSelector(
+  [
+    (state) => state.statuses,
+    (_state, statusId?: string) => !!statusId,
+    (state) => state.compose.get('quoted_status_id') as string | null,
+  ],
+  (statuses, isEditing, statusId) => {
+    if (isEditing || !statusId) return false;
+
+    const status = statuses.get(statusId);
+    if (!status) {
+      return false;
+    }
+
+    return status.get('visibility') === 'private';
+  },
+);
+
 export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   ({ onClose, onChange, statusId }, _ref) => {
@@ -110,24 +128,12 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
     const disableVisibility = !!statusId;
     const disableQuotePolicy =
       visibility === 'private' || visibility === 'direct';
+    const disablePublicVisibilities: boolean = useAppSelector(
+      selectDisablePublicVisibilities,
+    );
 
-    const visibilityItems = useMemo<SelectItem<StatusVisibility>[]>(
+    const visibilityItems = useMemo<SelectItem<StatusVisibility>[]>(() => {
-      () => [
+      const items: SelectItem<StatusVisibility>[] = [
-        {
-          value: 'public',
-          text: intl.formatMessage(privacyMessages.public_short),
-          meta: intl.formatMessage(privacyMessages.public_long),
-          icon: 'globe',
-          iconComponent: PublicIcon,
-        },
-        {
-          value: 'unlisted',
-          text: intl.formatMessage(privacyMessages.unlisted_short),
-          meta: intl.formatMessage(privacyMessages.unlisted_long),
-          extra: intl.formatMessage(privacyMessages.unlisted_extra),
-          icon: 'unlock',
-          iconComponent: QuietTimeIcon,
-        },
         {
           value: 'private',
           text: intl.formatMessage(privacyMessages.private_short),
@@ -142,9 +148,30 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
           icon: 'at',
           iconComponent: AlternateEmailIcon,
         },
-      ],
+      ];
-      [intl],
+
-    );
+      if (!disablePublicVisibilities) {
+        items.unshift(
+          {
+            value: 'public',
+            text: intl.formatMessage(privacyMessages.public_short),
+            meta: intl.formatMessage(privacyMessages.public_long),
+            icon: 'globe',
+            iconComponent: PublicIcon,
+          },
+          {
+            value: 'unlisted',
+            text: intl.formatMessage(privacyMessages.unlisted_short),
+            meta: intl.formatMessage(privacyMessages.unlisted_long),
+            extra: intl.formatMessage(privacyMessages.unlisted_extra),
+            icon: 'unlock',
+            iconComponent: QuietTimeIcon,
+          },
+        );
+      }
+
+      return items;
+    }, [intl, disablePublicVisibilities]);
     const quoteItems = useMemo<SelectItem<ApiQuotePolicy>[]>(
       () => [
         { value: 'public', text: intl.formatMessage(messages.quotePublic) },
@@ -198,10 +225,10 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
           <div className='dialog-modal__content__description'>
             <FormattedMessage
               id='visibility_modal.instructions'
-              defaultMessage='Control who can interact with this post. Global settings can be found under <link>Preferences > Other</link>.'
+              defaultMessage='Control who can interact with this post. You can also apply settings to all future posts by navigating to <link>Preferences > Posting defaults</link>.'
               values={{
                 link: (chunks) => (
-                  <a href='/settings/preferences/other'>{chunks}</a>
+                  <a href='/settings/preferences/posting_defaults'>{chunks}</a>
                 ),
               }}
               tagName='p'
@@ -216,7 +243,7 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
             >
               <FormattedMessage
                 id='visibility_modal.privacy_label'
-                defaultMessage='Privacy'
+                defaultMessage='Visibility'
               />
 
               <Dropdown
@@ -236,6 +263,14 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
                   />
                 </p>
               )}
+              {!statusId && disablePublicVisibilities && (
+                <p className='visibility-dropdown__helper'>
+                  <FormattedMessage
+                    id='visibility_modal.helper.privacy_private_self_quote'
+                    defaultMessage='Self-quotes of private posts cannot be made public.'
+                  />
+                </p>
+              )}
             </label>
 
             <label
@@ -246,7 +281,7 @@ export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
             >
               <FormattedMessage
                 id='visibility_modal.quote_label'
-                defaultMessage='Change who can quote'
+                defaultMessage='Who can quote'
               />
 
               <Dropdown

app/javascript/mastodon/locales/af.json

@@ -1,6 +1,7 @@
 {
   "about.blocks": "Gemodereerde bedieners",
   "about.contact": "Kontak:",
+  "about.default_locale": "Verstek",
   "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.",

app/javascript/mastodon/locales/az.json

@@ -948,9 +948,6 @@
   "visibility_modal.header": "Görünmə və qarşılıqlı əlaqə",
   "visibility_modal.helper.privacy_editing": "Dərc edilən göndərişlərin görünməsi dəyişdirilə bilməz.",
   "visibility_modal.helper.unlisted_quoting": "İnsanlar sizdən sitat gətirdiyi zaman, onların göndərişləri də trend zaman xəttindən gizlədiləcək.",
-  "visibility_modal.instructions": "Bu göndərişlə kimin əlaqə qura biləcəyini idarə edin. Qlobal ayarlar <link>Tərcihlər > Digər</link> bölməsinin altında tapıla bilər.",
-  "visibility_modal.privacy_label": "Gizlilik",
   "visibility_modal.quote_followers": "Yalnız izləyicilər",
-  "visibility_modal.quote_label": "Kimin sitat gətirə biləcəyini dəyişdir",
   "visibility_modal.quote_public": "Hər kəs"
 }

app/javascript/mastodon/locales/be.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Адкрыць медыя",
   "keyboard_shortcuts.pinned": "Адкрыць спіс замацаваных допісаў",
   "keyboard_shortcuts.profile": "Адкрыць профіль аўтара",
+  "keyboard_shortcuts.quote": "Цытаваць допіс",
   "keyboard_shortcuts.reply": "Адказаць на допіс",
   "keyboard_shortcuts.requests": "Адкрыць спіс запытаў на падпіску",
   "keyboard_shortcuts.search": "Сфакусіраваць пошукавы радок",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Працяг ланцужка",
   "status.copy": "Скапіраваць спасылку на допіс",
   "status.delete": "Выдаліць",
+  "status.delete.success": "Допіс быў выдалены",
   "status.detailed_status": "Дэтальны агляд размовы",
   "status.direct": "Згадаць асабіста @{name}",
   "status.direct_indicator": "Асабістае згадванне",
@@ -907,6 +909,7 @@
   "status.quotes.empty": "Яшчэ ніхто не цытаваў гэты допіс. Калі гэта адбудзецца, то Вы пабачыце гэта тут.",
   "status.read_more": "Чытаць болей",
   "status.reblog": "Пашырыць",
+  "status.reblog_or_quote": "Пашырыць ці цытаваць",
   "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
   "status.reblogged_by": "Карыстальнік {name} пашырыў",
   "status.reblogs": "{count, plural, one {пашырэнне} few {пашырэнні} many {пашырэнняў} other {пашырэння}}",
@@ -988,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Апублікаваным допісам нельга змяняць бачнасць.",
   "visibility_modal.helper.private_quoting": "Допісы для падпісчыкаў, створаныя на Mastodon, нельга цытаваць іншым людзям.",
   "visibility_modal.helper.unlisted_quoting": "Калі людзі працытуюць Вас, іх допіс таксама будзе схаваны ад стужкі трэндаў.",
-  "visibility_modal.instructions": "Кантралюйце, хто можа ўзаемадзейнічаць з Вашым допісам. Глабальныя налады можна знайсці ў <link>Налады > Іншае</link>.",
-  "visibility_modal.privacy_label": "Прыватнасць",
   "visibility_modal.quote_followers": "Толькі падпісчыкі",
-  "visibility_modal.quote_label": "Змяніць, хто можа цытаваць",
   "visibility_modal.quote_nobody": "Толькі я",
   "visibility_modal.quote_public": "Усе",
   "visibility_modal.save": "Захаваць"

app/javascript/mastodon/locales/bg.json

@@ -953,9 +953,6 @@
   "visibility_modal.button_title": "Задаване на видимост",
   "visibility_modal.header": "Видимост и взаимодействие",
   "visibility_modal.helper.privacy_editing": "Публикуваните публикации не може да променят видимостта си.",
-  "visibility_modal.instructions": "Управлявайте кой може да взаимодейства с тази публикация. Глобалните настройки може да се намерят под <link>Предпочитания> Друго</link>.",
-  "visibility_modal.privacy_label": "Поверителност",
   "visibility_modal.quote_followers": "Само последователи",
-  "visibility_modal.quote_label": "Промяна кой може да цитира",
   "visibility_modal.quote_public": "Някой"
 }

app/javascript/mastodon/locales/br.json

@@ -638,7 +638,6 @@
   "video.hide": "Kuzhat ar video",
   "video.pause": "Paouez",
   "video.play": "Lenn",
-  "visibility_modal.privacy_label": "Prevezded",
   "visibility_modal.quote_followers": "Tud koumanantet hepken",
   "visibility_modal.quote_public": "Pep den"
 }

app/javascript/mastodon/locales/ca.json

@@ -490,6 +490,7 @@
   "keyboard_shortcuts.open_media": "Obre mèdia",
   "keyboard_shortcuts.pinned": "Obre la llista de tuts fixats",
   "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
+  "keyboard_shortcuts.quote": "Citar la publicació",
   "keyboard_shortcuts.reply": "Respon al tut",
   "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
   "keyboard_shortcuts.search": "Centra la barra de cerca",
@@ -618,6 +619,7 @@
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta que heu respost",
+  "notification.quoted_update": "{name} ha editat una publicació que has citat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han impulsat la vostra publicació",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
@@ -859,6 +861,7 @@
   "status.continued_thread": "Continuació del fil",
   "status.copy": "Copia l'enllaç al tut",
   "status.delete": "Elimina",
+  "status.delete.success": "Publicació esborrada",
   "status.detailed_status": "Vista detallada de la conversa",
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
@@ -888,11 +891,16 @@
   "status.quote_error.pending_approval": "Publicació pendent",
   "status.quote_error.pending_approval_popout.body": "Les citacions compartides a través del Fediverse poden trigar en aparèixer, perquè diferents servidors tenen diferents protocols.",
   "status.quote_error.pending_approval_popout.title": "Publicació pendent? Mantinguem la calma",
+  "status.quote_followers_only": "Només els seguidors poden citar aquesta publicació",
+  "status.quote_manual_review": "L'autor ho revisarà manualment",
   "status.quote_policy_change": "Canvieu qui us pot citar",
   "status.quote_post_author": "S'ha citat una publicació de @{name}",
   "status.quote_private": "No es poden citar les publicacions privades",
+  "status.quotes": "{count, plural, one {cita} other {cites}}",
+  "status.quotes.empty": "Encara no ha citat aquesta publicació ningú. Quan ho faci algú apareixerà aquí.",
   "status.read_more": "Més informació",
   "status.reblog": "Impulsa",
+  "status.reblog_or_quote": "Impuls or cita",
   "status.reblog_private": "Impulsa amb la visibilitat original",
   "status.reblogged_by": "impulsat per {name}",
   "status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
@@ -905,6 +913,7 @@
   "status.reply": "Respon",
   "status.replyAll": "Respon al fil",
   "status.report": "Denuncia @{name}",
+  "status.request_quote": "Petició per a citar",
   "status.revoke_quote": "Elimina la meva publicació de la de @{name}",
   "status.sensitive_warning": "Contingut sensible",
   "status.share": "Comparteix",
@@ -968,12 +977,12 @@
   "video.volume_up": "Apuja el volum",
   "visibility_modal.button_title": "Establiu la visibilitat",
   "visibility_modal.header": "Visibilitat i interacció",
+  "visibility_modal.helper.direct_quoting": "No es poden citar mencions privades fetes a Mastondon.",
   "visibility_modal.helper.privacy_editing": "No es pot canviar la visibilitat de les publicacions ja fetes.",
+  "visibility_modal.helper.private_quoting": "No es poden citar publicacions fetes a Mastodon només per a seguidors.",
   "visibility_modal.helper.unlisted_quoting": "Quan la gent et citi les seves publicacions estaran amagades de les línies de temps de tendències.",
-  "visibility_modal.instructions": "Controleu qui pot interactuar amb aquesta publicació. La configuració global es troba a <link>Preferències>Altres</link>.",
-  "visibility_modal.privacy_label": "Privacitat",
   "visibility_modal.quote_followers": "Només seguidors",
-  "visibility_modal.quote_label": "Canvieu qui us pot citar",
+  "visibility_modal.quote_nobody": "Només jo",
   "visibility_modal.quote_public": "Qualsevol",
   "visibility_modal.save": "Desa"
 }

app/javascript/mastodon/locales/cs.json

@@ -870,6 +870,7 @@
   "status.continued_thread": "Pokračuje ve vlákně",
   "status.copy": "Zkopírovat odkaz na příspěvek",
   "status.delete": "Smazat",
+  "status.delete.success": "Příspěvek byl smazán",
   "status.detailed_status": "Podrobné zobrazení konverzace",
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
@@ -990,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Publikované příspěvky nemohou změnit svou viditelnost.",
   "visibility_modal.helper.private_quoting": "Příspěvky pouze pro sledující, které jsou vytvořeny na Mastodonu, nemohou být citovány ostatními.",
   "visibility_modal.helper.unlisted_quoting": "Když vás lidé citují, jejich příspěvek bude v časové ose populárních příspěvků také skryt.",
-  "visibility_modal.instructions": "Kontrolujte, kdo může interagovat s tímto příspěvkem. Globální nastavení můžete najít pod <link>Nastavení > Ostatní</link>.",
-  "visibility_modal.privacy_label": "Soukromí",
   "visibility_modal.quote_followers": "Pouze sledující",
-  "visibility_modal.quote_label": "Změňte, kdo může citovat",
   "visibility_modal.quote_nobody": "Jen já",
   "visibility_modal.quote_public": "Kdokoliv",
   "visibility_modal.save": "Uložit"

app/javascript/mastodon/locales/cy.json

@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Agor ffrwd gartref",
   "keyboard_shortcuts.hotkey": "Bysell boeth",
   "keyboard_shortcuts.legend": "Dangos yr allwedd hon",
+  "keyboard_shortcuts.load_more": "Canolbwyntio ar y botwm \"Llwytho rhagor\"",
   "keyboard_shortcuts.local": "Agor ffrwd lleol",
   "keyboard_shortcuts.mention": "Crybwyll yr awdur",
   "keyboard_shortcuts.muted": "Agor rhestr defnyddwyr rydych wedi'u tewi",
@@ -491,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Agor cyfryngau",
   "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
   "keyboard_shortcuts.profile": "Agor proffil yr awdur",
+  "keyboard_shortcuts.quote": "Dyfynnu postiad",
   "keyboard_shortcuts.reply": "Ateb postiad",
   "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
   "keyboard_shortcuts.search": "Ffocysu ar y bar chwilio",
@@ -619,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i atal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg rydych wedi pleidleisio ynddo wedi dod i ben",
+  "notification.quoted_update": "Golygodd {name} bostiad rydych chi wedi'i ddyfynnu",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
@@ -738,11 +741,18 @@
   "privacy.private.short": "Dilynwyr",
   "privacy.public.long": "Unrhyw un ar ac oddi ar Mastodon",
   "privacy.public.short": "Cyhoeddus",
+  "privacy.quote.anyone": "{visibility}, gall unrhyw un ddyfynnu",
+  "privacy.quote.disabled": "{visibility}, dyfyniadau wedi'u hanalluogi",
+  "privacy.quote.limited": "{visibility}, dyfyniadau wedi'u cyfyngu",
   "privacy.unlisted.additional": "Mae hwn yn ymddwyn yn union fel y cyhoeddus, ac eithrio na fydd y postiad yn ymddangos mewn ffrydiau byw neu hashnodau, archwilio, neu chwiliad Mastodon, hyd yn oed os ydych wedi eich cynnwys ar draws y cyfrif.",
   "privacy.unlisted.long": "Llai o ddathliadau algorithmig",
   "privacy.unlisted.short": "Tewi'r cyhoeddus",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
+  "quote_error.poll": "Dyw dyfynnu ddim yn cael ei ganiatáu gyda pholau.",
+  "quote_error.quote": "Dim ond un dyfyniad ar y tro sy'n cael ei ganiatáu.",
+  "quote_error.unauthorized": "Does gennych chi ddim awdurdod i ddyfynnu'r postiad hwn.",
+  "quote_error.upload": "Dyw dyfynnu ddim yn cael ei ganiatáu gydag atodiadau cyfryngau.",
   "recommended": "Argymhellwyd",
   "refresh": "Adnewyddu",
   "regeneration_indicator.please_stand_by": "Arhoswch am dipyn.",
@@ -849,15 +859,18 @@
   "status.admin_account": "Agor rhyngwyneb cymedroli @{name}",
   "status.admin_domain": "Agor rhyngwyneb cymedroli {domain}",
   "status.admin_status": "Agor y postiad hwn yn y rhyngwyneb cymedroli",
+  "status.all_disabled": "Mae hybu a dyfynnu wedi'u hanalluogi",
   "status.block": "Rhwystro @{name}",
   "status.bookmark": "Nod tudalen",
   "status.cancel_reblog_private": "Dadhybu",
+  "status.cannot_quote": "Mae'r awdur wedi analluogi dyfynnu ar y postiad hwn",
   "status.cannot_reblog": "Does dim modd hybu'r postiad hwn",
   "status.context.load_new_replies": "Mae atebion newydd ar gael",
   "status.context.loading": "Yn chwilio am fwy o atebion",
   "status.continued_thread": "Edefyn parhaus",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
+  "status.delete.success": "Postiad wedi'i ddileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
@@ -880,15 +893,22 @@
   "status.mute_conversation": "Anwybyddu sgwrs",
   "status.open": "Ehangu'r post hwn",
   "status.pin": "Pinio ar y proffil",
+  "status.quote": "Dyfynnu",
+  "status.quote.cancel": "Diddymu'r dyfyniad",
   "status.quote_error.filtered": "Wedi'i guddio oherwydd un o'ch hidlwyr",
   "status.quote_error.not_available": "Postiad ddim ar gael",
   "status.quote_error.pending_approval": "Postiad yn yr arfaeth",
   "status.quote_error.pending_approval_popout.body": "Gall dyfyniadau sy'n cael eu rhannu ar draws y Ffedysawd gymryd amser i'w dangos, gan fod gan wahanol weinyddion brotocolau gwahanol.",
   "status.quote_error.pending_approval_popout.title": "Dyfyniad yn aros? Amynedd :-)",
+  "status.quote_followers_only": "Dim ond dilynwyr all ddyfynnu'r postiad hwn",
+  "status.quote_manual_review": "Bydd yr awdur yn ei adolygu ei hyn",
   "status.quote_policy_change": "Newid pwy all ddyfynnu",
   "status.quote_post_author": "Wedi dyfynnu postiad gan @{name}",
+  "status.quote_private": "Does dim modd dyfynnu postiadau preifat",
+  "status.quotes.empty": "Does neb wedi dyfynnu'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, bydd yn ymddangos yma.",
   "status.read_more": "Darllen rhagor",
   "status.reblog": "Hybu",
+  "status.reblog_or_quote": "Hybu neu ddyfynnu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
   "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
@@ -901,6 +921,7 @@
   "status.reply": "Ymateb",
   "status.replyAll": "Ateb edefyn",
   "status.report": "Adrodd ar @{name}",
+  "status.request_quote": "Gofyn i gael dyfynnu",
   "status.revoke_quote": "Dileu fy mhostiad o bostiad @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
@@ -939,6 +960,7 @@
   "upload_button.label": "Ychwanegwch delweddau, fideo neu ffeil sain",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm llwytho.",
   "upload_error.poll": "Does dim modd llwytho ffeiliau â phleidleisiau.",
+  "upload_error.quote": "Does dim hawl llwytho i fyny gyda dyfyniadau.",
   "upload_form.drag_and_drop.instructions": "I godi atodiad cyfryngau, pwyswch y space neu enter. Wrth lusgo, defnyddiwch y bysellau saeth i symud yr atodiad cyfryngau i unrhyw gyfeiriad penodol. Pwyswch space neu enter eto i ollwng yr atodiad cyfryngau yn ei safle newydd, neu pwyswch escape i ddiddymu.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cafodd llusgo ei ddiddymu. Cafodd atodi cyfryngau {item} ei ollwng.",
   "upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
@@ -964,11 +986,12 @@
   "video.volume_up": "Lefel sain i fyny",
   "visibility_modal.button_title": "Gosod gwelededd",
   "visibility_modal.header": "Gwelededd a rhyngweithio",
+  "visibility_modal.helper.direct_quoting": "Does dim modd dyfynnu crybwylliadau preifat ysgrifennwyd ar Mastodon.",
   "visibility_modal.helper.privacy_editing": "Does dim modd newid gwelededd postiadau wedi'u cyhoeddi.",
+  "visibility_modal.helper.private_quoting": "Does dim modd dyfynnu crybwylliadau preifat ysgrifennwyd gan ddilynwyr.",
   "visibility_modal.helper.unlisted_quoting": "Pan fydd pobl yn eich dyfynnu, bydd eu postiad hefyd yn cael ei guddio rhag llinellau amser sy'n trendio.",
-  "visibility_modal.instructions": "Rheolwch bwy all ryngweithio â'r postiad hwn. Mae modd dod o hyd i osodiadau eang o dan <link>Dewisiadau > Arall</link>.",
-  "visibility_modal.privacy_label": "Preifatrwydd",
   "visibility_modal.quote_followers": "Dilynwyr yn unig",
-  "visibility_modal.quote_label": "Newid pwy all ddyfynnu",
+  "visibility_modal.quote_nobody": "Dim ond fi",
-  "visibility_modal.quote_public": "Pawb"
+  "visibility_modal.quote_public": "Pawb",
+  "visibility_modal.save": "Cadw"
 }

app/javascript/mastodon/locales/da.json

@@ -492,7 +492,7 @@
   "keyboard_shortcuts.open_media": "Åbn medier",
   "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
   "keyboard_shortcuts.profile": "Åbn forfatters profil",
-  "keyboard_shortcuts.quote": "Citer indlæg",
+  "keyboard_shortcuts.quote": "Citér indlæg",
   "keyboard_shortcuts.reply": "Besvar indlægget",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
   "keyboard_shortcuts.search": "Fokusér søgebjælke",
@@ -621,7 +621,7 @@
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
-  "notification.quoted_update": "{name} redigerede et indlæg, man har citeret",
+  "notification.quoted_update": "{name} redigerede et indlæg, du har citeret",
   "notification.reblog": "{name} fremhævede dit indlæg",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> fremhævede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
@@ -751,7 +751,7 @@
   "privacy_policy.title": "Privatlivspolitik",
   "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.unauthorized": "Du har ikke tilladelse til at citere dette indlæg.",
   "quote_error.upload": "Citering ikke tilladt ved medievedhæftninger.",
   "recommended": "Anbefalet",
   "refresh": "Genindlæs",
@@ -870,6 +870,7 @@
   "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
+  "status.delete.success": "Indlæg slettet",
   "status.detailed_status": "Detaljeret samtalevisning",
   "status.direct": "Nævn @{name} privat",
   "status.direct_indicator": "Privat omtale",
@@ -905,10 +906,10 @@
   "status.quote_post_author": "Citerede et indlæg fra @{name}",
   "status.quote_private": "Private indlæg kan ikke citeres",
   "status.quotes": "{count, plural, one {citat} other {citater}}",
-  "status.quotes.empty": "Ingen har citeret dette indlæg endnu. Når nogen gør det, vil det blive vist her.",
+  "status.quotes.empty": "Ingen har citeret dette indlæg endnu. Når det sker, vil det fremgå her.",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
-  "status.reblog_or_quote": "Fremhæv eller citer",
+  "status.reblog_or_quote": "Fremhæv eller citér",
   "status.reblog_private": "Fremhæv med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
   "status.reblogs": "{count, plural, one {# fremhævelse} other {# fremhævelser}}",
@@ -921,7 +922,7 @@
   "status.reply": "Besvar",
   "status.replyAll": "Svar alle",
   "status.report": "Anmeld @{name}",
-  "status.request_quote": "Anmod om tilladelse til at citere",
+  "status.request_quote": "Anmod om citeringsmulighed",
   "status.revoke_quote": "Fjern eget indlæg fra @{name}s indlæg",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
@@ -990,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Publicerede indlægs synlighed kan ikke ændres.",
   "visibility_modal.helper.private_quoting": "Kun-følger indlæg forfattet på Mastodon kan ikke citeres af andre.",
   "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": "Kun en selv",
   "visibility_modal.quote_public": "Alle",
   "visibility_modal.save": "Gem"

app/javascript/mastodon/locales/de.json

@@ -870,6 +870,7 @@
   "status.continued_thread": "Fortgeführter Thread",
   "status.copy": "Link zum Beitrag kopieren",
   "status.delete": "Beitrag löschen",
+  "status.delete.success": "Beitrag gelöscht",
   "status.detailed_status": "Detaillierte Ansicht der Unterhaltung",
   "status.direct": "@{name} privat erwähnen",
   "status.direct_indicator": "Private Erwähnung",
@@ -990,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Die Sichtbarkeit bereits veröffentlichter Beiträge kann nachträglich nicht mehr geändert werden.",
   "visibility_modal.helper.private_quoting": "Beiträge, die nur für deine Follower bestimmt sind und auf Mastodon verfasst wurden, können nicht von anderen zitiert werden.",
   "visibility_modal.helper.unlisted_quoting": "Sollten dich andere zitieren, werden ihre zitierten Beiträge ebenfalls nicht in den Trends und öffentlichen Timelines angezeigt.",
-  "visibility_modal.instructions": "Bestimme, wer mit diesem Beitrag interagieren darf. Allgemeingültige Einstellungen findest du unter <link>Einstellungen > Erweitert</link>.",
+  "visibility_modal.instructions": "Lege fest, wer mit diesem Beitrag interagieren darf. Du hast auch die Möglichkeit, diese Einstellung auf alle zukünftigen Beiträge anzuwenden. Gehe zu: <link>Einstellungen > Erweitert > Standardeinstellungen für Beiträge</link>",
-  "visibility_modal.privacy_label": "Datenschutz",
+  "visibility_modal.privacy_label": "Sichtbarkeit",
   "visibility_modal.quote_followers": "Nur Follower",
-  "visibility_modal.quote_label": "Ändern, wer zitieren darf",
+  "visibility_modal.quote_label": "Wer zitieren darf",
   "visibility_modal.quote_nobody": "Nur von mir",
   "visibility_modal.quote_public": "Alle",
   "visibility_modal.save": "Speichern"

app/javascript/mastodon/locales/el.json

@@ -980,10 +980,7 @@
   "visibility_modal.header": "Ορατότητα και αλληλεπίδραση",
   "visibility_modal.helper.privacy_editing": "Δημοσιευμένες αναρτήσεις δεν μπορούν να αλλάξουν την ορατότητά τους.",
   "visibility_modal.helper.unlisted_quoting": "Όταν οι άνθρωποι σας παραθέτουν, η ανάρτηση τους θα είναι επίσης κρυμμένη από τα δημοφιλή χρονοδιαγράμματα.",
-  "visibility_modal.instructions": "Ελέγξτε ποιός μπορεί να αλληλεπιδράσει με αυτή την ανάρτηση. Οι καθολικές ρυθμίσεις μπορούν να βρεθούν κάτω από <link>Προτιμήσεις > Άλλα</link>.",
-  "visibility_modal.privacy_label": "Απόρρητο",
   "visibility_modal.quote_followers": "Μόνο ακόλουθοι",
-  "visibility_modal.quote_label": "Αλλάξτε ποιός μπορεί να κάνει παράθεση",
   "visibility_modal.quote_public": "Οποιοσδήποτε",
   "visibility_modal.save": "Αποθήκευση"
 }

app/javascript/mastodon/locales/en.json

@@ -863,7 +863,7 @@
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
-  "status.cannot_quote": "Author has disabled quoting on this post",
+  "status.cannot_quote": "Quotes are disabled on this post",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.context.load_new_replies": "New replies available",
   "status.context.loading": "Checking for more replies",
@@ -989,12 +989,13 @@
   "visibility_modal.header": "Visibility and interaction",
   "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.privacy_private_self_quote": "Self-quotes of private posts cannot be made public.",
   "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.instructions": "Control who can interact with this post. You can also apply settings to all future posts by navigating to <link>Preferences > Posting defaults</link>.",
-  "visibility_modal.privacy_label": "Privacy",
+  "visibility_modal.privacy_label": "Visibility",
   "visibility_modal.quote_followers": "Followers only",
-  "visibility_modal.quote_label": "Change who can quote",
+  "visibility_modal.quote_label": "Who can quote",
   "visibility_modal.quote_nobody": "Just me",
   "visibility_modal.quote_public": "Anyone",
   "visibility_modal.save": "Save"

app/javascript/mastodon/locales/eo.json

@@ -966,9 +966,7 @@
   "visibility_modal.header": "Videblo kaj interago",
   "visibility_modal.helper.privacy_editing": "Publikigitaj afiŝoj ne povas ŝanĝi sian videblon.",
   "visibility_modal.helper.unlisted_quoting": "Kiam homoj citas vin, ilia afiŝo ankaŭ estos kaŝita de tendencaj templinioj.",
-  "visibility_modal.privacy_label": "Privateco",
   "visibility_modal.quote_followers": "Nur sekvantoj",
-  "visibility_modal.quote_label": "Ŝanĝi kiu povas citi",
   "visibility_modal.quote_nobody": "Nur mi",
   "visibility_modal.quote_public": "Iu ajn",
   "visibility_modal.save": "Konservi"

app/javascript/mastodon/locales/es-AR.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "No se puede cambiar la visibilidad a los mensajes ya enviados.",
   "visibility_modal.helper.private_quoting": "Los mensajes solo para seguidores redactados en Mastodon no pueden ser citados por otras cuentas.",
   "visibility_modal.helper.unlisted_quoting": "Cuando otras cuentas te citen, sus publicaciones también se ocultarán de las líneas temporales de tendencias.",
-  "visibility_modal.instructions": "Controlá quién puede interactuar con este mensaje. Los ajustes globales se pueden encontrar en <link>«Configuración» > «Otras opciones»</link>.",
+  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. También puede modificar los ajustes para todas las publicaciones futuras accediendo a <link>Preferencias > Publicaciones por defecto</link>.",
-  "visibility_modal.privacy_label": "Privacidad",
+  "visibility_modal.privacy_label": "Visibilidad",
   "visibility_modal.quote_followers": "Solo para seguidores",
-  "visibility_modal.quote_label": "Cambiá quién puede citar",
+  "visibility_modal.quote_label": "Quién puede citar",
   "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquier cuenta",
   "visibility_modal.save": "Guardar"

app/javascript/mastodon/locales/es-MX.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Las publicaciones ya enviadas no pueden cambiar su visibilidad.",
   "visibility_modal.helper.private_quoting": "Las publicaciones solo para seguidores creadas en Mastodon no pueden ser citadas por otros.",
   "visibility_modal.helper.unlisted_quoting": "Cuando las personas te citen, sus publicaciones también se ocultarán de las cronologías de tendencias.",
-  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. La configuración global se encuentra en <link>Preferencias > Otros</link>.",
+  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. También puedes modificar la configuración a todas las publicaciones futuras accediendo a <link>Preferencias > Publicaciones por defecto</link>.",
-  "visibility_modal.privacy_label": "Privacidad",
+  "visibility_modal.privacy_label": "Visibilidad",
   "visibility_modal.quote_followers": "Solo seguidores",
-  "visibility_modal.quote_label": "Cambia quién puede citarte",
+  "visibility_modal.quote_label": "Quién puede citar",
   "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquiera",
   "visibility_modal.save": "Guardar"

app/javascript/mastodon/locales/es.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Una vez publicada, no se puede cambiar su visibilidad.",
   "visibility_modal.helper.private_quoting": "Las publicaciones solo para seguidores hechas en Mastodon no pueden ser citadas por otros usuarios.",
   "visibility_modal.helper.unlisted_quoting": "Cuando la gente te cite, su publicación tampoco se mostrará en las cronologías públicas.",
-  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. Puedes encontrar los ajustes globales en <link>Preferencias > Otros</link>.",
+  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. También puede modificar los ajustes para todas las publicaciones futuras accediendo a <link>Preferencias > Publicaciones por defecto</link>.",
-  "visibility_modal.privacy_label": "Privacidad",
+  "visibility_modal.privacy_label": "Visibilidad",
   "visibility_modal.quote_followers": "Sólo seguidores",
-  "visibility_modal.quote_label": "Cambia quién puede citarte",
+  "visibility_modal.quote_label": "Quién puede citar",
   "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquiera",
   "visibility_modal.save": "Guardar"

app/javascript/mastodon/locales/et.json

@@ -324,7 +324,7 @@
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
   "empty_column.explore_statuses": "Praegu pole ühtegi trendi. Tule hiljem tagasi!",
   "empty_column.favourited_statuses": "Pole veel lemmikpostitusi. Kui märgid mõne, näed neid siin.",
-  "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, näed seda siin.",
+  "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "empty_column.follow_requests": "Pole hetkel ühtegi jälgimistaotlust. Kui saad mõne, näed neid siin.",
   "empty_column.followed_tags": "Sa ei jälgi veel ühtegi märksõna. Kui jälgid, ilmuvad need siia.",
   "empty_column.hashtag": "Selle sildi all ei ole ühtegi postitust.",
@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Ava meedia",
   "keyboard_shortcuts.pinned": "Ava kinnitatud postituste loetelu",
   "keyboard_shortcuts.profile": "Ava autori profiil",
+  "keyboard_shortcuts.quote": "Tsiteeri postitust",
   "keyboard_shortcuts.reply": "Vasta postitusele",
   "keyboard_shortcuts.requests": "Ava jälgimistaotluste loetelu",
   "keyboard_shortcuts.search": "Fookus otsingule",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Jätkatud lõim",
   "status.copy": "Kopeeri postituse link",
   "status.delete": "Kustuta",
+  "status.delete.success": "Postitus on kustutatud",
   "status.detailed_status": "Detailne vestluskuva",
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
@@ -898,16 +900,20 @@
   "status.quote_error.pending_approval": "Postitus on ootel",
   "status.quote_error.pending_approval_popout.body": "Kuna erinevates serverites on erinevad reeglid, siis üle Födiversumi jagatud tsitaatide kuvamine võib võtta aega.",
   "status.quote_error.pending_approval_popout.title": "Tsiteerimine on ootel? Palun jää rahulikuks",
+  "status.quote_followers_only": "Vaid jälgijad saavad seda postitust tsiteerida",
+  "status.quote_manual_review": "Autor vaatab selle üle",
   "status.quote_policy_change": "Muuda neid, kes võivad tsiteerida",
   "status.quote_post_author": "Tsiteeris kasutaja @{name} postitust",
   "status.quote_private": "Otsepostituste tsiteerimine pole võimalik",
   "status.quotes": "{count, plural, one {# tsiteerimine} other {# tsiteerimist}}",
+  "status.quotes.empty": "Keegi pole seda postitust veel tsiteerinud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "status.read_more": "Loe veel",
   "status.reblog": "Jaga",
+  "status.reblog_or_quote": "Anna hoogu või tsiteeri",
   "status.reblog_private": "Jaga algse nähtavusega",
   "status.reblogged_by": "{name} jagas",
   "status.reblogs": "{count, plural, one {jagamine} other {jagamist}}",
-  "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
+  "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
   "status.remove_favourite": "Eemalda lemmikute seast",
@@ -916,6 +922,7 @@
   "status.reply": "Vasta",
   "status.replyAll": "Vasta lõimele",
   "status.report": "Raporteeri @{name}",
+  "status.request_quote": "Küsi võimalust tsiteerida",
   "status.revoke_quote": "Eemalda minu tsitaat postituses, mille tegi @{name}",
   "status.sensitive_warning": "Tundlik sisu",
   "status.share": "Jaga",
@@ -984,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Avaldatud postitused ei saa muuta oma nähtavust.",
   "visibility_modal.helper.private_quoting": "Ainult jälgijatele mõeldud Mastodoni postitusi ei saa teiste poolt tsiteerida.",
   "visibility_modal.helper.unlisted_quoting": "Kui teised kasutajad sind tsiteerivad, siis nende postitused peidetakse ajajoonelt, mis näitavad populaarsust koguvaid postitusi.",
-  "visibility_modal.instructions": "Halda seda, kes võivad antud postitust kasutada. Üldised seadistused leiduvad siin: <link>Eelistused > Muu</link>.",
-  "visibility_modal.privacy_label": "Privaatsus",
   "visibility_modal.quote_followers": "Ainult jälgijad",
-  "visibility_modal.quote_label": "Muuda seda, kes võivad tsiteerida",
   "visibility_modal.quote_nobody": "Ainult mina",
   "visibility_modal.quote_public": "Kõik",
   "visibility_modal.save": "Salvesta"

app/javascript/mastodon/locales/fa.json

@@ -968,9 +968,6 @@
   "visibility_modal.header": "نمایانی و برهم‌کنش",
   "visibility_modal.helper.privacy_editing": "نمی‌توان نمایانی فرسته‌های منتشر شده را تغییر داد.",
   "visibility_modal.helper.unlisted_quoting": "هنگامی که افراد نقلتان می‌کنند فرسته‌شان هم از خط‌زمانی‌های داغ پنهان خواهد بود.",
-  "visibility_modal.instructions": "واپایش کسانی که می‌توانند با این فرسته برهم‌کنش داشته باشند. تنظیمات سراسری می‌تواند در <link>ترجیحات > دیگر</link> پیدا شود.",
-  "visibility_modal.privacy_label": "محرمانگی",
   "visibility_modal.quote_followers": "فقط پی‌گیرندگان",
-  "visibility_modal.quote_label": "تغییر کسانی که می‌توانند نقل کنند",
   "visibility_modal.quote_public": "هرکسی"
 }

app/javascript/mastodon/locales/fi.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Lähetettyjen julkaisujen näkyvyyttä ei voi vaihtaa.",
   "visibility_modal.helper.private_quoting": "Muut eivät voi lainata Mastodonissa kirjoitettuja, vain seuraajille tarkoitettuja julkaisuja.",
   "visibility_modal.helper.unlisted_quoting": "Kun ihmiset lainaavat sinua, myös heidän julkaisunsa piilotetaan suosittujen julkaisujen aikajanoilta.",
-  "visibility_modal.instructions": "Hallitse, kuka voi olla vuorovaikutuksessa tämän julkaisun kanssa. Yleiset asetukset sijaitsevat kohdassa <link>Asetukset > Muut</link>.",
+  "visibility_modal.instructions": "Määritä, kuka voi olla vuorovaikutuksessa tämän julkaisun kanssa. Voit soveltaa asetuksia kaikkiin tuleviin julkaisuihin siirtymällä kohtaan <link>Asetukset > Julkaisun oletusasetukset</link>.",
-  "visibility_modal.privacy_label": "Yksityisyys",
+  "visibility_modal.privacy_label": "Näkyvyys",
   "visibility_modal.quote_followers": "Vain seuraajat",
-  "visibility_modal.quote_label": "Vaihda, kuka voi lainata",
+  "visibility_modal.quote_label": "Kuka voi lainata",
   "visibility_modal.quote_nobody": "Vain minä",
   "visibility_modal.quote_public": "Kuka tahansa",
   "visibility_modal.save": "Tallenna"

app/javascript/mastodon/locales/fo.json

@@ -870,6 +870,7 @@
   "status.continued_thread": "Framhaldandi tráður",
   "status.copy": "Kopiera leinki til postin",
   "status.delete": "Strika",
+  "status.delete.success": "Postur strikaður",
   "status.detailed_status": "Útgreinað samrøðusýni",
   "status.direct": "Umrøð @{name} privat",
   "status.direct_indicator": "Privat umrøða",
@@ -905,6 +906,7 @@
   "status.quote_post_author": "Siteraði ein post hjá @{name}",
   "status.quote_private": "Privatir postar kunnu ikki siterast",
   "status.quotes": "{count, plural, one {sitat} other {sitat}}",
+  "status.quotes.empty": "Eingin hevur siterað hendan postin enn. Tá onkur siterar postin, verður hann sjónligur her.",
   "status.read_more": "Les meira",
   "status.reblog": "Stimbra",
   "status.reblog_or_quote": "Stimbra ella sitera",
@@ -989,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Útgivnir postar kunnnu ikki broyta sýni.",
   "visibility_modal.helper.private_quoting": "Postar, sum einans eru fyri fylgjarar á Mastodon, kunnu ikki siterast av øðrum.",
   "visibility_modal.helper.unlisted_quoting": "Tá fólk sitera teg, so vera teirra postar eisini fjaldir frá tíðarlinjum við ráki.",
-  "visibility_modal.instructions": "Stýr, hvør kann virka saman við hesum postinum. Globalar stillingar finnast undir <link>Stilingar > Onnur</link>.",
+  "visibility_modal.instructions": "Stýr hvør samvirka við hendan postin. Tú kanst eisini áseta stillingar til allar framtíðar postar við at fara til <link>Stillingar > Postingarstillingar</link>.",
-  "visibility_modal.privacy_label": "Privatlív",
+  "visibility_modal.privacy_label": "Sýni",
   "visibility_modal.quote_followers": "Einans fylgjarar",
-  "visibility_modal.quote_label": "Broyt hvør kann sitera",
+  "visibility_modal.quote_label": "Hvør kann sitera",
   "visibility_modal.quote_nobody": "Bara eg",
   "visibility_modal.quote_public": "Ein og hvør",
   "visibility_modal.save": "Goym"

app/javascript/mastodon/locales/fr-CA.json

@@ -955,7 +955,6 @@
   "video.volume_up": "Augmenter le volume",
   "visibility_modal.button_title": "Définir la visibilité",
   "visibility_modal.header": "Visibilité et interactions",
-  "visibility_modal.privacy_label": "Vie privée",
   "visibility_modal.quote_public": "Tout le monde",
   "visibility_modal.save": "Sauvegarder"
 }

app/javascript/mastodon/locales/fr.json

@@ -955,7 +955,6 @@
   "video.volume_up": "Augmenter le volume",
   "visibility_modal.button_title": "Définir la visibilité",
   "visibility_modal.header": "Visibilité et interactions",
-  "visibility_modal.privacy_label": "Vie privée",
   "visibility_modal.quote_public": "Tout le monde",
   "visibility_modal.save": "Sauvegarder"
 }

app/javascript/mastodon/locales/ga.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Oscail meáin",
   "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
+  "keyboard_shortcuts.quote": "Postáil luachana",
   "keyboard_shortcuts.reply": "Freagair ar phostáil",
   "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
   "keyboard_shortcuts.search": "Díriú ar an mbosca cuardaigh",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Snáithe ar lean",
   "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",
+  "status.delete.success": "Scriosadh an post",
   "status.detailed_status": "Amharc comhrá mionsonraithe",
   "status.direct": "Luaigh @{name} go príobháideach",
   "status.direct_indicator": "Lua príobháideach",
@@ -907,6 +909,7 @@
   "status.quotes.empty": "Níl an post seo luaite ag aon duine go fóill. Nuair a dhéanann duine é, taispeánfar anseo é.",
   "status.read_more": "Léan a thuilleadh",
   "status.reblog": "Treisiú",
+  "status.reblog_or_quote": "Borradh nó luachan",
   "status.reblog_private": "Mol le léargas bunúsach",
   "status.reblogged_by": "Mhol {name}",
   "status.reblogs": "{count, plural, one {buaic} other {buaic}}",
@@ -988,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Ní féidir infheictheacht postálacha foilsithe a athrú.",
   "visibility_modal.helper.private_quoting": "Ní féidir le daoine eile poist atá scríofa ar Mastodon agus atá dírithe ar leanúna amháin a lua.",
   "visibility_modal.helper.unlisted_quoting": "Nuair a luann daoine thú, beidh a bpost i bhfolach ó amlínte treochta freisin.",
-  "visibility_modal.instructions": "Rialú cé a fhéadfaidh idirghníomhú leis an bpost seo. Is féidir socruithe domhanda a fháil faoi <link>Sainroghanna > Eile</link>.",
-  "visibility_modal.privacy_label": "Príobháideacht",
   "visibility_modal.quote_followers": "Leantóirí amháin",
-  "visibility_modal.quote_label": "Athraigh cé a fhéadann luachan a thabhairt",
   "visibility_modal.quote_nobody": "Mise amháin",
   "visibility_modal.quote_public": "Aon duine",
   "visibility_modal.save": "Sábháil"

app/javascript/mastodon/locales/gl.json

@@ -991,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Non se pode cambiar a visibilidade das publicacións xa publicadas.",
   "visibility_modal.helper.private_quoting": "As publicacións só para seguidoras creadas con Mastodon non poden ser citadas.",
   "visibility_modal.helper.unlisted_quoting": "Cando alguén te cite, a súa publicación non aparecerá nas cronoloxías de popularidade.",
-  "visibility_modal.instructions": "Controla quen pode interactuar con esta publicación. Os axustes xerais están en <link>Preferencias > Outros</link>.",
-  "visibility_modal.privacy_label": "Privacidade",
   "visibility_modal.quote_followers": "Só para seguidoras",
-  "visibility_modal.quote_label": "Cambia quen pode citarte",
   "visibility_modal.quote_nobody": "Só para min",
   "visibility_modal.quote_public": "Calquera",
   "visibility_modal.save": "Gardar"

app/javascript/mastodon/locales/he.json

@@ -870,6 +870,7 @@
   "status.continued_thread": "שרשור מתמשך",
   "status.copy": "העתק/י קישור להודעה זו",
   "status.delete": "מחיקה",
+  "status.delete.success": "ההודעה נמחקה",
   "status.detailed_status": "תצוגת שיחה מפורטת",
   "status.direct": "הודעה פרטית אל @{name}",
   "status.direct_indicator": "הודעה פרטית",
@@ -990,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "לא ניתן לשנות את דרגת החשיפה של הודעות שפורסמו.",
   "visibility_modal.helper.private_quoting": "הודעות לעוקבים־בלבד שנוצרו במסטודון חסומות מציטוט על ידי אחרים.",
   "visibility_modal.helper.unlisted_quoting": "כאשר אחרים מצטטים אותך, ההודעות שלהם יוסתרו גם מ\"נושאים חמים\".",
-  "visibility_modal.instructions": "שליטה בהרשאה להידוּד (תגובות וציטוטים) עם הודעה זו. הגדרות ברירת המחדל ניתן למצוא תחת <link>העדפות > אחרים</link>.",
+  "visibility_modal.instructions": "שליטה ביכולות השימוש של קהל הקוראות בהודעה. תוכלו גם לבחור את ברירות המחדל לכל ההודעות העתידיות על ידי ניווט אל <link>העדפות > ברירות מחדל בפרסום</link>.",
-  "visibility_modal.privacy_label": "פרטיות",
+  "visibility_modal.privacy_label": "נראות",
   "visibility_modal.quote_followers": "לעוקבים בלבד",
-  "visibility_modal.quote_label": "הגדרת הרשאה לציטוט הודעותיך",
+  "visibility_modal.quote_label": "למי מותר לצטט",
   "visibility_modal.quote_nobody": "רק אני",
   "visibility_modal.quote_public": "כולם",
   "visibility_modal.save": "שמירה"

app/javascript/mastodon/locales/hu.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Média megnyitása",
   "keyboard_shortcuts.pinned": "Kitűzött bejegyzések listájának megnyitása",
   "keyboard_shortcuts.profile": "Szerző profiljának megnyitása",
+  "keyboard_shortcuts.quote": "Bejegyzés idézése",
   "keyboard_shortcuts.reply": "Válasz bejegyzésre",
   "keyboard_shortcuts.requests": "Követési kérések listájának megnyitása",
   "keyboard_shortcuts.search": "Fókuszálás a keresősávra",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Folytatott szál",
   "status.copy": "Link másolása bejegyzésbe",
   "status.delete": "Törlés",
+  "status.delete.success": "Bejegyzés törölve",
   "status.detailed_status": "Részletes beszélgetési nézet",
   "status.direct": "@{name} személyes említése",
   "status.direct_indicator": "Személyes említés",
@@ -907,6 +909,7 @@
   "status.quotes.empty": "Senki sem idézte még ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.read_more": "Bővebben",
   "status.reblog": "Megtolás",
+  "status.reblog_or_quote": "Megtolás vagy idézés",
   "status.reblog_private": "Megtolás az eredeti közönségnek",
   "status.reblogged_by": "{name} megtolta",
   "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
@@ -988,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "A közzétett bejegyzések láthatósága nem módosítható.",
   "visibility_modal.helper.private_quoting": "A Mastodonon írt, csak követőknek szóló bejegyzéseket mások nem idézhetik.",
   "visibility_modal.helper.unlisted_quoting": "Amikor idéznek tőled, a bejegyzésük rejtve lesz a felkapott bejegyzések hírfolyamain is.",
-  "visibility_modal.instructions": "Döntsd el, hogy ki léphet interakcióba a bejegyzéssel. A globális beállítások a <link>Beállítások > Egyéb</link> alatt találhatóak.",
+  "visibility_modal.instructions": "Állítsd be, hogy ki léphet interakcióba a bejegyzéssel. Az összes bejegyzésre is alkalmazhatod, ha a <link>Beállítások > Bejegyzések alapértelmezései</link> lapra navigálsz.",
-  "visibility_modal.privacy_label": "Adatvédelem",
+  "visibility_modal.privacy_label": "Láthatóság",
   "visibility_modal.quote_followers": "Csak követőknek",
-  "visibility_modal.quote_label": "Módosítás, hogy kik idézhetnek",
+  "visibility_modal.quote_label": "Ki idézhet",
   "visibility_modal.quote_nobody": "Csak én",
   "visibility_modal.quote_public": "Bárki",
   "visibility_modal.save": "Mentés"

app/javascript/mastodon/locales/ia.json

@@ -984,10 +984,7 @@
   "visibility_modal.helper.privacy_editing": "Le messages ja publicate non pote cambiar de visibilitate.",
   "visibility_modal.helper.private_quoting": "Le messages limitate al sequitores scribite sur Mastodon non pote esser citate per alteres.",
   "visibility_modal.helper.unlisted_quoting": "Quando un persona te cita, su message essera tamben celate del chronologia \"In tendentia\".",
-  "visibility_modal.instructions": "Controla qui pote interager con iste message. Le parametros global se trova sub <link>Preferentias > Alteres</link>.",
-  "visibility_modal.privacy_label": "Confidentialitate",
   "visibility_modal.quote_followers": "Solmente sequitores",
-  "visibility_modal.quote_label": "Cambiar qui pote citar",
   "visibility_modal.quote_nobody": "Solo io",
   "visibility_modal.quote_public": "Omnes",
   "visibility_modal.save": "Salvar"

app/javascript/mastodon/locales/is.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Ekki er hægt að breyta sýnileika birtra færslna.",
   "visibility_modal.helper.private_quoting": "Ekki er hægt að vitna í færslur einungis til fylgjenda sem skrifaðar eru á Mastodon.",
   "visibility_modal.helper.unlisted_quoting": "Þegar fólk vitnar í þig verða færslurnar þeirr einnig faldar á vinsældatímalínum.",
-  "visibility_modal.instructions": "Stýrðu hverjir geta átt við þessa færslu. Víðværar stillingar finnast undir <link>Kjörstillingar > Annað</link>.",
+  "visibility_modal.instructions": ". Stýrðu því hverjir geta átt við þessa færslu. Þú getur líka ákvarðað stillingar fyrir allar færslur í framtíðinni með því að fara í <link>Kjörstillingar > Sjálfgefin gildi við gerð færslna</link>.",
-  "visibility_modal.privacy_label": "Persónuvernd",
+  "visibility_modal.privacy_label": "Sýnileiki",
   "visibility_modal.quote_followers": "Einungis fylgjendur",
-  "visibility_modal.quote_label": "Breyttu því hver getur tilvitnað",
+  "visibility_modal.quote_label": "Hverjir geta gert tilvitnanir",
   "visibility_modal.quote_nobody": "Bara ég",
   "visibility_modal.quote_public": "Hver sem er",
   "visibility_modal.save": "Vista"

app/javascript/mastodon/locales/it.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Apre i multimedia",
   "keyboard_shortcuts.pinned": "Apre l'elenco dei post fissati",
   "keyboard_shortcuts.profile": "Apre il profilo dell'autore",
+  "keyboard_shortcuts.quote": "Cita il post",
   "keyboard_shortcuts.reply": "Risponde al post",
   "keyboard_shortcuts.requests": "Apre l'elenco delle richieste di seguirti",
   "keyboard_shortcuts.search": "Focalizza sulla barra di ricerca",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Discussione continua",
   "status.copy": "Copia link al post",
   "status.delete": "Elimina",
+  "status.delete.success": "Post eliminato",
   "status.detailed_status": "Vista conversazione dettagliata",
   "status.direct": "Menziona privatamente @{name}",
   "status.direct_indicator": "Menzione privata",
@@ -898,12 +900,16 @@
   "status.quote_error.pending_approval": "Post in attesa",
   "status.quote_error.pending_approval_popout.body": "Le citazioni condivise in tutto il Fediverso possono richiedere del tempo per la visualizzazione, poiché server diversi hanno protocolli diversi.",
   "status.quote_error.pending_approval_popout.title": "Citazione in attesa? Resta calmo",
+  "status.quote_followers_only": "Solo i seguaci possono citare questo post",
+  "status.quote_manual_review": "L'autore esaminerà manualmente",
   "status.quote_policy_change": "Cambia chi può citare",
   "status.quote_post_author": "Citato un post di @{name}",
   "status.quote_private": "I post privati non possono essere citati",
   "status.quotes": "{count, plural, one {citazione} other {citazioni}}",
+  "status.quotes.empty": "Nessuno ha ancora citato questo post. Quando qualcuno lo farà, verrà visualizzato qui.",
   "status.read_more": "Leggi di più",
   "status.reblog": "Reblog",
+  "status.reblog_or_quote": "Condividi o cita",
   "status.reblog_private": "Reblog con visibilità originale",
   "status.reblogged_by": "Rebloggato da {name}",
   "status.reblogs": "{count, plural, one {boost} other {boost}}",
@@ -916,6 +922,7 @@
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
   "status.report": "Segnala @{name}",
+  "status.request_quote": "Richiesta di citazione",
   "status.revoke_quote": "Rimuovi il mio post da quello di @{name}",
   "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
@@ -984,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "La visibilità dei post pubblicati non può essere modificata.",
   "visibility_modal.helper.private_quoting": "I post scritti e riservati ai seguaci su Mastodon non possono essere citati da altri.",
   "visibility_modal.helper.unlisted_quoting": "Quando le persone ti citano, il loro post verrà nascosto anche dalle timeline di tendenza.",
-  "visibility_modal.instructions": "Controlla chi può interagire con questo post. Le impostazioni globali si trovano in <link>Preferenze > Altro</link>.",
+  "visibility_modal.instructions": "Controlla chi può interagire con questo post. Puoi anche applicare le impostazioni a tutti i post futuri andando su <link>Preferenze > Impostazioni predefinite per i post</link>.",
-  "visibility_modal.privacy_label": "Privacy",
+  "visibility_modal.privacy_label": "Visibilità",
   "visibility_modal.quote_followers": "Solo i seguaci",
-  "visibility_modal.quote_label": "Cambia chi può citare",
+  "visibility_modal.quote_label": "Chi può citare",
   "visibility_modal.quote_nobody": "Solo io",
   "visibility_modal.quote_public": "Chiunque",
   "visibility_modal.save": "Salva"

app/javascript/mastodon/locales/kab.json

@@ -718,8 +718,6 @@
   "video.pause": "Sgunfu",
   "video.play": "Seddu",
   "video.unmute": "Kkes asgugem",
-  "visibility_modal.privacy_label": "Tabaḍnit",
   "visibility_modal.quote_followers": "Imeḍfaṛen kan",
-  "visibility_modal.quote_label": "Beddel anwa i izemren ad k-id-yebder",
   "visibility_modal.quote_public": "Yal yiwen"
 }

app/javascript/mastodon/locales/ko.json

@@ -292,6 +292,7 @@
   "domain_pill.your_handle": "내 핸들:",
   "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
   "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
+  "dropdown.empty": "옵션 선택",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -491,6 +492,7 @@
   "keyboard_shortcuts.open_media": "미디어 열기",
   "keyboard_shortcuts.pinned": "고정 게시물 리스트 열기",
   "keyboard_shortcuts.profile": "작성자의 프로필 열기",
+  "keyboard_shortcuts.quote": "게시물 인용",
   "keyboard_shortcuts.reply": "게시물에 답장",
   "keyboard_shortcuts.requests": "팔로우 요청 리스트 열기",
   "keyboard_shortcuts.search": "검색창에 포커스",
@@ -619,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 투표가 끝났습니다",
+  "notification.quoted_update": "{name} 님이 내가 인용한 게시물을 수정했습니다",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.reblog.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
@@ -746,7 +749,10 @@
   "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": "잠시 기다려주세요.",
@@ -864,6 +870,7 @@
   "status.continued_thread": "이어지는 글타래",
   "status.copy": "게시물 링크 복사",
   "status.delete": "삭제",
+  "status.delete.success": "게시물 삭제됨",
   "status.detailed_status": "대화 자세히 보기",
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
@@ -891,9 +898,16 @@
   "status.quote_error.filtered": "필터에 의해 가려짐",
   "status.quote_error.not_available": "게시물 사용 불가",
   "status.quote_error.pending_approval": "게시물 대기중",
+  "status.quote_followers_only": "팔로워만 이 게시물을 인용할 수 있습니다",
+  "status.quote_manual_review": "작성자가 직접 검토합니다",
+  "status.quote_policy_change": "누가 인용할 수 있는지",
   "status.quote_post_author": "인용된 @{name} 님의 게시물",
+  "status.quote_private": "비공개 게시물은 인용할 수 없습니다",
+  "status.quotes": "{count, plural, other {#}} 인용",
+  "status.quotes.empty": "아직 아무도 이 게시물을 인용하지 않았습니다. 누군가 인용한다면 여기에 표시됩니다.",
   "status.read_more": "더 보기",
   "status.reblog": "부스트",
+  "status.reblog_or_quote": "부스트 또는 인용",
   "status.reblog_private": "원래의 수신자들에게 부스트",
   "status.reblogged_by": "{name} 님이 부스트했습니다",
   "status.reblogs": "{count, plural, other {부스트}}",
@@ -906,6 +920,7 @@
   "status.reply": "답장",
   "status.replyAll": "글타래에 답장",
   "status.report": "@{name} 신고하기",
+  "status.request_quote": "인용 요청",
   "status.revoke_quote": "내 게시물을 @{name}의 게시물에서 삭제",
   "status.sensitive_warning": "민감한 내용",
   "status.share": "공유",
@@ -944,6 +959,7 @@
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
+  "upload_error.quote": "파일 업로드는 인용과 함께 쓸 수 없습니다.",
   "upload_form.drag_and_drop.instructions": "미디어 첨부파일을 집으려면 스페이스나 엔터를 누르세요. 드래그 하는 동안 방향키를 이용해 원하는 방향으로 이동할 수 있습니다. 스페이스나 엔터를 다시 눌러 새 위치에 놓거나 ESC를 이용해 취소할 수 있습니다.",
   "upload_form.drag_and_drop.on_drag_cancel": "드래그가 취소되었습니다. 미디어 첨부파일 {item}은 이동되지 않았습니다.",
   "upload_form.drag_and_drop.on_drag_end": "미디어 첨부파일 {item}은 이동되지 않았습니다.",
@@ -968,9 +984,10 @@
   "video.volume_down": "음량 감소",
   "video.volume_up": "음량 증가",
   "visibility_modal.button_title": "공개범위 설정",
-  "visibility_modal.privacy_label": "공개범위",
+  "visibility_modal.header": "공개범위와 반응",
-  "visibility_modal.quote_followers": "팔로워 전용",
+  "visibility_modal.helper.privacy_editing": "발행된 게시물은 공개설정을 바꿀 수 없습니다.",
-  "visibility_modal.quote_label": "누가 인용할 수 있는지",
+  "visibility_modal.helper.unlisted_quoting": "사람들이 나를 인용한 경우 그 게시물 또한 유행에서 제외됩니다.",
+  "visibility_modal.quote_followers": "팔로워만",
   "visibility_modal.quote_nobody": "나에게만",
   "visibility_modal.quote_public": "아무나",
   "visibility_modal.save": "저장"

app/javascript/mastodon/locales/lv.json

@@ -824,9 +824,7 @@
   "video.volume_up": "Pagriezt skaļāk",
   "visibility_modal.button_title": "Iestatīt redzamību",
   "visibility_modal.header": "Redzamība un mijjiedarbība",
-  "visibility_modal.privacy_label": "Privātums",
   "visibility_modal.quote_followers": "Tikai sekotāji",
-  "visibility_modal.quote_label": "Mainīt, kas var citēt",
   "visibility_modal.quote_nobody": "Tikai es",
   "visibility_modal.quote_public": "Ikviens",
   "visibility_modal.save": "Saglabāt"

app/javascript/mastodon/locales/nan.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Phah開媒體",
   "keyboard_shortcuts.pinned": "Phah開釘起來ê PO文列單",
   "keyboard_shortcuts.profile": "Phah開作者ê個人資料",
+  "keyboard_shortcuts.quote": "引用PO文",
   "keyboard_shortcuts.reply": "回應PO文",
   "keyboard_shortcuts.requests": "Phah開跟tuè請求ê列單",
   "keyboard_shortcuts.search": "揀tshiau-tshuē條á",
@@ -620,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "Lí ê口座ê權限已經停止ah。",
   "notification.own_poll": "Lí ê投票結束ah",
   "notification.poll": "Lí bat投ê投票結束ah",
+  "notification.quoted_update": "{name} 編輯lí有引用ê PO文",
   "notification.reblog": "{name} 轉送lí ê PO文",
   "notification.reblog.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>轉送lí ê PO文",
   "notification.relationships_severance_event": "Kap {name} ê結連無去",
@@ -744,7 +746,7 @@
   "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.unlisted.short": "恬靜公開",
   "privacy_policy.last_updated": "上尾更新tī：{date}",
   "privacy_policy.title": "隱私權政策",
   "quote_error.poll": "有投票ê PO文bē當引用。",
@@ -868,6 +870,7 @@
   "status.continued_thread": "接續ê討論線",
   "status.copy": "Khóo-pih PO文ê連結",
   "status.delete": "Thâi掉",
+  "status.delete.success": "PO文thâi掉ah",
   "status.detailed_status": "對話ê詳細",
   "status.direct": "私人提起 @{name}",
   "status.direct_indicator": "私人ê提起",
@@ -896,11 +899,16 @@
   "status.quote_error.pending_approval": "鋪文當咧送",
   "status.quote_error.pending_approval_popout.body": "因為無kâng ê服侍器有無kâng ê協定，佇聯邦宇宙分享ê引文可能愛開時間來顯示。",
   "status.quote_error.pending_approval_popout.title": "Leh送引文？請sió等leh",
+  "status.quote_followers_only": "Kan-ta tuè我ê ē當引用PO文",
+  "status.quote_manual_review": "作者ē hōo lâng人工審核",
   "status.quote_policy_change": "改通引用ê lâng",
   "status.quote_post_author": "引用 @{name} ê PO文ah",
   "status.quote_private": "私人PO文bē當引用",
+  "status.quotes": "{count, plural, other {# 篇引用ê PO文}}",
+  "status.quotes.empty": "Iáu無lâng引用tsit篇PO文。Nā是有lâng引用，ē佇tsia顯示。.",
   "status.read_more": "讀詳細",
   "status.reblog": "轉送",
+  "status.reblog_or_quote": "轉送á是引用",
   "status.reblog_private": "照原PO ê通看見ê範圍轉送",
   "status.reblogged_by": "{name} kā轉送ah",
   "status.reblogs": "{count, plural, other {# ê 轉送}}",
@@ -913,6 +921,7 @@
   "status.reply": "回應",
   "status.replyAll": "應討論線",
   "status.report": "檢舉 @{name}",
+  "status.request_quote": "要求引用PO文",
   "status.revoke_quote": "Kā 我ê PO文tuì @{name} ê thâi掉",
   "status.sensitive_warning": "敏感ê內容",
   "status.share": "分享",
@@ -976,12 +985,12 @@
   "video.volume_up": "變khah大聲",
   "visibility_modal.button_title": "設定通看ê程度",
   "visibility_modal.header": "通看ê程度kap互動",
+  "visibility_modal.helper.direct_quoting": "Mastodon頂發布ê私人提起bē當hōo別lâng引用。",
   "visibility_modal.helper.privacy_editing": "公開ê PO文bē當改in通看ê程度。",
+  "visibility_modal.helper.private_quoting": "Mastodon頂發布ê kan-ta跟tuè ê通看ê PO文，bē當hōo別lâng引用。",
   "visibility_modal.helper.unlisted_quoting": "若別lâng引用lí，in ê PO文mā ē tuì趨勢時間線隱藏。",
-  "visibility_modal.instructions": "控制ē當kap tsit篇PO文互動ê lâng，Ē當佇 <link>偏愛ê設定>其他</link>tshuē tio̍h全地ê設定。",
-  "visibility_modal.privacy_label": "隱私權",
   "visibility_modal.quote_followers": "Kan-ta hōo跟tuè ê lâng",
-  "visibility_modal.quote_label": "改通引用ê lâng",
+  "visibility_modal.quote_nobody": "Kan-ta我",
   "visibility_modal.quote_public": "Ta̍k ê lâng",
   "visibility_modal.save": "儲存"
 }

app/javascript/mastodon/locales/nl.json

@@ -990,10 +990,7 @@
   "visibility_modal.helper.privacy_editing": "Het is niet mogelijk om de zichtbaarheid van geplaatste berichten te wijzigen.",
   "visibility_modal.helper.private_quoting": "Berichten aan alleen volgers afkomstig van Mastodon kunnen niet door anderen worden geciteerd.",
   "visibility_modal.helper.unlisted_quoting": "Wanneer mensen jou citeren, verschijnt hun bericht ook niet onder trends.",
-  "visibility_modal.instructions": "Bepaal wie wat met dit bericht kan doen. De globale instellingen vind je onder <link>Voorkeuren > Overig</link>.",
-  "visibility_modal.privacy_label": "Privacy",
   "visibility_modal.quote_followers": "Alleen volgers",
-  "visibility_modal.quote_label": "Wijzig wie jou mag citeren",
   "visibility_modal.quote_nobody": "Alleen ik",
   "visibility_modal.quote_public": "Iedereen",
   "visibility_modal.save": "Opslaan"

app/javascript/mastodon/locales/nn.json

@@ -984,10 +984,7 @@
   "visibility_modal.helper.privacy_editing": "Du kan ikkje endra vising på publiserte innlegg.",
   "visibility_modal.helper.private_quoting": "Innlegg som er skrivne på Mastodon og berre for fylgjarar kan ikkje siterast av andre.",
   "visibility_modal.helper.unlisted_quoting": "Når folk siterer deg, vil innlegget deira ikkje syna på populære tidsliner.",
-  "visibility_modal.instructions": "Kontroller kven som kan samhandla med dette innlegget. Innstillingane finn du under <link>Innstillingar > Anna</link>.",
-  "visibility_modal.privacy_label": "Personvern",
   "visibility_modal.quote_followers": "Berre fylgjarar",
-  "visibility_modal.quote_label": "Endre kven som kan sitera",
   "visibility_modal.quote_nobody": "Berre eg",
   "visibility_modal.quote_public": "Allle",
   "visibility_modal.save": "Lagre"

app/javascript/mastodon/locales/pt-BR.json

@@ -104,7 +104,7 @@
   "alt_text_modal.add_text_from_image": "Adicione texto da imagem",
   "alt_text_modal.cancel": "Cancelar",
   "alt_text_modal.change_thumbnail": "Alterar miniatura",
-  "alt_text_modal.describe_for_people_with_hearing_impairments": "…Descreva isso para pessoas com deficiências auditivas.…",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descreva isso para pessoas com deficiências auditivas...",
   "alt_text_modal.describe_for_people_with_visual_impairments": "Descreva isso para pessoas com deficiências visuais…",
   "alt_text_modal.done": "Feito",
   "announcement.announcement": "Comunicados",
@@ -245,6 +245,9 @@
   "confirmations.remove_from_followers.confirm": "Remover seguidor",
   "confirmations.remove_from_followers.message": "{name} vai parar de te seguir. Tem certeza de que deseja continuar?",
   "confirmations.remove_from_followers.title": "Remover seguidor?",
+  "confirmations.revoke_quote.confirm": "Remover publicação",
+  "confirmations.revoke_quote.message": "Essa ação não pode ser desfeita.",
+  "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir o usuário?",
@@ -289,6 +292,7 @@
   "domain_pill.your_handle": "Seu identificador:",
   "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
   "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
+  "dropdown.empty": "Escolha uma opção",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
@@ -306,6 +310,8 @@
   "emoji_button.search_results": "Resultado da pesquisa",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viagem e Lugares",
+  "empty_column.account_featured.me": "Você ainda não destacou nada. Você sabia que pode destacar seus posts, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
+  "empty_column.account_featured.other": "{acct} Ainda não destacou nada. Você sabia que pode destacar suas publicações, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
   "empty_column.account_featured_other.unknown": "Esta conta ainda não destacou nada.",
   "empty_column.account_hides_collections": "A pessoa optou por não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
@@ -341,7 +347,9 @@
   "explore.trending_tags": "Hashtags",
   "featured_carousel.header": "{count, plural, one {Postagem fixada} other {Postagens fixadas}}",
   "featured_carousel.next": "Próximo",
+  "featured_carousel.post": "Publicação",
   "featured_carousel.previous": "Anterior",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto no qual você acessou esta publicação. Se quiser que a publicação seja filtrada nesse contexto também, você terá que editar o filtro.",
   "filter_modal.added.context_mismatch_title": "Incompatibilidade de contexto!",
   "filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, você precisará alterar a data de expiração para aplicar.",
@@ -420,6 +428,7 @@
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_follows": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
+  "home.column_settings.show_quotes": "Mostrar citações",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
@@ -474,6 +483,7 @@
   "keyboard_shortcuts.home": "abrir página inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "mostrar estes atalhos",
+  "keyboard_shortcuts.load_more": "Focar \"Carregar mais\" botão",
   "keyboard_shortcuts.local": "abrir linha local",
   "keyboard_shortcuts.mention": "mencionar usuário",
   "keyboard_shortcuts.muted": "abrir usuários silenciados",
@@ -482,6 +492,7 @@
   "keyboard_shortcuts.open_media": "abrir mídia",
   "keyboard_shortcuts.pinned": "abrir toots fixados",
   "keyboard_shortcuts.profile": "abrir perfil do usuário",
+  "keyboard_shortcuts.quote": "Publicação de citação",
   "keyboard_shortcuts.reply": "responder toot",
   "keyboard_shortcuts.requests": "abrir seguidores pendentes",
   "keyboard_shortcuts.search": "focar na pesquisa",
@@ -493,6 +504,8 @@
   "keyboard_shortcuts.translate": "Para traduzir um post",
   "keyboard_shortcuts.unfocus": "desfocar de tudo",
   "keyboard_shortcuts.up": "mover para cima",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Veja mais",
   "lightbox.close": "Fechar",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
@@ -542,8 +555,10 @@
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
+  "navigation_bar.account_settings": "Senha e segurança",
   "navigation_bar.administration": "Administração",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
+  "navigation_bar.automated_deletion": "Publicação de eliminação automático",
   "navigation_bar.blocks": "Usuários bloqueados",
   "navigation_bar.bookmarks": "Salvos",
   "navigation_bar.direct": "Menções privadas",
@@ -553,14 +568,23 @@
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.followed_tags": "Hashtags seguidas",
   "navigation_bar.follows_and_followers": "Segue e seguidores",
+  "navigation_bar.import_export": "Importar e exportar",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Feed ao vivo (local)",
+  "navigation_bar.live_feed_public": "Feed ao vivo (público)",
   "navigation_bar.logout": "Sair",
   "navigation_bar.moderation": "Moderação",
   "navigation_bar.more": "Mais",
   "navigation_bar.mutes": "Usuários silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicações, contas e outras páginas específicas são abertas por padrão na interface 'web' clássica.",
   "navigation_bar.preferences": "Preferências",
+  "navigation_bar.privacy_and_reach": "Privacidade e alcance",
   "navigation_bar.search": "Buscar",
+  "navigation_bar.search_trends": "Pesquisa / Em alta",
+  "navigation_panel.collapse_followed_tags": "Recolher menu de hashtags seguidas",
+  "navigation_panel.collapse_lists": "Fechar lista de menu",
+  "navigation_panel.expand_followed_tags": "Expandir o menu de hashtags seguidas",
+  "navigation_panel.expand_lists": "Expandir lista de menu",
   "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.",
   "notification.admin.report": "{name} denunciou {target}",
   "notification.admin.report_account": "{name} reportou {count, plural, one {Um post} other {# posts}} de {target} para {category}",
@@ -582,6 +606,7 @@
   "notification.label.mention": "Menção",
   "notification.label.private_mention": "Menção privada",
   "notification.label.private_reply": "Resposta privada",
+  "notification.label.quote": "{name} Citou a sua publicação",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menção",
   "notification.mentioned_you": "{name} te mencionou",
@@ -596,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
+  "notification.quoted_update": "{name} Editou um post seu",
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outra} other {# outras}}</a> impulsionaram a publicação",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
@@ -639,6 +665,7 @@
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Notificações push",
+  "notifications.column_settings.quote": "Citações:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Tocar som",
@@ -714,11 +741,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility} Qualquer pessoa pode citar",
+  "privacy.quote.disabled": "{visibility} Citações desabilitadas",
+  "privacy.quote.limited": "{visibility} Citações limitadas",
   "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
   "privacy.unlisted.long": "Menos notificações e recomendações do algoritmo",
   "privacy.unlisted.short": "Público (silencioso)",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
+  "quote_error.poll": "Citações não permitidas com enquetes.",
+  "quote_error.quote": "Apenas uma citação por vez é permitido.",
+  "quote_error.unauthorized": "Você não é autorizado a citar essa publicação.",
+  "quote_error.upload": "Citações não são permitidas com mídias anexadas.",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
   "regeneration_indicator.please_stand_by": "Aguarde um momento.",
@@ -787,6 +821,7 @@
   "report_notification.categories.violation": "Violação de regra",
   "report_notification.categories.violation_sentence": "violação de regra",
   "report_notification.open": "Abrir denúncia",
+  "search.clear": "Limpar pesquisas",
   "search.no_recent_searches": "Nenhuma busca recente",
   "search.placeholder": "Pesquisar",
   "search.quick_action.account_search": "Perfis correspondentes a {x}",
@@ -824,13 +859,18 @@
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir este toot na interface de moderação",
+  "status.all_disabled": "Acelerações e citações estão desabilitados",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Desfazer boost",
+  "status.cannot_quote": "O autor desabilitou a Citação dessa publicação",
   "status.cannot_reblog": "Este toot não pode receber boost",
+  "status.context.load_new_replies": "Novas respostas disponíveis",
+  "status.context.loading": "Verificando mais respostas",
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar link",
   "status.delete": "Excluir",
+  "status.delete.success": "Publicação deletada",
   "status.detailed_status": "Visão detalhada da conversa",
   "status.direct": "Mencione em privado @{name}",
   "status.direct_indicator": "Menção privada",
@@ -853,9 +893,23 @@
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Abrir toot",
   "status.pin": "Fixar",
+  "status.quote": "Citar",
+  "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": "Citações compartilhadas entre o Fedverse podem levar um tempo já que servidores diferentes têm protocolos diferentes.",
+  "status.quote_error.pending_approval_popout.title": "Citação pendente",
+  "status.quote_followers_only": "Apenas seguidores podem citar sua publicação",
+  "status.quote_manual_review": "Autor irá revisar manualmente",
+  "status.quote_policy_change": "Mude quem pode citar",
+  "status.quote_post_author": "Publicação citada por @{name}",
+  "status.quote_private": "Publicações privadas não podem ser citadas",
+  "status.quotes": "{count, plural, one {# voto} other {# votos}}",
+  "status.quotes.empty": "Ninguém citou essa publicação até agora. Quando alguém citar aparecerá aqui.",
   "status.read_more": "Ler mais",
   "status.reblog": "Dar boost",
+  "status.reblog_or_quote": "Acelerar ou citar",
   "status.reblog_private": "Dar boost para o mesmo público",
   "status.reblogged_by": "{name} deu boost",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
@@ -868,6 +922,8 @@
   "status.reply": "Responder",
   "status.replyAll": "Responder a conversa",
   "status.report": "Denunciar @{name}",
+  "status.request_quote": "Solicitar citação",
+  "status.revoke_quote": "Remover minha publicação de@{name} publicação",
   "status.sensitive_warning": "Mídia sensível",
   "status.share": "Compartilhar",
   "status.show_less_all": "Mostrar menos em tudo",
@@ -883,7 +939,10 @@
   "subscribed_languages.save": "Salvar alterações",
   "subscribed_languages.target": "Alterar idiomas inscritos para {target}",
   "tabs_bar.home": "Página inicial",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Notificações",
+  "tabs_bar.publish": "Nova publicação",
+  "tabs_bar.search": "Buscar",
   "terms_of_service.effective_as_of": "Em vigor a partir de {date}",
   "terms_of_service.title": "Termos de serviço",
   "terms_of_service.upcoming_changes_on": "Próximas mudanças em {date}",
@@ -902,6 +961,7 @@
   "upload_button.label": "Adicionar mídia",
   "upload_error.limit": "Limite de anexação alcançado.",
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
+  "upload_error.quote": "Mídias não podem ser anexadas com enquetes.",
   "upload_form.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",
@@ -924,5 +984,18 @@
   "video.skip_forward": "Avançar",
   "video.unmute": "Ativar som",
   "video.volume_down": "Diminuir o volume",
-  "video.volume_up": "Aumentar o volume"
+  "video.volume_up": "Aumentar o volume",
+  "visibility_modal.button_title": "Selecionar Visibilidade",
+  "visibility_modal.header": "Visibilidade e interação",
+  "visibility_modal.helper.direct_quoting": "Menções privadas escritas no Mastodon.",
+  "visibility_modal.helper.privacy_editing": "Os posts publicados não podem alterar sua visibilidade.",
+  "visibility_modal.helper.private_quoting": "Posts somente para seguidores feitos no Mastodon não podem ser citados por outros.",
+  "visibility_modal.helper.unlisted_quoting": "Quando as pessoas citam você, sua publicação também será ocultada das linhas de tempo de tendência.",
+  "visibility_modal.instructions": "Controle quem pode interagir com este post. Você também pode aplicar as configurações para todos os posts futuros navegando para <link>Preferências > Postagem padrão</link>.",
+  "visibility_modal.privacy_label": "Visibilidade",
+  "visibility_modal.quote_followers": "Apenas seguidores",
+  "visibility_modal.quote_label": "Quem pode citar",
+  "visibility_modal.quote_nobody": "Apenas eu",
+  "visibility_modal.quote_public": "Qualquer um",
+  "visibility_modal.save": "Salvar"
 }

app/javascript/mastodon/locales/pt-PT.json

@@ -988,10 +988,7 @@
   "visibility_modal.helper.privacy_editing": "Publicações publicadas não podem alterar a sua visibilidade.",
   "visibility_modal.helper.private_quoting": "As publicações apenas para seguidores criadas no Mastodon não podem ser citadas por outras pessoas.",
   "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": "Apenas eu",
   "visibility_modal.quote_public": "Todos",
   "visibility_modal.save": "Guardar"

app/javascript/mastodon/locales/sv.json

@@ -858,6 +858,7 @@
   "status.continued_thread": "Fortsatt tråd",
   "status.copy": "Kopiera inläggslänk",
   "status.delete": "Radera",
+  "status.delete.success": "Inlägg borttaget",
   "status.detailed_status": "Detaljerad samtalsvy",
   "status.direct": "Omnämn @{name} privat",
   "status.direct_indicator": "Privat omnämnande",
@@ -967,10 +968,7 @@
   "visibility_modal.header": "Synlighet och interaktion",
   "visibility_modal.helper.privacy_editing": "Publicerade inlägg kan inte ändra deras synlighet.",
   "visibility_modal.helper.unlisted_quoting": "När folk citerar dig, deras inlägg kommer också att döljas från trendiga tidslinjer.",
-  "visibility_modal.instructions": "Kontrollera vem som kan interagera med det här inlägget. Globala inställningar kan hittas under <link>Inställningar > Andra</link>.",
-  "visibility_modal.privacy_label": "Integritet",
   "visibility_modal.quote_followers": "Endast följare",
-  "visibility_modal.quote_label": "Ändra vem som kan citera",
   "visibility_modal.quote_public": "Alla",
   "visibility_modal.save": "Spara"
 }

app/javascript/mastodon/locales/tr.json

@@ -492,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Medyayı açmak için",
   "keyboard_shortcuts.pinned": "Sabitlenmiş gönderilerin listesini aç",
   "keyboard_shortcuts.profile": "Yazanın profilini açmak için",
+  "keyboard_shortcuts.quote": "Gönderiyi alıntıla",
   "keyboard_shortcuts.reply": "gönderiyi yanıtla",
   "keyboard_shortcuts.requests": "Takip istekleri listesini açmak için",
   "keyboard_shortcuts.search": "Aramaya odaklanmak için",
@@ -869,6 +870,7 @@
   "status.continued_thread": "Devam eden akış",
   "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",
+  "status.delete.success": "Gönderi silindi",
   "status.detailed_status": "Ayrıntılı sohbet görünümü",
   "status.direct": "@{name} kullanıcısına özelden değin",
   "status.direct_indicator": "Özel değinme",
@@ -907,6 +909,7 @@
   "status.quotes.empty": "Henüz hiç kimse bu gönderiyi alıntılamadı. Herhangi bir kullanıcı alıntıladığında burada görüntülenecek.",
   "status.read_more": "Devamını okuyun",
   "status.reblog": "Yeniden paylaş",
+  "status.reblog_or_quote": "Yükselt veya alıntıla",
   "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
   "status.reblogged_by": "{name} yeniden paylaştı",
   "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
@@ -988,10 +991,7 @@
   "visibility_modal.helper.privacy_editing": "Yayınlanan gönderilerin görünürlüğü değiştirilemez.",
   "visibility_modal.helper.private_quoting": "Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.",
   "visibility_modal.helper.unlisted_quoting": "İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.",
-  "visibility_modal.instructions": "Bu gönderiyle kimlerin etkileşimde bulunabileceğini kontrol edin. Genel ayarlara <link>Tercihler > Diğer</link> bölümünden ulaşabilirsiniz.",
-  "visibility_modal.privacy_label": "Gizlilik",
   "visibility_modal.quote_followers": "Sadece takipçiler",
-  "visibility_modal.quote_label": "Kimin alıntı yapabileceğini değiştirin",
   "visibility_modal.quote_nobody": "Sadece ben",
   "visibility_modal.quote_public": "Herkesten",
   "visibility_modal.save": "Kaydet"

app/javascript/mastodon/locales/uk.json

@@ -922,9 +922,7 @@
   "video.hide": "Приховати відео",
   "video.pause": "Призупинити",
   "video.play": "Програвати",
-  "visibility_modal.privacy_label": "Конфіденційність",
   "visibility_modal.quote_followers": "Тільки для підписників",
-  "visibility_modal.quote_label": "Змінити хто може цитувати",
   "visibility_modal.quote_public": "Будь-хто",
   "visibility_modal.save": "Зберегти"
 }

app/javascript/mastodon/locales/vi.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "Không thể thay đổi kiểu hiển thị của tút đã đăng.",
   "visibility_modal.helper.private_quoting": "Tút chỉ dành cho người theo dõi trên Mastodon không thể được người khác trích dẫn.",
   "visibility_modal.helper.unlisted_quoting": "Khi ai đó trích dẫn bạn, tút của họ cũng sẽ bị ẩn khỏi bảng tin công khai.",
-  "visibility_modal.instructions": "Kiểm soát những ai có thể tương tác với tút này. Cài đặt chung trong <link>Thiết lập > Khác</link>.",
+  "visibility_modal.instructions": "Kiểm soát những ai có thể tương tác với tút này. Bạn cũng có thể áp dụng cài đặt cho tất cả các tút trong tương lai bằng cách điều hướng đến <link>Thiết lập > Đăng</link>.",
-  "visibility_modal.privacy_label": "Riêng tư",
+  "visibility_modal.privacy_label": "Hiển thị",
   "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_label": "Ai có thể trích dẫn",
   "visibility_modal.quote_nobody": "Chỉ tôi",
   "visibility_modal.quote_public": "Bất cứ ai",
   "visibility_modal.save": "Lưu"

app/javascript/mastodon/locales/zh-CN.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "已发布的嘟文无法改变可见性。",
   "visibility_modal.helper.private_quoting": "Mastodon上发布的仅限关注者可见的嘟文无法被他人引用。",
   "visibility_modal.helper.unlisted_quoting": "当其他人引用你时，他们的嘟文也会从热门时间线上隐藏。",
-  "visibility_modal.instructions": "控制谁可以和此嘟文互动。可以在<link>偏好设置 > 其他</link>下找到全局设置。",
+  "visibility_modal.instructions": "控制谁可以和此嘟文互动。你也可以前往<link>偏好设置 > 发布默认值</link>将此设置应用到所有未来发布的嘟文。",
-  "visibility_modal.privacy_label": "隐私",
+  "visibility_modal.privacy_label": "可见性",
   "visibility_modal.quote_followers": "仅关注者",
-  "visibility_modal.quote_label": "更改谁可以引用",
+  "visibility_modal.quote_label": "谁可以引用",
   "visibility_modal.quote_nobody": "仅限自己",
   "visibility_modal.quote_public": "任何人",
   "visibility_modal.save": "保存"

app/javascript/mastodon/locales/zh-TW.json

@@ -991,10 +991,10 @@
   "visibility_modal.helper.privacy_editing": "無法變更已發佈的嘟文之可見性。",
   "visibility_modal.helper.private_quoting": "Mastodon 上發佈之僅限跟隨者嘟文無法被其他使用者引用。",
   "visibility_modal.helper.unlisted_quoting": "當其他人引用您時，他們的嘟文也會自熱門時間軸隱藏。",
-  "visibility_modal.instructions": "控制誰能與此嘟文互動。可在<link>偏好設定 > 其他</link>下找到全域設定。",
+  "visibility_modal.instructions": "控制誰能與此嘟文互動。您亦能藉由<link>偏好設定 > 嘟文預設值</link>此設定套用至所有未來嘟文。",
-  "visibility_modal.privacy_label": "隱私權",
+  "visibility_modal.privacy_label": "可見性",
   "visibility_modal.quote_followers": "僅限跟隨者",
-  "visibility_modal.quote_label": "變更可以引用的人",
+  "visibility_modal.quote_label": "誰能引用此嘟文",
   "visibility_modal.quote_nobody": "僅有我",
   "visibility_modal.quote_public": "所有人",
   "visibility_modal.save": "儲存"

app/javascript/mastodon/reducers/compose.js

@@ -334,7 +334,8 @@ export const composeReducer = (state = initialState, action) => {
     return state
       .set('quoted_status_id', status.get('id'))
       .set('spoiler', status.get('sensitive'))
-      .set('spoiler_text', status.get('spoiler_text'));
+      .set('spoiler_text', status.get('spoiler_text'))
+      .update('privacy', (visibility) => ['public', 'unlisted'].includes(visibility) && status.get('visibility') === 'private' ? 'private' : visibility);
   } else if (quoteComposeCancel.match(action)) {
     return state.set('quoted_status_id', null);
   } else if (setComposeQuotePolicy.match(action)) {

app/javascript/material-icons/400-24px/format_quote_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="M791-56 425-422 320-240h-92l92-160q-66 0-113-47t-47-113q0-27 8.5-51t23.5-44L56-791l56-57 736 736-57 56Zm-55-281L520-553v-7q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480l-82 143Z"/></svg>

app/javascript/material-icons/400-24px/format_quote_off.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M791-56 425-422 320-240h-92l92-160q-66 0-113-47t-47-113q0-27 8.5-51t23.5-44L56-791l56-57 736 736-57 56Zm-55-281L520-553v-7q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480l-82 143ZM320-500q6 0 12-1t11-3l-79-79q-2 5-3 11t-1 12q0 25 17.5 42.5T320-500Zm360 0q25 0 42.5-17.5T740-560q0-25-17.5-42.5T680-620q-25 0-42.5 17.5T620-560q0 25 17.5 42.5T680-500Zm-374-41Zm374-19Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M791-56 425-422 320-240h-92l92-160q-66 0-113-47t-47-113q0-27 8.5-51t23.5-44L56-791l56-57 736 736-57 56Zm-55-281L520-553v-7q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480l-82 143ZM320-500q6 0 12-1t11-3l-79-79q-2 5-3 11t-1 12q0 25 17.5 42.5T320-500Zm360 0q25 0 42.5-17.5T740-560q0-25-17.5-42.5T680-620q-25 0-42.5 17.5T620-560q0 25 17.5 42.5T680-500Zm-374-41Zm374-19Z"/></svg>

app/javascript/styles/mastodon/admin.scss

@@ -1889,7 +1889,7 @@ a.sparkline {
   font-size: 15px;
   line-height: 22px;
 
-  li {
+  > li {
     counter-increment: step 1;
     padding-inline-start: 2.5rem;
     padding-bottom: 8px;

app/javascript/styles/mastodon/polls.scss

@@ -102,7 +102,8 @@
       cursor: pointer;
     }
 
-    &.editable {
+    &.editable,
+    &.disabled {
       align-items: center;
       overflow: visible;
     }
@@ -160,7 +161,8 @@
     }
   }
 
-  &__option.editable &__input {
+  &__option.editable &__input,
+  &__option.disabled &__input {
     &:active,
     &:focus,
     &:hover {

app/javascript/styles/mastodon/tables.scss

@@ -195,7 +195,7 @@ a.table-action-link {
   &__toolbar {
     position: sticky;
     top: 0;
-    z-index: 1;
+    z-index: 200;
     border: 1px solid var(--background-border-color);
     background: var(--background-color);
     border-radius: 4px 4px 0 0;
@@ -205,6 +205,10 @@ a.table-action-link {
     &__actions {
       text-align: end;
       padding-inline-end: 16px - 5px;
+
+      .table-action-link {
+        padding: 0;
+      }
     }
   }
 

app/lib/antispam.rb

@@ -32,26 +32,30 @@ class Antispam
     end
   end
 
-  def local_preflight_check!(status)
+  def initialize(status)
-    return unless considered_spam?(status)
+    @status = status
+  end
 
-    report_if_needed!(status.account)
+  def local_preflight_check!
+    return unless considered_spam?
 
-    raise SilentlyDrop, status
+    report_if_needed!
+
+    raise SilentlyDrop, @status
   end
 
   private
 
-  def considered_spam?(status)
+  def considered_spam?
-    (all_time_suspicious?(status) || recent_suspicious?(status)) && suspicious_reply_or_mention?(status)
+    (all_time_suspicious? || recent_suspicious?) && suspicious_reply_or_mention?
   end
 
-  def all_time_suspicious?(status)
+  def all_time_suspicious?
-    all_time_spammy_texts.any? { |spammy_text| status.text.include?(spammy_text) }
+    all_time_spammy_texts.any? { |spammy_text| status_text.include?(spammy_text) }
   end
 
-  def recent_suspicious?(status)
+  def recent_suspicious?
-    status.account.created_at >= ACCOUNT_AGE_EXEMPTION.ago && spammy_texts.any? { |spammy_text| status.text.include?(spammy_text) }
+    @status.account.created_at >= ACCOUNT_AGE_EXEMPTION.ago && spammy_texts.any? { |spammy_text| status_text.include?(spammy_text) }
   end
 
   def spammy_texts
@@ -62,25 +66,26 @@ class Antispam
     redis.smembers('antispam:all_time_spammy_texts')
   end
 
-  def suspicious_reply_or_mention?(status)
+  def suspicious_reply_or_mention?
-    parent = status.thread
+    account_ids = ([@status.in_reply_to_account_id] + @status.mentions.map(&:account_id)).uniq
-    return true if parent.present? && !Follow.exists?(account_id: parent.account_id, target_account: status.account_id)
+    !Follow.exists?(account_id: account_ids, target_account_id: @status.account.id)
-
-    account_ids = status.mentions.map(&:account_id).uniq
-    !Follow.exists?(account_id: account_ids, target_account_id: status.account.id)
   end
 
-  def report_if_needed!(account)
+  def report_if_needed!
-    return if system_reports.unresolved.exists?(target_account: account)
+    return if system_reports.unresolved.exists?(target_account: @status.account)
 
     system_reports.create!(
       category: :spam,
       comment: 'Account automatically reported for posting a banned URL',
-      target_account: account
+      target_account: @status.account
     )
   end
 
   def system_reports
     Account.representative.reports
   end
+
+  def status_text
+    @status_text ||= @status.text.unicode_normalize(:nfkc).downcase
+  end
 end

app/lib/status_cache_hydrator.rb

@@ -74,6 +74,16 @@ class StatusCacheHydrator
     # TODO: performance optimization by not loading `Account` twice
     payload[:quote_approval][:current_user] = status.quote_policy_for_account(Account.find_by(id: account_id)) if payload[:quote_approval]
     payload[:quote] = hydrate_quote_payload(payload[:quote], status.quote, account_id, nested:) if payload[:quote]
+
+    # Nested statuses are more likely to have a stale cache
+    fill_status_stats(payload, status) if nested
+  end
+
+  def fill_status_stats(payload, status)
+    payload[:replies_count] = status.replies_count
+    payload[:reblogs_count] = status.untrusted_reblogs_count || status.reblogs_count
+    payload[:favourites_count] = status.untrusted_favourites_count || status.favourites_count
+    payload[:quotes_count] = status.quotes_count
   end
 
   def hydrate_quote_payload(empty_payload, quote, account_id, nested: false)

app/models/concerns/status/interaction_policy_concern.rb

@@ -27,7 +27,7 @@ module Status::InteractionPolicyConcern
 
   # Returns `:automatic`, `:manual`, `:unknown` or `:denied`
   def quote_policy_for_account(other_account, preloaded_relations: {})
-    return :denied if other_account.nil?
+    return :denied if other_account.nil? || direct_visibility?
 
     following_author = nil
 

app/models/status_edit.rb

@@ -44,16 +44,36 @@ class StatusEdit < ApplicationRecord
   scope :ordered, -> { order(id: :asc) }
 
   delegate :local?, :application, :edited?, :edited_at,
-           :discarded?, :visibility, :language, to: :status
+           :discarded?, :reply?, :visibility, :language, to: :status
 
   def with_media?
     ordered_media_attachments.any?
   end
 
+  def with_poll?
+    poll_options.present?
+  end
+
+  def poll
+    return @poll if defined?(@poll)
+    return @poll = nil if poll_options.blank?
+
+    @poll = Poll.new({
+      options: poll_options,
+      account_id: account_id,
+      status_id: status_id,
+    })
+  end
+
+  alias preloadable_poll poll
+
   def emojis
     return @emojis if defined?(@emojis)
 
-    @emojis = CustomEmoji.from_text([spoiler_text, text].join(' '), status.account.domain)
+    fields  = [spoiler_text, text]
+    fields += preloadable_poll.options unless preloadable_poll.nil?
+
+    @emojis = CustomEmoji.from_text(fields.join(' '), status.account.domain)
   end
 
   def ordered_media_attachments

app/services/activitypub/process_status_update_service.rb

@@ -112,6 +112,8 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @status.ordered_media_attachment_ids = @next_media_attachments.map(&:id)
 
     @media_attachments_changed = true if @status.ordered_media_attachment_ids != previous_media_attachments_ids
+
+    @status.media_attachments.reload if @media_attachments_changed
   end
 
   def download_media_files!

app/services/post_status_service.rb

@@ -39,8 +39,6 @@ class PostStatusService < BaseService
     @in_reply_to = @options[:thread]
     @quoted_status = @options[:quoted_status]
 
-    @antispam = Antispam.new
-
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
@@ -87,6 +85,7 @@ class PostStatusService < BaseService
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
     @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
+    @visibility   = :private if @quoted_status&.private_visibility?
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
   rescue ArgumentError
@@ -98,7 +97,9 @@ class PostStatusService < BaseService
     process_mentions_service.call(@status, save_records: false)
     safeguard_mentions!(@status)
     attach_quote!(@status)
-    @antispam.local_preflight_check!(@status)
+
+    antispam = Antispam.new(@status)
+    antispam.local_preflight_check!
 
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
@@ -129,7 +130,9 @@ class PostStatusService < BaseService
 
   def schedule_status!
     status_for_validation = @account.statuses.build(status_attributes)
-    @antispam.local_preflight_check!(status_for_validation)
+
+    antispam = Antispam.new(status_for_validation)
+    antispam.local_preflight_check!
 
     if status_for_validation.valid?
       # Marking the status as destroyed is necessary to prevent the status from being

app/views/admin/reports/show.html.haml

@@ -40,10 +40,6 @@
 
 %p
   = t 'admin.reports.statuses_description_html'
-  —
-  = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
-            admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
-            class: 'table-action-link'
 
 = form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
   .batch-table
@@ -51,6 +47,9 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
+        = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
+                  admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+                  class: 'table-action-link'
         - if !@statuses.empty? && @report.unresolved?
           = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
     .batch-table__body

app/views/admin/shared/_status_attachments.html.haml

@@ -1,3 +1,18 @@
+- if status.with_poll?
+  .poll
+    %ul
+      - status.preloadable_poll.options.each_with_index do |option, _index|
+        %li
+          %label.poll__option.disabled<>
+            - if status.preloadable_poll.multiple?
+              %span.poll__input.checkbox{ role: 'checkbox', 'aria-label': option }
+            - else
+              %span.poll__input{ role: 'radio', 'aria-label': option }
+            %span.poll__option__text
+              = prerender_custom_emojis(html_aware_format(option, status.local?, multiline: false), status.emojis)
+    %button.button.button-secondary{ disabled: true }
+      = t('polls.vote')
+
 - if status.with_media?
   - if status.ordered_media_attachments.first.video?
     = render_video_component(status, visible: false)

app/views/settings/preferences/other/show.html.haml

@@ -15,58 +15,6 @@
                  recommended: true,
                  wrapper: :with_label
 
-    %h4= t 'preferences.posting_defaults'
-
-    .fields-group
-      = ff.input :default_privacy,
-                 collection: Status.selectable_visibilities,
-                 selected: current_user.setting_default_privacy,
-                 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
-      = ff.input :default_quote_policy,
-                 collection: %w(public followers nobody),
-                 include_blank: false,
-                 label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
-                 label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
-                 hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
-                 required: false,
-                 wrapper: :with_label
-
-    .fields-group
-      = 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,
-                 hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),
-                 label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
-                 wrapper: :with_label
-
-    .fields-group
-      = ff.input :default_content_type,
-                 collection: %w(text/plain text/markdown text/html),
-                 wrapper: :with_label,
-                 label: I18n.t('simple_form.labels.defaults.setting_default_content_type'),
-                 include_blank: false,
-                 label_method: ->(item) { safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) },
-                 required: false,
-                 as: :radio_buttons,
-                 collection_wrapper_tag: 'ul',
-                 item_wrapper_tag: 'li',
-                 glitch_only: true
-
   %h4= t 'preferences.public_timelines'
 
   .fields-group

app/views/settings/preferences/posting_defaults/show.html.haml

@@ -0,0 +1,61 @@
+- content_for :page_title do
+  = t('preferences.posting_defaults')
+
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+= simple_form_for current_user, url: settings_preferences_posting_defaults_path, html: { id: :edit_preferences } do |f|
+  = render 'shared/error_messages', object: current_user
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .flash-message= t('posting_defaults.explanation')
+
+    .fields-group
+      = ff.input :default_privacy,
+                 collection: Status.selectable_visibilities,
+                 selected: current_user.setting_default_privacy,
+                 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
+      = ff.input :default_quote_policy,
+                 collection: %w(public followers nobody),
+                 include_blank: false,
+                 label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
+                 label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
+                 hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
+                 required: false,
+                 wrapper: :with_label
+
+    .fields-group
+      = 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,
+                 hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),
+                 label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
+                 wrapper: :with_label
+
+    .fields-group
+      = ff.input :default_content_type,
+                 collection: %w(text/plain text/markdown text/html),
+                 wrapper: :with_label,
+                 label: I18n.t('simple_form.labels.defaults.setting_default_content_type'),
+                 include_blank: false,
+                 label_method: ->(item) { safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) },
+                 required: false,
+                 as: :radio_buttons,
+                 collection_wrapper_tag: 'ul',
+                 item_wrapper_tag: 'li',
+                 glitch_only: true

app/views/user_mailer/warning.html.haml

@@ -35,11 +35,11 @@
               %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                 %tr
                   %td.email-border-top
-                    - @statuses.each_with_index do |status, i|
+                    - @statuses.each do |status|
                       %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
+                            = render 'notification_mailer/status', status: status, time_zone: @resource.time_zone.presence
 
             %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr

config/locales/ca.yml

@@ -361,6 +361,7 @@ ca:
       title: Emojis personalitzats
       uncategorized: Sense categoria
       unlist: No llistat
+      unlisted: Públic silenciós
       update_failed_msg: No s'ha pogut actualitzar aquest emoji
       updated_msg: Emoji s'ha actualitzat correctament!
       upload: Carrega
@@ -1880,13 +1881,19 @@ ca:
       limit: Ja has fixat el màxim nombre de tuts
       ownership: No es pot fixar el tut d'algú altre
       reblog: No es pot fixar un impuls
+    quote_policies:
+      followers: Només seguidors
+      nobody: Només jo
+      public: Qualsevol
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Menció privada
       private: Només seguidors
       private_long: Mostra només als seguidors
       public: Públic
+      public_long: Tothom dins o fora Mastodon
       unlisted: No llistat
+      unlisted_long: Amagat dels resultats de cerca de Mastodon, de les tendències i de les línies temporals
   statuses_cleanup:
     enabled: Esborra automàticament tuts antics
     enabled_hint: Suprimeix automàticament els teus tuts quan arribin a un llindar d’edat especificat, tret que coincideixin amb una de les excepcions següents

config/locales/da.yml

@@ -418,7 +418,7 @@ da:
         remove_all_data: Dette vil fjerne alt indhold, medier og profildata for dette domænes konti fra din server.
         stop_communication: Din server vil stoppe kommunikationen med disse servere.
         title: Bekræft blokering af domænet %{domain}
-        undo_relationships: Dette vil fortryde ethvert følgeforhold mellem konti for disse servere og din.
+        undo_relationships: Dette vil ophæve ethvert følgeforhold mellem konti på disse servere og dine.
       created_msg: Domæneblokering under behandling
       destroyed_msg: Domæneblokering er blevet fjernet
       domain: Domæne

config/locales/de.yml

@@ -187,7 +187,7 @@ de:
         create_domain_block: Domain sperren
         create_email_domain_block: E-Mail-Domain-Sperre erstellen
         create_ip_block: IP-Regel erstellen
-        create_relay: Relay erstellen
+        create_relay: Relais erstellen
         create_unavailable_domain: Nicht verfügbare Domain erstellen
         create_user_role: Rolle erstellen
         create_username_block: Regel für Profilnamen erstellen
@@ -200,18 +200,18 @@ de:
         destroy_email_domain_block: E-Mail-Domain-Sperre entfernen
         destroy_instance: Domain-Daten entfernen
         destroy_ip_block: IP-Regel löschen
-        destroy_relay: Relay löschen
+        destroy_relay: Relais löschen
         destroy_status: Beitrag entfernen
         destroy_unavailable_domain: Nicht-verfügbare Domain entfernen
         destroy_user_role: Rolle entfernen
         destroy_username_block: Regel für Profilnamen löschen
         disable_2fa_user: 2FA deaktivieren
         disable_custom_emoji: Eigenes Emoji deaktivieren
-        disable_relay: Relay deaktivieren
+        disable_relay: Relais deaktivieren
         disable_sign_in_token_auth_user: E-Mail-Token-Authentisierung für dieses Konto deaktivieren
         disable_user: Benutzer*in deaktivieren
         enable_custom_emoji: Eigenes Emoji aktivieren
-        enable_relay: Relay aktivieren
+        enable_relay: Relais aktivieren
         enable_sign_in_token_auth_user: E-Mail-Token-Authentisierung für dieses Konto aktivieren
         enable_user: Benutzer*in aktivieren
         memorialize_account: Gedenkkonto
@@ -268,18 +268,18 @@ de:
         destroy_email_domain_block_html: "%{name} entsperrte die E-Mail-Domain %{target}"
         destroy_instance_html: "%{name} entfernte die Daten der Domain %{target} von diesem Server"
         destroy_ip_block_html: "%{name} entfernte eine IP-Regel für %{target}"
-        destroy_relay_html: "%{name} löschte das Relay %{target}"
+        destroy_relay_html: "%{name} löschte das Relais %{target}"
         destroy_status_html: "%{name} entfernte einen Beitrag von %{target}"
         destroy_unavailable_domain_html: "%{name} nahm die Zustellung an die Domain %{target} wieder auf"
         destroy_user_role_html: "%{name} löschte die Rolle %{target}"
         destroy_username_block_html: "%{name} entfernte eine Regel für Profilnamen mit %{target}"
         disable_2fa_user_html: "%{name} deaktivierte die Zwei-Faktor-Authentisierung für %{target}"
         disable_custom_emoji_html: "%{name} deaktivierte das Emoji %{target}"
-        disable_relay_html: "%{name} deaktivierte das Relay %{target}"
+        disable_relay_html: "%{name} deaktivierte das Relais %{target}"
         disable_sign_in_token_auth_user_html: "%{name} deaktivierte die E-Mail-Token-Authentisierung für %{target}"
         disable_user_html: "%{name} deaktivierte den Zugang für %{target}"
         enable_custom_emoji_html: "%{name} aktivierte das Emoji %{target}"
-        enable_relay_html: "%{name} aktivierte das Relay %{target}"
+        enable_relay_html: "%{name} aktivierte das Relais %{target}"
         enable_sign_in_token_auth_user_html: "%{name} aktivierte die E-Mail-Token-Authentisierung für %{target}"
         enable_user_html: "%{name} aktivierte den Zugang für %{target}"
         memorialize_account_html: "%{name} wandelte das Konto von %{target} in eine Gedenkseite um"
@@ -629,21 +629,21 @@ de:
     relationships:
       title: Beziehungen von %{acct}
     relays:
-      add_new: Neues Relay hinzufügen
+      add_new: Neues Relais hinzufügen
       delete: Entfernen
-      description_html: Ein <strong>Föderierungsrelay</strong> ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relay abonnieren und zu ihm veröffentlichen, austauscht.<strong> Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken</strong>, was andernfalls das manuelle Folgen anderer Leute auf externen Servern durch lokale Nutzer*innen erfordern würde.
+      description_html: Ein <strong>Föderierungsrelay</strong> ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relais abonnieren und zu ihm veröffentlichen, austauscht.<strong> Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken</strong>, was andernfalls das manuelle Folgen anderer Leute auf externen Servern durch lokale Nutzer*innen erfordern würde.
       disable: Ausschalten
       disabled: Ausgeschaltet
       enable: Einschalten
-      enable_hint: Sobald aktiviert, wird dein Server alle öffentlichen Beiträge dieses Relays abonnieren und alle öffentlichen Beiträge dieses Servers an dieses senden.
+      enable_hint: Sobald aktiviert, wird dein Server alle öffentlichen Beiträge dieses Relais abonnieren und alle öffentlichen Beiträge dieses Servers an dieses senden.
       enabled: Eingeschaltet
       inbox_url: Relay-URL
       pending: Warte auf Zustimmung des Relays
       save_and_enable: Speichern und aktivieren
-      setup: Neues Relay verbinden
+      setup: Neues Relais verbinden
-      signatures_not_enabled: Die Relays funktionieren nicht korrekt, wenn der abgesicherte Modus aktiviert oder die Föderation eingeschränkt ist
+      signatures_not_enabled: Die Relais funktionieren nicht korrekt, wenn der abgesicherte Modus aktiviert oder die Föderation eingeschränkt ist
       status: Status
-      title: Relays
+      title: Relais
     report_notes:
       created_msg: Notiz zur Meldung erfolgreich erstellt!
       destroyed_msg: Notiz zur Meldung erfolgreich entfernt!
@@ -1290,7 +1290,7 @@ de:
     user_agreement_html: Ich stimme den <a href="%{terms_of_service_path}" target="_blank">Nutzungsbedingungen</a> sowie der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
     user_privacy_agreement_html: Ich stimme der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
   author_attribution:
-    example_title: Beispieltext
+    example_title: Beispieltitel
     hint_html: Schreibst du außerhalb von Mastodon journalistische Artikel oder andere Texte, beispielsweise in einem Blog? Lege hier fest, wann auf dein Profil verwiesen werden soll, wenn Links zu deinen Werken auf Mastodon geteilt werden.
     instructions: 'Der nachfolgende Code muss im HTML-Header deines zu verlinkenden Textes stehen:'
     more_from_html: Mehr von %{name}
@@ -1739,6 +1739,9 @@ de:
       self_vote: Du kannst an deinen eigenen Umfragen nicht selbst teilnehmen
       too_few_options: muss mehr als ein Auswahlfeld enthalten
       too_many_options: darf nicht mehr als %{max} Auswahlfelder enthalten
+    vote: Abstimmen
+  posting_defaults:
+    explanation: Diese Einstellungen werden standardmäßig für neue Beiträge verwendet. Du kannst sie auch beim Verfassen eines Beitrags individuell anpassen.
   preferences:
     other: Erweitert
     posting_defaults: Standardeinstellungen für Beiträge

config/locales/en.yml

@@ -1740,6 +1740,9 @@ en:
       self_vote: You cannot vote in your own polls
       too_few_options: must have more than one item
       too_many_options: can't contain more than %{max} items
+    vote: Vote
+  posting_defaults:
+    explanation: These settings will be used as defaults when you create new posts, but you can edit them per post within the composer.
   preferences:
     other: Other
     posting_defaults: Posting defaults

config/locales/es-AR.yml

@@ -1739,6 +1739,9 @@ es-AR:
       self_vote: No podés votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se usará como predeterminada cuando crees nuevas publicaciones, pero puedes modificarla al escribir una publicación.
   preferences:
     other: Otras opciones
     posting_defaults: Configuración predeterminada de mensajes

config/locales/es-MX.yml

@@ -1739,6 +1739,9 @@ es-MX:
       self_vote: No puedes votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se utilizará como predeterminada cuando crees nuevas publicaciones, pero puedes editarla para cada publicación dentro del editor.
   preferences:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones

config/locales/es.yml

@@ -1739,6 +1739,9 @@ es:
       self_vote: No puedes votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se usará como predeterminada cuando crees nuevas publicaciones, pero puedes modificarla al escribir una publicación.
   preferences:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones

config/locales/et.yml

@@ -1739,6 +1739,9 @@ et:
       self_vote: Sa ei saa enda hääletustel hääletada
       too_few_options: peab olema rohkem kui üks vastus
       too_many_options: ei saa sisaldada rohkem kui %{max} vastust
+    vote: Hääleta
+  posting_defaults:
+    explanation: Järgnevad seadistused on uute küsitluste loomisel kasutusel vaikimisi valikutena, kuid neid saad küsitluse koostamisel ka muuta.
   preferences:
     other: Muu
     posting_defaults: Postitamise vaikesätted

config/locales/fi.yml

@@ -1739,6 +1739,9 @@ fi:
       self_vote: Et voi äänestää omissa äänestyksissäsi
       too_few_options: on oltava useampi kuin yksi
       too_many_options: ei voi sisältää enempää kuin %{max} kohdetta
+    vote: Äänestä
+  posting_defaults:
+    explanation: Näitä asetuksia käytetään oletuksina, kun luot uusia julkaisuja, mutta voit muokata niitä julkaisukohtaisesti luontikentässä.
   preferences:
     other: Muut
     posting_defaults: Julkaisun oletusasetukset

config/locales/fo.yml

@@ -1739,6 +1739,9 @@ fo:
       self_vote: Tú kanst ikki atkvøða í tínum egnum atkvøðugreiðslum
       too_few_options: má hava meiri enn ein valmøguleika
       too_many_options: kann ikki innihalda fleiri enn %{max} valmøguleikar
+    vote: Atkvøð
+  posting_defaults:
+    explanation: Hesar stillingar verða brúktar sum sjálvval tá stovnar nýggjar postar, men tú kanst rætta tær fyri hvønn post í rættiøkinum.
   preferences:
     other: Annað
     posting_defaults: Postingarstillingar
@@ -1914,6 +1917,7 @@ fo:
       public: Ein og hvør
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Privat umrøða
       private: Einans fylgjarar
       private_long: Vís einans fyri fylgjarum
       public: Alment
@@ -1964,6 +1968,11 @@ fo:
     does_not_match_previous_name: samsvarar ikki við undanfarna navnið
   terms_of_service:
     title: Tænastutreytir
+  terms_of_service_interstitial:
+    future_preamble_html: Vit gera broytingar í tænastutreytunum, sum fáa virknað frá <strong>%{date}</strong>. Vit eggja tær til at eftirkanna dagførdu treytirnar.
+    past_preamble_html: Vit hava broytt tænastutreytirnar síðani tú seinast vitjaði. Vit eggja tær til at eftirkanna dagførdu treytirnar.
+    review_link: Eftirkanna tænastutreytir
+    title: Tænastutreytirnar á %{domain} verða broyttar
   themes:
     contrast: Mastodon (høgur kontrastur)
     default: Mastodon (myrkt)

config/locales/he.yml

@@ -1817,9 +1817,11 @@ he:
       self_vote: אין אפשרות להצביע במשאל שפרסמת בעצמך
       too_few_options: חייב להכיל יותר מפריט אחד
       too_many_options: לא יכול להכיל יותר מ-%{max} פריטים
+  posting_defaults:
+    explanation: העדפות אלו ישמשו כברירות המחדל כשתצרו הודעה חדשה, ברם תוכלו לבחור אחרת בכל חיבור הודעה בעתיד.
   preferences:
     other: שונות
-    posting_defaults: ברירות מחדל להודעות
+    posting_defaults: ברירות מחדל בפרסום
     public_timelines: פידים פומביים
   privacy:
     hint_html: "<strong>ניתן להתאים את הצורה שבה תירצו שיראו את פרופיל המשתמש וההודעות שלכם.</strong> מגוון אפשרויות במסטודון יכולות לעזור לכם להיחשף לקהל רחב יותר כאשר תפעילו אותן. הקדישו רגע לבדוק את ההגדרות הללו כדי לוודא שהן מתאימות לכם."

config/locales/hu.yml

@@ -1739,6 +1739,9 @@ hu:
       self_vote: Nem szavazhatsz a saját szavazásodon
       too_few_options: több, mint egy opciónak kell lennie
       too_many_options: nem lehet több, mint %{max} opció
+    vote: Szavazás
+  posting_defaults:
+    explanation: Ezek a beállítások lesznek alapértelmezésként használva, amikor új bejegyzéseket hoz létre, de a szerkesztő segítségével bejegyzésenként szerkeszthetők.
   preferences:
     other: Egyéb
     posting_defaults: Bejegyzések alapértelmezései

config/locales/is.yml

@@ -1743,6 +1743,9 @@ is:
       self_vote: Þú getur ekki greitt atkvæði í þínum eigin könnunum
       too_few_options: verður að vera með fleiri en eitt atriði
       too_many_options: getur ekki innihaldið meira en %{max} atriði
+    vote: Greiða atkvæði
+  posting_defaults:
+    explanation: Þessar stillingar verða notaðar sjálfgefið þegar útbúnar eru nýjar færslur, en hægt er að breyta þeim í ritlinum fyrir hverja og eina færslu.
   preferences:
     other: Annað
     posting_defaults: Sjálfgefin gildi við gerð færslna

config/locales/it.yml

@@ -1741,6 +1741,9 @@ it:
       self_vote: Non puoi votare nei tuoi sondaggi
       too_few_options: deve avere più di un elemento
       too_many_options: non può contenere più di %{max} elementi
+    vote: Vota
+  posting_defaults:
+    explanation: Queste impostazioni verranno utilizzate come predefinite quando crei nuovi post, ma puoi modificarle per ogni post all'interno della casella di testo.
   preferences:
     other: Altro
     posting_defaults: Predefinite di pubblicazione

config/locales/ko.yml

@@ -364,6 +364,7 @@ ko:
       title: 커스텀 에모지
       uncategorized: 분류되지 않음
       unlist: 목록에서 제거
+      unlisted: 조용한 공개
       update_failed_msg: 에모지를 업데이트 할 수 없습니다
       updated_msg: 성공적으로 에모지를 업데이트했습니다!
       upload: 업로드
@@ -1866,13 +1867,19 @@ ko:
       limit: 이미 너무 많은 게시물을 고정했습니다
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
+    quote_policies:
+      followers: 팔로워만
+      nobody: 나만
+      public: 누구나
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: 개인 멘션
       private: 비공개
       private_long: 팔로워에게만 공개됩니다
       public: 공개
+      public_long: 마스토돈 내외 모두
       unlisted: 미등재
+      unlisted_long: 마스토돈 검색결과, 유행, 공개 타임라인에서 숨기기
   statuses_cleanup:
     enabled: 오래된 게시물 자동 삭제
     enabled_hint: 아래의 예외 목록에 해당하지 않는다면, 명시된 기한 이후 당신의 게시물을 자동으로 삭제합니다

config/locales/nan.yml

@@ -364,6 +364,7 @@ nan:
       title: 自訂emoji
       uncategorized: Iáu無分類
       unlist: Tuì列單the̍h掉
+      unlisted: 恬靜公開
       update_failed_msg: Bē當更新hit ê emoji
       updated_msg: Emoji成功更新ah！
       upload: 傳上去
@@ -799,6 +800,29 @@ nan:
       about:
         manage_rules: 管理服侍器ê規則
         preamble: 提供關係服侍器án-nuá運作kap管理，以及資金源頭ê詳細資訊。
+        rules_hint: Tse是關係lí ê用者應該遵守ê規則ê專區。
+        title: 關係本站
+      allow_referrer_origin:
+        desc: Nā是lí ê用者點連結kàu外部網站，in ê瀏覽器可能ē kā lí ê Mastodon服侍器ê地址當做流量ê來源送出。如果tse ē唯一區別lí ê用者，比如tse是個人ê Mastodon服侍器，請kā停止使用。
+        title: 允准外部網站kā lí ê Mastodon服侍器當做流量ê來源
+      appearance:
+        preamble: 自訂Mastodon網頁ê界面。
+        title: 外觀
+      branding:
+        preamble: Lí ê服侍器品牌hōo伊kap別ê服侍器區別。Tsit ê資訊可能展示佇無kâng ê環境，比如Mastodon ê網頁界面、原底ê app、佇別站ê sing看連結ê所在kap佇通信app內底等。因為tsit ê緣故，上好kā資訊保持kah清楚、短koh簡要。
+        title: 品牌
+      captcha_enabled:
+        desc_html: Tsit ê功能需要tuì hCaptcha來ê外部kha本，可能有安全kap隱私ê顧慮。另外，<strong>tse ē明顯降kē tsi̍t寡lâng（特別是障礙者）註冊ê容易程度</strong>。因為tsiah ê緣故，請考慮別ê替代方案，比如審核制á是邀請制ê註冊。
+        title: 要求新ê用者解決CAPTCHA問題，來確認in ê口座
+      content_retention:
+        danger_zone: 危險ê所在
+        preamble: 控制使用者產生ê內容tiông佇Mastodon ê方法。
+        title: 內容保存期間
+      default_noindex:
+        desc_html: 影響逐ê iáu buē改變tsit ê設定ê用者
+        title: 預設kā用者tuì tshiau-tshuē ia̋n-jín ê索引排除
+      discovery:
+        follow_recommendations: 跟tuè建議
     statuses:
       language: 語言
     trends:

config/locales/pt-BR.yml

@@ -190,6 +190,7 @@ pt-BR:
         create_relay: Criar Retransmissão
         create_unavailable_domain: Criar domínio indisponível
         create_user_role: Criar cargo
+        create_username_block: Criar regra de usuário
         demote_user: Rebaixar usuário
         destroy_announcement: Excluir anúncio
         destroy_canonical_email_block: Deletar bloqueio de Email
@@ -203,6 +204,7 @@ pt-BR:
         destroy_status: Excluir publicação
         destroy_unavailable_domain: Excluir domínio indisponível
         destroy_user_role: Destruir cargo
+        destroy_username_block: Excluir regra de usuário
         disable_2fa_user: Desativar autenticação de dois fatores
         disable_custom_emoji: Desativar emoji personalizado
         disable_relay: Desativar Retransmissão
@@ -237,6 +239,7 @@ pt-BR:
         update_report: Atualizar Relatório
         update_status: Editar Status
         update_user_role: Atualizar cargo
+        update_username_block: Atualizar regra de usuário
       actions:
         approve_appeal_html: "%{name} aprovou a revisão da decisão da moderação em %{target}"
         approve_user_html: "%{name} aprovado inscrição de %{target}"
@@ -255,6 +258,7 @@ pt-BR:
         create_relay_html: "%{name} criou uma retransmissão %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
         create_user_role_html: "%{name} criou o cargo %{target}"
+        create_username_block_html: Regra %{name} adicionada para nomes de usuário contendo %{target}
         demote_user_html: "%{name} rebaixou o usuário %{target}"
         destroy_announcement_html: "%{name} excluiu o anúncio %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueou o endereço e-mail com o hash %{target}"
@@ -268,6 +272,7 @@ pt-BR:
         destroy_status_html: "%{name} removeu a publicação de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
         destroy_user_role_html: "%{name} excluiu o cargo %{target}"
+        destroy_username_block_html: Regra %{name} removida por usuário contendo %{target}
         disable_2fa_user_html: "%{name} desativou a exigência da autenticação de dois fatores para o usuário %{target}"
         disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
         disable_relay_html: "%{name} desativou uma retransmissão %{target}"
@@ -302,6 +307,7 @@ pt-BR:
         update_report_html: "%{name} atualizou o relatório %{target}"
         update_status_html: "%{name} atualizou a publicação de %{target}"
         update_user_role_html: "%{name} alterou o cargo %{target}"
+        update_username_block_html: Regra %{name} atualizada para nomes de usuários contendo %{target}
       deleted_account: conta excluída
       empty: Nenhum registro encontrado.
       filter_by_action: Filtrar por ação
@@ -361,6 +367,7 @@ pt-BR:
       title: Emojis personalizados
       uncategorized: Não categorizado
       unlist: Não listar
+      unlisted: Público silencioso
       update_failed_msg: Não foi possível atualizar esse emoji
       updated_msg: Emoji atualizado!
       upload: Enviar
@@ -578,6 +585,11 @@ pt-BR:
         limited: Limitados
         title: Moderação
       moderation_notes:
+        create: Adicionar Nota de Moderação
+        created_msg: Nota de moderação da instância criada com sucesso!
+        description_html: Visualize e deixe anotações para outros moderadores e seu próprio futuro
+        destroyed_msg: Nota de moderação da instância excluída com sucesso!
+        placeholder: Informações sobre esta instância, ações tomadas, ou qualquer outra coisa que ajudará você a moderar esta instância no futuro.
         title: Notas de Moderação
       private_comment: Comentário privado
       public_comment: Comentário público
@@ -1079,6 +1091,25 @@ pt-BR:
           other: Usado por %{count} pessoas na última semana
       title: Recomendações e tendências
       trending: Em alta
+    username_blocks:
+      add_new: Adicionar novo
+      block_registrations: Bloquear inscrições
+      comparison:
+        contains: Conteúdo
+        equals: Igual
+      contains_html: Contém %{string}
+      created_msg: Regra de nome de usuário criada com sucesso
+      delete: Excluir
+      edit:
+        title: Editar nome de usuário
+      matches_exactly_html: "%{string} É igual"
+      new:
+        create: Criar regra
+        title: Criar regra de usuário
+      no_username_block_selected: Nenhuma regra de usuário foi trocada nenhuma foi selecionada
+      not_permitted: Não permitido
+      title: Regras de usuário
+      updated_msg: Regra de usuário atualizada com sucesso
     warning_presets:
       add_new: Adicionar novo
       delete: Excluir
@@ -1343,6 +1374,10 @@ pt-BR:
     basic_information: Informações básicas
     hint_html: "<strong>Personalize o que as pessoas veem no seu perfil público e ao lado de suas publicações.</strong> É mais provável que outras pessoas o sigam de volta e interajam com você quando você tiver um perfil preenchido e uma foto de perfil."
     other: Outro
+  emoji_styles:
+    auto: Automático
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': A solicitação enviada é inválida ou incorreta.
     '403': Você não tem permissão para ver esta página.
@@ -1652,6 +1687,10 @@ pt-BR:
       title: Nova menção
     poll:
       subject: Uma enquete por %{name} terminou
+    quote:
+      body: 'Sua publicação foi Citada por %{name}:'
+      subject: "%{name} citou sua publicação"
+      title: Nova citação
     reblog:
       body: "%{name} impulsionou a sua publicação:"
       subject: "%{name} impulsionou a sua publicação"
@@ -1700,6 +1739,9 @@ pt-BR:
       self_vote: Você não pode votar nas suas próprias enquetes
       too_few_options: deve ter mais que um item
       too_many_options: não pode ter mais que %{max} itens
+    vote: Votar
+  posting_defaults:
+    explanation: Estas configurações serão usadas como padrão quando você criar publicações, mas você pode editá-las por postagem no compositor.
   preferences:
     other: Outro
     posting_defaults: Padrões de publicação
@@ -1862,18 +1904,26 @@ pt-BR:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação que você quer responder parece não existir.
+      quoted_status_not_found: A publicação que você quer responder parece não existir.
     over_character_limit: limite de caracteres de %{max} excedido
     pin_errors:
       direct: Publicações visíveis apenas para usuários mencionados não podem ser fixadas
       limit: Você alcançou o número limite de publicações fixadas
       ownership: As publicações dos outros não podem ser fixadas
       reblog: Um impulso não pode ser fixado
+    quote_policies:
+      followers: Apenas seguidores
+      nobody: Apenas eu
+      public: Qualquer um
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Citação privada
       private: Apenas seguidores
       private_long: Exibir apenas para seguidores
       public: Público
+      public_long: Qualquer um dentro ou fora do Mástodon
       unlisted: Não listado
+      unlisted_long: Oculto aos resultados de pesquisa em Mástodon
   statuses_cleanup:
     enabled: Excluir publicações antigas automaticamente
     enabled_hint: Exclui suas publicações automaticamente assim que elas alcançam sua validade, a não ser que se enquadrem em alguma das exceções abaixo

config/locales/simple_form.ca.yml

@@ -231,6 +231,7 @@ ca:
         setting_auto_play_gif: Reprodueix automàticament els GIF animats
         setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar
         setting_default_language: Llengua dels tuts
+        setting_default_privacy: Visibilitat de la publicació
         setting_default_quote_policy: Qui pot citar
         setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostra la finestra de confirmació abans d'esborrar un tut

config/locales/simple_form.de.yml

@@ -48,7 +48,7 @@ de:
         digest: Wenn du eine längere Zeit inaktiv bist oder du während deiner Abwesenheit in einer privaten Nachricht erwähnt worden bist
         email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
         header: WEBP, PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
-        inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
+        inbox_url: Kopiere die URL von der Startseite des gewünschten Relais
         irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
         locale: Die Sprache der Bedienoberfläche, E-Mails und Push-Benachrichtigungen
         password: Verwende mindestens 8 Zeichen
@@ -221,7 +221,7 @@ de:
         fields: Zusatzfelder
         header: Titelbild
         honeypot: "%{label} (nicht ausfüllen)"
-        inbox_url: URL des Relay-Posteingangs
+        inbox_url: URL des Relais-Posteingangs
         irreversible: Endgültig, nicht nur temporär ausblenden
         locale: Sprache des Webinterface
         max_uses: Maximale Anzahl von Verwendungen
@@ -237,7 +237,7 @@ de:
         setting_boost_modal: Bestätigungsdialog beim Teilen eines Beitrags anzeigen
         setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
-        setting_default_quote_policy: Wer darf zitieren
+        setting_default_quote_policy: Wer zitieren darf
         setting_default_sensitive: Medien immer mit einer Inhaltswarnung versehen
         setting_delete_modal: Bestätigungsdialog beim Löschen eines Beitrags anzeigen
         setting_disable_hover_cards: Profilvorschau deaktivieren, wenn die Maus über das Profil bewegt wird

config/locales/simple_form.ko.yml

@@ -234,6 +234,7 @@ ko:
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
         setting_boost_modal: 부스트 전 확인창을 띄웁니다
         setting_default_language: 게시물 언어
+        setting_default_privacy: 게시물 공개 범위
         setting_default_quote_policy: 인용할 수 있는 사람
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
         setting_delete_modal: 게시물 삭제 전 확인창을 띄웁니다

config/locales/simple_form.pt-BR.yml

@@ -56,10 +56,12 @@ pt-BR:
         scopes: Quais APIs o aplicativo vai ter permissão de acessar. Se você selecionar uma autorização de alto nível, você não precisa selecionar individualmente os outros.
         setting_aggregate_reblogs: Não mostrar novos impulsos para publicações que já foram impulsionadas recentemente (afeta somente os impulsos mais recentes)
         setting_always_send_emails: Normalmente, as notificações por e-mail não serão enviadas enquanto você estiver usando ativamente o Mastodon
+        setting_default_quote_policy: Esta configuração só terá efeito para posts criados com a próxima versão do Mastodon, mas você pode selecionar sua preferência na preparação.
         setting_default_sensitive: Mídia sensível está oculta por padrão e pode ser revelada com um clique
         setting_display_media_default: Sempre ocultar mídia sensível
         setting_display_media_hide_all: Sempre ocultar todas as mídias
         setting_display_media_show_all: Sempre mostrar mídia sensível
+        setting_emoji_style: Como exibir emojis. "Automáticos" tentará usar emojis nativos, mas voltará para o Twemoji para navegadores legados.
         setting_system_scrollbars_ui: Se aplica apenas para navegadores de computador baseado no Safari e Chrome
         setting_use_blurhash: O blur é baseado nas cores da imagem oculta, ofusca a maioria dos detalhes
         setting_use_pending_items: Ocultar atualizações da linha do tempo atrás de um clique ao invés de rolar automaticamente
@@ -148,6 +150,9 @@ pt-BR:
         min_age: Não deve ter menos que a idade mínima exigida pelas suas leis locais.
       user:
         chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
+        date_of_birth:
+          one: Precisamos ter certeza de que você tem, no mínimo, %{count} anos para usar o %{domain} Não armazenaremos essa informação.
+          other: Temos que ter certeza de que você é pelo menos %{count} para usar o %{domain} Não vamos armazenar isso.
         role: A função controla quais permissões o usuário tem.
       user_role:
         color: Cor a ser usada para o cargo em toda a interface do usuário, como RGB no formato hexadecimal
@@ -155,6 +160,10 @@ pt-BR:
         name: Nome público do cargo, se ele for definido para ser exibido como um distintivo
         permissions_as_keys: Usuários com esse cargo terão acesso a...
         position: Um cargo superior decide a resolução de conflitos em certas situações. Certas ações só podem ser executadas com cargos de menor prioridade
+      username_block:
+        allow_with_approval: Em vez de impedir a inscrição completa, a correspondência de cadastros exigirá sua aprovação
+        comparison: Por favor, esteja atento ao problema de Scunthorpe ao bloquear correspondências parciais
+        username: Serão correspondidos independentemente de casar e homólogos comuns como "4" para "a" ou "3" para "e"
       webhook:
         events: Selecione eventos para enviar
         template: Elabore seu próprio conteúdo JSON usando interpolação de variáveis. Deixe em branco para utilizar o JSON padrão.
@@ -227,6 +236,7 @@ pt-BR:
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Solicitar confirmação antes de dar boost
         setting_default_language: Idioma dos toots
+        setting_default_privacy: Visibilidade da publicação
         setting_default_quote_policy: Quem pode citar
         setting_default_sensitive: Sempre marcar mídia como sensível
         setting_delete_modal: Solicitar confirmação antes de excluir toot
@@ -236,6 +246,7 @@ pt-BR:
         setting_display_media_default: Padrão
         setting_display_media_hide_all: Ocultar tudo
         setting_display_media_show_all: Mostrar tudo
+        setting_emoji_style: Estilo de emoji
         setting_expand_spoilers: Sempre expandir toots com Aviso de Conteúdo
         setting_hide_network: Ocultar suas relações
         setting_missing_alt_text_modal: Mostrar caixa de diálogo de confirmação antes de postar mídia sem texto alternativo.
@@ -318,6 +329,7 @@ pt-BR:
         follow_request: Enviar e-mail quando alguém quiser te seguir
         mention: Enviar e-mail quando alguém te mencionar
         pending_account: Enviar e-mail quando uma nova conta precisa ser revisada
+        quote: Alguém citou você
         reblog: Enviar e-mail quando alguém der boost nos teus toots
         report: Nova denúncia foi enviada
         software_updates:
@@ -364,6 +376,10 @@ pt-BR:
         name: Nome
         permissions_as_keys: Permissões
         position: Prioridade
+      username_block:
+        allow_with_approval: Permitir inscrições com aprovação
+        comparison: Método de comparação
+        username: Palavra para corresponder
       webhook:
         events: Eventos habilitados
         template: Conteúdo JSON

config/locales/sv.yml

@@ -1738,6 +1738,7 @@ sv:
       self_vote: Du kan inte rösta i dina egna omröstningar
       too_few_options: måste ha mer än ett objekt
       too_many_options: kan inte innehålla mer än %{max} objekt
+    vote: Rösta
   preferences:
     other: Annat
     posting_defaults: Standardinställningar för inlägg

config/locales/uk.yml

@@ -1691,6 +1691,9 @@ uk:
       self_vote: Ви не можете голосувати у власному опитуванні
       too_few_options: має містити більше ніж один варіант
       too_many_options: не може мати більше ніж %{max} варіантів
+    vote: Голосувати
+  posting_defaults:
+    explanation: Ці налаштування будуть використовуватися як стандартні при створенні нових записів, але ви можете редагувати їх на кожен пост у цьому редакторі.
   preferences:
     other: Інше
     posting_defaults: Усталені налаштування дописів

config/locales/vi.yml

@@ -1700,6 +1700,9 @@ vi:
       self_vote: Bạn không thể tự vốt cho tút của mình
       too_few_options: phải có nhiều hơn một mục
       too_many_options: tối đa %{max} lựa chọn
+    vote: Vốt
+  posting_defaults:
+    explanation: Các thiết lập này sẽ được sử dụng làm mặc định khi bạn tạo tút mới, nhưng bạn có thể chỉnh sửa cho từng tút khi soạn thảo.
   preferences:
     other: Khác
     posting_defaults: Mặc định cho tút

config/locales/zh-CN.yml

@@ -1700,6 +1700,9 @@ zh-CN:
       self_vote: 你不能参与自己发起的投票
       too_few_options: 至少需要两个选项
       too_many_options: 不能超过 %{max} 项
+    vote: 投票
+  posting_defaults:
+    explanation: 这些设置会在您撰写新嘟文时作为默认值应用，但每篇嘟文的设置也可以在编辑器处单独修改。
   preferences:
     other: 其他
     posting_defaults: 发布默认值

config/locales/zh-TW.yml

@@ -1702,6 +1702,9 @@ zh-TW:
       self_vote: 您無法於您的嘟文投票
       too_few_options: 必須包含至少一個項目
       too_many_options: 不能包含多於 %{max} 個項目
+    vote: 投票
+  posting_defaults:
+    explanation: 這些設定將作為您建立新嘟文時之預設值，但您能於編輯器中編輯個別嘟文之設定。
   preferences:
     other: 其他
     posting_defaults: 嘟文預設值

config/navigation.rb

@@ -16,6 +16,7 @@ SimpleNavigation::Configuration.run do |navigation|
 
     n.item :preferences, safe_join([material_symbol('settings'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
       s.item :appearance, safe_join([material_symbol('computer'), t('settings.appearance')]), settings_preferences_appearance_path
+      s.item :posting_defaults, safe_join([material_symbol('edit_square'), t('preferences.posting_defaults')]), settings_preferences_posting_defaults_path
       s.item :notifications, safe_join([material_symbol('mail'), t('settings.notifications')]), settings_preferences_notifications_path
       s.item :other, safe_join([material_symbol('tune'), t('preferences.other')]), settings_preferences_other_path
     end

config/routes/settings.rb

@@ -9,6 +9,7 @@ namespace :settings do
 
   namespace :preferences do
     resource :appearance, only: [:show, :update], controller: :appearance
+    resource :posting_defaults, only: [:show, :update], controller: :posting_defaults
     resource :notifications, only: [:show, :update]
     resource :other, only: [:show, :update], controller: :other
   end

lib/mastodon/cli/ip_blocks.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rubygems/package'
 require_relative 'base'
 
 module Mastodon::CLI

spec/lib/antispam_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Antispam do
   describe '#local_preflight_check!' do
-    subject { described_class.new.local_preflight_check!(status) }
+    subject { described_class.new(status).local_preflight_check! }
 
     let(:status) { Fabricate :status }
 
@@ -39,6 +39,30 @@ RSpec.describe Antispam do
         end
       end
 
+      context 'when status matches unicode variants' do
+        let(:status) { Fabricate :status, text: 'I use https://𝐛𝐚𝐧𝐧𝐞𝐝.𝐞𝐱𝐚𝐦𝐩𝐥𝐞 urls in my text' }
+
+        it 'raises error and reports' do
+          expect { subject }
+            .to raise_error(described_class::SilentlyDrop)
+            .and change(spam_reports, :count).by(1)
+        end
+
+        context 'when report already exists' do
+          before { Fabricate :report, account: Account.representative, target_account: status.account }
+
+          it 'raises error and does not report' do
+            expect { subject }
+              .to raise_error(described_class::SilentlyDrop)
+              .and not_change(spam_reports, :count)
+          end
+        end
+
+        def spam_reports
+          Account.representative.reports.where(target_account: status.account).spam
+        end
+      end
+
       context 'when status does not match' do
         it { is_expected.to be_nil }
       end

spec/policies/status_policy_spec.rb

@@ -100,10 +100,10 @@ RSpec.describe StatusPolicy, type: :model do
 
   context 'with the permission of quote?' do
     permissions :quote? do
-      it 'grants access when direct and account is viewer' do
+      it 'does not grant access when direct and account is viewer' do
         status.visibility = :direct
 
-        expect(subject).to permit(status.account, status)
+        expect(subject).to_not permit(status.account, status)
       end
 
       it 'does not grant access access when direct and viewer is mentioned but not explicitly allowed' do

spec/services/activitypub/process_status_update_service_spec.rb

@@ -343,6 +343,42 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
       end
     end
 
+    context 'when originally without media attachments and text is removed' do
+      before do
+        stub_request(:get, 'https://example.com/foo.png').to_return(body: attachment_fixture('emojo.png'))
+      end
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: '',
+          updated: '2021-09-08T22:39:25Z',
+          attachment: [
+            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png' },
+          ],
+        }
+      end
+
+      it 'updates media attachments, fetches attachment, records media and text removal in edit' do
+        subject.call(status, json, json)
+
+        expect(status.reload.ordered_media_attachments.first)
+          .to be_present
+          .and(have_attributes(remote_url: 'https://example.com/foo.png'))
+
+        expect(a_request(:get, 'https://example.com/foo.png'))
+          .to have_been_made
+
+        expect(status.edits.reload.last.ordered_media_attachment_ids)
+          .to_not be_empty
+
+        expect(status.edits.reload.last.text)
+          .to_not be_present
+      end
+    end
+
     context 'when originally with media attachments' do
       let(:media_attachments) { [Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png'), Fabricate(:media_attachment, remote_url: 'https://example.com/unused.png')] }