Merge pull request #3167 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6ad0ddebe4be9fb76b9119924674b4679e8da74a

app/javascript/flavours/glitch/api_types/notifications.ts

@@ -31,7 +31,8 @@ export type NotificationWithStatusType =
   | 'mention'
   | 'quote'
   | 'poll'
-  | 'update';
+  | 'update'
+  | 'quoted_update';
 
 export type NotificationType =
   | NotificationWithStatusType

app/javascript/flavours/glitch/components/status_prepend.jsx

@@ -7,6 +7,7 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import FormatQuoteIcon from '@/material-icons/400-24px/format_quote.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 PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
@@ -101,6 +102,14 @@ export default class StatusPrepend extends PureComponent {
           values={{ name: link }}
         />
       );
+    case 'quoted_update':
+      return (
+        <FormattedMessage
+          id='notification.quoted_update'
+          defaultMessage='{name} edited a post you have quoted'
+          values={{ name: link }}
+        />
+      );
     case 'quote':
       return (
         <FormattedMessage
@@ -142,9 +151,13 @@ export default class StatusPrepend extends PureComponent {
       iconComponent = HomeIcon;
       break;
     case 'update':
+    case 'quoted_update':
       iconId = 'pencil';
       iconComponent = EditIcon;
       break;
+    case 'quote':
+      iconId = 'quote';
+      iconComponent = FormatQuoteIcon;
     }
 
     return !type ? null : (

app/javascript/flavours/glitch/components/status_quoted.tsx

@@ -84,12 +84,13 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
   const status = useAppSelector((state) =>
     quotedStatusId ? state.statuses.get(quotedStatusId) : undefined,
   );
+  const isQuoteLoaded = !!status && !status.get('isLoading');
 
   useEffect(() => {
-    if (!status && quotedStatusId) {
+    if (!isQuoteLoaded && quotedStatusId) {
       dispatch(fetchStatus(quotedStatusId));
     }
-  }, [status, quotedStatusId, dispatch]);
+  }, [isQuoteLoaded, quotedStatusId, dispatch]);
 
   // In order to find out whether the quoted post should be completely hidden
   // due to a matching filter, we run it through the selector used by `status_container`.

app/javascript/flavours/glitch/features/notifications/components/notification.jsx

@@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
-import FormatQuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import { Account } from 'flavours/glitch/components/account';
@@ -286,6 +285,31 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderQuotedUpdate (notification) {
+    return (
+      <StatusQuoteManager
+        containerId={notification.get('id')}
+        hidden={!!this.props.hidden}
+        id={notification.get('status')}
+        account={notification.get('account')}
+        prepend='quoted_update'
+        muted
+        notification={notification}
+        onMoveDown={this.handleMoveDown}
+        onMoveUp={this.handleMoveUp}
+        onMention={this.props.onMention}
+        contextType='notifications'
+        getScrollPosition={this.props.getScrollPosition}
+        updateScrollBottom={this.props.updateScrollBottom}
+        cachedMediaWidth={this.props.cachedMediaWidth}
+        cacheMediaWidth={this.props.cacheMediaWidth}
+        onUnmount={this.props.onUnmount}
+        withDismiss
+        unread={this.props.unread}
+      />
+    );
+  }
+
   renderPoll (notification) {
     return (
       <StatusQuoteManager
@@ -448,6 +472,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderStatus(notification);
     case 'update':
       return this.renderUpdate(notification);
+    case 'quoted_update':
+      return this.renderQuotedUpdate(notification);
     case 'poll':
       return this.renderPoll(notification);
     case 'severed_relationships':

app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx

@@ -16,6 +16,7 @@ import { NotificationMention } from './notification_mention';
 import { NotificationModerationWarning } from './notification_moderation_warning';
 import { NotificationPoll } from './notification_poll';
 import { NotificationQuote } from './notification_quote';
+import { NotificationQuotedUpdate } from './notification_quoted_update';
 import { NotificationReblog } from './notification_reblog';
 import { NotificationSeveredRelationships } from './notification_severed_relationships';
 import { NotificationStatus } from './notification_status';
@@ -115,6 +116,14 @@ export const NotificationGroup: React.FC<{
         <NotificationUpdate unread={unread} notification={notificationGroup} />
       );
       break;
+    case 'quoted_update':
+      content = (
+        <NotificationQuotedUpdate
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     case 'admin.sign_up':
       content = (
         <NotificationAdminSignUp

app/javascript/flavours/glitch/features/notifications_v2/components/notification_quoted_update.tsx

@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupQuotedUpdate } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (displayedName) => (
+  <FormattedMessage
+    id='notification.quoted_update'
+    defaultMessage='{name} edited a post you have quoted'
+    values={{ name: displayedName }}
+  />
+);
+
+export const NotificationQuotedUpdate: React.FC<{
+  notification: NotificationGroupQuotedUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);

app/javascript/flavours/glitch/models/notification_group.ts

@@ -39,6 +39,8 @@ export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
 export type NotificationGroupQuote = BaseNotificationWithStatus<'quote'>;
 export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
 export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupQuotedUpdate =
+  BaseNotificationWithStatus<'quoted_update'>;
 export type NotificationGroupFollow = BaseNotification<'follow'>;
 export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
 export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
@@ -91,6 +93,7 @@ export type NotificationGroup =
   | NotificationGroupQuote
   | NotificationGroupPoll
   | NotificationGroupUpdate
+  | NotificationGroupQuotedUpdate
   | NotificationGroupFollow
   | NotificationGroupFollowRequest
   | NotificationGroupModerationWarning
@@ -141,7 +144,8 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'quote':
     case 'poll':
-    case 'update': {
+    case 'update':
+    case 'quoted_update': {
       const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
         statusId: statusId ?? undefined,
@@ -215,6 +219,7 @@ export function createNotificationGroupFromNotificationJSON(
     case 'quote':
     case 'poll':
     case 'update':
+    case 'quoted_update':
       return {
         ...group,
         type: notification.type,

app/javascript/mastodon/api_types/notifications.ts

@@ -31,7 +31,8 @@ export type NotificationWithStatusType =
   | 'mention'
   | 'quote'
   | 'poll'
-  | 'update';
+  | 'update'
+  | 'quoted_update';
 
 export type NotificationType =
   | NotificationWithStatusType

app/javascript/mastodon/components/status_quoted.tsx

@@ -84,12 +84,13 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
   const status = useAppSelector((state) =>
     quotedStatusId ? state.statuses.get(quotedStatusId) : undefined,
   );
+  const isQuoteLoaded = !!status && !status.get('isLoading');
 
   useEffect(() => {
-    if (!status && quotedStatusId) {
+    if (!isQuoteLoaded && quotedStatusId) {
       dispatch(fetchStatus(quotedStatusId));
     }
-  }, [status, quotedStatusId, dispatch]);
+  }, [isQuoteLoaded, quotedStatusId, dispatch]);
 
   // In order to find out whether the quoted post should be completely hidden
   // due to a matching filter, we run it through the selector used by `status_container`.

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

@@ -38,6 +38,7 @@ const messages = defineMessages({
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
+  quoted_update: { id: 'notification.quoted_update', defaultMessage: '{name} edited a post you have quoted' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
@@ -336,6 +337,41 @@ class Notification extends ImmutablePureComponent {
     );
   }
 
+  renderQuotedUpdate (notification, link) {
+    const { intl, unread, status } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    return (
+      <Hotkeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-update focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.update, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='pencil' icon={EditIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.quoted_update' defaultMessage='{name} edited a post you have quoted' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusQuoteManager
+            id={notification.get('status')}
+            account={notification.get('account')}
+            contextType='notifications'
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+          />
+        </div>
+      </Hotkeys>
+    );
+  }
+
   renderPoll (notification, account) {
     const { intl, unread, status } = this.props;
     const ownPoll  = me === account.get('id');
@@ -492,6 +528,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderStatus(notification, link);
     case 'update':
       return this.renderUpdate(notification, link);
+    case 'quoted_update':
+      return this.renderQuotedUpdate(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
     case 'severed_relationships':

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

@@ -16,6 +16,7 @@ import { NotificationMention } from './notification_mention';
 import { NotificationModerationWarning } from './notification_moderation_warning';
 import { NotificationPoll } from './notification_poll';
 import { NotificationQuote } from './notification_quote';
+import { NotificationQuotedUpdate } from './notification_quoted_update';
 import { NotificationReblog } from './notification_reblog';
 import { NotificationSeveredRelationships } from './notification_severed_relationships';
 import { NotificationStatus } from './notification_status';
@@ -115,6 +116,14 @@ export const NotificationGroup: React.FC<{
         <NotificationUpdate unread={unread} notification={notificationGroup} />
       );
       break;
+    case 'quoted_update':
+      content = (
+        <NotificationQuotedUpdate
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     case 'admin.sign_up':
       content = (
         <NotificationAdminSignUp

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

@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupQuotedUpdate } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (displayedName) => (
+  <FormattedMessage
+    id='notification.quoted_update'
+    defaultMessage='{name} edited a post you have quoted'
+    values={{ name: displayedName }}
+  />
+);
+
+export const NotificationQuotedUpdate: React.FC<{
+  notification: NotificationGroupQuotedUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);

app/javascript/mastodon/locales/az.json

@@ -946,14 +946,11 @@
   "video.volume_up": "Həcmi artır",
   "visibility_modal.button_title": "Görünməni ayarla",
   "visibility_modal.header": "Görünmə və qarşılıqlı əlaqə",
-  "visibility_modal.helper.direct_quoting": "Şəxsi adçəkmələr, sitat gətirilə bilməz.",
   "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.private_quoting": "Yalnız izləyicilərə xas göndərişlər, sitat gətirilə 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_nobody": "Heç kim",
   "visibility_modal.quote_public": "Hər kəs"
 }

app/javascript/mastodon/locales/be.json

@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку",
   "keyboard_shortcuts.hotkey": "Спалучэнне клавіш",
   "keyboard_shortcuts.legend": "Паказаць легенду",
+  "keyboard_shortcuts.load_more": "Навесці на кнопку \"Загрузіць болей\"",
   "keyboard_shortcuts.local": "Адкрыць хатнюю храналагічную стужку",
   "keyboard_shortcuts.mention": "Згадаць аўтара",
   "keyboard_shortcuts.muted": "Адкрыць спіс ігнараваных карыстальнікаў",
@@ -738,11 +739,18 @@
   "privacy.private.short": "Падпісчыкі",
   "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
   "privacy.public.short": "Публічны",
+  "privacy.quote.anyone": "{visibility}, усе могуць цытаваць",
+  "privacy.quote.disabled": "{visibility}, цытаты адключаныя",
+  "privacy.quote.limited": "{visibility}, абмежаваныя цытаты",
   "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што допіс не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі Вы ўключылі бачнасць у пошуку ў наладах.",
   "privacy.unlisted.long": "Менш фанфар ад алгарытмаў",
   "privacy.unlisted.short": "Ціхі публічны",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
+  "quote_error.poll": "Нельга цытаваць з апытаннямі.",
+  "quote_error.quote": "За раз дазволена рабіць толькі адну цытату.",
+  "quote_error.unauthorized": "Вы не ўвайшлі, каб цытаваць гэты допіс.",
+  "quote_error.upload": "Нельга цытаваць з медыя далучэннямі.",
   "recommended": "Рэкамендаванае",
   "refresh": "Абнавiць",
   "regeneration_indicator.please_stand_by": "Пачакайце.",
@@ -944,6 +952,7 @@
   "upload_button.label": "Дадаць выяву, відэа- ці аўдыяфайл",
   "upload_error.limit": "Перавышана колькасць файлаў.",
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
+  "upload_error.quote": "Нельга запампоўваць файл пры цытаванні.",
   "upload_form.drag_and_drop.instructions": "Каб абраць медыя ўлажэнне, націсніце прабел ці Enter. Падчас перасоўвання выкарыстоўвайце кнопкі са стрэлкамі, каб пасунуць медыя далучэнне ў любым напрамку. Націсніце прабел ці Enter зноў, каб перасунуць медыя далучэнне ў новае месца, або Escape для адмены.",
   "upload_form.drag_and_drop.on_drag_cancel": "Перасоўванне адмененае. Медыя ўлажэнне {item} на месцы.",
   "upload_form.drag_and_drop.on_drag_end": "Медыя ўлажэнне {item} на месцы.",
@@ -969,14 +978,12 @@
   "video.volume_up": "Павялічыць гучнасць",
   "visibility_modal.button_title": "Вызначыць бачнасць",
   "visibility_modal.header": "Бачнасць і ўзаемадзеянне",
-  "visibility_modal.helper.direct_quoting": "Прыватныя згадванні нельга цытаваць.",
   "visibility_modal.helper.privacy_editing": "Апублікаваным допісам нельга змяняць бачнасць.",
-  "visibility_modal.helper.private_quoting": "Допісы для падпісчыкаў нельга цытаваць.",
   "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.quote_public": "Усе",
+  "visibility_modal.save": "Захаваць"
 }

app/javascript/mastodon/locales/bg.json

@@ -952,12 +952,10 @@
   "video.volume_up": "Увеличаване на звука",
   "visibility_modal.button_title": "Задаване на видимост",
   "visibility_modal.header": "Видимост и взаимодействие",
-  "visibility_modal.helper.direct_quoting": "Частни споменавания не може да се цитират.",
   "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_nobody": "Никого",
   "visibility_modal.quote_public": "Някой"
 }

app/javascript/mastodon/locales/br.json

@@ -640,6 +640,5 @@
   "video.play": "Lenn",
   "visibility_modal.privacy_label": "Prevezded",
   "visibility_modal.quote_followers": "Tud koumanantet hepken",
-  "visibility_modal.quote_nobody": "Den ebet",
   "visibility_modal.quote_public": "Pep den"
 }

app/javascript/mastodon/locales/ca.json

@@ -968,15 +968,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 les mencions privades.",
   "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 les publicacions 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": "Ningú",
   "visibility_modal.quote_public": "Qualsevol",
   "visibility_modal.save": "Desa"
 }

app/javascript/mastodon/locales/cs.json

@@ -977,15 +977,12 @@
   "video.volume_up": "Zvýšit hlasitost",
   "visibility_modal.button_title": "Nastavit viditelnost",
   "visibility_modal.header": "Viditelnost a interakce",
-  "visibility_modal.helper.direct_quoting": "Soukromé zmínky nemohou být citovány.",
   "visibility_modal.helper.privacy_editing": "Publikované příspěvky nemohou změnit svou viditelnost.",
-  "visibility_modal.helper.private_quoting": "Nelze citovat příspěvky, které jsou pouze pro sledující.",
   "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": "Nikdo",
   "visibility_modal.quote_public": "Kdokoliv",
   "visibility_modal.save": "Uložit"
 }

app/javascript/mastodon/locales/cy.json

@@ -964,14 +964,11 @@
   "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.",
   "visibility_modal.helper.privacy_editing": "Does dim modd newid gwelededd postiadau wedi'u cyhoeddi.",
-  "visibility_modal.helper.private_quoting": "Does dim modd dyfynnu postiadau dilynwyr yn unig.",
   "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": "Neb",
   "visibility_modal.quote_public": "Pawb"
 }

app/javascript/mastodon/locales/da.json

@@ -978,15 +978,12 @@
   "video.volume_up": "Lydstyrke op",
   "visibility_modal.button_title": "Indstil synlighed",
   "visibility_modal.header": "Synlighed og interaktion",
-  "visibility_modal.helper.direct_quoting": "Private omtaler kan ikke citeres.",
   "visibility_modal.helper.privacy_editing": "Publicerede indlægs synlighed kan ikke ændres.",
-  "visibility_modal.helper.private_quoting": "Indlæg kun for følgere kan ikke citeres.",
   "visibility_modal.helper.unlisted_quoting": "Når folk citerer dig, vil deres indlæg også blive skjult fra trendtidslinjer.",
   "visibility_modal.instructions": "Styr, hvem der kan interagere med dette indlæg. Globale indstillinger findes under <link>Præferencer > Andet</link>.",
   "visibility_modal.privacy_label": "Fortrolighed",
   "visibility_modal.quote_followers": "Kun følgere",
   "visibility_modal.quote_label": "Ændr hvem der kan citere",
-  "visibility_modal.quote_nobody": "Ingen",
   "visibility_modal.quote_public": "Alle",
   "visibility_modal.save": "Gem"
 }

app/javascript/mastodon/locales/de.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
+  "notification.quoted_update": "{name} bearbeitete einen von dir zitierten Beitrag",
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> teilten deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Ändern, wer zitieren darf",
   "status.quote_post_author": "Zitierte einen Beitrag von @{name}",
   "status.quote_private": "Private Beiträge können nicht zitiert werden",
+  "status.quotes": "{count, plural, one {Mal zitiert} other {Mal zitiert}}",
   "status.read_more": "Gesamten Beitrag anschauen",
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
@@ -978,15 +980,15 @@
   "video.volume_up": "Lauter",
   "visibility_modal.button_title": "Sichtbarkeit festlegen",
   "visibility_modal.header": "Sichtbarkeit und Interaktion",
-  "visibility_modal.helper.direct_quoting": "Private Erwähnungen können nicht zitiert werden.",
+  "visibility_modal.helper.direct_quoting": "Private Erwähnungen, die auf Mastodon verfasst wurden, können nicht von anderen zitiert werden.",
   "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, können nicht zitiert 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.privacy_label": "Datenschutz",
   "visibility_modal.quote_followers": "Nur Follower",
   "visibility_modal.quote_label": "Ändern, wer zitieren darf",
-  "visibility_modal.quote_nobody": "Niemand",
+  "visibility_modal.quote_nobody": "Nur ich",
   "visibility_modal.quote_public": "Alle",
   "visibility_modal.save": "Speichern"
 }

app/javascript/mastodon/locales/el.json

@@ -978,15 +978,12 @@
   "video.volume_up": "Αύξηση έντασης",
   "visibility_modal.button_title": "Ορισμός ορατότητας",
   "visibility_modal.header": "Ορατότητα και αλληλεπίδραση",
-  "visibility_modal.helper.direct_quoting": "Ιδιωτικές επισημάνσεις δεν μπορούν να παρατεθούν.",
   "visibility_modal.helper.privacy_editing": "Δημοσιευμένες αναρτήσεις δεν μπορούν να αλλάξουν την ορατότητά τους.",
-  "visibility_modal.helper.private_quoting": "Οι αναρτήσεις μόνο για ακολούθους δεν μπορούν να παρατεθούν.",
   "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/en.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
+  "notification.quoted_update": "{name} edited a post you have quoted",
   "notification.reblog": "{name} boosted your post",
   "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",

app/javascript/mastodon/locales/eo.json

@@ -730,6 +730,7 @@
   "privacy.unlisted.short": "Diskrete publika",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
+  "quote_error.quote": "Nur unu citaĵo samtempe estas permesita.",
   "recommended": "Rekomendita",
   "refresh": "Refreŝigu",
   "regeneration_indicator.please_stand_by": "Bonvolu atendi.",
@@ -878,6 +879,7 @@
   "status.quote_policy_change": "Ŝanĝi kiu povas citi",
   "status.quote_post_author": "Citis afiŝon de @{name}",
   "status.quote_private": "Privataj afiŝoj ne povas esti cititaj",
+  "status.quotes": "{count, plural,one {citaĵo} other {citaĵoj}}",
   "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
   "status.reblog_private": "Diskonigi kun la sama videbleco",
@@ -930,6 +932,7 @@
   "upload_button.label": "Aldonu bildojn, filmeton aŭ sondosieron",
   "upload_error.limit": "Limo de dosiera alŝutado transpasita.",
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
+  "upload_error.quote": "Ne estas permesita alŝuto de dosieroj kun citaĵoj.",
   "upload_form.drag_and_drop.instructions": "Por preni amaskomunikilaron aldonaĵon, premu spacoklavon aŭ enen-klavon. Dum trenado, uzu la sagoklavojn por movi la amaskomunikilaron aldonaĵon en iu ajn direkto. Premu spacoklavon aŭ enen-klavon denove por faligi la amaskomunikilaron aldonaĵon en ĝia nova pozicio, aŭ premu eskapan klavon por nuligi.",
   "upload_form.drag_and_drop.on_drag_cancel": "Trenado estis nuligita. Amaskomunikila aldonaĵo {item} estis forigita.",
   "upload_form.drag_and_drop.on_drag_end": "Amaskomunikila aldonaĵo {item} estis forigita.",
@@ -955,13 +958,12 @@
   "video.volume_up": "Laŭteco pliigi",
   "visibility_modal.button_title": "Agordu videblon",
   "visibility_modal.header": "Videblo kaj interago",
-  "visibility_modal.helper.direct_quoting": "Privataj mencioj ne povas esti cititaj.",
   "visibility_modal.helper.privacy_editing": "Publikigitaj afiŝoj ne povas ŝanĝi sian videblon.",
-  "visibility_modal.helper.private_quoting": "Afiŝoj nur por sekvantoj ne povas esti cititaj.",
   "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": "Neniu",
-  "visibility_modal.quote_public": "Iu ajn"
+  "visibility_modal.quote_nobody": "Nur mi",
+  "visibility_modal.quote_public": "Iu ajn",
+  "visibility_modal.save": "Konservi"
 }

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

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
+  "notification.quoted_update": "{name} editó un mensaje que citaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -742,7 +743,7 @@
   "privacy.quote.anyone": "{visibility}, todos pueden citar",
   "privacy.quote.disabled": "{visibility}, citas deshabilitadas",
   "privacy.quote.limited": "{visibility}, citas limitadas",
-  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje \"Público\", excepto que el mensaje no aparecerá en los líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal \"Explorá\", ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje «Público», excepto que el mensaje no aparecerá en las líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal «Explorá», ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
   "privacy.unlisted.long": "Menos fanfarrias algorítmicas",
   "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última actualización: {date}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Cambiá quién puede citar",
   "status.quote_post_author": "Se citó un mensaje de @{name}",
   "status.quote_private": "No se pueden citar los mensajes privados",
+  "status.quotes": "{count, plural, one {# voto} other {# votos}}",
   "status.read_more": "Leé más",
   "status.reblog": "Adherir",
   "status.reblog_private": "Adherir a la audiencia original",
@@ -978,15 +980,15 @@
   "video.volume_up": "Subir volumen",
   "visibility_modal.button_title": "Establecer visibilidad",
   "visibility_modal.header": "Visibilidad e interacción",
-  "visibility_modal.helper.direct_quoting": "No se pueden citar las menciones privadas.",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas redactadas en Mastodon no pueden ser citadas por otras cuentas.",
   "visibility_modal.helper.privacy_editing": "No se puede cambiar la visibilidad a los mensajes ya enviados.",
-  "visibility_modal.helper.private_quoting": "No se pueden citar los mensajes destinados solo a seguidores.",
+  "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.privacy_label": "Privacidad",
   "visibility_modal.quote_followers": "Solo para seguidores",
   "visibility_modal.quote_label": "Cambiá quién puede citar",
-  "visibility_modal.quote_nobody": "Ninguna cuenta",
+  "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquier cuenta",
   "visibility_modal.save": "Guardar"
 }

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

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.quoted_update": "{name} editó una publicación que has citado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Cambia quién puede citarte",
   "status.quote_post_author": "Ha citado una publicación de @{name}",
   "status.quote_private": "Las publicaciones privadas no pueden citarse",
+  "status.quotes": "{count, plural,one {cita} other {citas}}",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Implusar a la audiencia original",
@@ -978,15 +980,15 @@
   "video.volume_up": "Subir el volumen",
   "visibility_modal.button_title": "Establece la visibilidad",
   "visibility_modal.header": "Visibilidad e interacción",
-  "visibility_modal.helper.direct_quoting": "Las menciones privadas no pueden citarse.",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas creadas en Mastodon no pueden ser citadas por otros.",
   "visibility_modal.helper.privacy_editing": "Las publicaciones ya enviadas no pueden cambiar su visibilidad.",
-  "visibility_modal.helper.private_quoting": "Las publicaciones para seguidores no pueden citarse.",
+  "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.privacy_label": "Privacidad",
   "visibility_modal.quote_followers": "Solo seguidores",
   "visibility_modal.quote_label": "Cambia quién puede citarte",
-  "visibility_modal.quote_nobody": "Nadie",
+  "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquiera",
   "visibility_modal.save": "Guardar"
 }

app/javascript/mastodon/locales/es.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
+  "notification.quoted_update": "{name} editó una publicación que has citado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Cambia quién puede citarte",
   "status.quote_post_author": "Ha citado una publicación de @{name}",
   "status.quote_private": "Las publicaciones privadas no pueden ser citadas",
+  "status.quotes": "{count, plural,one {cita} other {citas}}",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar a la audiencia original",
@@ -978,15 +980,15 @@
   "video.volume_up": "Subir volumen",
   "visibility_modal.button_title": "Configura la visibilidad",
   "visibility_modal.header": "Visibilidad e interacciones",
-  "visibility_modal.helper.direct_quoting": "Las menciones privadas no se pueden citar.",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas publicadas en Mastodon no pueden ser citadas por otros usuarios.",
   "visibility_modal.helper.privacy_editing": "Una vez publicada, no se puede cambiar su visibilidad.",
-  "visibility_modal.helper.private_quoting": "Las publicaciones para seguidores no pueden citarse.",
+  "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.privacy_label": "Privacidad",
   "visibility_modal.quote_followers": "Sólo seguidores",
   "visibility_modal.quote_label": "Cambia quién puede citarte",
-  "visibility_modal.quote_nobody": "Nadie",
+  "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquiera",
   "visibility_modal.save": "Guardar"
 }

