diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index a54d2d3b50..a5cb12d7ca 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/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
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index 41589061da..32e106f0e4 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/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 : (
diff --git a/app/javascript/flavours/glitch/components/status_quoted.tsx b/app/javascript/flavours/glitch/components/status_quoted.tsx
index cfbc7fd0d2..882e2c9a07 100644
--- a/app/javascript/flavours/glitch/components/status_quoted.tsx
+++ b/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`.
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
index eb326f6c4d..eaa4a0ca93 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification.jsx
+++ b/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':
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
index f152eaef8b..5382287935 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
+++ b/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
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_quoted_update.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_quoted_update.tsx
new file mode 100644
index 0000000000..a2b474f304
--- /dev/null
+++ b/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}
+  />
+);
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
index 06e1cbed43..73b3bef96e 100644
--- a/app/javascript/flavours/glitch/models/notification_group.ts
+++ b/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,
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index 69fd17a256..b22ae59437 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/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
diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx
index 7f5f51977c..1b6ae2aaf3 100644
--- a/app/javascript/mastodon/components/status_quoted.tsx
+++ b/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`.
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 501ef8f5c1..7f522b6392 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/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':
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
index e992335cbc..d696211465 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
+++ b/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
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_quoted_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_quoted_update.tsx
new file mode 100644
index 0000000000..a48dd9b2b0
--- /dev/null
+++ b/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}
+  />
+);
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index 465a5f0877..eed1db7ab9 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index c6326096d0..1667829633 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/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": "Захаваць"
 }
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 04abc227fa..ff4167349e 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/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": "Някой"
 }
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index f07edacd0c..506aa9bd0c 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index eac9d13820..4dde78bb06 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 9be02f046d..5e43ffa769 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d88be09b56..505e37d02d 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9f5e229102..feba7cd99f 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 6d45d2b7c0..455263f2e4 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 7ff515b3f3..81781e189d 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/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": "Αποθήκευση"
 }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 79a01a02f2..57a45c2b64 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/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}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 1468f742d9..c362807d59 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index bb181ea449..262e7df4a8 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index a704ab5a72..53decec661 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 1d70f64888..99b5ceca57 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index a064afec88..4c6144d94f 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index b361b740c1..3f63adc4e0 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/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": "هرکسی"
 }
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 0b9c33ffcc..83d075520c 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index fecd8e3155..4c0877053d 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 550b121da2..c0851c3890 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 105ccce873..1a6fcad35f 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 18a1ac2d8a..2432887036 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/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": "שמירה"
 }
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index bb51f5ecd9..b699fd406c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index c6bba3bac9..60d94c0fa1 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 0911dd8f26..001409ab82 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 5b4b73d9d8..c9cf181283 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index e9ded90de5..bd28a8ee95 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index b74ad36ab9..94cdc3aaad 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/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": "저장"
 }
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index 93c6f7eabd..319a3001e3 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/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": "儲存"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index b5f4871078..07afa6cfae 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 08d279eb11..12d4ed9727 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 27c5ed093c..f038021138 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index d51907847a..ddb68e7714 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index e8bad3bf65..699e877fbd 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/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": "Зберегти"
 }
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index bbe9db1fa0..fe22988d72 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/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"
 }
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 429d882e3e..93debd5029 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/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": "保存"
 }
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index c847d79b6e..138bdc4155 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/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": "儲存"
 }
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index 9394cbbed8..7b88f90429 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/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,
diff --git a/app/models/notification.rb b/app/models/notification.rb
index acef474a59..8ee32798ad 100644
--- a/app/models/notification.rb
+++ b/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
diff --git a/app/models/quote.rb b/app/models/quote.rb
index ad5c9509ea..dcfcd3b353 100644
--- a/app/models/quote.rb
+++ b/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?
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 347659bdfe..40f7f04ede 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/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?
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 5644c0b105..46b9245be5 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/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!
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 95563698f4..fa2c728e57 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -8,6 +8,7 @@ class NotifyService < BaseService
     admin.report
     admin.sign_up
     update
+    quoted_update
     poll
     status
     moderation_warning
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index 40c46b8b6b..cd52953a40 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/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
diff --git a/app/views/filters/edit.html.haml b/app/views/filters/edit.html.haml
index 3dc3f07b72..2042977e69 100644
--- a/app/views/filters/edit.html.haml
+++ b/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
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index b26b6251f1..4e4dfbff8e 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/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,
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb
index 749a54b73b..e76572984d 100644
--- a/app/workers/local_notification_worker.rb
+++ b/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
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 8b69c6db8f..168cb1904b 100644
--- a/config/locales/an.yml
+++ b/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
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c23532e724..19a10803d7 100644
--- a/config/locales/ar.yml
+++ b/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: حذف منشوراتك تلقائياً بمجرد أن تصل إلى عتبة عمرية محددة، إلا إذا كانت مطابقة لأحد الاستثناءات أدناه
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 629043b4a5..d63ba80dff 100644
--- a/config/locales/ast.yml
+++ b/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
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 302dccdecb..51c612ec25 100644
--- a/config/locales/az.yml
+++ b/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
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 9faf58d8ad..a65dfed159 100644
--- a/config/locales/be.yml
+++ b/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: Аўтаматычна выдаляць вашыя допісы, калі яны дасягаюць вызначанага тэрміну, акрамя наступных выпадкаў
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 8a2d9ff8f9..8bb97bb22d 100644
--- a/config/locales/bg.yml
+++ b/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: От само себе си трие публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 74ff25d754..75b0fbd611 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -183,7 +183,6 @@ bn:
       title: স্বনির্ধারিত ইমোজিগুলি
       uncategorized: শ্রেণীবিহীন
       unlist: তালিকামুক্ত
-      unlisted: তালিকামুক্ত
       update_failed_msg: সেই ইমোজি আপডেট করতে পারেনি
       updated_msg: ইমোজি সফলভাবে আপডেট হয়েছে!
       upload: আপলোড
diff --git a/config/locales/br.yml b/config/locales/br.yml
index f0d15fde9a..38794dd75d 100644
--- a/config/locales/br.yml
+++ b/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:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f4ce7885e7..0089796d8b 100644
--- a/config/locales/ca.yml
+++ b/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
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 0f2a5ed364..597dc5c3e8 100644
--- a/config/locales/ckb.yml
+++ b/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:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 52b6bde60c..29217c0b65 100644
--- a/config/locales/co.yml
+++ b/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
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 035fdc79aa..6874e3d7f8 100644
--- a/config/locales/cs.yml
+++ b/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
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index f0e3575fc0..e9fb6491b8 100644
--- a/config/locales/cy.yml
+++ b/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
diff --git a/config/locales/da.yml b/config/locales/da.yml
index db934b1dd5..42eecab4d1 100644
--- a/config/locales/da.yml
+++ b/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
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4898dc1e81..8550fb754a 100644
--- a/config/locales/de.yml
+++ b/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
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e5b208bbe3..000f5fbff2 100644
--- a/config/locales/el.yml
+++ b/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: Διαγράφει αυτόματα τις αναρτήσεις σου μόλις φτάσουν σε ένα καθορισμένο όριο ηλικίας, εκτός αν ταιριάζουν με μία από τις παρακάτω εξαιρέσεις
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2571116436..e2cf9701d7 100644
--- a/config/locales/en-GB.yml
+++ b/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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a653a2108a..014ec44863 100644
--- a/config/locales/en.yml
+++ b/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
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c91cc06f7f..7daabc1928 100644
--- a/config/locales/eo.yml
+++ b/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
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index c113a6a339..9d7654d309 100644
--- a/config/locales/es-AR.yml
+++ b/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
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 8cf47f946f..6616604e53 100644
--- a/config/locales/es-MX.yml
+++ b/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
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3d1009b20d..6009d86a06 100644
--- a/config/locales/es.yml
+++ b/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
diff --git a/config/locales/et.yml b/config/locales/et.yml
index b8da4dbb85..9178d2fbf1 100644
--- a/config/locales/et.yml
+++ b/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
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 7a2eebf639..92e504aa28 100644
--- a/config/locales/eu.yml
+++ b/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
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 00da597331..1fcdfaaee4 100644
--- a/config/locales/fa.yml
+++ b/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: فرسته‌هایتان را هنگام رسیدن به کرانهٔ سن خاصی به صورت خودکار حذف می‌کند، مگر این که با یکی از استثناهای زیر مطابق باشند
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 44eaa4083f..3ebcafd12a 100644
--- a/config/locales/fi.yml
+++ b/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
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 2ac0966434..999fe27d34 100644
--- a/config/locales/fo.yml
+++ b/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
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 53885694c0..efc728307d 100644
--- a/config/locales/fr-CA.yml
+++ b/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
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index a83a85121b..07627b39a7 100644
--- a/config/locales/fr.yml
+++ b/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
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index b00a52f4db..b00b81d9fb 100644
--- a/config/locales/fy.yml
+++ b/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
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 97866f641d..b5e7c4daf8 100644
--- a/config/locales/ga.yml
+++ b/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
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 9c231e187f..edb49ee87a 100644
--- a/config/locales/gd.yml
+++ b/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
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index e28fb9e116..d7c947e493 100644
--- a/config/locales/gl.yml
+++ b/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
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 09c52d7427..13f343cc18 100644
--- a/config/locales/he.yml
+++ b/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: מוחק אוטומטית את הודעותיך לכשהגיעו לסף גיל שנקבע מראש, אלא אם הן תואמות את אחת ההחרגות למטה
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 908cbf51c4..a85aed5882 100644
--- a/config/locales/hr.yml
+++ b/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:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 66d5b5858e..1a4e34d3e7 100644
--- a/config/locales/hu.yml
+++ b/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
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index 6a4122e81b..69edde570f 100644
--- a/config/locales/hy.yml
+++ b/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:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 3b30426fc7..681cbd4cc1 100644
--- a/config/locales/ia.yml
+++ b/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
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 9c3bd035e4..b0ee019098 100644
--- a/config/locales/id.yml
+++ b/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"
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 92fdb59b23..2c767daa37 100644
--- a/config/locales/ie.yml
+++ b/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
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 2c89a46463..c1f6825fbe 100644
--- a/config/locales/io.yml
+++ b/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
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 13ebc99233..8857d0e1e2 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -367,7 +367,7 @@ is:
       title: Sérsniðin tjáningartákn
       uncategorized: Óflokkað
       unlist: Afskrá
-      unlisted: Óskráð
+      unlisted: Hljóðlátt opinbert
       update_failed_msg: Gat ekki uppfært þetta tjáningartákn
       updated_msg: Tókst að uppfæra tjáningartákn!
       upload: Senda inn
@@ -1913,18 +1913,18 @@ is:
       ownership: Færslur frá einhverjum öðrum er ekki hægt að festa
       reblog: Ekki er hægt að festa endurbirtingu
     quote_policies:
-      followers: Einungis þeir sem fylgjast með þér
-      nobody: Enginn
-      public: Allir
+      followers: Einungis fylgjendur
+      nobody: Bara ég
+      public: Hver sem er
     title: "%{name}: „%{quote}‟"
     visibilities:
       direct: Einkaspjall
       private: Einungis fylgjendur
       private_long: Aðeins birt fylgjendum
       public: Opinber
-      public_long: Allir geta séð
+      public_long: Hver sem er, á og utan Mastodon
       unlisted: Óskráð
-      unlisted_long: Allir geta skoðað, en er ekki talið upp á opinberum tímalínum
+      unlisted_long: Falið frá leitarniðurstöðum Mastodon, vinsældalistum og opinberum tímalínum
   statuses_cleanup:
     enabled: Sjálfkrafa eyða eldri færslum
     enabled_hint: Eyðir sjálfkrafa færslum þínum um leið og þær ná tilteknum aldursmörkum, nema ef þær samsvara einni af undantekningunum hér fyrir neðan
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 882dff662e..5f9aca0a88 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -367,7 +367,7 @@ it:
       title: Emoji personalizzate
       uncategorized: Nessuna categoria
       unlist: Escludi dall'elenco
-      unlisted: Non elencato
+      unlisted: Pubblico silenzioso
       update_failed_msg: Impossibile aggiornare questa emojii
       updated_msg: Emoji aggiornata con successo!
       upload: Carica
@@ -1911,18 +1911,18 @@ it:
       ownership: Non puoi fissare in cima un post di qualcun altro
       reblog: Un toot condiviso non può essere fissato in cima
     quote_policies:
-      followers: Solo i tuoi seguaci
-      nobody: Nessuno
-      public: Tutti
+      followers: Solo i seguaci
+      nobody: Solo io
+      public: Chiunque
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Menzione privata
       private: Mostra solo ai tuoi seguaci
       private_long: Mostra solo ai seguaci
       public: Pubblico
-      public_long: Tutti lo possono vedere
+      public_long: Chiunque dentro e fuori Mastodon
       unlisted: Pubblico, ma non visibile sulla timeline pubblica
-      unlisted_long: Tutti lo possono vedere, ma non compare nelle timeline pubbliche
+      unlisted_long: Nascosto dai risultati di ricerca di Mastodon, dalle tendenze e dalle timeline pubbliche
   statuses_cleanup:
     enabled: Cancella automaticamente i vecchi post
     enabled_hint: Cancella automaticamente i tuoi post quando diventano più vecchi di una soglia di età specificata, a meno che non corrispondano a una delle eccezioni sotto
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0e77438e1b..09169210b6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -358,7 +358,6 @@ ja:
       title: カスタム絵文字
       uncategorized: 未分類
       unlist: 非表示
-      unlisted: 非表示
       update_failed_msg: 絵文字を更新できませんでした
       updated_msg: 絵文字の更新に成功しました！
       upload: アップロード
@@ -1824,16 +1823,12 @@ ja:
       limit: 固定できる投稿数の上限に達しました
       ownership: 他人の投稿を固定することはできません
       reblog: ブーストを固定することはできません
-    quote_policies:
-      public: 全員
     title: '%{name}: "%{quote}"'
     visibilities:
       private: フォロワー限定
       private_long: フォロワーにのみ表示されます
       public: 公開
-      public_long: 誰でも見ることができ、かつ公開タイムラインに表示されます
       unlisted: 非収載
-      unlisted_long: 誰でも見ることができますが、公開タイムラインには表示されません
   statuses_cleanup:
     enabled: 古い投稿を自動的に削除する
     enabled_hint: 設定した期間を過ぎた投稿は、以下の例外に該当しない限り、自動的に削除されます
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index f3178be8d3..039a7a0b10 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -108,7 +108,6 @@ ka:
       shortcode: მოკლე-კოდი
       shortcode_hint: მინ. 2 ნიშანი, მხოლოდ ალფანუმერიკული ნიშნები და "ქვედა-ტირეები"
       title: პერსონალიზირებული ემოჯიები
-      unlisted: ჩამოუთვლელი
       update_failed_msg: ემოჯის განახლება ვერ მოხერხდა
       updated_msg: ემოჯი წარმატებით განახლდა!
       upload: ატვირთვა
@@ -436,9 +435,7 @@ ka:
       private: მხოლოდ-მიმდევრები
       private_long: აჩვენე მხოლოდ მიმდევრებს
       public: საჯარო
-      public_long: ხედავს ყველა
       unlisted: ჩამოუთვლელი
-      unlisted_long: ხედავს ყველა, მაგრამ არ ჩანს საჯარო თაიმლაინებში
   stream_entries:
     sensitive_content: მგრძნობიარე კონტენტი
   themes:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 53ccaf9cf3..906d7c8cc9 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -223,7 +223,6 @@ kab:
       title: Imujiten udmawanen
       uncategorized: War-taggayt
       unlist: Kkes seg wumuɣ
-      unlisted: Yettwakkes seg wumuɣ
       update_failed_msg: Ur izmir ara ad-issali umuji-a
       upload: Sali
     dashboard:
@@ -882,16 +881,11 @@ kab:
         one: "%{count} n tbidyutt"
         other: "%{count} n tbidyutin"
     edited_at_html: Tettwaẓreg ass n %{date}
-    quote_policies:
-      followers: Ala wid i k·m-yeṭṭafaṛen
-      nobody: Ula yiwen
-      public: Yal yiwen
     title: '%{name} : "%{quote}"'
     visibilities:
       private: Imeḍfaṛen kan
       private_long: Ssken i ymeḍfaṛen kan
       public: Azayez
-      public_long: Yal yiwen·t yezmer at iwali
       unlisted: War tabdert
   statuses_cleanup:
     enabled: Tukksa n tsuffaɣ tiqburin s wudem awurman
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index a2123107ed..4b32abdf5b 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -151,7 +151,6 @@ kk:
       title: Таңдаулы эмодзилар
       uncategorized: Санатсыз
       unlist: Тізімге енбеген
-      unlisted: Тізімде жоқ
       update_failed_msg: Бұл эмодзи жаңартылмады
       updated_msg: Эмодзи сәтті жаңартылды!
       upload: Жүктеу
@@ -652,9 +651,7 @@ kk:
       private: Тек оқырмандарға
       private_long: Тек оқырмандарға ғана көрінеді
       public: Ашық
-      public_long: Бәрі көре алады
       unlisted: Тізімге енбеген
-      unlisted_long: Бәрі көре алады, бірақ ашық тізімдерге ене алмайды
   stream_entries:
     sensitive_content: Нәзік мазмұн
   tags:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 3dded160c0..e72ec3506d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -364,7 +364,6 @@ ko:
       title: 커스텀 에모지
       uncategorized: 분류되지 않음
       unlist: 목록에서 제거
-      unlisted: 목록에 없음
       update_failed_msg: 에모지를 업데이트 할 수 없습니다
       updated_msg: 성공적으로 에모지를 업데이트했습니다!
       upload: 업로드
@@ -1867,19 +1866,13 @@ ko:
       limit: 이미 너무 많은 게시물을 고정했습니다
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
-    quote_policies:
-      followers: 내 팔로워만
-      nobody: 없음
-      public: 모두
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: 개인 멘션
       private: 비공개
       private_long: 팔로워에게만 공개됩니다
       public: 공개
-      public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
       unlisted: 미등재
-      unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
   statuses_cleanup:
     enabled: 오래된 게시물 자동 삭제
     enabled_hint: 아래의 예외 목록에 해당하지 않는다면, 명시된 기한 이후 당신의 게시물을 자동으로 삭제합니다
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index e764227931..9bc02ea2f0 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -314,7 +314,6 @@ ku:
       title: Hestokên kesane
       uncategorized: Bêbeş
       unlist: Dervî rêzokê
-      unlisted: Nerêzokkirî
       update_failed_msg: Ev hestok nehate rojanekirin
       updated_msg: Emojî bi awayekî serkeftî hate rojanekirin!
       upload: Bar bike
@@ -1408,9 +1407,7 @@ ku:
       private: Tenê şopîneran
       private_long: Tenê bo şopîneran nîşan bide
       public: Gelemperî
-      public_long: Herkes dikare bibîne
       unlisted: Nerêzokkirî
-      unlisted_long: Herkes dikare bibîne, lê di demnameya gelemperî de nayê rêz kirin
   statuses_cleanup:
     enabled: Şandiyên berê bi xweberî va jê bibe
     enabled_hint: Gava ku ew gihîştibe sînorê temenê diyarkirî, şandiyên te bi xweberî jê dibe, ji bilî van awareteyên jêrîn
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 85da825ec4..2791843f98 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -348,7 +348,6 @@ lad:
       title: Emojis personalizados
       uncategorized: No kategorizado
       unlist: No lista
-      unlisted: No listado
       update_failed_msg: No se pudo aktualizar akel emoji
       updated_msg: Emoji aktualizado kon sukseso!
       upload: Karga
@@ -1746,16 +1745,12 @@ lad:
       limit: Ya tienes fiksado el numero maksimo de publikasyones
       ownership: La publikasyon de otra persona no puede fiksarse
       reblog: No se puede fixar una repartajasyon
-    quote_policies:
-      public: Todos
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Solo suivantes
       private_long: Solo amostra a tus segidores
       public: Publiko
-      public_long: Todos pueden ver
       unlisted: No listado
-      unlisted_long: Todos pueden ver, ama no esta listado en las linyas de tiempo publikas
   statuses_cleanup:
     enabled: Otomatikamente efasa publikasyones viejas
     enabled_hint: Supreme otomatikamente tus publikasyones kuando alkansen un limito de tiempo espesifikado, a manko ke koensiden kon alguna de las eksepsiones detalyadas debasho
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index e6fb94944b..92791bd795 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -352,7 +352,6 @@ lt:
       title: Asmeniniai jaustukai
       uncategorized: Be kategorijos
       unlist: Neįtraukti į sąrašą
-      unlisted: Neįtrauktas į sąrašą
       update_failed_msg: Jaustukas negalėjo būti pakeistas
       updated_msg: Jaustukas sėkmingai pakeistas!
       upload: Įkelti
@@ -1220,9 +1219,7 @@ lt:
       private: Tik sekėjams
       private_long: rodyti tik sekėjams
       public: Vieša
-      public_long: visi gali matyti
       unlisted: Neįtrauktas į sąrašą
-      unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
     interaction_exceptions_explanation: Atkreipk dėmesį, kad negarantuojama, jog įrašai nebus ištrinti, jei jų mėgstamumo ar pasidalinimo riba bus žemesnė, nors vieną kartą ji jau buvo viršyta.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 8bef0836f3..7c296022f5 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -358,7 +358,6 @@ lv:
       title: Pielāgotās emocijzīmes
       uncategorized: Nekategorizētās
       unlist: Izslēgt
-      unlisted: Neminētie
       update_failed_msg: Nevarēja atjaunināt šo emocijzīmi
       updated_msg: Emocijzīme sekmīgi atjaunināta.
       upload: Augšupielādēt
@@ -1904,16 +1903,12 @@ lv:
       limit: Jau ir piesprausts lielākais iespējamais ierakstu skaits
       ownership: Kāda cita ierakstu nevar piespraust
       reblog: Pastiprinātu ierakstu nevar piespraust
-    quote_policies:
-      public: Visi
     title: "%{name}: “%{quote}”"
     visibilities:
       private: Tikai sekotājiem
       private_long: Rādīt tikai sekotājiem
       public: Publisks
-      public_long: Visi var redzēt
       unlisted: Nerindota
-      unlisted_long: Redzams visiem, bet nav uzskaitīts visiem pieejamās laika joslās
   statuses_cleanup:
     enabled: Automātiski dzēst vecās ziņas
     enabled_hint: Automātiski izdzēš Tavus ierakstus, tiklīdz tie sasniedz noteiktu vecuma slieksni, ja vien tie neatbilst kādam no zemāk norādītajiem izņēmumiem
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 1862c12aa1..d9c057e503 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -321,7 +321,6 @@ ms:
       title: Emoji sendiri
       uncategorized: Tidak dikategorikan
       unlist: Nyahsenaraikan
-      unlisted: Dinyahsenaraikan
       update_failed_msg: Tidak boleh mengemaskini emoji tersebut
       updated_msg: Emoji berjaya dikemaskini!
       upload: Muat naik
@@ -1557,9 +1556,7 @@ ms:
       private: Pengikut sahaja
       private_long: Hanya tunjukkan kepada pengikut
       public: Awam
-      public_long: Semua orang boleh melihat
       unlisted: Tidak tersenarai
-      unlisted_long: Semua orang boleh melihat, tetapi tidak disenaraikan pada garis masa awam
   statuses_cleanup:
     enabled: Padam hantaran lama secara automatik
     enabled_hint: Memadamkan pos anda secara automatik setelah mereka mencapai ambang umur yang ditentukan, melainkan ia sepadan dengan salah satu pengecualian di bawah
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 761489c4a6..6e03b196c3 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -316,7 +316,6 @@ my:
       title: စိတ်ကြိုက်အီမိုဂျီများ
       uncategorized: အမျိုးအစားခွဲခြားထားခြင်းမရှိပါ
       unlist: စာရင်းမသွင်းထားပါ