app/javascript/mastodon/locales/et.json

@@ -977,14 +977,11 @@
   "video.volume_up": "Heli valjemaks",
   "visibility_modal.button_title": "Muuda nähtavust",
   "visibility_modal.header": "Nähtavus ja kasutus",
-  "visibility_modal.helper.direct_quoting": "Otsepostituste, kus on mainimisi, tsiteerimine pole võimalik.",
   "visibility_modal.helper.privacy_editing": "Avaldatud postitused ei saa muuta oma nähtavust.",
-  "visibility_modal.helper.private_quoting": "Vaid jälgijatele mõeldud postitusi ei saa 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": "Mitte keegi",
   "visibility_modal.quote_public": "Kõik"
 }

app/javascript/mastodon/locales/fa.json

@@ -966,14 +966,11 @@
   "video.volume_up": "افزایش حجم صدا",
   "visibility_modal.button_title": "تنظیم نمایانی",
   "visibility_modal.header": "نمایانی و برهم‌کنش",
-  "visibility_modal.helper.direct_quoting": "نام‌بری‌های خصوصی قابل نقل نیستند.",
   "visibility_modal.helper.privacy_editing": "نمی‌توان نمایانی فرسته‌های منتشر شده را تغییر داد.",
-  "visibility_modal.helper.private_quoting": "فرسته‌های فقط برای پی‌گیرندگان نمی‌توانند نقل شوند.",
   "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": "هرکسی"
 }

app/javascript/mastodon/locales/fi.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+  "notification.quoted_update": "{name} muokkasi lainaamaasi julkaisua",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Vaihda, kuka voi lainata",
   "status.quote_post_author": "Lainaa käyttäjän @{name} julkaisua",
   "status.quote_private": "Yksityisiä julkaisuja ei voi lainata",
+  "status.quotes": "{count, plural, one {lainaus} other {lainausta}}",
   "status.read_more": "Näytä enemmän",
   "status.reblog": "Tehosta",
   "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
@@ -978,15 +980,15 @@
   "video.volume_up": "Lisää äänenvoimakkuutta",
   "visibility_modal.button_title": "Aseta näkyvyys",
   "visibility_modal.header": "Näkyvyys ja vuorovaikutus",
-  "visibility_modal.helper.direct_quoting": "Yksityismainintoja ei voi lainata.",
+  "visibility_modal.helper.direct_quoting": "Muut eivät voi lainata Mastodonissa kirjoitettuja yksityismainintoja.",
   "visibility_modal.helper.privacy_editing": "Lähetettyjen julkaisujen näkyvyyttä ei voi vaihtaa.",
-  "visibility_modal.helper.private_quoting": "Vain seuraajille tarkoitettuja julkaisuja ei voi lainata.",
+  "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.privacy_label": "Yksityisyys",
   "visibility_modal.quote_followers": "Vain seuraajat",
   "visibility_modal.quote_label": "Vaihda, kuka voi lainata",
-  "visibility_modal.quote_nobody": "Ei kukaan",
+  "visibility_modal.quote_nobody": "Vain minä",
   "visibility_modal.quote_public": "Kuka tahansa",
   "visibility_modal.save": "Tallenna"
 }

app/javascript/mastodon/locales/fo.json

@@ -978,15 +978,12 @@
   "video.volume_up": "Øk um ljóðstyrki",
   "visibility_modal.button_title": "Set sýni",
   "visibility_modal.header": "Sýni og samvirkni",
-  "visibility_modal.helper.direct_quoting": "Privatar umrøður kunnu ikki siterast.",
   "visibility_modal.helper.privacy_editing": "Útgivnir postar kunnnu ikki broyta sýni.",
-  "visibility_modal.helper.private_quoting": "Postar, sum einans eru fyri fylgjarar, kunnu ikki siterast.",
   "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.privacy_label": "Privatlív",
   "visibility_modal.quote_followers": "Einans fylgjarar",
   "visibility_modal.quote_label": "Broyt hvør kann sitera",
-  "visibility_modal.quote_nobody": "Eingin",
   "visibility_modal.quote_public": "Ein og hvør",
   "visibility_modal.save": "Goym"
 }

app/javascript/mastodon/locales/ga.json

@@ -969,14 +969,11 @@
   "video.volume_up": "Toirt suas",
   "visibility_modal.button_title": "Socraigh infheictheacht",
   "visibility_modal.header": "Infheictheacht agus idirghníomhaíocht",
-  "visibility_modal.helper.direct_quoting": "Ní féidir lua a thabhairt ar luanna príobháideacha.",
   "visibility_modal.helper.privacy_editing": "Ní féidir infheictheacht postálacha foilsithe a athrú.",
-  "visibility_modal.helper.private_quoting": "Ní féidir poist 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": "Níl aon duine",
   "visibility_modal.quote_public": "Aon duine"
 }

app/javascript/mastodon/locales/gl.json

@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
   "keyboard_shortcuts.hotkey": "Tecla de atallo",
   "keyboard_shortcuts.legend": "Para amosar esta lenda",
+  "keyboard_shortcuts.load_more": "Foco no botón \"Cargar máis\"",
   "keyboard_shortcuts.local": "Para abrir a cronoloxía local",
   "keyboard_shortcuts.mention": "Para mencionar a autora",
   "keyboard_shortcuts.muted": "Abrir lista de usuarias acaladas",
@@ -619,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
+  "notification.quoted_update": "{name} editou unha publicación que citaches",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> promoveron a túa publicación",
   "notification.relationships_severance_event": "Relacións perdidas con {name}",
@@ -899,6 +901,7 @@
   "status.quote_policy_change": "Cambia quen pode citarte",
   "status.quote_post_author": "Citou unha publicación de @{name}",
   "status.quote_private": "As publicacións privadas non se poden citar",
+  "status.quotes": "{count, plural, one {cita} other {citas}}",
   "status.read_more": "Ler máis",
   "status.reblog": "Promover",
   "status.reblog_private": "Compartir coa audiencia orixinal",
@@ -977,14 +980,15 @@
   "video.volume_up": "Subir volume",
   "visibility_modal.button_title": "Establece a visibilidade",
   "visibility_modal.header": "Visibilidade e interaccións",
-  "visibility_modal.helper.direct_quoting": "A mencións privadas non se poden citar.",
+  "visibility_modal.helper.direct_quoting": "As mencións privadas creadas con Mastodon non poden ser citadas.",
   "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 non se poden citar.",
+  "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": "Ninguén",
-  "visibility_modal.quote_public": "Calquera"
+  "visibility_modal.quote_nobody": "Só para min",
+  "visibility_modal.quote_public": "Calquera",
+  "visibility_modal.save": "Gardar"
 }

app/javascript/mastodon/locales/he.json

@@ -978,15 +978,12 @@
   "video.volume_up": "הגברת עוצמת שמע",
   "visibility_modal.button_title": "בחירת רמת חשיפה",
   "visibility_modal.header": "חשיפה והידוּד (אינטראקציה)",
-  "visibility_modal.helper.direct_quoting": "הודעות פרטיות לא ניתנות לציטוט.",
   "visibility_modal.helper.privacy_editing": "לא ניתן לשנות את דרגת החשיפה של הודעות שפורסמו.",
-  "visibility_modal.helper.private_quoting": "לא ניתן לצטט הודעות שחשופות לעוקבים בלבד.",
   "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/hu.json

@@ -972,14 +972,11 @@
   "video.volume_up": "Hangerő fel",
   "visibility_modal.button_title": "Láthatóság beállítása",
   "visibility_modal.header": "Láthatóság és interakció",
-  "visibility_modal.helper.direct_quoting": "A privát említések nem idézhetőek.",
   "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 csak követőknek szánt bejegyzéseket nem lehet idézni.",
   "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.privacy_label": "Adatvédelem",
   "visibility_modal.quote_followers": "Csak követőknek",
   "visibility_modal.quote_label": "Módosítás, hogy kik idézhetnek",
-  "visibility_modal.quote_nobody": "Senki",
   "visibility_modal.quote_public": "Bárki"
 }

app/javascript/mastodon/locales/ia.json

@@ -483,6 +483,7 @@
   "keyboard_shortcuts.home": "Aperir le chronologia de initio",
   "keyboard_shortcuts.hotkey": "Clave accelerator",
   "keyboard_shortcuts.legend": "Monstrar iste legenda",
+  "keyboard_shortcuts.load_more": "Focalisar le button “Cargar plus”",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
   "keyboard_shortcuts.mention": "Mentionar le autor",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
@@ -619,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
   "notification.poll": "Un sondage in le qual tu ha votate ha finite",
+  "notification.quoted_update": "{name} ha modificate un message que tu ha citate",
   "notification.reblog": "{name} ha impulsate tu message",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a> ha impulsate tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
@@ -738,11 +740,18 @@
   "privacy.private.short": "Sequitores",
   "privacy.public.long": "Quicunque, sur Mastodon o non",
   "privacy.public.short": "Public",
+  "privacy.quote.anyone": "{visibility}, omnes pote citar",
+  "privacy.quote.disabled": "{visibility}, citation disactivate",
+  "privacy.quote.limited": "{visibility}, citation limitate",
   "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
   "privacy.unlisted.long": "Minus fanfares algorithmic",
   "privacy.unlisted.short": "Public, non listate",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "quote_error.poll": "Non es permittite citar sondages.",
+  "quote_error.quote": "Solmente un citation al vice es permittite.",
+  "quote_error.unauthorized": "Tu non es autorisate a citar iste message.",
+  "quote_error.upload": "Non es permittite citar con annexos multimedial.",
   "recommended": "Recommendate",
   "refresh": "Refrescar",
   "regeneration_indicator.please_stand_by": "Un momento, per favor.",
@@ -849,9 +858,11 @@
   "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
   "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
   "status.admin_status": "Aperir iste message in le interfacie de moderation",
+  "status.all_disabled": "Impulso e citation es disactivate",
   "status.block": "Blocar @{name}",
   "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
+  "status.cannot_quote": "Le autor ha disactivate le citation de iste message",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
   "status.context.load_new_replies": "Nove responsas disponibile",
   "status.context.loading": "Cercante plus responsas",
@@ -880,6 +891,7 @@
   "status.mute_conversation": "Silentiar conversation",
   "status.open": "Expander iste message",
   "status.pin": "Fixar sur profilo",
+  "status.quote": "Citar",
   "status.quote.cancel": "Cancellar le citation",
   "status.quote_error.filtered": "Celate a causa de un de tu filtros",
   "status.quote_error.not_available": "Message indisponibile",
@@ -888,6 +900,8 @@
   "status.quote_error.pending_approval_popout.title": "Citation pendente? Resta calme",
   "status.quote_policy_change": "Cambiar qui pote citar",
   "status.quote_post_author": "Ha citate un message de @{name}",
+  "status.quote_private": "Le messages private non pote esser citate",
+  "status.quotes": "{count, plural, one {citation} other {citationes}}",
   "status.read_more": "Leger plus",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar con visibilitate original",
@@ -897,8 +911,8 @@
   "status.redraft": "Deler e reconciper",
   "status.remove_bookmark": "Remover marcapagina",
   "status.remove_favourite": "Remover del favoritos",
-  "status.replied_in_thread": "Respondite in le discussion",
-  "status.replied_to": "Respondite a {name}",
+  "status.replied_in_thread": "Responsa in discussion",
+  "status.replied_to": "Responsa a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al discussion",
   "status.report": "Reportar @{name}",
@@ -940,6 +954,7 @@
   "upload_button.label": "Adde imagines, un video o un file de audio",
   "upload_error.limit": "Limite de incargamento de files excedite.",
   "upload_error.poll": "Incargamento de files non permittite con sondages.",
+  "upload_error.quote": "Non es permittite incargar files con citationes.",
   "upload_form.drag_and_drop.instructions": "Pro prender un annexo multimedial, preme sur le barra de spatios o Enter. Trahente lo, usa le claves de flecha pro displaciar le annexo multimedial in un certe direction. Preme le barra de spatios o Enter de novo pro deponer le annexo multimedial in su nove position, o preme sur Escape pro cancellar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le displaciamento ha essite cancellate. Le annexo multimedial {item} ha essite deponite.",
   "upload_form.drag_and_drop.on_drag_end": "Le annexo multimedial {item} ha essite deponite.",