-      unlisted: စာရင်းမသွင်းထားပါ
       update_failed_msg: ထိုအီမိုဂျီကို ပြင်ဆင်၍မရပါ
       updated_msg: အီမိုဂျီကို ပြင်ဆင်ပြီးပါပြီ။
       upload: တင္ရန်
@@ -1548,9 +1547,7 @@ my:
       private: စောင့်ကြည့်သူများသာ
       private_long: စောင့်ကြည့်သူများကိုသာ ပြရန်
       public: အများမြင်
-      public_long: လူတိုင်းမြင်နိုင်ပါသည်
       unlisted: စာရင်းမသွင်းထားပါ
-      unlisted_long: လူတိုင်းမြင်နိုင်သော်လည်း အများမြင်မည့်စာမျက်နှာများတွင် စာရင်းမသွင်းထားပါ။
   statuses_cleanup:
     enabled: ပို့စ်အဟောင်းများကို အလိုအလျောက် ဖျက်ပါ
     enabled_hint: အောက်ပါခြွင်းချက်များထဲမှ တစ်ခုနှင့် မကိုက်ညီပါက သတ်မှတ်ထားသည့်ကာလအပိုင်းအခြားသို့ ရောက်သည်နှင့် သင့်ပို့စ်များကို အလိုအလျောက် ဖျက်ပါမည်
diff --git a/config/locales/nan.yml b/config/locales/nan.yml
index 3ac5c2f267..7b267caedb 100644
--- a/config/locales/nan.yml
+++ b/config/locales/nan.yml
@@ -364,7 +364,6 @@ nan:
       title: 自訂emoji
       uncategorized: Iáu無分類
       unlist: Tuì列單the̍h掉
-      unlisted: The̍h掉ah
       update_failed_msg: Bē當更新hit ê emoji
       updated_msg: Emoji成功更新ah！
       upload: 傳上去
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 6a2a6dee09..9fb17e305e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -367,7 +367,7 @@ nl:
       title: Lokale emoji’s
       uncategorized: Niet gecategoriseerd
       unlist: Niet in lijst
-      unlisted: Niet weergegeven
+      unlisted: Minder openbaar
       update_failed_msg: Deze emoji kon niet worden bijgewerkt
       updated_msg: Bijwerken van emoji is geslaagd!
       upload: Uploaden
@@ -589,7 +589,7 @@ nl:
         created_msg: Aanmaken van servermoderatie-opmerking geslaagd!
         description_html: Opmerkingen bekijken, en voor jezelf en andere moderatoren achterlaten
         destroyed_msg: Verwijderen van servermoderatie-opmerking geslaagd!
-        placeholder: Informatie over deze server, genomen acties of iets anders die jou kunnen helpen om deze server in de toekomst te modereren.
+        placeholder: Informatie over deze server, ondernomen acties of iets anders dat jou kan helpen om deze server in de toekomst te modereren.
         title: Moderatie-opmerkingen
       private_comment: Privé-opmerking
       public_comment: Openbare opmerking
@@ -1909,17 +1909,18 @@ nl:
       ownership: Een bericht van iemand anders kan niet worden vastgemaakt
       reblog: Een boost kan niet worden vastgezet
     quote_policies:
-      followers: Alleen jouw volgers
-      nobody: Niemand
+      followers: Alleen volgers
+      nobody: Alleen ik
       public: Iedereen
     title: '%{name}: "%{quote}"'
     visibilities:
+      direct: Privébericht
       private: Alleen volgers
       private_long: Alleen aan jouw volgers tonen
       public: Openbaar
-      public_long: Aan iedereen tonen, ook op openbare tijdlijnen
+      public_long: Iedereen op en buiten Mastodon
       unlisted: Minder openbaar
-      unlisted_long: Aan iedereen tonen, maar niet op openbare tijdlijnen
+      unlisted_long: Niet zichtbaar in de zoekresultaten van Mastodon, onder trends, hashtags en op openbare tijdlijnen
   statuses_cleanup:
     enabled: Automatisch oude berichten verwijderen
     enabled_hint: Verwijder uw berichten automatisch zodra ze een bepaalde leeftijdsgrens bereiken, tenzij ze overeenkomen met een van de onderstaande uitzonderingen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 985c482a04..1b422032a7 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -367,7 +367,6 @@ nn:
       title: Eigne kjensleteikn
       uncategorized: Ukategorisert
       unlist: Uoppfør
-      unlisted: Ikkje oppført
       update_failed_msg: Klarte ikkje å oppdatera emojien
       updated_msg: Kjensleteiknet er oppdatert!
       upload: Last opp
@@ -1908,18 +1907,12 @@ nn:
       limit: Du har allereie festa så mange tut som det går an å festa
       ownership: Du kan ikkje festa andre sine tut
       reblog: Ei framheving kan ikkje festast
-    quote_policies:
-      followers: Berre dei som fylgjer deg
-      nobody: Ingen
-      public: Alle
     title: "%{name}: «%{quote}»"
     visibilities:
       private: Berre fylgjarar
       private_long: Vis berre til fylgjarar
       public: Offentleg
-      public_long: Alle kan sjå
       unlisted: Ikkje oppført
-      unlisted_long: Alle kan sjå, men ikkje oppført på offentlege tidsliner
   statuses_cleanup:
     enabled: Slett gamle innlegg automatisk
     enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 011c172d17..7cbf08b48e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -323,7 +323,6 @@
       title: Egenoppførte emojier
       uncategorized: Ukategorisert
       unlist: Fjern oppføring
-      unlisted: Unoterte
       update_failed_msg: Kunne ikke oppdatere emojien
       updated_msg: Emoji oppdatert uten problemer!
       upload: Last opp
@@ -1632,9 +1631,7 @@
       private: Privat
       private_long: Synlig kun for følgere
       public: Offentlig
-      public_long: Synlig for alle
       unlisted: Uoppført
-      unlisted_long: Synlig for alle, men ikke på offentlige tidslinjer
   statuses_cleanup:
     enabled: Slett gamle innlegg automatisk
     enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index ac952182c6..82888e38ff 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -219,7 +219,6 @@ oc:
       title: Emojis personals
       uncategorized: Sens categoria
       unlist: Listar pas
-      unlisted: Pas listat
       update_failed_msg: Mesa a jorn de l’emoji fracasada
       updated_msg: Emoji ben mes a jorn !
       upload: Enviar
@@ -851,9 +850,7 @@ oc:
       private: Seguidors solament
       private_long: Mostrar pas qu’als seguidors
       public: Public
-      public_long: Tot lo monde pòt veire
       unlisted: Pas listat
-      unlisted_long: Tot lo monde pòt veire mai serà pas visible sul flux public
   statuses_cleanup:
     enabled: Supression automatica de publicacions ancianas
     enabled_hint: Suprimís automaticament vòstras publicacions quand correspondon al critèri d’atge causit, levat se correspondon tanben a las excepcions çai-jos
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 70940e6700..6945ce57c0 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -372,7 +372,6 @@ pl:
       title: Niestandardowe emoji
       uncategorized: Bez kategorii
       unlist: Usuń z listy
-      unlisted: Niewidoczne
       update_failed_msg: Nie udało się zaktualizować emoji
       updated_msg: Pomyślnie zaktualizowano emoji!
       upload: Dodaj
@@ -1972,18 +1971,12 @@ pl:
       limit: Przekroczyłeś maksymalną liczbę przypiętych wpisów
       ownership: Nie możesz przypiąć cudzego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
-    quote_policies:
-      followers: Tylko obserwujący
-      nobody: Nikt
-      public: Wszyscy
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Tylko dla obserwujących
       private_long: Widoczne tylko dla osób, które Cię obserwują
       public: Publiczne
-      public_long: Widoczne dla wszystkich użytkowników
       unlisted: Niewypisane
-      unlisted_long: Widoczne dla wszystkich, ale nie wyświetlane na publicznych osiach czasu
   statuses_cleanup:
     enabled: Automatycznie usuwaj stare wiadomości
     enabled_hint: Automatycznie usuwa Twoje posty, gdy osiągną określony próg wiekowy, chyba że spełniają jeden z poniższych wyjątków
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 79e93879bb..efe24b4442 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -361,7 +361,6 @@ pt-BR:
       title: Emojis personalizados
       uncategorized: Não categorizado
       unlist: Não listar
-      unlisted: Não-listado
       update_failed_msg: Não foi possível atualizar esse emoji
       updated_msg: Emoji atualizado!
       upload: Enviar
@@ -1869,16 +1868,12 @@ pt-BR:
       limit: Você alcançou o número limite de publicações fixadas
       ownership: As publicações dos outros não podem ser fixadas
       reblog: Um impulso não pode ser fixado
-    quote_policies:
-      public: Todos
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Apenas seguidores
       private_long: Exibir apenas para seguidores
       public: Público
-      public_long: Todos podem ver
       unlisted: Não listado
-      unlisted_long: Todos podem ver, mas não é listado em linhas do tempo públicas
   statuses_cleanup:
     enabled: Excluir publicações antigas automaticamente
     enabled_hint: Exclui suas publicações automaticamente assim que elas alcançam sua validade, a não ser que se enquadrem em alguma das exceções abaixo
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 466ecf0dd6..db83ea4e54 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -367,7 +367,6 @@ pt-PT:
       title: Emojis personalizados
       uncategorized: Não categorizados
       unlist: Não listar
-      unlisted: Não listado
       update_failed_msg: Não foi possível atualizar esse emoji
       updated_msg: Emoji atualizado com sucesso!
       upload: Enviar
@@ -1908,19 +1907,13 @@ pt-PT:
       limit: Já fixaste a quantidade máxima de publicações
       ownership: Não podem ser fixadas publicações de outras pessoas
       reblog: Não é possível fixar um impulso
-    quote_policies:
-      followers: Apenas os seus seguidores
-      nobody: Ninguém
-      public: Todos
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Menção privada
       private: Só para seguidores
       private_long: Mostrar só aos seguidores
       public: Público
-      public_long: Todos podem ver
       unlisted: Não listado
-      unlisted_long: Todos podem ver, mas não aparecerá nas cronologias públicas
   statuses_cleanup:
     enabled: Eliminar publicações antigas automaticamente
     enabled_hint: Elimina automaticamente as tuas publicações assim que atingirem um certo limite de tempo, a não ser que correspondam a uma das seguintes exceções
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index aeaa1e283c..17d10f7924 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -269,7 +269,6 @@ ro:
       title: Emoticoane personalizate
       uncategorized: Necategorizat
       unlist: Nu mai lista
-      unlisted: Nelistat
       update_failed_msg: Nu s-a putut actualiza emoticonul respectiv
       updated_msg: Emoticon actualizat cu succes!
       upload: Încarcă
@@ -688,9 +687,7 @@ ro:
     visibilities:
       private: Doar urmăritorii
       private_long: Arată doar urmăritorilor
-      public_long: Toată lumea poate vedea
       unlisted: Nelistat
-      unlisted_long: Toată lumea poate vedea, dar nu este listată pe fluxurile publice
   stream_entries:
     sensitive_content: Conținut sensibil
   tags:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b20f81f59a..895eb869d9 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -373,7 +373,6 @@ ru:
       title: Эмодзи
       uncategorized: Вне категорий
       unlist: Из списка
-      unlisted: Не в списке
       update_failed_msg: Не удалось обновить эмодзи
       updated_msg: Эмодзи обновлён
       upload: Загрузить
@@ -1975,18 +1974,12 @@ ru:
       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: По истечении определённого срока с момента публикации ваши посты, кроме соответствующих отмеченным ниже исключениям, будут автоматически удалены
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index dbfab34aa7..444b26eb80 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -303,7 +303,6 @@ sc:
       title: Emojis personalizados
       uncategorized: Sena categoria
       unlist: Esclude de sa lista
-      unlisted: Esclùidu de sa lista
       update_failed_msg: Impossìbile atualizare custu emoji
       updated_msg: Emoji atualizadu
       upload: Càrriga