@@ -965,14 +980,15 @@
   "video.volume_up": "Augmentar le volumine",
   "visibility_modal.button_title": "Definir visibilitate",
   "visibility_modal.header": "Visibilitate e interaction",
-  "visibility_modal.helper.direct_quoting": "Le mentiones private non pote esser citate.",
+  "visibility_modal.helper.direct_quoting": "Le mentiones private scribite sur Mastodon non pote esser citate per alteres.",
   "visibility_modal.helper.privacy_editing": "Le messages ja publicate non pote cambiar de visibilitate.",
-  "visibility_modal.helper.private_quoting": "Le messages reservate al sequitores non pote esser citate.",
+  "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": "Necuno",
-  "visibility_modal.quote_public": "Omnes"
+  "visibility_modal.quote_nobody": "Solo io",
+  "visibility_modal.quote_public": "Omnes",
+  "visibility_modal.save": "Salvar"
 }

app/javascript/mastodon/locales/is.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
+  "notification.quoted_update": "{name} breytti færslu sem þú hefur vitnað í",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> endurbirt færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Breyttu því hver getur tilvitnað",
   "status.quote_post_author": "Vitnaði í færslu frá @{name}",
   "status.quote_private": "Ekki er hægt að vitna í einkafærslur",
+  "status.quotes": "{count, plural, one {tilvitnun} other {tilvitnanir}}",
   "status.read_more": "Lesa meira",
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
@@ -978,15 +980,15 @@
   "video.volume_up": "Hækka hljóðstyrk",
   "visibility_modal.button_title": "Stilla sýnileika",
   "visibility_modal.header": "Sýnileiki og gagnvirkni",
-  "visibility_modal.helper.direct_quoting": "Ekki er hægt að vitna í einkaspjall.",
+  "visibility_modal.helper.direct_quoting": "Ekki er hægt að vitna í einkaspjall sem skrifað er á Mastodon.",
   "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 sem eingöngu eru til fylgjenda.",
+  "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.privacy_label": "Persónuvernd",
   "visibility_modal.quote_followers": "Einungis fylgjendur",
   "visibility_modal.quote_label": "Breyttu því hver getur tilvitnað",
-  "visibility_modal.quote_nobody": "Enginn",
+  "visibility_modal.quote_nobody": "Bara ég",
   "visibility_modal.quote_public": "Hver sem er",
   "visibility_modal.save": "Vista"
 }

app/javascript/mastodon/locales/it.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
+  "notification.quoted_update": "{name} ha modificato un post che hai citato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count,  plural, one {# altro} other {altri #}}</a> hanno condiviso il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
@@ -900,6 +901,7 @@
   "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.read_more": "Leggi di più",
   "status.reblog": "Reblog",
   "status.reblog_private": "Reblog con visibilità originale",
@@ -978,15 +980,15 @@
   "video.volume_up": "Alza volume",
   "visibility_modal.button_title": "Imposta la visibilità",
   "visibility_modal.header": "Visibilità e interazione",
-  "visibility_modal.helper.direct_quoting": "Le menzioni private non possono essere citate.",
+  "visibility_modal.helper.direct_quoting": "Le menzioni private scritte su Mastodon non possono essere citate da altri.",
   "visibility_modal.helper.privacy_editing": "La visibilità dei post pubblicati non può essere modificata.",
-  "visibility_modal.helper.private_quoting": "I post riservati ai seguaci non possono essere citati.",
+  "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.privacy_label": "Privacy",
   "visibility_modal.quote_followers": "Solo i seguaci",
   "visibility_modal.quote_label": "Cambia chi può citare",
-  "visibility_modal.quote_nobody": "Nessuno",
+  "visibility_modal.quote_nobody": "Solo io",
   "visibility_modal.quote_public": "Chiunque",
   "visibility_modal.save": "Salva"
 }

app/javascript/mastodon/locales/kab.json

@@ -721,6 +721,5 @@
   "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_nobody": "Ula yiwen",
   "visibility_modal.quote_public": "Yal yiwen"
 }

app/javascript/mastodon/locales/ko.json

@@ -971,7 +971,6 @@
   "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/nan.json

@@ -976,15 +976,12 @@
   "video.volume_up": "變khah大聲",
   "visibility_modal.button_title": "設定通看ê程度",
   "visibility_modal.header": "通看ê程度kap互動",
-  "visibility_modal.helper.direct_quoting": "私人ê提起bē當引用。",
   "visibility_modal.helper.privacy_editing": "公開ê PO文bē當改in通看ê程度。",
-  "visibility_modal.helper.private_quoting": "Bē當引用kan-ta跟tuè ê通看ê PO文。",
   "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": "無半位",
   "visibility_modal.quote_public": "Ta̍k ê lâng",
   "visibility_modal.save": "儲存"
 }

app/javascript/mastodon/locales/nl.json

@@ -292,6 +292,7 @@
   "domain_pill.your_handle": "Jouw fediverse-adres:",
   "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
   "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
+  "dropdown.empty": "Selecteer een optie",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
@@ -482,6 +483,7 @@
   "keyboard_shortcuts.home": "Starttijdlijn tonen",
   "keyboard_shortcuts.hotkey": "Sneltoets",
   "keyboard_shortcuts.legend": "Deze legenda tonen",
+  "keyboard_shortcuts.load_more": "\"Meer laden\"-knop focussen",
   "keyboard_shortcuts.local": "Lokale tijdlijn tonen",
   "keyboard_shortcuts.mention": "Account vermelden",
   "keyboard_shortcuts.muted": "Genegeerde gebruikers tonen",
@@ -618,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
+  "notification.quoted_update": "{name} bewerkte een door jou geciteerd bericht",
   "notification.reblog": "{name} boostte jouw bericht",
   "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht geboost",
   "notification.relationships_severance_event": "Verloren verbindingen met {name}",
@@ -730,18 +733,25 @@
   "poll.votes": "{votes, plural, one {# stem} other {# stemmen}}",
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
-  "privacy.change": "Zichtbaarheid van bericht aanpassen",
+  "privacy.change": "Privacy voor een bericht aanpassen",
   "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
   "privacy.direct.short": "Privébericht",
   "privacy.private.long": "Alleen jouw volgers",
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
+  "privacy.quote.anyone": "{visibility}, iedereen kan citeren",
+  "privacy.quote.disabled": "{visibility}, citeren uitgeschakeld",
+  "privacy.quote.limited": "{visibility}, citeren beperkt",
   "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
   "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
+  "quote_error.poll": "Het is niet mogelijk om polls te citeren.",
+  "quote_error.quote": "Je kunt maar één bericht per keer citeren.",
+  "quote_error.unauthorized": "Je bent niet gemachtigd om dit bericht te citeren.",
+  "quote_error.upload": "Je kunt geen mediabijlage aan een bericht met een citaat toevoegen.",
   "recommended": "Aanbevolen",
   "refresh": "Vernieuwen",
   "regeneration_indicator.please_stand_by": "Even geduld alsjeblieft.",
@@ -848,9 +858,11 @@
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_domain": "Moderatie-omgeving van {domain} openen",
   "status.admin_status": "Dit bericht in de moderatie-omgeving tonen",
+  "status.all_disabled": "Boosts en citaten zijn uitgeschakeld",
   "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
+  "status.cannot_quote": "Dit account heeft het citeren van dit bericht uitgeschakeld",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
   "status.context.load_new_replies": "Nieuwe reacties beschikbaar",
   "status.context.loading": "Op nieuwe reacties aan het controleren",
@@ -879,12 +891,17 @@
   "status.mute_conversation": "Gesprek negeren",
   "status.open": "Volledig bericht tonen",
   "status.pin": "Aan profielpagina vastmaken",
+  "status.quote": "Citeren",
+  "status.quote.cancel": "Citeren annuleren",
   "status.quote_error.filtered": "Verborgen door een van je filters",
   "status.quote_error.not_available": "Bericht niet beschikbaar",
   "status.quote_error.pending_approval": "Bericht in afwachting",
   "status.quote_error.pending_approval_popout.body": "Het kan even duren voordat citaten die in de Fediverse gedeeld worden, worden weergegeven. Omdat verschillende servers niet allemaal hetzelfde protocol gebruiken.",
   "status.quote_error.pending_approval_popout.title": "Even geduld wanneer het citaat nog moet worden goedgekeurd.",
+  "status.quote_policy_change": "Wijzig wie jou mag citeren",
   "status.quote_post_author": "Citeerde een bericht van @{name}",
+  "status.quote_private": "Citeren van berichten aan alleen volgers is niet mogelijk",
+  "status.quotes": "{count, plural, one {citaat} other {citaten}}",
   "status.read_more": "Meer lezen",
   "status.reblog": "Boosten",
   "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
@@ -937,6 +954,7 @@
   "upload_button.label": "Afbeeldingen, een video- of een geluidsbestand toevoegen",
   "upload_error.limit": "Uploadlimiet van bestand overschreden.",
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
+  "upload_error.quote": "Je kunt geen bestand aan een bericht met een citaat toevoegen.",
   "upload_form.drag_and_drop.instructions": "Druk op spatie of enter om een mediabijlage op te pakken. Gebruik de pijltjestoetsen om de bijlage in een bepaalde richting te verplaatsen. Druk opnieuw op de spatiebalk of enter om de mediabijlage op de nieuwe positie te plaatsen, of druk op escape om te annuleren.",
   "upload_form.drag_and_drop.on_drag_cancel": "Slepen is geannuleerd. Mediabijlage {item} is niet verplaatst.",
   "upload_form.drag_and_drop.on_drag_end": "Mediabijlage {item} is niet verplaatst.",
@@ -959,5 +977,18 @@
   "video.skip_forward": "Vooruitspoelen",
   "video.unmute": "Dempen opheffen",
   "video.volume_down": "Volume omlaag",
-  "video.volume_up": "Volume omhoog"
+  "video.volume_up": "Volume omhoog",
+  "visibility_modal.button_title": "Privacy instellen",
+  "visibility_modal.header": "Zichtbaarheid en interactie",
+  "visibility_modal.helper.direct_quoting": "Privéberichten afkomstig van Mastodon kunnen niet door anderen worden geciteerd.",
+  "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/pt-PT.json

@@ -978,15 +978,12 @@
   "video.volume_up": "Aumentar volume",
   "visibility_modal.button_title": "Definir visibilidade",
   "visibility_modal.header": "Visibilidade e interação",
-  "visibility_modal.helper.direct_quoting": "Menções privadas não podem ser citadas.",
   "visibility_modal.helper.privacy_editing": "Publicações publicadas não podem alterar a sua visibilidade.",
-  "visibility_modal.helper.private_quoting": "Publicações apenas para seguidores não podem ser citadas.",
   "visibility_modal.helper.unlisted_quoting": "Quando as pessoas o citarem, as publicações delas serão também ocultadas das tendências.",
   "visibility_modal.instructions": "Controle quem pode interagir com esta publicação. As configurações globais podem ser encontradas em <link>Preferências > Outros</link>.",
   "visibility_modal.privacy_label": "Privacidade",
   "visibility_modal.quote_followers": "Apenas seguidores",
   "visibility_modal.quote_label": "Altere quem pode citar",
-  "visibility_modal.quote_nobody": "Ninguém",
   "visibility_modal.quote_public": "Todos",
   "visibility_modal.save": "Guardar"
 }

app/javascript/mastodon/locales/sv.json

@@ -965,15 +965,12 @@
   "video.volume_up": "Volym upp",
   "visibility_modal.button_title": "Ange synlighet",
   "visibility_modal.header": "Synlighet och interaktion",
-  "visibility_modal.helper.direct_quoting": "Privata omnämnanden kan inte bli citerade.",
   "visibility_modal.helper.privacy_editing": "Publicerade inlägg kan inte ändra deras synlighet.",
-  "visibility_modal.helper.private_quoting": "Inlägg som endast är synliga för följare kan inte citeras.",
   "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_nobody": "Ingen",
   "visibility_modal.quote_public": "Alla",
   "visibility_modal.save": "Spara"
 }

app/javascript/mastodon/locales/tr.json

@@ -970,15 +970,12 @@
   "video.volume_up": "Sesi yükselt",
   "visibility_modal.button_title": "Görünürlüğü ayarla",
   "visibility_modal.header": "Görünürlük ve etkileşim",
-  "visibility_modal.helper.direct_quoting": "Özel gönderiler alıntılanamaz.",
   "visibility_modal.helper.privacy_editing": "Yayınlanan gönderilerin görünürlüğü değiştirilemez.",