@@ -1159,9 +1158,7 @@ sc:
       private: Isceti pro chie ti sighit
       private_long: Ammustra isceti a chie ti sighit
       public: Pùblicu
-      public_long: Podet èssere bidu dae chie si siat
       unlisted: Esclùidu de sa lista
-      unlisted_long: Podet èssere bidu dae chie si siat, però non podet èssere ammustradu in lìnias de tempus pùblicas
   statuses_cleanup:
     exceptions: Etzetziones
     min_age:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 6fa7d7386e..c20b14dab3 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -312,7 +312,6 @@ sco:
       title: Custom emoji
       uncategorized: No categorized
       unlist: Unlist
-      unlisted: Unlistit
       update_failed_msg: Cuidnae update that emoji
       updated_msg: Emoji successfully updatit!
       upload: Upload
@@ -1398,9 +1397,7 @@ sco:
       private: Follaers-ainly
       private_long: Ainly shaw tae follaers
       public: Public
-      public_long: Awbody kin see
       unlisted: No listit
-      unlisted_long: Awbody kin see, but no listit on public timelines
   statuses_cleanup:
     enabled: Automatically delete auld posts
     enabled_hint: Automatically deletes yer posts ance they reach a specified age threshold, unless they match ane o the exceptions ablow
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 04889cb2ce..8e7fffc75c 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -279,7 +279,6 @@ si:
       title: අභිරුචි ඉමෝජි
       uncategorized: වර්ගීකරණය නොකළ
       unlist: ලැයිස්තුගත නොකරන්න
-      unlisted: ලැයිස්තුගත නොකළ
       update_failed_msg: එම ඉමොජි යාවත්කාලීන කළ නොහැකි විය
       updated_msg: ඉමොජි සාර්ථකව යාවත්කාලීන කරන ලදී!
       upload: උඩුගත කරන්න
@@ -1271,9 +1270,7 @@ si:
       private: අනුගාමිකයින් පමණි
       private_long: අනුගාමිකයින්ට පමණක් පෙන්වන්න
       public: ප්‍රසිද්ධ
-      public_long: හැමෝටම පේනවා
       unlisted: ලැයිස්තුගත නොකළ
-      unlisted_long: සෑම කෙනෙකුටම දැකිය හැක, නමුත් පොදු කාලරාමුවෙහි ලැයිස්තුගත කර නොමැත
   statuses_cleanup:
     enabled: පරණ ලිපි ස්වයංක්‍රීයව මකන්න
     exceptions: හැර දැමීම්
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index c59391f552..ad17b19ba0 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -180,7 +180,6 @@ an:
         setting_auto_play_gif: Reproducir automaticament los GIFs animaus
         setting_boost_modal: Amostrar finestra de confirmación antes de retutar
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidat de publicacions
         setting_default_sensitive: Marcar siempre imachens como sensibles
         setting_delete_modal: Amostrar dialogo de confirmación antes de borrar una publicación
         setting_disable_swiping: Deshabilitar movimientos d'eslizamiento
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index ba1f3c1218..17fc95b678 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -227,7 +227,6 @@ ar:
         setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
         setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة نشر أي منشور
         setting_default_language: لغة النشر
-        setting_default_privacy: خصوصية المنشور
         setting_default_quote_policy: من يستطيع الاقتباس
         setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
         setting_delete_modal: إظهار مربع حوار التأكيد قبل حذف أي منشور
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 9e5db2ba30..c042d3ced4 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -106,7 +106,6 @@ ast:
         setting_auto_play_gif: Reproducir automáticamente los GIFs
         setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir una publicación
         setting_default_language: Llingua de los artículos
-        setting_default_privacy: Privacidá de los artículos
         setting_default_sensitive: Marcar siempre tol conteníu como sensible
         setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar una publicación
         setting_disable_hover_cards: Desactivar la previsualización de perfiles al pasar el mur penriba
diff --git a/config/locales/simple_form.az.yml b/config/locales/simple_form.az.yml
index 97c8eb6015..ab7b23ed77 100644
--- a/config/locales/simple_form.az.yml
+++ b/config/locales/simple_form.az.yml
@@ -52,7 +52,6 @@ az:
         setting_always_send_emails: E-poçt göndərişlərini həmişə göndər
         setting_auto_play_gif: Animasiyalı GIF-ləri avto-oxut
         setting_boost_modal: Bir təkrar paylaşımı silməzdən əvvəl təsdiq dialoq pəncərəsini göstər
-        setting_default_privacy: Göndəriş məxfiliyi
         setting_default_sensitive: Medianı həmişə həssas olaraq işarələ
         setting_delete_modal: Bir göndərişi silməzdən əvvəl təsdiq dialoq pəncərəsini göstər
         setting_disable_hover_cards: Üzərinə gəldikdə profil önizləməsini sıradan çıxart
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index da411075d6..d3b31b27c1 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -238,7 +238,6 @@ be:
         setting_auto_play_gif: Аўтапрайграванне анімаваных GIF
         setting_boost_modal: Паказваць акно пацвярджэння перад пашырэннем
         setting_default_language: Мова допісаў
-        setting_default_privacy: Прыватнасць допісаў
         setting_default_quote_policy: Хто можа цытаваць
         setting_default_sensitive: Заўсёды пазначаць кантэнт як далікатны
         setting_delete_modal: Паказваць акно пацвярджэння перад выдаленнем допісу
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 87ebe45e57..615be9b864 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -235,7 +235,6 @@ bg:
         setting_auto_play_gif: Самопускащи се анимирани гифчета
         setting_boost_modal: Показване на прозорец за потвърждение преди подсилване
         setting_default_language: Език на публикуване
-        setting_default_privacy: Поверителност на публикуване
         setting_default_quote_policy: Кой може да цитира
         setting_default_sensitive: Все да се бележи мултимедията като деликатна
         setting_delete_modal: Показване на прозорче за потвърждение преди изтриване на публикация
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index ee24975b5d..35f64599e1 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -231,7 +231,6 @@ ca:
         setting_auto_play_gif: Reprodueix automàticament els GIF animats
         setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar
         setting_default_language: Llengua dels tuts
-        setting_default_privacy: Privacitat dels tuts
         setting_default_quote_policy: Qui pot citar
         setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostra la finestra de confirmació abans d'esborrar un tut
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index cfadea034d..0956460a6b 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -129,7 +129,6 @@ ckb:
         setting_auto_play_gif: خۆکاربەخشکردنی GIFــەکان
         setting_boost_modal: پیشاندانی دیالۆگی دووپاتکردنەوە پێش دوبارە توتاندن
         setting_default_language: زمانی نووسراوەکانتان
-        setting_default_privacy: چوارچێوەی تایبەتێتی ئێوە
         setting_default_sensitive: هەمیشە نیشانکردنی میدیا وەک هەستیار
         setting_delete_modal: نیساندانی پەیامی پەسەند کردن پاش سڕینەوە
         setting_disable_swiping: جوڵەی سڕینەوە لە کاربخە
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index 06c993f406..b4d15c8a1a 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -130,7 +130,6 @@ co:
         setting_auto_play_gif: Lettura autumatica di i GIF animati
         setting_boost_modal: Mustrà una cunfirmazione per sparte un statutu
         setting_default_language: Lingua di pubblicazione
-        setting_default_privacy: Cunfidenzialità di i statuti
         setting_default_sensitive: Sempre cunsiderà media cum’è sensibili
         setting_delete_modal: Mustrà une cunfirmazione per toglie un statutu
         setting_disable_swiping: Disattivà e sculiscere
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index b318f15709..b9243ea075 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -238,7 +238,6 @@ cs:
         setting_auto_play_gif: Automaticky přehrávat animace GIF
         setting_boost_modal: Před boostnutím zobrazovat potvrzovací okno
         setting_default_language: Jazyk příspěvků
-        setting_default_privacy: Soukromí příspěvků
         setting_default_quote_policy: Kdo může citovat
         setting_default_sensitive: Vždy označovat média jako citlivá
         setting_delete_modal: Před smazáním příspěvku zobrazovat potvrzovací dialog
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 8a727fcd78..9bb8659b78 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -240,7 +240,6 @@ cy:
         setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
         setting_boost_modal: Dangos deialog cadarnhau cyn rhoi hwb
         setting_default_language: Iaith postio
-        setting_default_privacy: Preifatrwydd cyhoeddi
         setting_default_quote_policy: Pwy sy'n gallu dyfynnu
         setting_default_sensitive: Marcio cyfryngau fel eu bod yn sensitif bob tro
         setting_delete_modal: Dangos deialog cadarnhau cyn dileu postiad
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index e85dd32556..5580c544e4 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -236,7 +236,6 @@ da:
         setting_auto_play_gif: Autoafspil animerede GIF'er
         setting_boost_modal: Vis bekræftelsesdialog inden fremhævelse
         setting_default_language: Sprog for indlæg
-        setting_default_privacy: Fortrolighed for indlæg
         setting_default_quote_policy: Hvem kan citere
         setting_default_sensitive: Markér altid medier som sensitive
         setting_delete_modal: Vis bekræftelsesdialog før et indlæg slettes
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index fcbe7dc32d..984b6a410e 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -236,7 +236,6 @@ el:
         setting_auto_play_gif: Αυτόματη αναπαραγωγή των GIF
         setting_boost_modal: Επιβεβαίωση πριν την προώθηση
         setting_default_language: Γλώσσα κατά την ανάρτηση
-        setting_default_privacy: Ιδιωτικότητα αναρτήσεων
         setting_default_quote_policy: Ποιος μπορεί να παραθέσει
         setting_default_sensitive: Σημείωση όλων των πολυμέσων ως ευαίσθητου περιεχομένου
         setting_delete_modal: Επιβεβαίωση πριν τη διαγραφή ενός τουτ
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 494f0c7b2a..e813ecc0c3 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -228,7 +228,6 @@ en-GB:
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialogue before boosting
         setting_default_language: Posting language
-        setting_default_privacy: Posting privacy
         setting_default_quote_policy: Who can quote
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialogue before deleting a post
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index d79899e908..6892c41f63 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -236,7 +236,7 @@ en:
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_language: Posting language
-        setting_default_privacy: Posting privacy
+        setting_default_privacy: Posting visibility
         setting_default_quote_policy: Who can quote
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 2687f78229..d2fb53b6f1 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -227,7 +227,6 @@ eo:
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
         setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon
         setting_default_language: Publikada lingvo
-        setting_default_privacy: Privateco de afiŝado
         setting_default_sensitive: Ĉiam marki la vidaŭdaĵojn kiel tiklaj
         setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
         setting_disable_hover_cards: Malebligi profilan antaŭmontron kiam oni musumas
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index f3972d01a9..3848b832fd 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -236,7 +236,7 @@ es-AR:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar diálogo de confirmación antes de adherir
         setting_default_language: Idioma de tus mensajes
-        setting_default_privacy: Privacidad de mensajes
+        setting_default_privacy: Visibilidad del mensaje
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Siempre marcar medios como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de eliminar un mensaje
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 6b20f6e6ae..88c2544e06 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -236,7 +236,7 @@ es-MX:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar ventana de confirmación antes de impulsar
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidad de publicaciones
+        setting_default_privacy: Visibilidad de publicación
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar una publicación
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 53115056f4..69a9ea1763 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -236,7 +236,7 @@ es:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar diálogo de confirmación antes de impulsar una publicación
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidad de publicaciones
+        setting_default_privacy: Visibilidad de publicación
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar una publicación
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 2217eee7a3..d4b737ad53 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -213,7 +213,6 @@ et:
         setting_auto_play_gif: Esita GIF-e automaatselt
         setting_boost_modal: Näita enne jagamist kinnitusdialoogi
         setting_default_language: Postituse keel
-        setting_default_privacy: Postituse nähtavus
         setting_default_quote_policy: Kes võivad tsiteerida
         setting_default_sensitive: Alati märgista meedia tundlikuks
         setting_delete_modal: Näita kinnitusdialoogi enne postituse kustutamist
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index be04b7b026..c1879e9f87 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -221,7 +221,6 @@ eu:
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
         setting_default_language: Argitalpenen hizkuntza
-        setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
         setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik
         setting_disable_swiping: Desgaitu hatza pasatzeko mugimenduak
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 19697b72aa..20cbc1033a 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -236,7 +236,6 @@ fa:
         setting_auto_play_gif: پخش خودکار تصویرهای متحرک
         setting_boost_modal: نمایش پیغام تأیید پیش از تقویت کردن
         setting_default_language: زبان نوشته‌های شما
-        setting_default_privacy: حریم خصوصی نوشته‌ها
         setting_default_quote_policy: افراد مجاز به نقل
         setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن
         setting_delete_modal: نمایش پیغام تأیید پیش از پاک کردن یک نوشته
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 54e0e98c7d..dab3465bf8 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -236,7 +236,6 @@ fo:
         setting_auto_play_gif: Spæl teknimyndagjørdar GIFar sjálvvirkandi
         setting_boost_modal: Vís váttanarmynd, áðrenn tú stimbrar postar
         setting_default_language: Mál, sum verður brúkt til postar
-        setting_default_privacy: Hvussu privatir eru postar?
         setting_default_quote_policy: Hvør kann sitera
         setting_default_sensitive: Merk altíð miðlafílur sum viðkvæmar
         setting_delete_modal: Vís váttanarmynd, áðrenn postar verða strikaðir
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 51a5b432a3..971036087e 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -228,7 +228,6 @@ fr-CA:
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Demander confirmation avant de partager un message
         setting_default_language: Langue de publication
-        setting_default_privacy: Confidentialité des messages
         setting_default_quote_policy: Autoriser les citations pour
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 90218f8b8e..b8120d4600 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -228,7 +228,6 @@ fr:
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Demander confirmation avant de partager un message
         setting_default_language: Langue de publication
-        setting_default_privacy: Confidentialité des messages
         setting_default_quote_policy: Autoriser les citations pour
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 690522b8cf..4345f2f6a7 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -231,7 +231,6 @@ fy:
         setting_auto_play_gif: Spylje animearre GIF’s automatysk ôf
         setting_boost_modal: Freegje foar it boosten fan in berjocht in befêstiging
         setting_default_language: Taal fan jo berjochten
-        setting_default_privacy: Sichtberheid fan nije berjochten
         setting_default_quote_policy: Wa kin sitearje
         setting_default_sensitive: Media altyd as gefoelich markearje
         setting_delete_modal: Freegje foar it fuortsmiten fan in berjocht in befêstiging
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index e9afcc8d42..d3c867d196 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -239,7 +239,6 @@ ga:
         setting_auto_play_gif: Gifs beoite go huathoibríoch a imirt
         setting_boost_modal: Taispeáin dialóg deimhnithe roimh threisiú
         setting_default_language: Teanga postála
-        setting_default_privacy: Postáil príobháideachta
         setting_default_quote_policy: Cé a fhéadfaidh lua
         setting_default_sensitive: Marcáil na meáin mar íogair i gcónaí
         setting_delete_modal: Taispeáin dialóg deimhnithe sula scriostar postáil
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 7cdc27750b..0c6487e872 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -227,7 +227,6 @@ gd:
         setting_auto_play_gif: Cluich GIFs beòthaichte gu fèin-obrachail
         setting_boost_modal: Seall còmhradh dearbhaidh mus dèan thu brosnachadh
         setting_default_language: Cànan postaidh
-        setting_default_privacy: Prìobhaideachd postaidh
         setting_default_quote_policy: Cò dh’fhaodas luaidh
         setting_default_sensitive: Cuir comharra ri meadhanan an-còmhnaidh gu bheil iad frionasach
         setting_delete_modal: Seall còmhradh dearbhaidh mus sguab thu às post
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 1225e67b73..67e00329d8 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -236,7 +236,7 @@ gl:
         setting_auto_play_gif: Reprodución automática de GIFs animados
         setting_boost_modal: Solicitar confirmación antes de promover
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidade da publicación
+        setting_default_privacy: Visibilidade da publicación
         setting_default_quote_policy: Quen pode citar
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmación antes de eliminar unha publicación
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 69c9f00cc5..3335f2900d 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -238,7 +238,6 @@ he:
         setting_auto_play_gif: ניגון אוטומטי של גיפים
         setting_boost_modal: הצגת דיאלוג אישור לפני הדהוד
         setting_default_language: שפת ברירת מחדל להודעה
-        setting_default_privacy: פרטיות ההודעות
         setting_default_quote_policy: למי מותר לצטט
         setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה
         setting_delete_modal: להראות תיבת אישור לפני מחיקת חיצרוץ
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index ea40543c51..0236c8c00c 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -34,7 +34,6 @@ hr:
         otp_attempt: Dvofaktorski kôd
         password: Lozinka
         setting_auto_play_gif: Automatski pokreni animirane GIF-ove
-        setting_default_privacy: Privatnost objavljivanja
         setting_display_media_default: Zadano
         setting_display_media_hide_all: Sakrij sve
         setting_display_media_show_all: Prikaži sve
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index f34d9a5232..2e1c0c576e 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -236,7 +236,6 @@ hu:
         setting_auto_play_gif: GIF-ek automatikus lejátszása
         setting_boost_modal: Megerősítés kérése megtolás előtt
         setting_default_language: Bejegyzések nyelve
-        setting_default_privacy: Bejegyzések láthatósága
         setting_default_quote_policy: Ki idézhet
         setting_default_sensitive: Minden médiafájl megjelölése kényesként
         setting_delete_modal: Megerősítés kérése bejegyzés törlése előtt
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 36185f73e4..a9c770e5cb 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -129,7 +129,6 @@ hy:
         setting_auto_play_gif: Աւտոմատ մեկնարկել GIFs անիմացիաները
         setting_boost_modal: Ցուցադրել հաստատման պատուհանը տարածելուց առաջ
         setting_default_language: Հրապարակման լեզու
-        setting_default_privacy: Հրապարակման գաղտնիութիւն
         setting_default_sensitive: Միշտ նշել մեդիան որպէս դիւրազգաց
         setting_delete_modal: Ցուցադրել հաստատման պատուհանը ջնջելուց առաջ
         setting_disable_swiping: Կասեցնել սահող շարժումները
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 914257a89b..21fe483765 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -236,7 +236,7 @@ ia:
         setting_auto_play_gif: Auto-reproduce GIFs animate
         setting_boost_modal: Monstrar dialogo de confirmation ante de impulsar
         setting_default_language: Lingua de publication
-        setting_default_privacy: Confidentialitate del messages
+        setting_default_privacy: Visibilitate de publication
         setting_default_quote_policy: Qui pote citar
         setting_default_sensitive: Sempre marcar le medios cmo sensbile
         setting_delete_modal: Monstrar le dialogo de confirmation ante deler un message
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 0bc98874eb..0413dafe36 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -179,7 +179,6 @@ id:
         setting_auto_play_gif: Mainkan otomatis animasi GIF
         setting_boost_modal: Tampilkan dialog konfirmasi dialog sebelum boost
         setting_default_language: Bahasa posting
-        setting_default_privacy: Privasi postingan
         setting_default_sensitive: Selalu tandai media sebagai sensitif
         setting_delete_modal: Tampilkan dialog konfirmasi sebelum hapus toot
         setting_disable_swiping: Nonaktifkan gerak usap
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 56e737172d..24635c7f83 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -206,7 +206,6 @@ ie:
         setting_auto_play_gif: Reproducter automaticmen animat GIFs
         setting_boost_modal: Monstrar dialog de confirmation ante boostar
         setting_default_language: Lingue in quel postar
-        setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
         setting_delete_modal: Monstrar dialog de confirmation ante deleter un posta
         setting_disable_swiping: Desactivar motiones de glissar
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 7da9441ba6..b0904353c1 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -220,7 +220,6 @@ io:
         setting_auto_play_gif: Autoplear anima GIFi
         setting_boost_modal: Montrez konfirmdialogo ante repetar
         setting_default_language: Postolinguo
-        setting_default_privacy: Videbleso di la mesaji
         setting_default_sensitive: Omnatempe markas audvidaji quale trublema
         setting_delete_modal: Montrez konfirmdialogo ante efacar posto
         setting_disable_hover_cards: Desebligar profilprevido dum paso
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index fc559af7ba..b68cc49c8b 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -236,7 +236,7 @@ is:
         setting_auto_play_gif: Spila sjálfkrafa GIF-hreyfimyndir
         setting_boost_modal: Sýna staðfestingarglugga fyrir endurbirtingu
         setting_default_language: Tungumál sem skrifað er á
-        setting_default_privacy: Gagnaleynd færslna
+        setting_default_privacy: Sýnileiki færslna
         setting_default_quote_policy: Hverjir geta gert tilvitnanir
         setting_default_sensitive: Alltaf merkja myndefni sem viðkvæmt
         setting_delete_modal: Birta staðfestingarglugga áður en færslu er eytt
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f349680a36..d79713d67b 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -236,7 +236,7 @@ it:
         setting_auto_play_gif: Riproduci automaticamente le GIF animate
         setting_boost_modal: Mostra dialogo di conferma prima del boost
         setting_default_language: Lingua dei post
-        setting_default_privacy: Privacy dei post
+        setting_default_privacy: Visibilità dei post
         setting_default_quote_policy: Chi può citare
         setting_default_sensitive: Segna sempre i media come sensibili
         setting_delete_modal: Mostra dialogo di conferma prima di eliminare un post
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index a2fe712ed2..29ec1e2927 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -227,7 +227,6 @@ ja:
         setting_auto_play_gif: アニメーションGIFを自動再生する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
         setting_default_language: 投稿する言語
-        setting_default_privacy: 投稿の公開範囲
         setting_default_quote_policy: 引用できるユーザー
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: 投稿を削除する前に確認ダイアログを表示する
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index 48f028c575..e9a07fd97a 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -51,7 +51,6 @@ ka:
         setting_auto_play_gif: ანიმაციური გიფების ავტო-დაკვრა
         setting_boost_modal: ბუსტამე მოხდეს დამოწმება
         setting_default_language: პოსტინგის ენა
-        setting_default_privacy: პოსტის კონფიდენციალურობა
         setting_default_sensitive: ყოველთვის მოინიშნოს მედია მგრძნობიარედ
         setting_delete_modal: ტუტის გაუქმებამდე გამოჩნდეს დადასტურების ფანჯარა
         setting_hide_network: თქვენი ქსელის დამალვა
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 16c425186b..4e06281ece 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -95,7 +95,6 @@ kab:
         setting_advanced_layout: Rmed agrudem n web leqqayen
         setting_always_send_emails: Dima ttazen-d ilɣa s yimayl
         setting_default_language: Tutlayt n usuffeɣ
-        setting_default_privacy: Tabaḍnit n usuffeɣ
         setting_default_quote_policy: Anwa i izemren ad d-yebder
         setting_display_media: Askanay n imidyaten
         setting_display_media_default: Akk-a kan
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index e6ba46fdf8..97cfcbd23b 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -45,7 +45,6 @@ kk:
         setting_auto_play_gif: GIF анимацияларды бірден қосу
         setting_boost_modal: Бөлісу алдында растау диалогын көрсету
         setting_default_language: Жазба тілі
-        setting_default_privacy: Жазба құпиялылығы
         setting_default_sensitive: Медиаларды әрдайым нәзік ретінде белгілеу
         setting_delete_modal: Жазбаны өшірместен бұрын растау диалогын көрсету
         setting_display_media: Медианы көрсету
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index e60ad24d78..a5d552b8bb 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -234,7 +234,6 @@ ko:
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
         setting_boost_modal: 부스트 전 확인창을 띄웁니다
         setting_default_language: 게시물 언어
-        setting_default_privacy: 게시물 프라이버시
         setting_default_quote_policy: 인용할 수 있는 사람
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
         setting_delete_modal: 게시물 삭제 전 확인창을 띄웁니다
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index db50384c7e..b9111e3f64 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -178,7 +178,6 @@ ku:
         setting_auto_play_gif: GIF ên livok bi xweber bilîzine
         setting_boost_modal: Gotûbêja pejirandinê nîşan bide berî ku şandî werê bilindkirin
         setting_default_language: Zimanê weşanê