-  "visibility_modal.helper.private_quoting": "Sadece takipçilere özel paylaşımlar 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": "Kimseden",
   "visibility_modal.quote_public": "Herkesten",
   "visibility_modal.save": "Kaydet"
 }

app/javascript/mastodon/locales/uk.json

@@ -924,7 +924,6 @@
   "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/vi.json

@@ -620,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Vốt của bạn đã kết thúc",
   "notification.poll": "Vốt mà bạn tham gia đã kết thúc",
+  "notification.quoted_update": "{name} đã chỉnh sửa tút mà bạn trích dẫn",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.reblog.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "Thay đổi người có thể trích dẫn",
   "status.quote_post_author": "Trích dẫn từ tút của @{name}",
   "status.quote_private": "Không thể trích dẫn nhắn riêng",
+  "status.quotes": "{count, plural, other {trích dẫn}}",
   "status.read_more": "Đọc tiếp",
   "status.reblog": "Đăng lại",
   "status.reblog_private": "Đăng lại (Riêng tư)",
@@ -978,15 +980,15 @@
   "video.volume_up": "Tăng âm lượng",
   "visibility_modal.button_title": "Thay đổi quyền riêng tư",
   "visibility_modal.header": "Hiển thị và tương tác",
-  "visibility_modal.helper.direct_quoting": "Không thể trích dẫn nhắn riêng.",
+  "visibility_modal.helper.direct_quoting": "Nhắn riêng trên Mastodon không thể được người khác trích dẫn.",
   "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": "Không thể trích dẫn những tút chỉ dành cho người theo dõi.",
+  "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.privacy_label": "Riêng tư",
   "visibility_modal.quote_followers": "Chỉ người theo dõi",
   "visibility_modal.quote_label": "Thay đổi người có thể trích dẫn",
-  "visibility_modal.quote_nobody": "Không ai",
+  "visibility_modal.quote_nobody": "Chỉ tôi",
   "visibility_modal.quote_public": "Bất cứ ai",
   "visibility_modal.save": "Lưu"
 }

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

@@ -945,7 +945,6 @@
   "visibility_modal.button_title": "设置可见性",
   "visibility_modal.privacy_label": "隐私",
   "visibility_modal.quote_label": "更改谁可以引用",
-  "visibility_modal.quote_nobody": "没有人",
   "visibility_modal.quote_public": "任何人",
   "visibility_modal.save": "保存"
 }

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

@@ -620,6 +620,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} 失去連結",
@@ -900,6 +901,7 @@
   "status.quote_policy_change": "變更可以引用的人",
   "status.quote_post_author": "已引用 @{name} 之嘟文",
   "status.quote_private": "無法引用私人嘟文",
+  "status.quotes": "{count, plural, other {# 則引用嘟文}}",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
   "status.reblog_private": "依照原嘟可見性轉嘟",
@@ -978,15 +980,15 @@
   "video.volume_up": "提高音量",
   "visibility_modal.button_title": "設定可見性",
   "visibility_modal.header": "可見性與互動",
-  "visibility_modal.helper.direct_quoting": "無法引用私人提及。",
+  "visibility_modal.helper.direct_quoting": "Mastodon 上發佈之私人提及嘟文無法被其他使用者引用。",
   "visibility_modal.helper.privacy_editing": "無法變更已發佈的嘟文之可見性。",
-  "visibility_modal.helper.private_quoting": "無法引用僅追蹤者的嘟文。",
+  "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_nobody": "僅有我",
   "visibility_modal.quote_public": "所有人",
   "visibility_modal.save": "儲存"
 }

app/javascript/mastodon/models/notification_group.ts

@@ -39,6 +39,8 @@ export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
 export type NotificationGroupQuote = BaseNotificationWithStatus<'quote'>;
 export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
 export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupQuotedUpdate =
+  BaseNotificationWithStatus<'quoted_update'>;
 export type NotificationGroupFollow = BaseNotification<'follow'>;
 export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
 export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
@@ -91,6 +93,7 @@ export type NotificationGroup =
   | NotificationGroupQuote
   | NotificationGroupPoll
   | NotificationGroupUpdate
+  | NotificationGroupQuotedUpdate
   | NotificationGroupFollow
   | NotificationGroupFollowRequest
   | NotificationGroupModerationWarning
@@ -141,7 +144,8 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'quote':
     case 'poll':
-    case 'update': {
+    case 'update':
+    case 'quoted_update': {
       const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
         statusId: statusId ?? undefined,
@@ -215,6 +219,7 @@ export function createNotificationGroupFromNotificationJSON(
     case 'quote':
     case 'poll':
     case 'update':
+    case 'quoted_update':
       return {
         ...group,
         type: notification.type,

app/models/notification.rb

@@ -77,6 +77,9 @@ class Notification < ApplicationRecord
     quote: {
       filterable: true,
     }.freeze,
+    quoted_update: {
+      filterable: false,
+    }.freeze,
   }.freeze
 
   TYPES = PROPERTIES.keys.freeze
@@ -89,6 +92,7 @@ class Notification < ApplicationRecord
     favourite: [favourite: :status],
     poll: [poll: :status],
     update: :status,
+    quoted_update: :status,
     'admin.report': [report: :target_account],
   }.freeze
 
@@ -120,7 +124,7 @@ class Notification < ApplicationRecord
 
   def target_status
     case type
-    when :status, :update
+    when :status, :update, :quoted_update
       status
     when :reblog
       status&.reblog
@@ -172,7 +176,7 @@ class Notification < ApplicationRecord
         cached_status = cached_statuses_by_id[notification.target_status.id]
 
         case notification.type
-        when :status, :update
+        when :status, :update, :quoted_update
           notification.status = cached_status
         when :reblog
           notification.status.reblog = cached_status
@@ -202,7 +206,9 @@ class Notification < ApplicationRecord
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'Quote'
+    when 'Status'
+      self.from_account_id = type == :quoted_update ? activity&.quote&.quoted_account_id : activity&.account_id
+    when 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'Quote'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id

app/models/quote.rb

@@ -90,13 +90,13 @@ class Quote < ApplicationRecord
   end
 
   def increment_counter_caches!
-    return unless acceptable?
+    return unless accepted?
 
     quoted_status&.increment_count!(:quotes_count)
   end
 
   def decrement_counter_caches!
-    return unless acceptable?
+    return unless accepted?
 
     quoted_status&.decrement_count!(:quotes_count)
   end
@@ -104,7 +104,7 @@ class Quote < ApplicationRecord
   def update_counter_caches!
     return if legacy? || !state_previously_changed?
 
-    if acceptable?
+    if accepted?
       quoted_status&.increment_count!(:quotes_count)
     else
       # TODO: are there cases where this would not be correct?

app/serializers/rest/notification_group_serializer.rb

@@ -24,7 +24,7 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
   end
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll, :update, :quote].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update, :quote, :quoted_update].include?(object.type)
   end
 
   def report_type?

app/services/fan_out_on_write_service.rb

@@ -101,6 +101,12 @@ class FanOutOnWriteService < BaseService
         [account.id, @status.id, 'Status', 'update']
       end
     end
+
+    @status.quotes.accepted.find_in_batches do |quotes|
+      LocalNotificationWorker.push_bulk(quotes) do |quote|
+        [quote.account_id, quote.status_id, 'Status', 'quoted_update']
+      end
+    end
   end
 
   def deliver_to_all_followers!

app/services/notify_service.rb

@@ -8,6 +8,7 @@ class NotifyService < BaseService
     admin.report
     admin.sign_up
     update
+    quoted_update
     poll
     status
     moderation_warning

app/views/admin/domain_blocks/edit.html.haml

@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('admin.domain_blocks.edit')
 
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |form|
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block) do |form|
   = render 'shared/error_messages', object: @domain_block
 
   = render form

app/views/filters/edit.html.haml

@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('filters.edit.title')
 
-= simple_form_for @filter, url: filter_path(@filter), method: :put do |f|
+= simple_form_for @filter, url: filter_path(@filter) do |f|
   = render 'filter_fields', f: f
 
   .actions

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

@@ -17,38 +17,36 @@
 
     %h4= t 'preferences.posting_defaults'
 
-    .fields-row
-      .fields-group.fields-row__column.fields-row__column-6
-        = 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_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.fields-row__column.fields-row__column-6
-        = 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_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-row
-      .fields-group.fields-row__column.fields-row__column-6
-        = 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,

app/workers/local_notification_worker.rb

@@ -17,6 +17,8 @@ class LocalNotificationWorker
     # should replace the previous ones.
     if type == 'update'
       Notification.where(account: receiver, activity: activity, type: 'update').in_batches.delete_all
+    elsif type == 'quoted_update'
+      Notification.where(account: receiver, activity: activity, type: 'quoted_update').in_batches.delete_all
     elsif Notification.where(account: receiver, activity: activity, type: type).any?
       return
     end

config/locales/an.yml

@@ -314,7 +314,6 @@ an:
       title: Emojis personalizaus
       uncategorized: Sin clasificar
       unlist: No listau
-      unlisted: Sin listar
       update_failed_msg: No se podió actualizar ixe emoji
       updated_msg: Emoji actualizau con exito!
       upload: Puyar
@@ -1413,9 +1412,7 @@ an:
       private: Nomás amostrar a seguidores
       private_long: Nomás amostrar a las tuyas seguidores
       public: Publico
-      public_long: Totz pueden veyer
       unlisted: Publico, pero no amostrar en a historia federada
-      unlisted_long: Totz pueden veyer, pero no ye listau en as linias de tiempo publicas
   statuses_cleanup:
     enabled: Borrar automaticament publicacions antigas
     enabled_hint: Elimina automaticament las tuyas publicacions una vegada que aconsigan un branquil de tiempo especificau, de no estar que coincidan con bella d'as excepcions detalladas debaixo

config/locales/ar.yml

@@ -373,7 +373,6 @@ ar:
       title: الإيموجي الخاصة
       uncategorized: غير مصنّف
       unlist: تنحية مِن القائمة
-      unlisted: غير مدرج
       update_failed_msg: تعذرت عملية تحديث ذاك الإيموجي
       updated_msg: تم تحديث الإيموجي بنجاح!
       upload: رفع
@@ -2046,16 +2045,12 @@ ar:
       limit: لقد بلغت الحد الأقصى للمنشورات المثبتة
       ownership: لا يمكن تثبيت منشور نشره شخص آخر
       reblog: لا يمكن تثبيت إعادة نشر
-    quote_policies:
-      public: الجميع
     title: '%{name}: "%{quote}"'
     visibilities:
       private: لمتابِعيك فقط
       private_long: اعرضه لمتابعيك فقط
       public: للعامة
-      public_long: يمكن للجميع رؤية منشوراتك
       unlisted: غير مُدرَج
-      unlisted_long: يُمكن لأيٍ كان رُؤيتَه و لكن لن يُعرَض على الخيوط العامة
   statuses_cleanup:
     enabled: حذف المنشورات القديمة تلقائياً
     enabled_hint: حذف منشوراتك تلقائياً بمجرد أن تصل إلى عتبة عمرية محددة، إلا إذا كانت مطابقة لأحد الاستثناءات أدناه

config/locales/ast.yml

@@ -813,8 +813,6 @@ ast:
     visibilities:
       private: Namás siguidores
       private_long: Namás los ven los perfiles siguidores
-      public_long: Tol mundu pue velos
-      unlisted_long: Tol mundu pue velos, mas nun apaecen nes llinies de tiempu públiques
   statuses_cleanup:
     exceptions: Esceiciones
     interaction_exceptions: Esceiciones basaes nes interaiciones

config/locales/az.yml

@@ -283,14 +283,9 @@ az:
     default_language: İnterfeys dili ilə eyni
     pin_errors:
       reblog: Təkrar paylaşım, sancıla bilməz
-    quote_policies:
-      followers: Yalnız izləyiciləriniz
-      public: Hər kəs
     visibilities:
       private: Yalnız izləyicilər
       private_long: Yalnız izləyicilər görə bilər
-      public_long: Hər kəs görə bilər
-      unlisted_long: Hər kəs görə bilər, ancaq hər kəsə açıq zaman xətlərində sadalanmır
   statuses_cleanup:
     enabled: Köhnə göndərişləri avtomatik sil
     enabled_hint: Aşağıdakı istisnalardan heç birinə uyuşmadığı müddətcə, göndərişləriniz qeyd edilmiş yaş həddinə çatdıqda avtomatik silinir

config/locales/be.yml

@@ -373,7 +373,6 @@ be:
       title: Адвольныя эмодзі
       uncategorized: Без катэгорыі
       unlist: Прыбраць