-        setting_default_privacy: Ewlehiya weşanê
         setting_default_sensitive: Her dem medya wek hestyar bide nîşan
         setting_delete_modal: Berî ku peyamek were jêbirin, gotûbêja pejirandinê nîşan bide
         setting_disable_swiping: Tevgerên dişiqite ne çalak bike
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index aef3536569..08fefe240f 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -203,7 +203,6 @@ lad:
         setting_auto_play_gif: Siempre reproduse los GIFs animados
         setting_boost_modal: Amostra ventana de konfirmasyon antes de repartajar
         setting_default_language: Lingua de publikasyones
-        setting_default_privacy: Privasita de publikasyones
         setting_default_sensitive: Syempre marka multimedia komo sensivles
         setting_delete_modal: Mostra dialogo de konfirmasyon antes de efasar una publikasyon
         setting_disable_swiping: Inkapasita movimyentos de arresvalamiento
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index bbd22e3f76..2b2f2df136 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -160,7 +160,6 @@ lt:
         setting_auto_play_gif: Automatiškai leisti animuotų GIF
         setting_boost_modal: Rodyti patvirtinimo dialogą prieš pakėliant įrašą
         setting_default_language: Skelbimo kalba
-        setting_default_privacy: Skelbimo privatumas
         setting_default_sensitive: Visada žymėti mediją kaip jautrią
         setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
         setting_disable_hover_cards: Išjungti profilio peržiūrą užvedus
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 0349aa1809..6e7e57ffab 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -221,7 +221,6 @@ lv:
         setting_auto_play_gif: Automātiski atskaņot animētos GIF
         setting_boost_modal: Rādīt apstiprinājuma dialogu pirms izcelšanas
         setting_default_language: Publicēšanas valoda
-        setting_default_privacy: Publicēšanas privātums
         setting_default_quote_policy: Kas var citēt
         setting_default_sensitive: Vienmēr atzīmēt informācijas nesējus kā jūtīgus
         setting_delete_modal: Parādīt apstiprinājuma dialogu pirms ziņas dzēšanas
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index d3670a1c86..6c45240781 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -201,7 +201,6 @@ ms:
         setting_auto_play_gif: Automain GIF animasi
         setting_boost_modal: Tunjukkan dialog pengesahan sebelum meningkatkan
         setting_default_language: Bahasa hantaran
-        setting_default_privacy: Privasi hantaran
         setting_default_sensitive: Selalu tandakan media sebagai sensitif
         setting_delete_modal: Tunjukkan dialog pengesahan sebelum memadamkan pos
         setting_disable_swiping: Lumpuhkan gerakan meleret
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 474b0f6cb4..283acbd76d 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -198,7 +198,6 @@ my:
         setting_auto_play_gif: ကာတွန်း GIF များကို အလိုအလျောက်ဖွင့်ပါ
         setting_boost_modal: Boost မလုပ်မီ အတည်ပြုချက်ပြပါ
         setting_default_language: ပို့စ်တင်မည့်ဘာသာစကား
-        setting_default_privacy: ပို့စ်ကို ဘယ်သူမြင်နိုင်မလဲ
         setting_default_sensitive: သတိထားရသောမီဒီယာအဖြစ် အမြဲအမှတ်အသားပြုပါ
         setting_delete_modal: ပို့စ်တစ်ခုမဖျက်မီ အတည်ပြုချက်ပြပါ။
         setting_disable_swiping: ပွတ်ဆွဲခြင်းများကို ပိတ်ပါ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 53307d7e11..fc6b20eac5 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -237,7 +237,7 @@ nl:
         setting_boost_modal: Vraag voor het boosten van een bericht een bevestiging
         setting_default_language: Taal van jouw berichten
         setting_default_privacy: Zichtbaarheid van nieuwe berichten
-        setting_default_quote_policy: Wie kan citeren
+        setting_default_quote_policy: Wie mag jou citeren
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
         setting_disable_hover_cards: Hover-kaarten met profielvoorbeelden uitschakelen
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 54e45d29e4..9d19921612 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -236,7 +236,6 @@ nn:
         setting_auto_play_gif: Spel av animerte GIF-ar automatisk
         setting_boost_modal: Vis stadfesting før framheving
         setting_default_language: Språk på innlegg
-        setting_default_privacy: Privatliv
         setting_default_quote_policy: Kven kan sitera
         setting_default_sensitive: Merk alltid media som nærtakande
         setting_delete_modal: Vis stadfesting før du slettar eit tut
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index f9b60ed796..cd92a269b1 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -200,7 +200,6 @@
         setting_auto_play_gif: Autoavspill animert GIF-filer
         setting_boost_modal: Vis bekreftelse før fremheving
         setting_default_language: Innleggsspråk
-        setting_default_privacy: Postintegritet
         setting_default_sensitive: Merk alltid media som følsomt
         setting_delete_modal: Vis bekreftelse før du sletter et innlegg
         setting_disable_swiping: Skru av sveipebevegelser
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 05b0508a51..2eb7c58f54 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -132,7 +132,6 @@ oc:
         setting_auto_play_gif: Lectura automatica dels GIFS animats
         setting_boost_modal: Mostrar una fenèstra de confirmacion abans de partejar un estatut
         setting_default_language: Lenga de publicacion
-        setting_default_privacy: Confidencialitat dels tuts
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
         setting_delete_modal: Mostrar una fenèstra de confirmacion abans de suprimir un estatut
         setting_disable_swiping: Desactivar las accions en lisant
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 7300d67c97..2ce9f42e93 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -238,7 +238,6 @@ pl:
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_language: Język wpisów
-        setting_default_privacy: Widoczność wpisów
         setting_default_quote_policy: Kto może cytować
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 9bcb70fc38..478a63d953 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -227,7 +227,6 @@ pt-BR:
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Solicitar confirmação antes de dar boost
         setting_default_language: Idioma dos toots
-        setting_default_privacy: Privacidade dos toots
         setting_default_quote_policy: Quem pode citar
         setting_default_sensitive: Sempre marcar mídia como sensível
         setting_delete_modal: Solicitar confirmação antes de excluir toot
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index adc58a7aed..31ef4ea452 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -236,7 +236,6 @@ pt-PT:
         setting_auto_play_gif: Reproduzir GIF automaticamente
         setting_boost_modal: Mostrar caixa de diálogo de confirmação antes de impulsionar
         setting_default_language: Idioma de publicação
-        setting_default_privacy: Privacidade da publicação
         setting_default_quote_policy: Quem pode citar
         setting_default_sensitive: Marcar sempre os multimédia como sensíveis
         setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 5cb4e116a2..ae8e2e065c 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -191,7 +191,6 @@ ro:
         setting_auto_play_gif: Redă automat animațiile GIF
         setting_boost_modal: Arată dialogul de confirmare înainte de a impulsiona
         setting_default_language: În ce limbă postezi
-        setting_default_privacy: Cine vede postările tale
         setting_default_sensitive: Întotdeauna marchează conținutul media ca fiind sensibil
         setting_delete_modal: Arată dialogul de confirmare înainte de a șterge o postare
         setting_display_media: Afișare media
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index e2f2e13eec..44db49c657 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -233,7 +233,6 @@ ru:
         setting_auto_play_gif: Включить автовоспроизведение анимированных GIF-файлов
         setting_boost_modal: Запрашивать подтверждение при продвижении поста
         setting_default_language: Язык публикуемых постов
-        setting_default_privacy: Видимость постов
         setting_default_quote_policy: Кто может цитировать вас
         setting_default_sensitive: Отмечать все мои медиа как содержимое деликатного характера
         setting_delete_modal: Запрашивать подтверждение при удалении поста
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index fc53103950..757bdd28d8 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -136,7 +136,6 @@ sc:
         setting_auto_play_gif: Riprodui is GIF animadas in automàticu
         setting_boost_modal: Ammustra unu diàlogu de cunfirma in antis de cumpartzire
         setting_default_language: Idioma de publicatzione
-        setting_default_privacy: Riservadesa de is publicatziones
         setting_default_sensitive: Marca semper is elementos multimediales comente sensìbiles
         setting_delete_modal: Ammustra unu diàlogu de cunfirma in antis de cantzellare unu tut
         setting_disable_swiping: Disativa animatziones
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 2bc4f6a456..1a08061dcc 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -176,7 +176,6 @@ sco:
         setting_auto_play_gif: Auto-pley animatit GIFs
         setting_boost_modal: Shaw confirmation dialog afore heezin
         setting_default_language: Postin leid
-        setting_default_privacy: Postin privacy
         setting_default_sensitive: Aye mairk media as sensitive
         setting_delete_modal: Shaw confirmation dialog afore deletin a post
         setting_disable_swiping: Turn aff swipin motions
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index 119e3d253d..8aac332bf2 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -227,7 +227,6 @@ si:
         setting_auto_play_gif: සජීවිකරණ GIF ස්වයංක්‍රීයව ධාවනය කරන්න
         setting_boost_modal: වැඩි කිරීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න
         setting_default_language: ලිපිවල භාෂාව
-        setting_default_privacy: ලිපියේ රහස්‍යතාව
         setting_default_quote_policy: උපුටා දැක්විය හැක්කේ කාටද?
         setting_default_sensitive: සෑමවිට මාධ්‍ය සංවේදී බව සලකුණු කරන්න
         setting_delete_modal: ලිපියක් මැකීමට පෙර ඒ ගැන විමසන්න
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index aa8dbe7693..b6896c73e1 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -113,7 +113,6 @@ sk:
         setting_auto_play_gif: Automaticky prehrávaj animované GIFy
         setting_boost_modal: Zobrazuj potvrdzovacie okno pred povýšením
         setting_default_language: Píšeš v jazyku
-        setting_default_privacy: Súkromie príspevkov
         setting_default_sensitive: Označ všetky mediálne súbory ako chúlostivé
         setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazaním toot-u
         setting_display_media: Zobrazovanie médií
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index d59fc2c844..9a2850119c 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -225,7 +225,6 @@ sl:
         setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov
         setting_boost_modal: Pred izpostavljanjem pokaži potrditveno okno
         setting_default_language: Jezik objavljanja
-        setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
         setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
         setting_disable_hover_cards: Onemogoči predogled profila pod kazalcem
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 0672fe05a4..ad26b87a5a 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -226,7 +226,6 @@ sq:
         setting_auto_play_gif: Vetëluaji GIF-et e animuar
         setting_boost_modal: Shfaq dialog ripohimi përpara përforcimi
         setting_default_language: Gjuhë postimi
-        setting_default_privacy: Privatësi postimi
         setting_default_quote_policy: Cilët mund të citojnë
         setting_default_sensitive: Mediave vëru përherë shenjë si rezervat
         setting_delete_modal: Shfaq dialog ripohimi përpara fshirjes së një mesazhi
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index fee7600074..213075e6b4 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -206,7 +206,6 @@ sr-Latn:
         setting_auto_play_gif: Automatski reprodukuj animirane GIF-ove
         setting_boost_modal: Prikaži dijalog za potvrdu pre davanja podrške
         setting_default_language: Jezik objavljivanja
-        setting_default_privacy: Privatnost objava
         setting_default_sensitive: Uvek označi multimediju kao osetljivu
         setting_delete_modal: Prikaži dijalog za potvrdu pre brisanja objave
         setting_disable_hover_cards: Onemogući pregled profila prelaskom kursora
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 7161627e28..96c5732ebd 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -206,7 +206,6 @@ sr:
         setting_auto_play_gif: Аутоматски репродукуј анимиране GIF-ове
         setting_boost_modal: Прикажи дијалог за потврду пре давања подршке
         setting_default_language: Језик објављивања
-        setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања објаве
         setting_disable_hover_cards: Онемогући преглед профила преласком курсора
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index ee8fae37f1..fd680127aa 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -236,7 +236,6 @@ sv:
         setting_auto_play_gif: Spela upp GIF:ar automatiskt
         setting_boost_modal: Visa bekräftelsedialog innan boostning
         setting_default_language: Inläggsspråk