-      unlisted: Не ў стужках
       update_failed_msg: Немагчыма абнавіць гэта эмодзі
       updated_msg: Смайлік паспяхова абноўлены!
       upload: Запампаваць
@@ -1994,18 +1993,13 @@ be:
       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/bg.yml

@@ -359,7 +359,6 @@ bg:
       title: Потребителски емоджита
       uncategorized: Некатегоризирано
       unlist: Премахване от списъка
-      unlisted: Извънсписъчно
       update_failed_msg: Не може да се обнови това емоджи
       updated_msg: Успешно осъвременено емоджи!
       upload: Качване
@@ -1892,18 +1891,12 @@ bg:
       limit: Вече сте закачили максималния брой публикации
       ownership: Публикация на някого другиго не може да бъде закачена
       reblog: Раздуване не може да бъде закачано
-    quote_policies:
-      followers: Само последователите ви
-      nobody: Никого
-      public: Всеки
     title: "%{name}: „%{quote}“"
     visibilities:
       private: Покажи само на последователите си
       private_long: Видими само за последователи
       public: Публично
-      public_long: Всеки ги вижда
       unlisted: Публично, но не показвай в публичния канал
-      unlisted_long: Всеки ги вижда, но са скрити от публичните хронологии
   statuses_cleanup:
     enabled: Автоматично изтриване на стари публикации
     enabled_hint: От само себе си трие публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу

config/locales/bn.yml

@@ -183,7 +183,6 @@ bn:
       title: স্বনির্ধারিত ইমোজিগুলি
       uncategorized: শ্রেণীবিহীন
       unlist: তালিকামুক্ত
-      unlisted: তালিকামুক্ত
       update_failed_msg: সেই ইমোজি আপডেট করতে পারেনি
       updated_msg: ইমোজি সফলভাবে আপডেট হয়েছে!
       upload: আপলোড

config/locales/br.yml

@@ -564,8 +564,6 @@ br:
       quoted_status_not_found: War a seblant, n'eus ket eus an embannadenn emaoc'h o klask menegiñ.
     pin_errors:
       ownership: N'hallit ket spilhennañ embannadurioù ar re all
-    quote_policies:
-      public: Pep den
     visibilities:
       public: Publik
   statuses_cleanup:

config/locales/ca.yml

@@ -361,7 +361,6 @@ ca:
       title: Emojis personalitzats
       uncategorized: Sense categoria
       unlist: No llistat
-      unlisted: Sense classificar
       update_failed_msg: No s'ha pogut actualitzar aquest emoji
       updated_msg: Emoji s'ha actualitzat correctament!
       upload: Carrega
@@ -1881,19 +1880,13 @@ 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 els vostres seguidors
-      nobody: Ningú
-      public: Tothom
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Menció privada
       private: Només seguidors
       private_long: Mostra només als seguidors
       public: Públic
-      public_long: Tothom pot veure-ho
       unlisted: No llistat
-      unlisted_long: Tothom ho pot veure, però no es mostra en les línies de temps públiques
   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/ckb.yml

@@ -258,7 +258,6 @@ ckb:
       title: ئیمۆجی دڵخواز
       uncategorized: هاوپۆل نەکراوە
       unlist: بێ پێرست
-      unlisted: پێرست نەبووە
       update_failed_msg: نه یتوانی ئه و ئیمۆجییه نوێ بکاتەوە
       updated_msg: ئیمۆجی بە سەرکەوتوویی نوێکرایەوە!
       upload: بارکردن
@@ -942,9 +941,7 @@ ckb:
       private: شوێنکەوتوانی تەنها
       private_long: تەنها بۆ شوێنکەوتوانی پیشان بدە
       public: گشتی
-      public_long: هەموو کەس دەتوانێت ببینێت
       unlisted: پێرست نەبووە
-      unlisted_long: هەموو کەس دەتوانێت بیبینێت، بەڵام لە هێڵی کاتی گشتی دا نەریزراوە
   stream_entries:
     sensitive_content: ناوەڕۆکی هەستیار
   tags:

config/locales/co.yml

@@ -268,7 +268,6 @@ co:
       title: Emoji parsunalizate
       uncategorized: Micca categurizatu
       unlist: Slistà
-      unlisted: Micca listata
       update_failed_msg: Ùn s’hè micca pussutu mette à ghjornu l’emoji
       updated_msg: L’emoji hè stata messa à ghjornu!
       upload: Caricà
@@ -927,9 +926,7 @@ co:
       private: Solu per l’abbunati
       private_long: Mustrà solu à l’abbunati
       public: Pubblicu
-      public_long: Tuttu u mondu pò vede
       unlisted: Micca listatu
-      unlisted_long: Tuttu u mondu pò vede, mà micca indè e linee pubbliche
   statuses_cleanup:
     exceptions: Eccezzione
     keep_direct: Cunservà i missaghji diretti

config/locales/cs.yml

@@ -373,7 +373,6 @@ cs:
       title: Vlastní emoji
       uncategorized: Nezařazeno
       unlist: Neuvést
-      unlisted: Neuvedeno
       update_failed_msg: Toto emoji nebylo možné aktualizovat
       updated_msg: Emoji úspěšně aktualizováno!
       upload: Nahrát
@@ -1994,19 +1993,13 @@ cs:
       limit: Už jste si připnuli maximální počet příspěvků
       ownership: Nelze připnout příspěvek někoho jiného
       reblog: Boosty nelze připnout
-    quote_policies:
-      followers: Pouze vaši sledující
-      nobody: Nikdo
-      public: Všichni
     title: "%{name}: „%{quote}“"
     visibilities:
       direct: Soukromá zmínka
       private: Pouze pro sledující
       private_long: Zobrazit pouze sledujícím
       public: Veřejné
-      public_long: Uvidí kdokoliv
       unlisted: Neuvedené
-      unlisted_long: Uvidí kdokoliv, ale nebude zahrnut ve veřejných časových osách
   statuses_cleanup:
     enabled: Automaticky mazat staré příspěvky
     enabled_hint: Automaticky maže vaše příspěvky poté, co dosáhnou stanoveného stáří, nesplňují-li některou z výjimek níže

config/locales/cy.yml

@@ -379,7 +379,6 @@ cy:
       title: Emoji cyfaddas
       uncategorized: Heb gategori
       unlist: Dad-restru
-      unlisted: Heb eu rhestru
       update_failed_msg: Methwyd a diweddaru'r emoji hwnnw
       updated_msg: Llwyddwyd i ddiweddaru'r emoji!
       upload: Llwytho
@@ -2079,18 +2078,12 @@ cy:
       limit: Rydych chi eisoes wedi pinio uchafswm nifer y postiadau
       ownership: Nid oes modd pinio postiad rhywun arall
       reblog: Nid oes modd pinio hwb
-    quote_policies:
-      followers: Dim ond eich dilynwyr
-      nobody: Neb
-      public: Pawb
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Dilynwyr yn unig
       private_long: Dangos i ddilynwyr yn unig
       public: Cyhoeddus
-      public_long: Gall pawb weld
       unlisted: Heb ei restru
-      unlisted_long: Gall pawb weld, ond heb eu rhestru ar ffrydiau cyhoeddus
   statuses_cleanup:
     enabled: Dileu hen bostiadau'n awtomatig
     enabled_hint: Yn dileu eich postiadau yn awtomatig ar ôl iddyn nhw gyrraedd trothwy oed penodedig, oni bai eu bod yn cyfateb i un o'r eithriadau isod

config/locales/da.yml

@@ -367,7 +367,6 @@ da:
       title: Tilpassede emojier
       uncategorized: Ukategoriseret
       unlist: Fjern fra liste
-      unlisted: Ikke oplistet
       update_failed_msg: Kunne ikke opdatere denne emoji
       updated_msg: Emoji er opdateret!
       upload: Upload
@@ -1908,19 +1907,13 @@ da:
       limit: Maksimalt antal indlæg allerede fastgjort
       ownership: Andres indlæg kan ikke fastgøres
       reblog: En fremhævelse kan ikke fastgøres
-    quote_policies:
-      followers: Kun dine følgere
-      nobody: Ingen
-      public: Alle
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Privat omtale
       private: Kun følgere
       private_long: Vis kun til følgere
       public: Offentlig
-      public_long: Kan ses af alle
       unlisted: Ikke oplistet
-      unlisted_long: Kan ses af alle, men vises ikke på offentlige tidslinjer
   statuses_cleanup:
     enabled: Slet automatisk gamle indlæg
     enabled_hint: Sletter automatisk dine indlæg, når disse når en bestemt alder, medmindre de matcher en af undtagelserne nedenfor

config/locales/de.yml

@@ -367,7 +367,7 @@ de:
       title: Eigene Emojis
       uncategorized: Unkategorisiert
       unlist: Nicht anzeigen
-      unlisted: Nicht sichtbar
+      unlisted: Öffentlich (still)
       update_failed_msg: Konnte dieses Emoji nicht bearbeiten
       updated_msg: Emoji erfolgreich bearbeitet!
       upload: Hochladen
@@ -1909,8 +1909,8 @@ de:
       ownership: Du kannst nur eigene Beiträge anheften
       reblog: Du kannst keine geteilten Beiträge anheften
     quote_policies:
-      followers: Nur meine Follower
-      nobody: Niemand
+      followers: Nur Follower
+      nobody: Nur ich
       public: Alle
     title: "%{name}: „%{quote}“"
     visibilities:
@@ -1918,9 +1918,9 @@ de:
       private: Nur Follower
       private_long: Nur für deine Follower sichtbar
       public: Öffentlich
-      public_long: Für alle sichtbar
+      public_long: Alle in und außerhalb von Mastodon
       unlisted: Nicht gelistet
-      unlisted_long: Für alle sichtbar (mit Ausnahme von öffentlichen Timelines)
+      unlisted_long: Wird nicht in den Suchergebnissen, Trends oder öffentlichen Timelines von Mastodon angezeigt
   statuses_cleanup:
     enabled: Alte Beiträge automatisch entfernen
     enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen

config/locales/el.yml

@@ -367,7 +367,6 @@ el:
       title: Προσαρμοσμένα emoji
       uncategorized: Χωρίς κατηγορία
       unlist: Αφαίρεση από λίστα
-      unlisted: Μη καταχωρημένα
       update_failed_msg: Αδυναμία ενημέρωσης του emoji
       updated_msg: Επιτυχής ενημέρωση του emoji!
       upload: Μεταμόρφωση
@@ -1908,19 +1907,13 @@ el:
       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/en-GB.yml

@@ -361,7 +361,6 @@ en-GB:
       title: Custom emojis
       uncategorized: Uncategorised
       unlist: Unlist
-      unlisted: Unlisted
       update_failed_msg: Could not update that emoji
       updated_msg: Emoji successfully updated!
       upload: Upload
@@ -1878,16 +1877,12 @@ en-GB:
       limit: You have already pinned the maximum number of posts
       ownership: Someone else's post cannot be pinned
       reblog: A boost cannot be pinned
-    quote_policies:
-      public: Everyone
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Followers-only
       private_long: Only show to followers
       public: Public
-      public_long: Everyone can see
       unlisted: Unlisted
-      unlisted_long: Everyone can see, but not listed on public timelines
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below

config/locales/en.yml

@@ -367,7 +367,7 @@ en:
       title: Custom emojis
       uncategorized: Uncategorized
       unlist: Unlist
-      unlisted: Unlisted
+      unlisted: Quiet public
       update_failed_msg: Could not update that emoji
       updated_msg: Emoji successfully updated!
       upload: Upload
@@ -1919,9 +1919,9 @@ en:
       private: Followers-only
       private_long: Only show to followers
       public: Public
-      public_long: Everyone can see
+      public_long: Anyone on and off Mastodon
       unlisted: Unlisted
-      unlisted_long: Everyone can see, but not listed on public timelines
+      unlisted_long: Hidden from Mastodon search results, trending, and public timelines
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below

config/locales/eo.yml

@@ -361,7 +361,6 @@ eo:
       title: Propraj emoĝioj
       uncategorized: Nekategoriigita
       unlist: Nelistigi
-      unlisted: Nelistigita
       update_failed_msg: Ĝisdatigi tiun emoĝion ne eblis
       updated_msg: Emoĝio sukcese ĝisdatigita!
       upload: Alŝuti
@@ -1859,16 +1858,12 @@ eo:
       limit: Vi jam atingis la maksimuman nombron de alpinglitaj mesaĝoj
       ownership: Mesaĝo de iu alia ne povas esti alpinglita
       reblog: Diskonigo ne povas esti alpinglita
-    quote_policies:
-      public: Ĉiuj
     title: "%{name}: “%{quote}”"
     visibilities:
       private: Montri nur al sekvantoj
       private_long: Montri nur al sekvantoj
       public: Publika