-        setting_default_privacy: Inläggsintegritet
         setting_default_quote_policy: Vem kan citera
         setting_default_sensitive: Markera alltid media som känsligt
         setting_delete_modal: Visa bekräftelsedialog innan radering av inlägg
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 530bd60ad1..8ec163d433 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -210,7 +210,6 @@ th:
         setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
         setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
         setting_default_language: ภาษาของการโพสต์
-        setting_default_privacy: ความเป็นส่วนตัวของการโพสต์
         setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
         setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
         setting_disable_hover_cards: ปิดใช้งานตัวอย่างโปรไฟล์เมื่อวางเมาส์เหนือ
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index e403d34e60..a4bf379f05 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -236,7 +236,6 @@ tr:
         setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
         setting_boost_modal: Paylaşmadan önce onay iletişim kutusu göster
         setting_default_language: Gönderi dili
-        setting_default_privacy: Gönderi gizliliği
         setting_default_quote_policy: Kimler alıntılayabilir
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
         setting_delete_modal: Bir gönderiyi silmeden önce onay iletişim kutusu göster
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 1fb1c542f1..017e041ecd 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -225,7 +225,6 @@ uk:
         setting_auto_play_gif: Автоматично відтворювати анімовані GIF
         setting_boost_modal: Показувати діалог підтвердження під час поширення
         setting_default_language: Мова дописів
-        setting_default_privacy: Видимість дописів
         setting_default_sensitive: Позначати медіа делікатними
         setting_delete_modal: Показувати діалог підтвердження під час видалення допису
         setting_disable_hover_cards: Вимкнути попередній перегляд профілю під час наведення мишки
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index f754cb07e3..8fcd7e3e4f 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -229,7 +229,6 @@ zh-CN:
         setting_auto_play_gif: 自动播放 GIF 动画
         setting_boost_modal: 在转嘟前询问我
         setting_default_language: 发布语言
-        setting_default_privacy: 嘟文默认可见范围
         setting_default_quote_policy: 谁可以引用
         setting_default_sensitive: 始终标记媒体为敏感内容
         setting_delete_modal: 在删除嘟文前询问我
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 9b935b991a..de4a76c0ed 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -204,7 +204,6 @@ zh-HK:
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
         setting_default_language: 文章語言
-        setting_default_privacy: 文章預設為
         setting_default_sensitive: 預設我的內容為敏感內容
         setting_delete_modal: 刪除文章前，請要求我確認
         setting_disable_swiping: 停用滑動手勢
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 8fc48dfa98..aee82d7790 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -235,7 +235,7 @@ zh-TW:
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 轉嘟前先詢問我
         setting_default_language: 嘟文語言
-        setting_default_privacy: 嘟文隱私設定
+        setting_default_privacy: 嘟文可見性
         setting_default_quote_policy: 誰能引用此嘟文
         setting_default_sensitive: 總是將媒體標記為敏感內容
         setting_delete_modal: 刪除嘟文前先詢問我
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a0df45ef49..a9e409aad5 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -328,7 +328,6 @@ sk:
       title: Vlastné emoji
       uncategorized: Nezaradené
       unlist: Nezaraď
-      unlisted: Nie je na zozname
       update_failed_msg: Nebolo možné aktualizovať toto emoji
       updated_msg: Emoji bolo úspešne aktualizované!
       upload: Nahraj
@@ -1281,9 +1280,7 @@ sk:
       private: Iba pre sledovateľov
       private_long: Ukáž iba následovateľom
       public: Verejné
-      public_long: Všetci môžu vidieť
       unlisted: Nezaradené
-      unlisted_long: Všetci môžu vidieť, ale nieje zaradené do verejnej osi
   statuses_cleanup:
     exceptions: Výnimky
     ignore_favs: Ignoruj obľúbené
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1a32c036e5..f8b1949d6b 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -366,7 +366,6 @@ sl:
       title: Emotikoni po meri
       uncategorized: Brez kategorije
       unlist: Ne prikaži na seznamu
-      unlisted: Neuvrščeni
       update_failed_msg: Tega emotikona ni bilo mogoče posodobiti
       updated_msg: Emotikon je uspešno posodobljen!
       upload: Pošlji
@@ -1915,9 +1914,7 @@ sl:
       private: Samo sledilci
       private_long: Prikaži samo sledilcem
       public: Javno
-      public_long: Vsi lahko vidijo
       unlisted: Ni prikazano
-      unlisted_long: Vsi lahko vidijo, vendar ni objavljeno na javnih časovnicah
   statuses_cleanup:
     enabled: Samodejno izbriši stare objave
     enabled_hint: Samodejno izbriše vaše objave, ko dosežejo določen starostni prag, razen če ne ustrezajo eni od spodnjih izjem
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 1bccd172ff..c94161f535 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -361,7 +361,6 @@ sq:
       title: Emoxhi vetjake
       uncategorized: I pakategorizuar
       unlist: Hiqe nga lista
-      unlisted: Hequr prej liste
       update_failed_msg: S’u përditësua dot ai emoxhi
       updated_msg: Emoji u përditësua me sukses!
       upload: Ngarkoje
@@ -1864,16 +1863,12 @@ sq:
       limit: Keni fiksuar tashmë numrin maksimum të mesazheve
       ownership: S’mund të fiksohen mesazhet e të tjerëve
       reblog: S’mund të fiksohet një përforcim
-    quote_policies:
-      public: Këdo
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Vetëm ndjekësve
       private_long: Shfaqua vetëm ndjekësve
       public: Publike
-      public_long: Mund ta shohë kushdo
       unlisted: Jo në listë
-      unlisted_long: Mund ta shohë gjithkush, por s’gjendet në rrjedha publike kohore
   statuses_cleanup:
     enabled: Fshi automatikisht postime të vjetra
     enabled_hint: Fshin automatikisht postimet tuaja, pasi mbërrijnë një prag të caktuar moshe, hiq rastin kur ka përputhje me një nga përjashtimet më poshtë
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 54d1d9a8a2..31a379aa84 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -324,7 +324,6 @@ sr-Latn:
       title: Proizvoljni emotidžiji
       uncategorized: Nekategorizovano
       unlist: Neizlistan
-      unlisted: Neizlistan
       update_failed_msg: Ne mogu da ažuriram ovaj emodži
       updated_msg: Emodži uspešno ažuriran!
       upload: Otpremi
@@ -1658,9 +1657,7 @@ sr-Latn:
       private: Samo pratioci
       private_long: Prikaži samo pratiocima
       public: Javno
-      public_long: Svako može da vidi
       unlisted: Neizlistano
-      unlisted_long: Svako može da vidi, ali nije izlistano na javnim vremenskim linijama
   statuses_cleanup:
     enabled: Automatski izbriši stare objave
     enabled_hint: Automatski briše vaše objave kada dostignu određeni starosni prag, osim ako se ne podudaraju sa jednim od izuzetaka u nastavku
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 346a05b571..6c6c5b740e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -345,7 +345,6 @@ sr:
       title: Произвољни емотиџији
       uncategorized: Некатегоризовано
       unlist: Неизлистан
-      unlisted: Неизлистан
       update_failed_msg: Не могу да ажурирам овај емоџи
       updated_msg: Емоџи успешно ажуриран!
       upload: Отпреми
@@ -1688,9 +1687,7 @@ sr:
       private: Само пратиоци
       private_long: Прикажи само пратиоцима
       public: Јавно
-      public_long: Свако може да види
       unlisted: Неизлистано
-      unlisted_long: Свако може да види, али није излистано на јавним временским линијама
   statuses_cleanup:
     enabled: Аутоматски избриши старе објаве
     enabled_hint: Аутоматски брише ваше објаве када достигну одређени старосни праг, осим ако се не подударају са једним од изузетака у наставку
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index e1eec89481..b7eaf4d797 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -367,7 +367,6 @@ sv:
       title: Egentillverkade emojis
       uncategorized: Okategoriserad / Okategoiserat / Okategoriserade
       unlist: Avnotera / Tag bort
-      unlisted: Olistade
       update_failed_msg: Kunde inte uppdatera emoji
       updated_msg: Emoji uppdaterades utan problem!
       upload: Ladda upp
@@ -1908,18 +1907,12 @@ sv:
       limit: Du har redan fäst det maximala antalet inlägg
       ownership: Någon annans inlägg kan inte fästas
       reblog: En boost kan inte fästas
-    quote_policies:
-      followers: Endast dina följare
-      nobody: Ingen
-      public: Alla
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Endast följare
       private_long: Visa endast till följare
       public: Offentlig
-      public_long: Alla kan se
       unlisted: Olistade
-      unlisted_long: Alla kan se, men listas inte på offentliga tidslinjer
   statuses_cleanup:
     enabled: Ta automatiskt bort gamla inlägg
     enabled_hint: Raderar dina inlägg automatiskt när de når en specifik ålder, såvida de inte matchar något av undantagen nedan
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 56b2895c74..e295fe8a87 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -151,7 +151,6 @@ ta:
       not_permitted: இச்செயலைச் செய்ய உங்களுக்கு அனுமதி இல்லை
       uncategorized: வகைப்படுத்தப்படாதவை
       unlist: பட்டியலில் இருந்து அகற்றுக
-      unlisted: பட்டியலிடப்படாத
       upload: பதிவேற்றம்
     domain_blocks:
       new:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 228909a0c1..9ce35ef0ec 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -352,7 +352,6 @@ th:
       title: อีโมจิที่กำหนดเอง
       uncategorized: ไม่มีหมวดหมู่
       unlist: เลิกแสดงรายการ
-      unlisted: ไม่อยู่ในรายการ
       update_failed_msg: ไม่สามารถอัปเดตอีโมจินั้น
       updated_msg: อัปเดตอีโมจิสำเร็จ!
       upload: อัปโหลด
@@ -1786,9 +1785,7 @@ th:
       private: ผู้ติดตามเท่านั้น
       private_long: แสดงแก่ผู้ติดตามเท่านั้น
       public: สาธารณะ
-      public_long: ทุกคนสามารถเห็น
       unlisted: ไม่อยู่ในรายการ
-      unlisted_long: ทุกคนสามารถเห็น แต่ไม่แสดงรายการในเส้นเวลาสาธารณะ
   statuses_cleanup:
     enabled: ลบโพสต์เก่าโดยอัตโนมัติ
     enabled_hint: ลบโพสต์ของคุณโดยอัตโนมัติเมื่อโพสต์ถึงค่าเกณฑ์อายุที่ระบุ เว้นแต่โพสต์ตรงกับหนึ่งในข้อยกเว้นด้านล่าง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 328b6f886d..d23e18e3aa 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -367,7 +367,6 @@ tr:
       title: Özel emojiler
       uncategorized: Kategorilenmemiş
       unlist: Liste dışı
-      unlisted: Listelenmemiş
       update_failed_msg: Bu emoji güncellenemedi
       updated_msg: Emoji başarıyla güncellendi!
       upload: Yükle
@@ -1908,18 +1907,12 @@ tr:
       limit: Halihazırda maksimum sayıda gönderi sabitlediniz
       ownership: Başkasının gönderisi sabitlenemez
       reblog: Bir gönderi sabitlenemez
-    quote_policies:
-      followers: Yalnızca takipçileriniz
-      nobody: Hiç kimse
-      public: Herkes
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Sadece takipçiler
       private_long: Sadece takipçilerime gönder
       public: Herkese açık
-      public_long: Herkese açık zaman tüneline gönder
       unlisted: Listelenmemiş
-      unlisted_long: Herkes görebilir fakat herkese açık zaman tünellerinde listelenmez
   statuses_cleanup:
     enabled: Eski gönderileri otomatik olarak sil
     enabled_hint: Belirli bir zaman eşiğine ulaşan eski gönderilerinizi, aşağıdaki istisnalara uymadıkları sürece otomatik olarak siler
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index b5a4f6844e..bbbcabab46 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -367,7 +367,6 @@ uk:
       title: Особливі емодзі
       uncategorized: Без категорії
       unlist: Прибрати
-      unlisted: Не у списку
       update_failed_msg: Не вийшло оновити емозді
       updated_msg: Емодзі успішно оновлене!
       upload: Вивантажити
@@ -1874,9 +1873,7 @@ uk:
       private: Для підписників
       private_long: Показувати тільки підписникам
       public: Для всіх
-      public_long: Показувати всім
       unlisted: Приховувати зі стрічок
-      unlisted_long: Показувати всім, але не відображати в публічних стрічках
   statuses_cleanup:
     enabled: Автовидалення давніх дописів
     enabled_hint: Автоматично видаляє ваші дописи після досягнення вказаного вікового порогу, якщо вони не є одним з наведених винятків
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index aa2b47a890..99d643dec2 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -364,7 +364,7 @@ vi:
       title: Emoji
       uncategorized: Chưa phân loại
       unlist: Bỏ danh sách
-      unlisted: Chưa cho phép
+      unlisted: Hạn chế
       update_failed_msg: Không thể cập nhật Emoji này
       updated_msg: Cập nhật thành công Emoji!
       upload: Tải lên
@@ -1867,17 +1867,17 @@ vi:
       reblog: Không thể ghim tút đăng lại
     quote_policies:
       followers: Chỉ người theo dõi
-      nobody: Không ai
-      public: Mọi người
+      nobody: Chỉ tôi
+      public: Bất cứ ai
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Nhắn riêng
       private: Riêng tư
       private_long: Chỉ người theo dõi mới được xem
       public: Công khai
-      public_long: Ai cũng có thể thấy
+      public_long: Bất kỳ ai trong và ngoài Mastodon
       unlisted: Hạn chế
-      unlisted_long: Không hiện trên bảng tin máy chủ
+      unlisted_long: Ẩn khỏi kết quả tìm kiếm, xu hướng và dòng thời gian công khai của Mastodon
   statuses_cleanup:
     enabled: Tự động xóa những tút cũ
     enabled_hint: Trừ những ngoại lệ bên dưới
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6ca241b7c0..35b2ab9114 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -358,7 +358,6 @@ zh-CN:
       title: 自定义表情
       uncategorized: 未分类
       unlist: 隐藏
-      unlisted: 已隐藏
       update_failed_msg: 表情更新失败
       updated_msg: 表情更新成功！
       upload: 上传新表情
@@ -1826,16 +1825,12 @@ zh-CN:
       limit: 你置顶的嘟文数量已达上限
       ownership: 不能置顶别人的嘟文
       reblog: 不能置顶转嘟
-    quote_policies:
-      public: 所有人
     title: "%{name}：“%{quote}”"
     visibilities:
       private: 仅关注者
       private_long: 只有关注你的用户能看到
       public: 公开
-      public_long: 主页与列表
       unlisted: 悄悄公开
-      unlisted_long: 对所有人可见，但不出现在公共时间线上
   statuses_cleanup:
     enabled: 自动删除旧嘟文
     enabled_hint: 自动删除你发布的超过指定期限的嘟文，除非满足下列条件之一
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 387503d854..5de477a408 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -318,7 +318,6 @@ zh-HK:
       title: 自訂 Emoji 表情符號
       uncategorized: 未分類
       unlist: 隱藏
-      unlisted: 已隱藏
       update_failed_msg: 無法更新表情符號
       updated_msg: 已更新表情符號
       upload: 上傳新的表情符號
@@ -1637,9 +1636,7 @@ zh-HK:
       private: 關注者觀看
       private_long: 只有關注你的人能看到
       public: 公開
-      public_long: 所有人都能看到
       unlisted: 公開，但不在公共時間軸顯示
-      unlisted_long: 所有人都能看到，但不在公共時間軸（本站時間軸、跨站時間軸）顯示
   statuses_cleanup:
     enabled: 自動刪除舊嘟文
     enabled_hint: 當您的嘟文達到指定的時間門檻後，自動刪除嘟文，除非他們符合其中以下例外條件之一
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index dbc9c6b8a2..874307d42b 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -364,7 +364,7 @@ zh-TW:
       title: 自訂 emoji 表情符號
       uncategorized: 未分類
       unlist: 不公開
-      unlisted: 已隱藏
+      unlisted: 不於公開時間軸顯示
       update_failed_msg: 無法更新該 emoji 表情符號
       updated_msg: 已更新 emoji 表情符號！
       upload: 上傳新的表情符號
@@ -1868,18 +1868,18 @@ zh-TW:
       ownership: 不能釘選他人的嘟文
       reblog: 不能釘選轉嘟
     quote_policies:
-      followers: 僅限您之跟隨者
-      nobody: 禁止任何人
-      public: 任何人
+      followers: 僅限跟隨者
+      nobody: 僅有我
+      public: 所有人
     title: "%{name}：「%{quote}」"
     visibilities:
       direct: 私訊
       private: 僅限跟隨者
       private_long: 只有跟隨您的人能看到
       public: 公開
-      public_long: 所有人都能看到
+      public_long: 所有人 (無論在 Mastodon 上與否)
       unlisted: 不於公開時間軸顯示
-      unlisted_long: 所有人都能看到，但不會出現在公開時間軸上
+      unlisted_long: 不顯示於 Mastodon 之搜尋結果、熱門趨勢、及公開時間軸上
   statuses_cleanup:
     enabled: 自動刪除舊嘟文
     enabled_hint: 一旦達到指定的保存期限，就會自動刪除您的嘟文，除非該嘟文符合下列例外
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 67c85b40f3..08427a521a 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -69,6 +69,17 @@ RSpec.describe Notification do
       end
     end
 
+    context 'when the notification is a quoted post update notification' do
+      it 'sets the notification from_account correctly' do
+        status = Fabricate(:status)
+        quote = Fabricate(:quote, quoted_status: status)
+
+        notification = Fabricate.build(:notification, activity_type: 'Status', type: 'quoted_update', activity: quote.status)
+
+        expect(notification.from_account).to eq(status.account)
+      end
+    end
+
     context 'when activity_type is a Follow' do
       it 'sets the notification from_account correctly' do
         follow = Fabricate(:follow)
diff --git a/spec/serializers/rest/status_serializer_spec.rb b/spec/serializers/rest/status_serializer_spec.rb
index b6908aa414..be1b4bcae4 100644
--- a/spec/serializers/rest/status_serializer_spec.rb
+++ b/spec/serializers/rest/status_serializer_spec.rb
@@ -26,6 +26,7 @@ RSpec.describe REST::StatusSerializer do
       status.status_stat.tap do |status_stat|
         status_stat.reblogs_count = 10
         status_stat.favourites_count = 20
+        status_stat.quotes_count = 15
         status_stat.save
       end
     end
@@ -34,6 +35,7 @@ RSpec.describe REST::StatusSerializer do
       it 'shows the trusted counts' do
         expect(subject['reblogs_count']).to eq(10)
         expect(subject['favourites_count']).to eq(20)
+        expect(subject['quotes_count']).to eq(15)
       end
     end
 
diff --git a/spec/system/admin/terms_of_service/drafts_spec.rb b/spec/system/admin/terms_of_service/drafts_spec.rb
index cf4c10ce00..d8c4a3d7f4 100644
--- a/spec/system/admin/terms_of_service/drafts_spec.rb
+++ b/spec/system/admin/terms_of_service/drafts_spec.rb
@@ -8,34 +8,75 @@ RSpec.describe 'Admin TermsOfService Drafts' do
   before { sign_in(admin_user) }
 
   describe 'Managing TOS drafts' do
-    let!(:terms) { Fabricate :terms_of_service, published_at: nil }
+    context 'when a draft TOS record exists' do
+      let!(:terms) { Fabricate :terms_of_service, published_at: nil }
 
-    it 'saves and publishes TOS drafts' do
-      visit admin_terms_of_service_draft_path
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+      it 'saves and publishes TOS drafts' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Invalid submission
-      expect { click_on I18n.t('admin.terms_of_service.save_draft') }
-        .to_not(change { terms.reload.published_at })
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Invalid submission
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to_not(change { terms.reload.published_at })
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Valid submission with draft button
-      fill_in 'terms_of_service_text', with: 'new'
-      expect { click_on I18n.t('admin.terms_of_service.save_draft') }
-        .to not_change { terms.reload.published_at }.from(nil)
-        .and not_change(Admin::ActionLog, :count)
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Valid submission with draft button
+        fill_in 'terms_of_service_text', with: 'new'
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to not_change { terms.reload.published_at }.from(nil)
+          .and not_change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Valid with publish button
-      fill_in 'terms_of_service_text', with: 'newer'
-      expect { click_on I18n.t('admin.terms_of_service.publish') }
-        .to change { terms.reload.published_at }.from(nil)
-        .and change(Admin::ActionLog, :count)
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Valid with publish button
+        fill_in 'terms_of_service_text', with: 'newer'
+        expect { click_on I18n.t('admin.terms_of_service.publish') }
+          .to change { terms.reload.published_at }.from(nil)
+          .and change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
+    end
+
+    context 'when a live TOS record exists' do
+      before do
+        travel_to 5.days.ago do
+          Fabricate :terms_of_service, published_at: 2.days.ago, effective_date: 1.day.from_now
+        end
+      end
+
+      it 'populates an unsaved record with prior text' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+
+        # Valid submission with draft button
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to change(TermsOfService, :count).by(1)
+          .and not_change(Admin::ActionLog, :count)
+        expect(TermsOfService.current.text)
+          .to eq(TermsOfService.draft.last.text)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
+    end
+
+    context 'when there are no TOS records' do
+      it 'builds an unsaved record for editing' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+
+        # Valid submission with draft button
+        fill_in 'terms_of_service_text', with: 'new'
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to change(TermsOfService, :count).by(1)
+          .and not_change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
     end
   end
 end
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index dac04d5b6c..652a1a3f23 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -53,8 +53,8 @@ RSpec.describe 'Filters' do
       click_on filter_title
 
       fill_in filter_title_field, with: new_title
-      fill_in 'custom_filter_keywords_attributes_0_keyword', with: 'New value'
-      fill_in 'custom_filter_keywords_attributes_1_keyword', with: 'Wilderness'
+      custom_filter_keywords_fields.first.fill_in with: 'New value'
+      custom_filter_keywords_fields.last.fill_in with: 'Wilderness'
 
       expect { click_on submit_button }
         .to change { keyword_one.reload.keyword }.to(/New value/)
@@ -107,6 +107,10 @@ RSpec.describe 'Filters' do
     click_on I18n.t('filters.new.save')
   end
 
+  def custom_filter_keywords_fields
+    page.all('.keywords-table .custom_filter_keywords_keyword')
+  end
+
   def filter_title_field
     form_label('defaults.title')
   end
diff --git a/spec/system/profile_spec.rb b/spec/system/profile_spec.rb
index 21bdb712ed..eb0aed1593 100644
--- a/spec/system/profile_spec.rb
+++ b/spec/system/profile_spec.rb
@@ -23,11 +23,11 @@ RSpec.describe 'Profile' do
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
 
-    fill_in 'account_fields_attributes_0_name', with: 'Personal Website'
-    fill_in 'account_fields_attributes_0_value', with: 'https://host.example/personal'
+    account_fields_labels.first.fill_in with: 'Personal Website'
+    account_fields_values.first.fill_in with: 'https://host.example/personal'
 
-    fill_in 'account_fields_attributes_1_name', with: 'Professional Biography'
-    fill_in 'account_fields_attributes_1_value', with: 'https://host.example/pro'
+    account_fields_labels.last.fill_in with: 'Professional Biography'
+    account_fields_values.last.fill_in with: 'https://host.example/pro'
 
     expect { submit_form }
       .to change { bob.account.reload.display_name }.to('Bob')
@@ -40,6 +40,14 @@ RSpec.describe 'Profile' do
     first('button[type=submit]').click
   end
 
+  def account_fields_labels
+    page.all('.account_fields_name input')
+  end
+
+  def account_fields_values
+    page.all('.account_fields_value input')
+  end
+
   def change_account_fields
     change { bob.account.reload.fields }
       .from([])