-      public_long: Ĉiuj povas vidi
       unlisted: Ne enlistigita
-      unlisted_long: Ĉiuj povas vidi, sed nelistigita en publikaj templinioj
   statuses_cleanup:
     enabled: Aŭtomate forigi malnovajn postojn
     enabled_hint: Automate forigi viajn mesaĝojn kiam ili atingas la aĝlimon kaj havas escepton

config/locales/es-AR.yml

@@ -367,7 +367,7 @@ es-AR:
       title: Emojis personalizados
       uncategorized: Sin categoría
       unlist: No listar
-      unlisted: No listado
+      unlisted: Público pero silencioso
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "¡Emoji actualizado exitosamente!"
       upload: Subir
@@ -1909,18 +1909,18 @@ es-AR:
       ownership: No se puede fijar el mensaje de otra cuenta
       reblog: No se puede fijar una adhesión
     quote_policies:
-      followers: Solo tus seguidores
-      nobody: Nadie
-      public: Todos
+      followers: Solo seguidores
+      nobody: Solo yo
+      public: Cualquier cuenta
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Mención privada
       private: Sólo a seguidores
       private_long: Sólo mostrar a seguidores
       public: Público
-      public_long: Todos pueden ver
+      public_long: Todo el mundo, dentro y fuera de Mastodon
       unlisted: No listado
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas temporales públicas
+      unlisted_long: Oculto de los resultados de búsqueda, tendencias y líneas temporales públicas de Mastodon
   statuses_cleanup:
     enabled: Eliminar automáticamente mensajes antiguos
     enabled_hint: Elimina automáticamente tus mensajes una vez que alcancen un umbral de edad especificado, a menos que coincidan con una de las excepciones a continuación

config/locales/es-MX.yml

@@ -367,7 +367,7 @@ es-MX:
       title: Emojis personalizados
       uncategorized: Sin clasificar
       unlist: No listado
-      unlisted: Sin listar
+      unlisted: Ocultos
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "¡Emoji actualizado con éxito!"
       upload: Subir
@@ -1909,8 +1909,8 @@ es-MX:
       ownership: La publicación de alguien más no puede fijarse
       reblog: No se puede fijar una publicación impulsada
     quote_policies:
-      followers: Solo tus seguidores
-      nobody: Nadie
+      followers: Solo seguidores
+      nobody: Solo yo
       public: Cualquiera
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1918,9 +1918,9 @@ es-MX:
       private: Sólo mostrar a seguidores
       private_long: Solo mostrar a tus seguidores
       public: Público
-      public_long: Todos pueden ver
+      public_long: Cualquiera dentro y fuera de Mastodon
       unlisted: Público, pero no mostrar en la historia federada
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
+      unlisted_long: Ocultado de los resultados de búsqueda de Mastodon, tendencias y cronologías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
     enabled_hint: Elimina automáticamente tus publicaciones una vez que alcancen un umbral de tiempo especificado, a menos que coincidan con alguna de las excepciones detalladas debajo

config/locales/es.yml

@@ -367,7 +367,7 @@ es:
       title: Emojis personalizados
       uncategorized: Sin clasificar
       unlist: No listado
-      unlisted: Sin listar
+      unlisted: Ocultos
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "¡Emoji actualizado con éxito!"
       upload: Subir
@@ -1909,8 +1909,8 @@ es:
       ownership: La publicación de otra persona no puede fijarse
       reblog: Una publicación impulsada no puede fijarse
     quote_policies:
-      followers: Solo tus seguidores
-      nobody: Nadie
+      followers: Solo seguidores
+      nobody: Solo yo
       public: Cualquiera
     title: "%{name}: «%{quote}»"
     visibilities:
@@ -1918,9 +1918,9 @@ es:
       private: Solo seguidores
       private_long: Solo mostrar a tus seguidores
       public: Pública
-      public_long: Todos pueden ver
+      public_long: Cualquiera dentro y fuera de Mastodon
       unlisted: Pública, pero no mostrar en la historia federada
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
+      unlisted_long: Ocultado de los resultados de búsqueda de Mastodon, tendencias y cronologías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
     enabled_hint: Elimina automáticamente tus publicaciones una vez que alcancen un umbral de tiempo especificado, a menos que coincidan con alguna de las excepciones detalladas debajo

config/locales/et.yml

@@ -367,7 +367,6 @@ et:
       title: Emotikonid
       uncategorized: Kategoriseerimata
       unlist: Loetlemata
-      unlisted: Ajajooneväline
       update_failed_msg: Ei saanud seda emotikoni uuendada
       updated_msg: Emotikoni uuendamine õnnestus!
       upload: Lae üles
@@ -1892,16 +1891,12 @@ et:
       limit: Kinnitatud on juba maksimaalne arv postitusi
       ownership: Kellegi teise postitust ei saa kinnitada
       reblog: Jagamist ei saa kinnitada
-    quote_policies:
-      public: Kõik
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Ainult jälgijatele
       private_long: Näevad ainult jälgijad
       public: Avalik
-      public_long: Postitused on kõigile näha
       unlisted: Ajajooneväline
-      unlisted_long: Kõigile näha, kuid ei näidata avalikel ajajoontel
   statuses_cleanup:
     enabled: Vanade postituste automaatne kustutamine
     enabled_hint: Kustutab automaatselt postitused, mis ületavad määratud ajalimiiti, välja arvatud allpool toodud erandite puhul

config/locales/eu.yml

@@ -350,7 +350,6 @@ eu:
       title: Emoji pertsonalak
       uncategorized: Kategoriarik gabe
       unlist: Kendu zerrendatik
-      unlisted: Zerrendatu gabea
       update_failed_msg: Ezin izan da emoji hori eguneratu
       updated_msg: Emoji-a ongi eguneratu da!
       upload: Igo
@@ -1741,16 +1740,12 @@ eu:
       limit: Gehienez finkatu daitekeen bidalketa kopurua finkatu duzu jada
       ownership: Ezin duzu beste norbaiten bidalketa bat finkatu
       reblog: Bultzada bat ezin da finkatu
-    quote_policies:
-      public: Guztiak
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Jarraitzaileak soilik
       private_long: Erakutsi jarraitzaileei soilik
       public: Publikoa
-      public_long: Edonork ikusi dezake
       unlisted: Zerrendatu gabea
-      unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
   statuses_cleanup:
     enabled: Ezabatu bidalketa zaharrak automatikoki
     enabled_hint: Zure bidalketa zaharrak automatikoki ezabatzen ditu zehazturiko denbora mugara iristean, beheko baldintza bat betetzen ez bada

config/locales/fa.yml

@@ -367,7 +367,6 @@ fa:
       title: شکلک‌های سفارشی
       uncategorized: دسته‌بندی نشده
       unlist: نافهرست
-      unlisted: فهرست نشده
       update_failed_msg: این شکلک نتوانست به‌روز شود
       updated_msg: شکلک با موفقیت به‌روز شد!
       upload: بارگذاری
@@ -1908,18 +1907,12 @@ fa:
       limit: از این بیشتر نمی‌شود نوشته‌های ثابت داشت
       ownership: نوشته‌های دیگران را نمی‌توان ثابت کرد
       reblog: تقویت نمی‌تواند سنجاق شود
-    quote_policies:
-      followers: تنها پی‌گیرندگانتان
-      nobody: هیچ‌کس
-      public: هرکسی
     title: "%{name}: «%{quote}»"
     visibilities:
       private: خصوصی
       private_long: تنها پیگیران شما می‌بینند
       public: عمومی
-      public_long: همه می‌توانند ببینند
       unlisted: فهرست نشده
-      unlisted_long: عمومی، ولی در فهرست نوشته‌ها نمایش نمی‌یابد
   statuses_cleanup:
     enabled: حذف خودکار فرسته‌های قدیمی
     enabled_hint: فرسته‌هایتان را هنگام رسیدن به کرانهٔ سن خاصی به صورت خودکار حذف می‌کند، مگر این که با یکی از استثناهای زیر مطابق باشند

config/locales/fi.yml

@@ -367,7 +367,7 @@ fi:
       title: Mukautetut emojit
       uncategorized: Luokittelematon
       unlist: Poista listasta
-      unlisted: Ei listassa
+      unlisted: Vaivihkaisesti julkinen
       update_failed_msg: Emojin päivitys epäonnistui
       updated_msg: Emojin päivitys onnistui!
       upload: Lähetä
@@ -1909,18 +1909,18 @@ fi:
       ownership: Muiden julkaisuja ei voi kiinnittää
       reblog: Tehostusta ei voi kiinnittää
     quote_policies:
-      followers: Vain seuraajasi
-      nobody: Ei kukaan
-      public: Kaikki
+      followers: Vain seuraajat
+      nobody: Vain minä
+      public: Kuka tahansa
     title: "%{name}: ”%{quote}”"
     visibilities:
       direct: Yksityismaininta
       private: Vain seuraajat
       private_long: Näytä vain seuraajille
       public: Julkinen
-      public_long: Kaikki voivat nähdä
+      public_long: Kuka tahansa Mastodonissa ja sen ulkopuolella
       unlisted: Listaamaton
-      unlisted_long: Kaikki voivat nähdä, mutta ei näytetä julkisilla aikajanoilla
+      unlisted_long: Piilotettu Mastodonin hakutuloksista, trendeistä ja julkisilta aikajanoilta
   statuses_cleanup:
     enabled: Poista vanhat julkaisut automaattisesti
     enabled_hint: Poistaa julkaisusi automaattisesti, kun ne saavuttavat valitun ikäkynnyksen, ellei jokin alla olevista poikkeuksista tule kyseeseen

config/locales/fo.yml

@@ -367,7 +367,6 @@ fo:
       title: Sergjørd kenslutekn
       uncategorized: Ikki flokkað
       unlist: Tak av listanum
-      unlisted: Ikki listað
       update_failed_msg: Fekk ikki dagført hatta kensluteknið
       updated_msg: Kenslutekn dagført!
       upload: Legg upp
@@ -1908,18 +1907,12 @@ fo:
       limit: Tú hevur longu fest loyvda talið av postum
       ownership: Postar hjá øðrum kunnu ikki festast
       reblog: Ein stimbran kann ikki festast
-    quote_policies:
-      followers: Einans tey, ið fylgja tær
-      nobody: Eingin
-      public: Øll
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Einans fylgjarar
       private_long: Vís einans fyri fylgjarum
       public: Alment
-      public_long: Øll kunnu síggja
       unlisted: Ólistað
-      unlisted_long: Øll kunnu síggja, men ikki listað á almennum tíðarlinjum
   statuses_cleanup:
     enabled: Strika gamlar postar sjálvvirkandi
     enabled_hint: Strikar postar tínar sjálvvirkandi, tá teir verða eldri enn eitt vist, uttan so at teir samsvara við eitt av undantøkunum niðanfyri

config/locales/fr-CA.yml

@@ -361,7 +361,6 @@ fr-CA:
       title: Émojis personnalisés
       uncategorized: Non catégorisé
       unlist: Délister
-      unlisted: Délisté
       update_failed_msg: Cet émoji n'a pas pu être mis à jour
       updated_msg: Émoji mis à jour avec succès !
       upload: Téléverser
@@ -1852,18 +1851,12 @@ fr-CA:
       limit: Vous avez déjà épinglé le nombre maximum de messages
       ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
-    quote_policies:
-      followers: Vos abonné·es seulement
-      nobody: Personne
-      public: Tout le monde
     title: "%{name} : « %{quote} »"
     visibilities:
       private: Abonné⋅e⋅s uniquement
       private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos messages
       unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
     enabled: Supprimer automatiquement vos anciens messages
     enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous

config/locales/fr.yml

@@ -361,7 +361,6 @@ fr:
       title: Émojis personnalisés
       uncategorized: Non catégorisé
       unlist: Délister
-      unlisted: Délisté
       update_failed_msg: Cet émoji n'a pas pu être mis à jour
       updated_msg: Émoji mis à jour avec succès !
       upload: Téléverser
@@ -1852,18 +1851,12 @@ fr:
       limit: Vous avez déjà épinglé le nombre maximum de messages
       ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
-    quote_policies:
-      followers: Vos abonné·es seulement
-      nobody: Personne
-      public: Tout le monde
     title: "%{name} : « %{quote} »"
     visibilities:
       private: Abonné⋅e⋅s uniquement
       private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos messages
       unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
     enabled: Supprimer automatiquement vos anciens messages
     enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous

config/locales/fy.yml

@@ -367,7 +367,6 @@ fy:
       title: Lokale emoji
       uncategorized: Net kategorisearre
       unlist: Net yn list
-      unlisted: Net werjaan
       update_failed_msg: Dizze emoji koe net bywurke wurde
       updated_msg: Emoji fernije is slagge!
       upload: Oplade
@@ -1904,16 +1903,12 @@ fy:
       limit: Jo hawwe it maksimaal tal berjochten al fêstmakke
       ownership: In berjocht fan in oar kin net fêstmakke wurde
       reblog: In boost kin net fêstset wurde
-    quote_policies:
-      public: Elkenien
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Allinnich folgers
       private_long: Allinnich oan jo folgers toane
       public: Iepenbier
-      public_long: Elkenien kin it sjen
       unlisted: Minder iepenbier
-      unlisted_long: Elkenien kin it sjen, mar net op iepenbiere tiidlinen
   statuses_cleanup:
     enabled: Automatysk âlde berjochten fuortsmite
     enabled_hint: Smyt jo berjochten automatysk fuort sa gau as se in bepaalde leeftiidsgrins berikke, útsein se oerienkomme mei ien fan de ûndersteande útsûnderingen

config/locales/ga.yml

@@ -376,7 +376,6 @@ ga:
       title: Emojis saincheaptha
       uncategorized: Neamhchatagóirithe
       unlist: Neamhliostaigh
-      unlisted: Neamhliostaithe
       update_failed_msg: Níorbh fhéidir an emoji sin a nuashonrú
       updated_msg: D'éirigh le Emoji a nuashonrú!
       upload: Uaslódáil
@@ -2037,18 +2036,12 @@ ga:
       limit: Tá uaslíon na bpostálacha pinn agat cheana féin
       ownership: Ní féidir postáil duine éigin eile a phionnáil
       reblog: Ní féidir treisiú a phinnáil
-    quote_policies:
-      followers: Do leanúna amháin
-      nobody: Aon duine
-      public: Gach duine
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Leantóirí amháin
       private_long: Taispeáin do leantóirí amháin
       public: Poiblí
-      public_long: Is féidir le gach duine a fheiceáil
       unlisted: Neamhliostaithe
-      unlisted_long: Is féidir le gach duine a fheiceáil, ach nach bhfuil liostaithe ar amlínte poiblí
   statuses_cleanup:
     enabled: Scrios seanphostálacha go huathoibríoch
     enabled_hint: Scriostar do phostálacha go huathoibríoch nuair a shroicheann siad tairseach aoise sonraithe, ach amháin má thagann siad le ceann de na heisceachtaí thíos

config/locales/gd.yml

@@ -367,7 +367,6 @@ gd:
       title: Emojis gnàthaichte
       uncategorized: Gun roinn-seòrsa
       unlist: Falaich o liostaichean
-      unlisted: Falaichte o liostaichean
       update_failed_msg: Cha b’ urrainn dhuinn an t-Emoji sin ùrachadh
       updated_msg: Chaidh an t-Emoji ùrachadh!
       upload: Luchdaich suas
@@ -1960,16 +1959,12 @@ gd:
       limit: Tha an àireamh as motha de phostaichean prìnichte agad a tha ceadaichte
       ownership: Chan urrainn dhut post càich a phrìneachadh
       reblog: Chan urrainn dhut brosnachadh a phrìneachadh
-    quote_policies:
-      public: A h-uile duine
     title: "%{name}: “%{quote}”"
     visibilities:
       private: Luchd-leantainn a-mhàin
       private_long: Na seall ach dhan luchd-leantainn
       public: Poblach
-      public_long: Chì a h-uile duine seo
       unlisted: Falaichte o liostaichean
-      unlisted_long: Chì a h-uile duine seo ach cha nochd e air loidhnichean-ama poblach
   statuses_cleanup:
     enabled: Sguab às seann-phostaichean gu fèin-obrachail
     enabled_hint: Sguabaidh seo às na seann-phostaichean agad gu fèin-obrachail nuair a ruigeas iad stairsneach aoise sònraichte ach ma fhreagras iad ri gin dhe na h-eisgeachdan gu h-ìosal

config/locales/gl.yml

@@ -367,7 +367,7 @@ gl:
       title: Emoticonas personalizadas
       uncategorized: Sen categoría
       unlist: Non listar
-      unlisted: Fóra das listas
+      unlisted: Público limitado
       update_failed_msg: Non foi posíbel actualizar a emoticona
       updated_msg: Actualizouse a emoticona de xeito correcto!
       upload: Subir
@@ -1910,7 +1910,7 @@ gl:
       reblog: Non se poden fixar as mensaxes promovidas
     quote_policies:
       followers: Só para seguidoras
-      nobody: Ninguén
+      nobody: Só para min
       public: Calquera
     title: '%{name}: "%{quote}"'
     visibilities:
@@ -1918,9 +1918,9 @@ gl:
       private: Só seguidoras
       private_long: Mostrar só as seguidoras
       public: Público
-      public_long: Visible para calquera
+      public_long: Para calquera dentro e fóra de Mastodon
       unlisted: Fóra das listas
-      unlisted_long: Visible para calquera, pero non en cronoloxías públicas
+      unlisted_long: Non aparece nos resultados de buscas en Mastodon, nas tendencias e cronoloxías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicacións antigas
     enabled_hint: Borra automáticamente as túas publicacións unha vez acadan certa lonxevidade, a menos que cumpran algunha destas excepcións

config/locales/he.yml

@@ -373,7 +373,6 @@ he:
       title: אמוג'י שהעלינו
       uncategorized: לא מסווגים
       unlist: בטל רישום
-      unlisted: לא רשומים
       update_failed_msg: לא ניתן היה לעדכן את היצגן הזה
       updated_msg: יצגן עודכן בהצלחה!
       upload: העלאה
@@ -1994,19 +1993,13 @@ he:
       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/hr.yml

@@ -217,9 +217,7 @@ hr:
     visibilities:
       private: Samo pratitelji
       public: Javno
-      public_long: Svi mogu vidjeti
       unlisted: Neprikazano
-      unlisted_long: Svi mogu vidjeti, ali nije izlistano u javnim timelineovima
   statuses_cleanup:
     enabled: Automatski obriši strare postove
   stream_entries:

config/locales/hu.yml

@@ -367,7 +367,6 @@ hu:
       title: Egyéni emodzsik
       uncategorized: Nem kategorizált
       unlist: Elrejtés a listáról
-      unlisted: Nem listázott
       update_failed_msg: Nem sikerült frissíteni az emodzsit
       updated_msg: Emodzsi sikeresen frissítve!
       upload: Feltöltés
@@ -1908,19 +1907,13 @@ hu:
       limit: Elérted a kitűzhető bejegyzések maximális számát
       ownership: Nem tűzheted ki valaki más bejegyzését
       reblog: Megtolt bejegyzést nem tudsz kitűzni
-    quote_policies:
-      followers: Csak a követőid
-      nobody: Senki
-      public: Mindenki
     title: "%{name}: „%{quote}”"
     visibilities:
       direct: Privát említés
       private: Csak követőknek
       private_long: Csak a követőidnek jelenik meg
       public: Nyilvános
-      public_long: Bárki láthatja
       unlisted: Listázatlan
-      unlisted_long: Mindenki látja, de a nyilvános idővonalakon nem jelenik meg
   statuses_cleanup:
     enabled: Régi bejegyzések automatikus törlése
     enabled_hint: Automatikusan törli a bejegyzéseidet, ahogy azok elérik a megadott korhatárt, kivéve azokat, melyek illeszkednek valamely alábbi kivételre

config/locales/hy.yml

@@ -229,7 +229,6 @@ hy:
       title: Սեփական էմօջիներ
       uncategorized: Չդասակարգուած
       unlist: Ապացուցակագրում
-      unlisted: Ծածուկ
       update_failed_msg: Էմոջին չի կարող թարմացուել
       updated_msg: Էմոջին թարմացուեց
       upload: Վերբեռնել
@@ -780,9 +779,7 @@ hy:
       private: Միայն հետեւողներին
       private_long: Հասանելի միայն հետեւորդներին
       public: Հրապարակային
-      public_long: Տեսանելի բոլորին
       unlisted: Ծածուկ
-      unlisted_long: Տեսանելի է բոլորին, բայց չի յայտնւում հանրային հոսքերում
   statuses_cleanup:
     exceptions: Բացառություններ
     min_age:

config/locales/ia.yml

@@ -367,7 +367,7 @@ ia:
       title: Emojis personalisate
       uncategorized: Sin categoria
       unlist: Non listar
-      unlisted: Non listate
+      unlisted: Public, non listate
       update_failed_msg: Non poteva actualisar le emoji
       updated_msg: Emoji actualisate con successo!
       upload: Incargar
@@ -902,7 +902,7 @@ ia:
       open: Aperir message
       original_status: Message original
       reblogs: Republicationes
-      replied_to_html: Respondite a %{acct_link}
+      replied_to_html: Responsa a %{acct_link}
       status_changed: Message cambiate
       status_title: Message de @%{name}
       title: Messages del conto – @%{name}
@@ -1909,17 +1909,18 @@ ia:
       ownership: Le message de alcuno altere non pote esser appunctate
       reblog: Un impulso non pote esser affixate
     quote_policies:
-      followers: Solmente tu sequitores
-      nobody: Necuno
+      followers: Solmente sequitores
+      nobody: Solo io
       public: Omnes
     title: "%{name}: “%{quote}”"
     visibilities:
+      direct: Mention private
       private: Solmente sequitores
       private_long: Solmente monstrar a sequitores
       public: Public
-      public_long: Omnes pote vider
+      public_long: Quicunque, sur Mastodon o non
       unlisted: Non listate
-      unlisted_long: Omnes pote vider, ma non es listate in le chronologias public
+      unlisted_long: Celate in resultatos de recerca, tendentias e chronologias public de Mastodon
   statuses_cleanup:
     enabled: Deler automaticamente le messages ancian
     enabled_hint: Dele automaticamente tu messages un vice que illos attinge un limine de etate specificate, salvo que illes concorda un del exceptiones infra

config/locales/id.yml

@@ -317,7 +317,6 @@ id:
       title: Emoji kustom
       uncategorized: Tak terkategorikan
       unlist: Tak terdaftar
-      unlisted: Tak terdaftar
       update_failed_msg: Tak dapat memperbarui emoji
       updated_msg: Emoji berhasil diperbarui!
       upload: Unggah
@@ -1382,9 +1381,7 @@ id:
       private: Khusus pengikut
       private_long: Hanya tampilkan ke pengikut
       public: Publik
-      public_long: Bisa dilihat semua orang
       unlisted: Bisa dilihat semua orang, tapi tidak ditampilkan di linimasa publik
-      unlisted_long: Tidak terdaftar di linimasa publik tetapi siapapun dapat melihat
   statuses_cleanup:
     enabled: Otomatis hapus kiriman lama
     enabled_hint: "Otomatis menghapus kiriman Anda saat sudah mencapai batasan usia, kecuali yang cocok \nsesuai di bawah ini"

config/locales/ie.yml

@@ -319,7 +319,6 @@ ie:
       title: Customisat emoji
       uncategorized: Íncategorisat
       unlist: Delistar
-      unlisted: Delistat
       update_failed_msg: Ne posset actualisar ti emoji
       updated_msg: Emoji successosimen actualisat!
       upload: Cargar
@@ -1625,9 +1624,7 @@ ie:
       private: Solmen por sequitores
       private_long: Monstrar solmen a sequitores
       public: Public
-      public_long: Omnes posse vider
       unlisted: Delistat
-      unlisted_long: Omnes posse vider, ma ne listat sur public témpor-lineas
   statuses_cleanup:
     enabled: Automaticmen deleter old postas
     enabled_hint: Deleter automaticmen tui postas quande ili atinge un cert etá, except si ili concorda con un del exceptiones ci infra

config/locales/io.yml

@@ -356,7 +356,6 @@ io:
       title: Kustumizita emocimaji
       uncategorized: Nekategorigita
       unlist: Delistigez
-      unlisted: Delistigita
       update_failed_msg: Ne povas novigar ta emocimajo
       updated_msg: Emocimajo sucesoze novigesis!
       upload: Adkargar
@@ -1746,9 +1745,7 @@ io:
       private: Montrar nur a sequanti
       private_long: Nur montrez a sequanti
       public: Publika
-      public_long: Omnu povas vidar
       unlisted: Publika, ma ne aperos en publika tempolinei
-      unlisted_long: Omnu povas vidar ma ne listigesas che publika tempolinei
   statuses_cleanup:
     enabled: Automata efacez olda posti
     enabled_hint: Automata efacez vua posti pos oli atingar fixita oldeslimito, se oli ne parigesas a 1 de suba ecepti