Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream

CHANGELOG.md

@@ -6,13 +6,18 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- **Add support for allowing and authoring quotes** (#35355, #35578, #35614, #35618, #35624, #35626, #35652, #35629, #35665, #35653, #35670, #35677, #35690, #35697, #35689, #35699, #35700, #35701, #35709, #35714, #35713, #35715, #35725, #35749, #35769, #35780, #35762, #35804, #35808, #35805, #35819, #35824, #35828, #35822, #35835, #35865, #35860, #35832, #35891, #35894, #35895, #35820, #35917, #35924, #35925, #35914, #35930, #35941, #35939, #35948, #35955, #35967, #35990, #35991, #35975, #35971, #36002, #35986, #36031, #36034, #36038, #36054, #36052, #36055, #36065, #36068, #36083, #36087, #36080, #36091, #36090, #36118, #36119, #36128, #36094, #36129, #36138, #36132, #36151, #36158, #36171, #36194, #36220, #36169, #36130, #36249, #36153, #36299, #36291, #36301, #36315, #36317, #36364, #36383, #36381, #36459, #36464, #36461, #36516 and #36528 by @ChaosExAnima, @ClearlyClaire, @Lycolia, @diondiondion, and @tribela)\
+- **Add support for allowing and authoring quotes** (#35355, #35578, #35614, #35618, #35624, #35626, #35652, #35629, #35665, #35653, #35670, #35677, #35690, #35697, #35689, #35699, #35700, #35701, #35709, #35714, #35713, #35715, #35725, #35749, #35769, #35780, #35762, #35804, #35808, #35805, #35819, #35824, #35828, #35822, #35835, #35865, #35860, #35832, #35891, #35894, #35895, #35820, #35917, #35924, #35925, #35914, #35930, #35941, #35939, #35948, #35955, #35967, #35990, #35991, #35975, #35971, #36002, #35986, #36031, #36034, #36038, #36054, #36052, #36055, #36065, #36068, #36083, #36087, #36080, #36091, #36090, #36118, #36119, #36128, #36094, #36129, #36138, #36132, #36151, #36158, #36171, #36194, #36220, #36169, #36130, #36249, #36153, #36299, #36291, #36301, #36315, #36317, #36364, #36383, #36381, #36459, #36464, #36461, #36516, #36528, #36549, #36550 and #36559 by @ChaosExAnima, @ClearlyClaire, @Lycolia, @diondiondion, and @tribela)\
   This includes a revamp of the composer interface.\
   See https://blog.joinmastodon.org/2025/09/introducing-quote-posts/ for a user-centric overview of the feature, and https://docs.joinmastodon.org/client/quotes/ for API documentation.
-- **Add support for fetching and refreshing replies to the web UI** (#35210, #35496, #35575, #35500, #35577, #35602, #35603, #35654, #36141, #36237, #36172, #36256, #36271, #36334, #36382, #36239, #36484 and #36481 by @ClearlyClaire, @Gargron, and @diondiondion)
+- **Add support for fetching and refreshing replies to the web UI** (#35210, #35496, #35575, #35500, #35577, #35602, #35603, #35654, #36141, #36237, #36172, #36256, #36271, #36334, #36382, #36239, #36484, #36481, #36583, #36627 and #36547 by @ClearlyClaire, @diondiondion, @Gargron and @renchap)
 - **Add ability to block words in usernames** (#35407, #35655, and #35806 by @ClearlyClaire and @Gargron)
+- Add ability to individually disable local or remote feeds for visitors or logged-in users `disabled` value to server setting for live and topic feeds, as well as user permission to bypass that (#36338, #36467, #36497, #36563, #36577, #36585, and #36607 by @ClearlyClaire)\
+  This splits the `timeline_preview` setting into four more granular settings controlling live feeds and topic (hashtag, trending link) feeds, with 3 values each: `public`, `authenticated`, `disabled`.\
+  When `disabled`, users with the “View live and topic feeds” will still be able to view them.
 - Add support for displaying of quote posts in Moderator UI (#35964 by @ThisIsMissEm)
 - Add support for displaying link previews for Admin UI (#35958 by @ThisIsMissEm)
+- Add a new server setting to choose the server landing page (#36588 and #36602 by @ClearlyClaire and @renchap)
+- Add support for `Update` activities on converted object types (#36322 by @ClearlyClaire)
 - Add support for dynamic viewport height (#36272 by @e1berd)
 - Add support for numeric-based URIs for new local accounts (#32724, #36304, #36316, and #36365 by @ClearlyClaire)
 - Add Traditional Mongolian to posting languages (#36196 by @shimon1024)
@@ -28,7 +33,7 @@ All notable changes to this project will be documented in this file.
 - Add example of quote post with a preview card to development sample data (#35616 by @ClearlyClaire)
 - Add second set of blocked text that applies to accounts regardless of account age for spam-blocking (#35563 by @ClearlyClaire)
 - Added emoji from Twemoji v16 (#36501 and #36530 by @ChaosExAnima)
-- Add experimental feature to select custom emoji rendering (#35229, #35282, #35253, #35424, #35473, #35483, #35505, #35568, #35605, #35659, #35664, #35739, #35985, #36051, #36071, #36137, #36165, #36248, #36262, #36275, #36293, #36341, #36342, #36366, #36377, #36378, #36385, #36393, #36397, #36403, #36413, #36410, #36454, #36402, #36503, #36502 and #36532 by @ChaosExAnima and @braddunbar)\
+- Add feature to select custom emoji rendering (#35229, #35282, #35253, #35424, #35473, #35483, #35505, #35568, #35605, #35659, #35664, #35739, #35985, #36051, #36071, #36137, #36165, #36248, #36262, #36275, #36293, #36341, #36342, #36366, #36377, #36378, #36385, #36393, #36397, #36403, #36413, #36410, #36454, #36402, #36503, #36502, #36532, #36603 and #36409 by @ChaosExAnima and @braddunbar)\
   This also completely reworks the processing and rendering of emojis and server-rendered HTML in statuses and other places.
 
 ### Changed
@@ -36,11 +41,17 @@ All notable changes to this project will be documented in this file.
 - Change confirmation dialogs for follow button actions “unfollow”, “unblock”, and “withdraw request” (#36289 by @diondiondion)
 - Change “Follow” button labels (#36264 by @diondiondion)
 - Change appearance settings to introduce new Advanced settings section (#36496 and #36506 by @diondiondion)
+- Change display of blocked and muted quoted users (#36619 by @ClearlyClaire)\
+  This adds `blocked_account`, `blocked_domain` and `muted_account` values to the `state` attribute of `Quote` and `ShallowQuote` REST API entities.
 - Change display of content warnings in Admin UI (#35935 by @ThisIsMissEm)
+- Change styling of column banners (#36531 by @ClearlyClaire)
+- Change recommended Node version to 24 (LTS) (#36539 by @renchap)
+- Change min. characters required for logged-out account search from 5 to 3 (#36487 by @Gargron)
+- Change browser target to Vite legacy plugin defaults (#36611 by @larouxn)
 - Change index on `follows` table to improve performance of some queries (#36374 by @ClearlyClaire)
 - Change links to accounts in settings and moderation views to link to local view unless account is suspended (#36340 by @diondiondion)
 - Change redirection for denied registration from web app to sign-in page with error message (#36384 by @ClearlyClaire)
-- Change `timeline_preview` setting into four more granular settings (#36338, #36467 and #36497 by @ClearlyClaire)
+- Change support for RFC9421 HTTP signatures to be enabled unconditionally (#36610 by @oneiros)
 - Change wording and design of interaction dialog to simplify it (#36124 by @diondiondion)
 - Change dropdown menus to allow disabled items to be focused (#36078 by @diondiondion)
 - Change modal background colours in light mode (#36069 by @diondiondion)
@@ -48,7 +59,7 @@ All notable changes to this project will be documented in this file.
 - Change description of “Quiet public” (#36032 by @ClearlyClaire)
 - Change “Boost with original visibility” to “Share again with your followers” (#36035 by @ClearlyClaire)
 - Change handling of push subscriptions to automatically delete invalid ones on delivery (#35987 by @ThisIsMissEm)
-- Change design of quote posts in web UI (#35584 and #35834 by @ClearlyClaire and @Gargron)
+- Change design of quote posts in web UI (#35584 and #35834 by @Gargron)
 - Change auditable accounts to be sorted by username in admin action logs interface (#35272 by @breadtk)
 - Change order of translation restoration and service credit on post card (#33619 by @colindean)
 - Change position of ‘add more’ to be inside table toolbar on reports (#35963 by @ThisIsMissEm)
@@ -59,6 +70,14 @@ All notable changes to this project will be documented in this file.
 - Fix relationship not being fetched to evaluate whether to show a quote post (#36517 by @ClearlyClaire)
 - Fix rendering of poll options in status history modal (#35633 by @ThisIsMissEm)
 - Fix “mute” button being displayed to unauthenticated visitors in hashtag dropdown (#36353 by @mkljczk)
+- Fix URL comparison for mentions in case of empty path (#36613 and #36626 by @ClearlyClaire)
+- Fix hashtags not being picked up when full-width hash sign is used (#36103 and #36625 by @ClearlyClaire and @Gargron)
+- Fix layout of severed relationships when purged events are listed (#36593 by @mejofi)
+- Fix vacuum tasks being interrupted by a single batch failure (#36606 by @Gargron)
+- Fix handling of unreachable network error for search services (#36587 by @mjankowski)
+- Fix bookmarks export when a bookmarked status is soft-deleted (#36576 by @ClearlyClaire)
+- Fix text overflow alignment for long author names in News (#36562 by @diondiondion)
+- Fix discovery preamble missing word in admin settings (#36560 by @belatedly)
 - Fix overflow handling of `.more-from-author` (#36310 by @edent)
 - Fix unfortunate action button wrapping in admin area (#36247 by @diondiondion)
 - Fix translate button width in Safari (#36164 and #36216 by @diondiondion)
@@ -81,6 +100,10 @@ All notable changes to this project will be documented in this file.
 - Fix glitchy status keyboard navigation (#35455 and #35504 by @diondiondion)
 - Fix post being submitted when pressing “Enter” in the CW field (#35445 by @diondiondion)
 
+### Removed
+
+- Remove support for PostgreSQL 13 (#36540 by @renchap)
+
 ## [4.4.8] - 2025-10-21
 
 ### Security

app/javascript/mastodon/components/status_quoted.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -83,6 +83,62 @@ const LimitedAccountHint: React.FC<{ accountId: string }> = ({ accountId }) => {
   );
 };
 
+const FilteredQuote: React.FC<{
+  reveal: VoidFunction;
+  quotedAccountId: string;
+  quoteState: string;
+}> = ({ reveal, quotedAccountId, quoteState }) => {
+  const account = useAppSelector((state) =>
+    quotedAccountId ? state.accounts.get(quotedAccountId) : undefined,
+  );
+
+  const quoteAuthorName = account?.acct;
+  const domain = quoteAuthorName?.split('@')[1];
+
+  let message;
+
+  switch (quoteState) {
+    case 'blocked_account':
+      message = (
+        <FormattedMessage
+          id='status.quote_error.blocked_account_hint.title'
+          defaultMessage="This post is hidden because you've blocked @{name}."
+          values={{ name: quoteAuthorName }}
+        />
+      );
+      break;
+    case 'blocked_domain':
+      message = (
+        <FormattedMessage
+          id='status.quote_error.blocked_domain_hint.title'
+          defaultMessage="This post is hidden because you've blocked {domain}."
+          values={{ domain }}
+        />
+      );
+      break;
+    case 'muted_account':
+      message = (
+        <FormattedMessage
+          id='status.quote_error.muted_account_hint.title'
+          defaultMessage="This post is hidden because you've muted @{name}."
+          values={{ name: quoteAuthorName }}
+        />
+      );
+  }
+
+  return (
+    <>
+      {message}
+      <button onClick={reveal} className='link-button'>
+        <FormattedMessage
+          id='status.quote_error.limited_account_hint.action'
+          defaultMessage='Show anyway'
+        />
+      </button>
+    </>
+  );
+};
+
 interface QuotedStatusProps {
   quote: QuoteMap;
   contextType?: string;
@@ -130,6 +186,11 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
   const isLoaded = loadingState === 'complete';
 
   const isFetchingQuoteRef = useRef(false);
+  const [revealed, setRevealed] = useState(false);
+
+  const reveal = useCallback(() => {
+    setRevealed(true);
+  }, [setRevealed]);
 
   useEffect(() => {
     if (isLoaded) {
@@ -189,6 +250,20 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
         defaultMessage='Post removed by author'
       />
     );
+  } else if (
+    (quoteState === 'blocked_account' ||
+      quoteState === 'blocked_domain' ||
+      quoteState === 'muted_account') &&
+    !revealed &&
+    accountId
+  ) {
+    quoteError = (
+      <FilteredQuote
+        quoteState={quoteState}
+        reveal={reveal}
+        quotedAccountId={accountId}
+      />
+    );
   } else if (
     !status ||
     !quotedStatusId ||

app/javascript/mastodon/locales/be.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Рэдагаваць спіс",
   "column.favourites": "Упадабанае",
   "column.firehose": "Стужкі",
+  "column.firehose_local": "Жывая стужка гэтага сервера",
+  "column.firehose_singular": "Жывая стужка",
   "column.follow_requests": "Запыты на падпіску",
   "column.home": "Галоўная",
   "column.list_members": "Кіраванне ўдзельнікамі спіса",

app/javascript/mastodon/locales/bg.json

@@ -978,6 +978,8 @@
   "visibility_modal.button_title": "Задаване на видимост",
   "visibility_modal.header": "Видимост и взаимодействие",
   "visibility_modal.helper.privacy_editing": "Видимостта не може да се променя след публикуване на публикацията.",
+  "visibility_modal.helper.privacy_private_self_quote": "Самоцитирането на частни публикации не може да се огласява публично.",
+  "visibility_modal.instructions": "Управлява кой може да взаимодейства с тази публикация. Може също да приложите настройките за всички бъдещи публикации, навигирайки към <link>Предпочитания > Публикуване по подразбиране</link>.",
   "visibility_modal.privacy_label": "Видимост",
   "visibility_modal.quote_followers": "Само последователи",
   "visibility_modal.quote_label": "Кой може да цитира",

app/javascript/mastodon/locales/da.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Redigér liste",
   "column.favourites": "Favoritter",
   "column.firehose": "Live feeds",
+  "column.firehose_local": "Live feed for denne server",
+  "column.firehose_singular": "Live feed",
   "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.list_members": "Håndtér listemedlemmer",

app/javascript/mastodon/locales/el.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Επεξεργασία λίστας",
   "column.favourites": "Αγαπημένα",
   "column.firehose": "Ζωντανές ροές",
+  "column.firehose_local": "Ζωντανή ροή για αυτόν τον διακομιστή",
+  "column.firehose_singular": "Ζωντανή ροή",
   "column.follow_requests": "Αιτήματα ακολούθησης",
   "column.home": "Αρχική",
   "column.list_members": "Διαχείριση μελών λίστας",

app/javascript/mastodon/locales/en.json

@@ -911,9 +911,12 @@
   "status.pin": "Pin on profile",
   "status.quote": "Quote",
   "status.quote.cancel": "Cancel quote",
+  "status.quote_error.blocked_account_hint.title": "This post is hidden because you've blocked @{name}.",
+  "status.quote_error.blocked_domain_hint.title": "This post is hidden because you've blocked {domain}.",
   "status.quote_error.filtered": "Hidden due to one of your filters",
   "status.quote_error.limited_account_hint.action": "Show anyway",
   "status.quote_error.limited_account_hint.title": "This account has been hidden by the moderators of {domain}.",
+  "status.quote_error.muted_account_hint.title": "This post is hidden because you've muted @{name}.",
   "status.quote_error.not_available": "Post unavailable",
   "status.quote_error.pending_approval": "Post pending",
   "status.quote_error.pending_approval_popout.body": "On Mastodon, you can control whether someone can quote you. This post is pending while we're getting the original author's approval.",

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

@@ -173,6 +173,8 @@
   "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
   "column.firehose": "Líneas temporales en vivo",
+  "column.firehose_local": "Línea temporal en vivo para este servidor",
+  "column.firehose_singular": "Línea temporal en vivo",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Principal",
   "column.list_members": "Administrar miembros de la lista",

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

@@ -173,6 +173,8 @@
   "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
   "column.firehose": "Cronologías",
+  "column.firehose_local": "Cronología para este servidor",
+  "column.firehose_singular": "Cronología",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
   "column.list_members": "Administrar miembros de la lista",

app/javascript/mastodon/locales/es.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
   "column.firehose": "Cronologías",
+  "column.firehose_local": "Cronología para este servidor",
+  "column.firehose_singular": "Cronología",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
   "column.list_members": "Administrar miembros de la lista",

app/javascript/mastodon/locales/fi.json

@@ -3,7 +3,7 @@
   "about.contact": "Yhteydenotto:",
   "about.default_locale": "Oletus",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
-  "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
+  "about.domain_blocks.no_reason_available": "Syytä ei ole ilmoitettu",
   "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
   "about.domain_blocks.silenced.explanation": "Et yleensä näe tämän palvelimen profiileja ja sisältöä, jollet erityisesti etsi juuri sitä tai liity siihen seuraamalla.",
   "about.domain_blocks.silenced.title": "Rajoitettu",
@@ -173,6 +173,8 @@
   "column.edit_list": "Muokkaa listaa",
   "column.favourites": "Suosikit",
   "column.firehose": "Livesyötteet",
+  "column.firehose_local": "Tämän palvelimen livesyöte",
+  "column.firehose_singular": "Livesyöte",
   "column.follow_requests": "Seurantapyynnöt",
   "column.home": "Koti",
   "column.list_members": "Hallitse listan jäseniä",
@@ -333,6 +335,7 @@
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
   "empty_column.direct": "Yksityismainintoja ei vielä ole. Jos lähetät tai sinulle lähetetään sellaisia, näet ne täällä.",
+  "empty_column.disabled_feed": "Palvelimen ylläpito on poistanut käytöstä tämän syötteen.",
   "empty_column.domain_blocks": "Verkkotunnuksia ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei ole nyt suosittua. Tarkista myöhemmin uudelleen!",
   "empty_column.favourited_statuses": "Sinulla ei ole vielä yhtään suosikkijulkaisua. Kun lisäät sellaisen, näkyy se tässä.",

app/javascript/mastodon/locales/he.json

@@ -173,6 +173,8 @@
   "column.edit_list": "עריכת רשימה",
   "column.favourites": "חיבובים",
   "column.firehose": "פידים עדכניים",
+  "column.firehose_local": "פיד זמן האמת עבור שרת זה",
+  "column.firehose_singular": "פיד זמן אמת",
   "column.follow_requests": "בקשות מעקב",
   "column.home": "פיד הבית",
   "column.list_members": "ניהול חברי הרשימה",

app/javascript/mastodon/locales/is.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Breyta lista",
   "column.favourites": "Eftirlæti",
   "column.firehose": "Bein streymi",
+  "column.firehose_local": "Beint streymi á þessum netþjóni",
+  "column.firehose_singular": "Beint streymi",
   "column.follow_requests": "Beiðnir um að fylgjast með",
   "column.home": "Heim",
   "column.list_members": "Sýsla með meðlimi listans",

app/javascript/mastodon/locales/ko.json

@@ -28,6 +28,7 @@
   "account.disable_notifications": "@{name} 의 게시물 알림 끄기",
   "account.domain_blocking": "도메인 차단함",
   "account.edit_profile": "프로필 편집",
+  "account.edit_profile_short": "수정",
   "account.enable_notifications": "@{name} 의 게시물 알림 켜기",
   "account.endorse": "프로필에 추천하기",
   "account.familiar_followers_many": "{name1}, {name2} 님 외 내가 아는 {othersCount, plural, other {#}} 명이 팔로우함",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "게시물 없음",
   "account.follow": "팔로우",
   "account.follow_back": "맞팔로우",
+  "account.follow_back_short": "맞팔로우",
+  "account.follow_request": "팔로우 요청",
+  "account.follow_request_cancel": "요청 취소",
+  "account.follow_request_cancel_short": "취소",
+  "account.follow_request_short": "요청",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
   "account.followers_counter": "{count, plural, other {팔로워 {counter}명}}",
@@ -167,6 +173,8 @@
   "column.edit_list": "리스트 편집",
   "column.favourites": "좋아요",
   "column.firehose": "실시간 피드",
+  "column.firehose_local": "이 서버에 대한 실시간 피드",
+  "column.firehose_singular": "실시간 피드",
   "column.follow_requests": "팔로우 요청",
   "column.home": "홈",
   "column.list_members": "리스트 구성원 관리",
@@ -251,7 +259,12 @@
   "confirmations.revoke_quote.confirm": "게시물 삭제",
   "confirmations.revoke_quote.message": "이 작업은 되돌릴 수 없습니다.",
   "confirmations.revoke_quote.title": "게시물을 지울까요?",
+  "confirmations.unblock.confirm": "차단 해제",
+  "confirmations.unblock.title": "{name} 님을 차단 해제할까요?",
   "confirmations.unfollow.confirm": "팔로우 해제",
+  "confirmations.unfollow.title": "{name} 님을 언팔로우 할까요?",
+  "confirmations.withdraw_request.confirm": "요청 삭제",
+  "confirmations.withdraw_request.title": "{name} 님에 대한 팔로우 요청을 취소할까요?",
   "content_warning.hide": "게시물 숨기기",
   "content_warning.show": "무시하고 보기",
   "content_warning.show_more": "더 보기",
@@ -322,6 +335,7 @@
   "empty_column.bookmarked_statuses": "아직 북마크에 저장한 게시물이 없습니다. 게시물을 북마크 지정하면 여기에 나타납니다.",
   "empty_column.community": "로컬 타임라인에 아무것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "개인적인 멘션이 없습니다. 보내거나 받으면 여기에 표시됩니다.",
+  "empty_column.disabled_feed": "이 피드는 서버 관리자에 의해 비활성화되었습니다.",
   "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
   "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
   "empty_column.favourited_statuses": "아직 좋아요한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
@@ -454,6 +468,7 @@
   "interaction_modal.no_account_yet": "아직 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
+  "interaction_modal.title": "로그인해서 계속하기",
   "interaction_modal.username_prompt": "예시: {example}",
   "intervals.full.days": "{number} 일",
   "intervals.full.hours": "{number} 시간",
@@ -740,6 +755,7 @@
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
+  "quote_error.edit": "게시물을 수정하면서 인용을 추가할 수 없습니다.",
   "quote_error.poll": "인용과 투표를 함께 사용할 수 없습니다.",
   "quote_error.quote": "한 번의 인용만 허용됩니다.",
   "quote_error.unauthorized": "이 게시물을 인용할 권한이 없습니다.",
@@ -860,6 +876,12 @@
   "status.cannot_quote": "인용을 비허용한 게시물",
   "status.cannot_reblog": "이 게시물은 부스트 할 수 없습니다",
   "status.contains_quote": "인용 포함",
+  "status.context.loading": "더 많은 답글 불러오는 중",
+  "status.context.loading_error": "새 답글을 불러올 수 없습니다",
+  "status.context.loading_success": "새 답글을 불러왔습니다",
+  "status.context.more_replies_found": "답글을 더 찾았습니다",
+  "status.context.retry": "재시도",
+  "status.context.show": "보기",
   "status.continued_thread": "이어지는 글타래",
   "status.copy": "게시물 링크 복사",
   "status.delete": "삭제",
@@ -889,8 +911,11 @@
   "status.quote": "인용",
   "status.quote.cancel": "인용 취소",
   "status.quote_error.filtered": "필터에 의해 가려짐",
+  "status.quote_error.limited_account_hint.action": "그냥 보기",
+  "status.quote_error.limited_account_hint.title": "이 계정은 {domain}의 중재자에 의해 숨겨진 상태입니다.",
   "status.quote_error.not_available": "게시물 사용 불가",
   "status.quote_error.pending_approval": "게시물 대기중",
+  "status.quote_error.revoked": "원작성자에 의해 게시물 삭제됨",
   "status.quote_followers_only": "팔로워만 인용할 수 있는 게시물",
   "status.quote_manual_review": "작성자가 직접 검토합니다",
   "status.quote_noun": "인용",
@@ -909,6 +934,7 @@
   "status.redraft": "지우고 다시 쓰기",
   "status.remove_bookmark": "북마크 삭제",
   "status.remove_favourite": "즐겨찾기에서 제거",
+  "status.remove_quote": "삭제",
   "status.replied_in_thread": "글타래에 답장",
   "status.replied_to": "{name} 님에게",
   "status.reply": "답장",
@@ -979,6 +1005,8 @@
   "video.volume_up": "음량 증가",
   "visibility_modal.button_title": "공개범위 설정",
   "visibility_modal.header": "공개범위와 반응",
+  "visibility_modal.helper.privacy_private_self_quote": "자신의 비공개 게시물을 공개 게시물로 인용할 수 없습니다.",
+  "visibility_modal.helper.private_quoting": "마스토돈에서 작성된 팔로워 전용 게시물은 다른 사용자가 인용할 수 없습니다.",
   "visibility_modal.helper.unlisted_quoting": "사람들에게 인용된 경우, 인용한 게시물도 유행 타임라인에서 감추게 됩니다.",
   "visibility_modal.instructions": "누가 이 게시물과 상호작용할 수 있는 지 제어합니다. 또한 <link>환경설정 > 게시물 기본설정</link>으로 이동해 향후 모든 게시물의 설정을 적용할 수 있습니다.",
   "visibility_modal.privacy_label": "공개 범위",

app/javascript/mastodon/locales/lad.json

@@ -31,6 +31,7 @@
   "account.edit_profile_short": "Edita",
   "account.enable_notifications": "Avizame kuando @{name} publike",
   "account.endorse": "Avalia en profil",
+  "account.featured": "Avaliado",
   "account.featured.accounts": "Profiles",
   "account.featured.hashtags": "Etiketas",
   "account.featured_tags.last_status_at": "Ultima publikasyon de {date}",
@@ -403,8 +404,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar avizos de mensyones privadas no solisitadas?",
   "info_button.label": "Ayuda",
   "interaction_modal.go": "Va",
+  "interaction_modal.no_account_yet": "Ainda no tienes kuento?",
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
+  "interaction_modal.title": "Konektate para kontinuar",
   "interaction_modal.username_prompt": "Por enshemplo {example}",
   "intervals.full.days": "{number, plural, one {# diya} other {# diyas}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
@@ -601,6 +604,7 @@
   "onboarding.follows.done": "Fecho",
   "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
   "onboarding.follows.search": "Bushka",
+  "onboarding.follows.title": "Sige personas para ampezar",
   "onboarding.profile.discoverable": "Faz ke mi profil apareska en bushkedas",
   "onboarding.profile.discoverable_hint": "Kuando permites ke tu profil sea diskuvriravle en Mastodon, tus publikasyones podran apareser en rezultados de bushkedas i trendes i tu profil podra ser sujerido a personas kon intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre amostrado",
@@ -741,6 +745,8 @@
   "status.cancel_reblog_private": "No repartaja",
   "status.cannot_reblog": "Esta publikasyon no se puede repartajar",
   "status.contains_quote": "Kontriene sita",
+  "status.context.loading": "Kargando mas repuestas",
+  "status.context.loading_error": "No se pudieron kargar repuestas muevas",
   "status.context.loading_success": "Muevas repuestas kargadas",
   "status.context.more_replies_found": "Se toparon mas repuestas",
   "status.context.retry": "Reprova",
@@ -755,6 +761,7 @@
   "status.edit": "Edita",
   "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
+  "status.embed": "Obtiene kodiche para enkrustar",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
   "status.history.created": "{name} kriyo {date}",
@@ -775,6 +782,8 @@
   "status.quote_error.limited_account_hint.title": "Este kuento fue eskondido por los moderadores de {domain}.",
   "status.quote_error.not_available": "Puvlikasyon no desponivle",
   "status.quote_error.pending_approval": "Puvlikasyon esta asperando",
+  "status.quote_error.revoked": "Puvlikasyon kitada por el otor",
+  "status.quote_followers_only": "Solo los suivantes pueden sitar esta puvlikasyon",
   "status.quote_noun": "Sita",
   "status.quote_policy_change": "Troka ken puede sitar",
   "status.quote_post_author": "Sito una puvlikasyon de @{name}",
@@ -794,6 +803,7 @@
   "status.reply": "Arisponde",
   "status.replyAll": "Arisponde al filo",
   "status.report": "Raporta @{name}",
+  "status.request_quote": "Solisita sitasyon",
   "status.sensitive_warning": "Kontenido sensivle",
   "status.share": "Partaja",
   "status.show_less_all": "Amostra manko para todo",

app/javascript/mastodon/locales/nl.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Lijst bewerken",
   "column.favourites": "Favorieten",
   "column.firehose": "Openbare tijdlijnen",
+  "column.firehose_local": "Lokale tijdlijn",
+  "column.firehose_singular": "Openbare tijdlijn",
   "column.follow_requests": "Volgverzoeken",
   "column.home": "Start",
   "column.list_members": "Lijstleden beheren",

app/javascript/mastodon/locales/oc.json

@@ -1,10 +1,12 @@
 {
   "about.blocks": "Servidors moderats",
   "about.contact": "Contacte :",
+  "about.default_locale": "Per defaut",
   "about.disclaimer": "Mastodon es gratuit, un logicial libre e una marca de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Rason pas disponibla",
   "about.domain_blocks.silenced.title": "Limitats",
   "about.domain_blocks.suspended.title": "Suspenduts",
+  "about.language_label": "Lenga",
   "about.not_available": "Aquesta informacion foguèt pas renduda disponibla sus aqueste servidor.",
   "about.powered_by": "Malhum social descentralizat propulsat per {mastodon}",
   "about.rules": "Règlas del servidor",
@@ -16,17 +18,26 @@
   "account.block_domain": "Tot amagar del domeni {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocat",
+  "account.blocking": "Blocatge",
   "account.cancel_follow_request": "Retirar la demanda d’abonament",
   "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
   "account.disable_notifications": "Quitar de m’avisar quand @{name} publica quicòm",
   "account.edit_profile": "Modificar lo perfil",
+  "account.edit_profile_short": "Modificar",
   "account.enable_notifications": "M’avisar quand @{name} publica quicòm",
   "account.endorse": "Mostrar pel perfil",
+  "account.familiar_followers_many": "Seguit per {name1}, {name2} e {othersCount, plural, one {qualqu’un mai que coneissètz} other {# autras personas que coneissètz}}",
+  "account.familiar_followers_one": "Seguit per {name1}",
+  "account.familiar_followers_two": "Seguit per {name1} e {name2}",
+  "account.featured.accounts": "Perfils",
+  "account.featured.hashtags": "Etiquetas",
   "account.featured_tags.last_status_at": "Darrièra publicacion lo {date}",
   "account.featured_tags.last_status_never": "Cap de publicacion",
   "account.follow": "Sègre",
   "account.follow_back": "Sègre en retorn",
+  "account.follow_request_cancel": "Anullar la demanda",
+  "account.follow_request_cancel_short": "Anullar",
   "account.followers": "Seguidors",
   "account.followers.empty": "Degun sèc pas aqueste utilizaire pel moment.",
   "account.following": "Abonat",
@@ -45,16 +56,20 @@
   "account.mute_notifications_short": "Amudir las notificacions",
   "account.mute_short": "Amudir",
   "account.muted": "Mes en silenci",
+  "account.mutual": "Vos seguissètz",
   "account.no_bio": "Cap de descripcion pas fornida.",
   "account.open_original_page": "Dobrir la pagina d’origina",
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts e responsas",
+  "account.remove_from_followers": "Tirar {name} dels seguidors",
   "account.report": "Senhalar @{name}",
   "account.requested_follow": "{name} a demandat a vos sègre",
+  "account.requests_to_follow_you": "Demanda a vos sègre",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
   "account.unblock": "Desblocar @{name}",
   "account.unblock_domain": "Desblocar {domain}",
+  "account.unblock_domain_short": "Desblocar",
   "account.unblock_short": "Desblocat",
   "account.unendorse": "Mostrar pas pel perfil",
   "account.unfollow": "Quitar de sègre",
@@ -97,13 +112,18 @@
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Marcadors",
   "column.community": "Flux public local",
+  "column.create_list": "Crear una lista",
   "column.direct": "Mencions privadas",
   "column.directory": "Percórrer los perfils",
   "column.domain_blocks": "Domenis resconduts",
+  "column.edit_list": "Modificar la lista",
   "column.favourites": "Favorits",
   "column.firehose": "Tuts en dirèct",
+  "column.firehose_local": "Fial en dirècte d’aqueste servidor",
+  "column.firehose_singular": "Fial en dirècte",
   "column.follow_requests": "Demandas d’abonament",
   "column.home": "Acuèlh",
+  "column.list_members": "Gestion dels membres de la lista",
   "column.lists": "Listas",
   "column.mutes": "Personas rescondudas",
   "column.notifications": "Notificacions",
@@ -116,6 +136,7 @@
   "column_header.pin": "Penjar",
   "column_header.show_settings": "Mostrar los paramètres",
   "column_header.unpin": "Despenjar",
+  "column_search.cancel": "Anullar",
   "community.column_settings.local_only": "Sonque local",
   "community.column_settings.media_only": "Solament los mèdias",
   "community.column_settings.remote_only": "Sonque alonhat",
@@ -144,14 +165,28 @@
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Escafar",
   "confirmations.delete.message": "Volètz vertadièrament escafar l’estatut ?",
+  "confirmations.delete.title": "Suprimir la publicacion ?",
   "confirmations.delete_list.confirm": "Suprimir",
   "confirmations.delete_list.message": "Volètz vertadièrament suprimir aquesta lista per totjorn ?",
+  "confirmations.delete_list.title": "Suprimir la lista ?",
   "confirmations.discard_edit_media.confirm": "Ignorar",
   "confirmations.logout.confirm": "Desconnexion",
   "confirmations.logout.message": "Volètz vertadièrament vos desconnectar ?",
+  "confirmations.missing_alt_text.confirm": "Apondre un tèxte alternatiu",
+  "confirmations.missing_alt_text.message": "Vòstra publicacion conten un mèdia sens tèxt alternatiu. L'apondon de descripcions ajuda a rendre vòstre contengut accessible a mai de monde.",
+  "confirmations.missing_alt_text.secondary": "Publicar malgrat tot",
+  "confirmations.missing_alt_text.title": "Apondre un tèxte alternatiu ?",
   "confirmations.mute.confirm": "Rescondre",
+  "confirmations.quiet_post_quote_info.dismiss": "Me remembrar pas mai",
+  "confirmations.quiet_post_quote_info.got_it": "Plan comprés",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
+  "confirmations.revoke_quote.title": "Suprimir la publicacion ?",
+  "confirmations.unblock.confirm": "Desblocar",
+  "confirmations.unblock.title": "Desblocar {name} ?",
   "confirmations.unfollow.confirm": "Quitar de sègre",
+  "confirmations.unfollow.title": "Quitar de sègre {name} ?",
+  "content_warning.hide": "Amagar la publicacion",
+  "content_warning.show_more": "Ne veire mai",
   "conversation.delete": "Suprimir la conversacion",
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
@@ -206,6 +241,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Copiar las traças al quichapapièrs",
   "errors.unexpected_crash.report_issue": "Senhalar un problèma",
   "explore.suggested_follows": "Personas",
+  "explore.title": "Tendéncia",
   "explore.trending_links": "Novèlas",
   "explore.trending_statuses": "Publicacions",
   "explore.trending_tags": "Etiquetas",
@@ -231,6 +267,7 @@
   "footer.privacy_policy": "Politica de confidencialitat",
   "footer.source_code": "Veire lo còdi font",
   "footer.status": "Estat",
+  "footer.terms_of_service": "Condicions d’utilizacion",
   "generic.saved": "Enregistrat",
   "getting_started.heading": "Per començar",
   "hashtag.column_header.tag_mode.all": "e {additional}",
@@ -246,6 +283,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} tut} other {{counter} tuts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} tut} other {{counter} tuts}} uèi",
   "hashtag.follow": "Sègre l’etiqueta",
+  "hashtag.mute": "Amudar #{hashtag}",
   "hashtag.unfollow": "Quitar de sègre l’etiqueta",
   "hashtags.and_other": "…e {count, plural, one {}other {# de mai}}",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
@@ -253,6 +291,7 @@
   "home.hide_announcements": "Rescondre las anóncias",
   "home.pending_critical_update.link": "Veire las mesas a jorn",
   "home.show_announcements": "Mostrar las anóncias",
+  "info_button.label": "Ajuda",
   "interaction_modal.on_another_server": "Sus un autre servidor",
   "interaction_modal.on_this_server": "Sus aqueste servidor",
   "intervals.full.days": "{number, plural, one {# jorn} other {# jorns}}",
@@ -292,21 +331,29 @@
   "keyboard_shortcuts.toot": "començar un estatut tot novèl",
   "keyboard_shortcuts.unfocus": "quitar lo camp tèxte/de recèrca",
   "keyboard_shortcuts.up": "far montar dins la lista",
+  "learn_more_link.got_it": "Plan comprés",
+  "learn_more_link.learn_more": "Ne saber mai",
   "lightbox.close": "Tampar",
   "lightbox.next": "Seguent",
   "lightbox.previous": "Precedent",
   "limited_account_hint.action": "Afichar lo perfil de tota manièra",
   "limited_account_hint.title": "Aqueste perfil foguèt rescondut per la moderacion de {domain}.",
   "link_preview.author": "Per {name}",
+  "link_preview.more_from_author": "Mai de {name}",
   "lists.delete": "Suprimir la lista",
   "lists.edit": "Modificar la lista",
   "lists.replies_policy.followed": "Quin seguidor que siá",
   "lists.replies_policy.list": "Membres de la lista",
   "lists.replies_policy.none": "Degun",
+  "lists.save": "Enregistrar",
+  "lists.search": "Recercar",
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
   "loading_indicator.label": "Cargament…",
+  "media_gallery.hide": "Rescondre",
   "navigation_bar.about": "A prepaus",
+  "navigation_bar.administration": "Administracion",
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
+  "navigation_bar.automated_deletion": "Supression auto de las publicacions",
   "navigation_bar.blocks": "Personas blocadas",
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.direct": "Mencions privadas",
@@ -316,19 +363,32 @@
   "navigation_bar.follow_requests": "Demandas d’abonament",
   "navigation_bar.followed_tags": "Etiquetas seguidas",
   "navigation_bar.follows_and_followers": "Abonament e seguidors",
+  "navigation_bar.import_export": "Import e export",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Desconnexion",
+  "navigation_bar.moderation": "Moderacion",
+  "navigation_bar.more": "Mai",
   "navigation_bar.mutes": "Personas rescondudas",
   "navigation_bar.preferences": "Preferéncias",
   "navigation_bar.search": "Recercar",
+  "navigation_bar.search_trends": "Recèrca / Tendéncia",
   "not_signed_in_indicator.not_signed_in": "Devètz vos connectar per accedir a aquesta ressorsa.",
   "notification.admin.report": "{name} senhalèt {target}",
   "notification.admin.sign_up": "{name} se marquèt",
   "notification.favourite": "{name} a mes vòstre estatut en favorit",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} a demandat a vos sègre",
+  "notification.label.mention": "Mencion",
+  "notification.label.private_mention": "Mencion privada",
+  "notification.label.private_reply": "Responsa privada",
+  "notification.label.quote": "{name} a citat vòstra publicacion",
+  "notification.label.reply": "Respondre",
+  "notification.mention": "Mencionar",
+  "notification.mentioned_you": "{name} vos a mencionat",
+  "notification.moderation-warning.learn_more": "Ne saber mai",
   "notification.own_poll": "Vòstre sondatge es acabat",
   "notification.reblog": "{name} a partejat vòstre estatut",
+  "notification.relationships_severance_event.learn_more": "Ne saber mai",
   "notification.status": "{name} ven de publicar",
   "notification.update": "{name} modiquè sa publicacion",
   "notifications.clear": "Escafar",
@@ -379,7 +439,12 @@
   "poll_button.add_poll": "Ajustar un sondatge",
   "poll_button.remove_poll": "Levar lo sondatge",
   "privacy.change": "Ajustar la confidencialitat del messatge",
+  "privacy.direct.long": "Sonque los qu’avètz mencionats dins la publicacion",
+  "privacy.direct.short": "Mencion privada",
+  "privacy.private.long": "Mostrar pas qu’als seguidors",
+  "privacy.private.short": "Seguidors",
   "privacy.public.short": "Public",
+  "privacy.unlisted.short": "Public silenciós",
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
@@ -423,6 +488,7 @@
   "report.target": "Senhalar {target}",
   "report.thanks.title": "Volètz pas veire aquò ?",
   "report.unfollow": "Quitar de sègre {name}",
+  "report.unfollow_explanation": "Seguissètz aqueste compte. Per veire pas pus lors publicacions dins vòstra cronologia, quitatz de lo sègre.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicacion junta} other {{count} publicacions juntas}}",
   "report_notification.categories.other": "Autre",
   "report_notification.categories.spam": "Messatge indesirable",
@@ -454,6 +520,9 @@
   "status.bookmark": "Marcador",
   "status.cancel_reblog_private": "Quitar de partejar",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
+  "status.context.loading": "Cargament de mai de responsas",
+  "status.context.more_replies_found": "Mai de responsas trobadas",
+  "status.continued_thread": "Seguida del fial",
   "status.copy": "Copiar lo ligam de l’estatut",
   "status.delete": "Escafar",
   "status.detailed_status": "Vista detalhada de la convèrsa",

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

@@ -173,6 +173,8 @@
   "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
   "column.firehose": "Cronologias em tempo real",
+  "column.firehose_local": "Cronologia em tempo real para este servidor",
+  "column.firehose_singular": "Cronologia em tempo real",
   "column.follow_requests": "Pedidos de seguidores",
   "column.home": "Início",
   "column.list_members": "Gerir membros da lista",

app/javascript/mastodon/locales/vi.json

@@ -173,6 +173,8 @@
   "column.edit_list": "Sửa danh sách",
   "column.favourites": "Những tút đã thích",
   "column.firehose": "Bảng tin",
+  "column.firehose_local": "Bảng tin máy chủ này",
+  "column.firehose_singular": "Bảng tin",
   "column.follow_requests": "Yêu cầu theo dõi",
   "column.home": "Trang chủ",
   "column.list_members": "Những người trong danh sách",

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

@@ -173,6 +173,8 @@
   "column.edit_list": "編輯列表",
   "column.favourites": "最愛",
   "column.firehose": "即時內容",
+  "column.firehose_local": "本站伺服器之即時內容",
+  "column.firehose_singular": "即時內容",
   "column.follow_requests": "跟隨請求",
   "column.home": "首頁",
   "column.list_members": "管理列表成員",

app/lib/status_cache_hydrator.rb

@@ -98,12 +98,12 @@ class StatusCacheHydrator
         if quote.quoted_status.nil?
           payload[nested ? :quoted_status_id : :quoted_status] = nil
           payload[:state] = 'deleted'
-        elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered_for_quote?
-          payload[nested ? :quoted_status_id : :quoted_status] = nil
-          payload[:state] = 'unauthorized'
         else
-          payload[:state] = 'accepted'
+          filter_state = StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filter_state_for_quote
-          if nested
+          payload[:state] = filter_state || 'accepted'
+          if filter_state == 'unauthorized'
+            payload[nested ? :quoted_status_id : :quoted_status] = nil
+          elsif nested
             payload[:quoted_status_id] = quote.quoted_status_id&.to_s
           else
             payload[:quoted_status] = StatusCacheHydrator.new(quote.quoted_status).hydrate(account_id, nested: true)

app/lib/status_filter.rb

@@ -15,10 +15,18 @@ class StatusFilter
     blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
   end
 
-  def filtered_for_quote?
+  def filter_state_for_quote
-    return false if !account.nil? && account.id == status.account_id
+    if !account.nil? && account.id == status.account_id
-
+      nil
-    blocked_by_policy? || (account_present? && filtered_status?)
+    elsif blocked_by_policy?
+      'unauthorized'
+    elsif account_present? && blocking_domain?
+      'blocked_domain'
+    elsif account_present? && blocking_account?
+      'blocked_account'
+    elsif account_present? && muting_account?
+      'muted_account'
+    end
   end
 
   private

app/serializers/rest/base_quote_serializer.rb

@@ -8,13 +8,12 @@ class REST::BaseQuoteSerializer < ActiveModel::Serializer
 
     # Extra states when a status is unavailable
     return 'deleted' if object.quoted_status.nil?
-    return 'unauthorized' if status_filter.filtered_for_quote?
 
-    object.state
+    status_filter.filter_state_for_quote || object.state
   end
 
   def quoted_status
-    object.quoted_status if object.accepted? && object.quoted_status.present? && !object.quoted_status&.reblog? && !status_filter.filtered_for_quote?
+    object.quoted_status if object.accepted? && object.quoted_status.present? && !object.quoted_status&.reblog? && status_filter.filter_state_for_quote != 'unauthorized'
   end
 
   private

config/locales/devise.ko.yml

@@ -7,6 +7,7 @@ ko:
       send_paranoid_instructions: 이메일 주소가 저희 데이터베이스에 있는 경우, 몇 분 내에 이메일 주소를 확인하는 방법에 대한 안내가 포함된 이메일을 받을 수 있습니다. 이 이메일을 받지 못했다면 스팸 폴더를 확인해 주세요.
     failure:
       already_authenticated: 이미 로그인 된 상태입니다.
+      closed_registrations: 네트워크 정책에 의해 가입 시도가 차단되었습니다. 오류라고 생각된다면 %{email}에 문의해주세요.
       inactive: 계정이 아직 활성화 되지 않았습니다.
       invalid: 올바르지 않은 %{authentication_keys} 혹은 암호입니다.
       last_attempt: 계정이 잠기기까지 한 번의 시도가 남았습니다.

config/locales/es-AR.yml

@@ -857,8 +857,8 @@ es-AR:
           public: Todos
       landing_page:
         values:
-          about: Acerca de
+          about: Información
-          local_feed: Cronología local
+          local_feed: Línea temporal local
           trends: Tendencias
       registrations:
         moderation_recommandation: Por favor, ¡asegurate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todos!

config/locales/fi.yml

@@ -796,6 +796,8 @@ fi:
         view_dashboard_description: Sallii käyttäjille pääsyn koontinäyttöön ja erilaisiin mittareihin
         view_devops: DevOps
         view_devops_description: Sallii käyttäjille pääsyn Sidekiq- ja pgHero-hallintapaneeleihin
+        view_feeds: Näytä live- ja aihesyötteet
+        view_feeds_description: Sallii käyttäjien tarkastella live- ja aihesyötteitä palvelimen asetuksista riippumatta
       title: Roolit
     rules:
       add_new: Lisää sääntö
@@ -837,6 +839,7 @@ fi:
         title: Jätä käyttäjät oletusarvoisesti hakukoneindeksoinnin ulkopuolelle
       discovery:
         follow_recommendations: Seurantasuositukset
+        preamble: Mielenkiintoisen sisällön esille tuominen on keskeistä uusien käyttäjien perehdyttämisessä, jotka eivät ehkä tunne ketään Mastodonissa. Hallitse, miten eri löydettävyysominaisuudet toimivat palvelimellasi.
         privacy: Yksityisyys
         profile_directory: Profiilihakemisto
         public_timelines: Julkiset aikajanat
@@ -850,7 +853,13 @@ fi:
       feed_access:
         modes:
           authenticated: Vain todennetut käyttäjät
+          disabled: Vaadi tiettyä käyttäjäroolia
           public: Kaikki
+      landing_page:
+        values:
+          about: Tietoja
+          local_feed: Paikallinen syöte
+          trends: Trendit
       registrations:
         moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin avaat rekisteröitymisen kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.

config/locales/gl.yml

@@ -855,6 +855,11 @@ gl:
           authenticated: Só para usuarias con sesión iniciada
           disabled: Requerir un rol da usuaria específico
           public: Para calquera
+      landing_page:
+        values:
+          about: Sobre
+          local_feed: Cronoloxía Local
+          trends: Tendencias
       registrations:
         moderation_recommandation: Por favor, pon interese en crear un equipo de moderación competente e reactivo antes de permitir que calquera poida crear unha conta!
         preamble: Xestiona quen pode crear unha conta no teu servidor.

config/locales/ko.yml

@@ -784,6 +784,8 @@ ko:
         view_dashboard_description: 사용자가 여러 통계정보를 볼 수 있는 대시보드에 접근할 수 있도록 허용
         view_devops: 데브옵스
         view_devops_description: Sidekiq과 pgHero 대시보드에 접근할 수 있도록 허용
+        view_feeds: 실시간, 해시태그 피드 보기
+        view_feeds_description: 서버 설정에 관계 없이 실시간과 해시태그 피드에 접근할 수 있도록 허용
       title: 역할
     rules:
       add_new: 규칙 추가
@@ -835,6 +837,16 @@ ko:
         all: 모두에게
         disabled: 아무에게도 안 함
         users: 로그인 한 사용자에게
+      feed_access:
+        modes:
+          authenticated: 로그인한 사용자들만
+          disabled: 특정한 사용자 역할 필요
+          public: 모두
+      landing_page:
+        values:
+          about: 정보
+          local_feed: 로컬 피드
+          trends: 유행
       registrations:
         moderation_recommandation: 모두에게 가입을 열기 전에 적절하고 반응이 빠른 중재 팀을 데리고 있는지 확인해 주세요!
         preamble: 누가 이 서버에 계정을 만들 수 있는지 제어합니다.
@@ -896,6 +908,7 @@ ko:
       title: 계정 게시물 - @%{name}
       trending: 유행 중
       view_publicly: 공개시점으로 보기
+      view_quoted_post: 인용된 게시물 보기
       visibility: 공개 설정
       with_media: 미디어 있음
     strikes:
@@ -1165,7 +1178,10 @@ ko:
     hint_html: 다른 계정에서 이 계정으로 옮기길 원하는 경우, 여기에서 별칭을 만들 수 있습니다, 기존 계정의 팔로워를 이쪽으로 옮기고 싶은 경우 필요한 과정입니다. 이 행동 자체는 <strong>해롭지 않고 되돌리기가 가능합니다</strong>.<strong>계정 이주는 이전 계정에서 착수하게 됩니다</strong>
     remove: 별칭 연결 끊기
   appearance:
+    advanced_settings: 고급 설정
     animations_and_accessibility: 애니메이션과 접근성
+    boosting_preferences: 부스팅 설정
+    boosting_preferences_info_html: "<strong>팁:</strong> 설정에 관계 없이 %{icon}을 <kbd>쉬프트</kbd>+<kbd>클릭</kbd>하여 곧바로 부스트할 수 있습니다."
     discovery: 발견하기
     localization:
       body: 마스토돈은 자원봉사자들에 의해 번역되었습니다.
@@ -1547,6 +1563,13 @@ ko:
       expires_at: 만료
       uses: 이용 수
     title: 초대하기
+  link_preview:
+    author_html: "%{name} 작성"
+    potentially_sensitive_content:
+      action: 클릭하여 보기
+      confirm_visit: 정말로 이 링크를 여시겠습니까?
+      hide_button: 숨기기
+      label: 민감한 컨텐츠일 수 있음
   lists:
     errors:
       limit: 리스트 최대 개수를 초과합니다
@@ -1854,6 +1877,9 @@ ko:
         other: "%{count} 개의 영상"
     boosted_from_html: "%{acct_link}의 글을 부스트"
     content_warning: '열람 주의: %{warning}'
+    content_warnings:
+      hide: 게시물 숨기기
+      show: 더 보기
     default_language: 화면 표시 언어와 동일하게
     disallowed_hashtags:
       other: '허용되지 않은 해시태그를 포함하고 있습니다: %{tags}'
@@ -1867,13 +1893,19 @@ ko:
       limit: 이미 너무 많은 게시물을 고정했습니다
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
+    quote_error:
+      not_available: 게시물 사용 불가
+      pending_approval: 게시물 대기중
+      revoked: 원작성자에 의해 게시물 삭제됨
     quote_policies:
       followers: 팔로워만
       nobody: 나만
       public: 누구나
+    quote_post_author: 인용된 %{acct} 님의 게시물
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: 개인 멘션
+      private: 팔로워만
       public: 공개
       public_long: 마스토돈 내외 모두
       unlisted: 조용한 공개

config/locales/lad.yml

@@ -189,6 +189,7 @@ lad:
         create_relay: Kriya relevo
         create_unavailable_domain: Kriya domeno no desponivle
         create_user_role: Kriya rolo
+        create_username_block: Kriya regla de nombre de utilizador
         demote_user: Degrada utilizador
         destroy_announcement: Efasa pregon
         destroy_canonical_email_block: Efasa bloko de posta elektronika
@@ -202,6 +203,7 @@ lad:
         destroy_status: Efasa publikasyon
         destroy_unavailable_domain: Efasa domeno no desponivle
         destroy_user_role: Efasa rolo
+        destroy_username_block: Suprime regla de nombre de utilizador
         disable_2fa_user: Inkapasita autentifikasyon en dos pasos
         disable_custom_emoji: Inkapasita emoji personalizados
         disable_relay: Dezaktiva relevo
@@ -236,6 +238,7 @@ lad:
         update_report: Aktualiza raporto
         update_status: Aktualiza publikasyon
         update_user_role: Aktualiza rolo
+        update_username_block: Aktualiza regla de nombre de utilizador
       actions:
         approve_appeal_html: "%{name} acheto la solisitasyon de moderasyon de %{target}"
         approve_user_html: "%{name} acheto el enrejistramiento de %{target}"
@@ -476,9 +479,12 @@ lad:
           ip: Adreso IP
       providers:
         active: Aktivo
+        base_url: URL baza
         delete: Efasa
+        edit: Edita prokurador
         finish_registration: Finaliza enrejistrasyon
         name: Nombre
+        providers: Prokuradores
         registration_requested: Enrejistrasyon rekerida
         registrations:
           confirm: Konfirma
@@ -770,6 +776,8 @@ lad:
       description_html: Aunke la majorita afirma aver meldado i estar de akodro kon los terminos de servisyo, la djente normalmente no los melda asta dempues de ke surja algun problema. <strong>Az ke sea mas kolay ver las normas de tu sirvidor de un vistazo estipulándolas en una lista de puntos.</strong> Aprova ke kada norma sea corta i kolay, ama sin estar divididas en munchos puntos.
       edit: Edita regla
       empty: Dinguna regla del sirvidor tiene sido definida.
+      move_down: Mueve verso abasho
+      move_up: Mueve verso arriva
       title: Reglas del sirvidor
       translation: Traduksyon
       translations: Traduksyones
@@ -950,13 +958,17 @@ lad:
       updated_msg: Konfigurasyon de etiketas aktualizada kon sukseso
     terms_of_service:
       changelog: Ke troko
+      create: Uza los tuyos
       current: Aktual
+      generate: Uza modelo
       generates:
         action: Djenera
+        title: Konfigurasyon de terminos de servisyo
       history: Istorya
       live: En bivo
       notify_users: Aviza a los utilizadores
       publish: Publika
+      published_on_html: Puvlikado el %{date}
       title: Terminos de servisyo
     title: Administrasyon
     trends:
@@ -1028,10 +1040,19 @@ lad:
       block_registrations: Bloka enrejistrasyones
       comparison:
         contains: Kontyene
+        equals: Es egual a
+      contains_html: Kontyene %{string}
+      created_msg: Regla de nombre de utilizador kriyada kon reusho
       delete: Efasa
+      edit:
+        title: Edita regla de nombre de utilizador
+      matches_exactly_html: Es egual a %{string}
       new:
         create: Kriya regla
+        title: Kriya mueva regla de nombre de utilizador
       not_permitted: Sin permiso
+      title: Reglas de nombre de utilizador
+      updated_msg: Regla de nombre de utilizador aktualizada kon reusho
     warning_presets:
       add_new: Adjusta muevo
       delete: Efasa

config/locales/simple_form.es-AR.yml

@@ -93,7 +93,7 @@ es-AR:
         content_cache_retention_period: Todos los mensajes de otros servidores (incluyendo adhesiones y respuestas) se eliminarán después del número de días especificado, sin tener en cuenta la interacción del usuario local con esos mensajes. Esto incluye mensajes que un usuario local haya agregado a marcadores o los haya marcado como favoritos. Las menciones privadas entre usuarios de diferentes servidores también se perderán y también serán imposibles de restaurar. El uso de esta configuración está destinado a servidores de propósito especial y rompe muchas expectativas de los usuarios cuando se implementa para uso general.
         custom_css: Podés aplicar estilos personalizados a la versión web de Mastodon.
         favicon: WEBP, PNG, GIF o JPG. Reemplaza el favicón predeterminado de Mastodon con uno personalizado.
-        landing_page: Selecciona qué página ven los nuevos visitantes cuando llegan por primera vez a tu servidor. Si seleccionas "Tendencias", entonces las tendencias deben estar habilitadas en la Configuración de Descubrimiento. Si selecciona "Cronología local", entonces "Acceso a las cronologías que destacan publicaciones locales" debe configurarse a "Todos" en la Configuración de Descubrimiento.
+        landing_page: Selecciona qué página se carga para los nuevos visitantes cuando llegan por primera vez a tu servidor. Si seleccionás «Tendencias», entonces las tendencias tienen que estar habilitadas en la configuración de «Descubrimiento». Si seleccionás «Línea temporal local», entonces «Acceso a líneas temporales en vivo, destacando mensajes locales» tiene que estar establecida a «Todos» en la configuración de «Descubrimiento».
         mascot: Reemplaza la ilustración en la interface web avanzada.
         media_cache_retention_period: Los archivos de medios de mensajes publicados por usuarios remotos se almacenan en la memoria caché en tu servidor. Cuando se establece un valor positivo, los medios se eliminarán después del número especificado de días. Si los datos multimedia se solicitan después de eliminarse, se volverán a descargar, si es que el contenido fuente todavía está disponible. Debido a restricciones en la frecuencia con la que las tarjetas de previsualización de enlace consultan a sitios web de terceros, se recomienda establecer este valor a, al menos, 14 días, o las tarjetas de previsualización de enlaces no se actualizarán a pedido antes de ese momento.
         min_age: Se pedirá a los usuarios que confirmen su fecha de nacimiento durante el registro
@@ -287,7 +287,7 @@ es-AR:
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         favicon: Favicón
-        landing_page: Página de inicio para nuevos visitantes
+        landing_page: Página de carga para nuevos visitantes
         local_live_feed_access: Acceso a líneas temporales en vivo, destacando mensajes locales
         local_topic_feed_access: Acceso a líneas temporales de etiquetas y enlaces, destacando mensajes locales
         mascot: Mascota personalizada (legado)

config/locales/simple_form.fi.yml

@@ -93,6 +93,7 @@ fi:
         content_cache_retention_period: Kaikki muiden palvelinten julkaisut (mukaan lukien tehostukset ja vastaukset) poistuvat, kun määritetty määrä päiviä on kulunut, lukuun ottamatta paikallisen käyttäjän vuorovaikutusta näiden julkaisujen kanssa. Tämä sisältää julkaisut, jotka paikallinen käyttäjä on merkinnyt kirjanmerkiksi tai suosikiksi. Myös yksityismaininnat eri palvelinten käyttäjien välillä menetetään, eikä niitä voi palauttaa. Tämä asetus on tarkoitettu käytettäväksi erityistapauksissa ja rikkoo monia käyttäjien odotuksia, kun sitä sovelletaan yleiskäyttöön.
         custom_css: Voit käyttää mukautettuja tyylejä Mastodonin selainversiossa.
         favicon: WEBP, PNG, GIF tai JPG. Korvaa oletusarvoisen Mastodonin sivustokuvakkeen haluamallasi kuvakkeella.
+        landing_page: Valitsee mitä sivua uudet kävijät näkevät saapuessaan palvelimellesi. Jos valitset "Trendit", trendien tulee olla käytössä Löytöasetuksissa. Jos valitset "Paikallinen syöte", "Pääsy paikallisten julkaisujen live-syötteisiin" tulee asettaa "Kaikille" Löytöasetuksissa.
         mascot: Korvaa kuvituksen edistyneessä selainkäyttöliittymässä.
         media_cache_retention_period: Etäkäyttäjien tekemien julkaisujen mediatiedostot ovat välimuistissa palvelimellasi. Kun kentän arvo on positiivinen, media poistuu, kun määritetty määrä päiviä on kulunut. Jos mediaa pyydetään sen poistamisen jälkeen, se ladataan uudelleen, jos lähdesisältö on vielä saatavilla. Koska linkkien esikatselun kyselyitä kolmansien osapuolien sivustoille on rajoitettu, on suositeltavaa asettaa tämä arvo vähintään 14 päivään, tai linkkien kortteja ei päivitetä pyynnöstä ennen tätä ajankohtaa.
         min_age: Käyttäjiä pyydetään rekisteröitymisen aikana vahvistamaan syntymäpäivänsä
@@ -144,6 +145,7 @@ fi:
         admin_email: Oikeudellisiin ilmoituksiin kuuluvat vastailmoitukset, oikeuden määräykset, poistopyynnöt ja lainvalvontaviranomaisten pyynnöt.
         arbitration_address: Voi olla sama kuin edellä mainittu Fyysinen osoite tai ”N/A”, jos käytät sähköpostia.
         arbitration_website: Voi olla verkkolomake tai ”N/A”, jos käytät sähköpostia.
+        choice_of_law: Kaupunki, alue, territoriumi tai valtio, jonka sisäiset substantiiviset lait säätelevät kaikkia vaateita.
         dmca_address: Yhdysvaltalaisten operaattoreiden on käytettävä DMCA Designated Agent Directory -luetteloon rekisteröityä osoitetta. Postilokeroluettelo on saatavissa suoralla pyynnöllä, joten käytä DMCA Designated Agent Post Office Box Waiver Request -lomaketta lähettääksesi sähköpostia tekijänoikeusvirastolle ja kuvaile, että olet kotona toimiva sisältömoderaattori, joka pelkää kostoa tai rangaistusta toimistaan ja tarvitsee postilokeroa pitääkseen kotiosoitteensa poissa julkisuudesta.
         dmca_email: Voi olla sama kuin edellä mainittu ”Sähköpostiosoite oikeudellisille ilmoituksille”.
         domain: Tarjoamasi verkkopalvelun yksilöllinen tunniste.
@@ -285,6 +287,7 @@ fi:
         content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
         favicon: Sivustokuvake
+        landing_page: Uusien kävijöiden aloitussivu
         local_live_feed_access: Pääsy paikallisia julkaisuja esitteleviin livesyötteisiin
         local_topic_feed_access: Pääsy paikallisia julkaisuja esitteleviin aihetunniste- ja linkkisyötteisiin
         mascot: Mukautettu maskotti (vanhentunut)

config/locales/simple_form.gl.yml

@@ -93,6 +93,7 @@ gl:
         content_cache_retention_period: Todas as publicacións procedentes de outros servidores (incluído promocións e respostas) van ser eliminadas despois do número de días indicado, sen importar as interaccións das usuarias locais con esas publicacións. Esto inclúe publicacións que a usuaria local marcou como favoritas ou incluíu nos marcadores. As mencións privadas entre usuarias de diferentes instancias tamén se eliminarán e non se poderán restablecer. O uso desta ferramenta esta orientado a situacións especiais e estraga moitas das expectativas das usuarias ao implementala cun propósito de uso xeral.
         custom_css: Podes aplicar deseños personalizados na versión web de Mastodon.
         favicon: WEBP, PNG, GIF ou JPG. Sobrescribe a icona de favoritos de Mastodon por defecto cunha icona personalizada.
+        landing_page: Elixe a páxina que verán as persoas que se acheguen por primeira vez ao teu servidor. Se elixes «Tendencias» entón debes activar as tendencias nos Axustes de Descubrimento. Se elixes «Cronoloxía local», hai que configurar nos Axustes de Descubrimento a opción «Acceso das cronoloxías en directo ás publicacións locais» como «Calquera».
         mascot: Sobrescribe a ilustración na interface web avanzada.
         media_cache_retention_period: Os ficheiros multimedia de publicacións de usuarias remotas están almacenados no teu servidor. Ao establecer un valor positivo, o multimedia vaise eliminar despois do número de días establecido. Se o multimedia fose requerido após ser eliminado entón descargaríase outra vez, se aínda está dispoñible na orixe. Debido a restricións sobre a frecuencia en que o servizo de vista previa trae recursos de terceiras partes, é recomendable establecer este valor polo menos en 14 días, ou as tarxetas de vista previa non se actualizarán baixo demanda para casos anteriores a ese prazo.
         min_age: Váiselle pedir ás usuarias que confirmen a súa data de nacemento cando creen a conta
@@ -286,6 +287,7 @@ gl:
         content_cache_retention_period: Período de retención de contido remoto
         custom_css: CSS personalizado
         favicon: Favicon
+        landing_page: Páxina que se mostra ás visitas
         local_live_feed_access: Acceso a cronoloxías ao vivo que mostran publicacións locais
         local_topic_feed_access: Acceso a cronoloxías de ligazóns e cancelos que mostran publicacións locais
         mascot: Mascota propia (herdado)

config/locales/simple_form.is.yml

@@ -93,6 +93,7 @@ is:
         content_cache_retention_period: Öllum færslum af öðrum netþjónum (þar með taldar endurbirtingar og svör) verður eytt eftir uppgefinn fjölda daga, án tillits til gagnvirkni staðværra notenda við þessar færslur. Þetta á einnig við um færslur sem notandinn hefur merkt sem bókamerki eða eftirlæti. Beinar tilvísanir (einkaspjall) milli notenda af mismunandi netþjónum munu einnig tapast og er engin leið til að endurheimta þær. Notkun á þessari stillingu er einungis ætluð sérstilltum netþjónum og mun skemma fyrir notendum ef þetta er sett upp fyrir almenna notkun.
         custom_css: Þú getur virkjað sérsniðna stíla í vefútgáfu Mastodon.
         favicon: WEBP, PNG, GIF eða JPG. Tekur yfir sjálfgefna Mastodon favicon-táknmynd með sérsniðinni táknmynd.
+        landing_page: Þetta ákvarðar hvaða síðu nýir gestir sjá þegar þeir koma fyrst á netþjóninn þinn. Ef þú velur "Vinsælt" þá þurfa vinsælar færslur að vera virkjaðar í stillingum fyrir Uppgötvun. Ef þú velur "Staðbundið streymi" þá þarf "Aðgangur að beinum streymum, þar með töldum staðværum færslum" að vera stillt á "Allir" í stillingum fyrir Uppgötvun.
         mascot: Þetta tekyr yfir myndskreytinguna í ítarlega vefviðmótinu.
         media_cache_retention_period: Myndefnisskrár úr færslum sem gerðar eru af fjartengdum notendum eru geymdar á netþjóninum þínum. Þegar þetta er stillt á jákvætt gildi, verður þessum skrám eytt sjáfkrafa eftir þeim tiltekna fjölda daga. Ef beðið er um myndefnið eftir að því er eytt, mun það verða sótt aftur ef frumgögnin eru ennþá aðgengileg. Vegna takmarkana á hversu oft forskoðunarspjöld tengla eru sótt á utanaðkomandi netþjóna, þá er mælt með því að setja þetta gildi á að minnsta kosti 14 daga, annars gæti mistekist að uppfæra forskoðunarspjöld tengla eftir þörfum fyrir þann tíma.
         min_age: Notendur verða beðnir um að staðfesta fæðingardag sinn við nýskráningu

config/locales/simple_form.ko.yml

@@ -56,11 +56,15 @@ ko:
         scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다.
         setting_aggregate_reblogs: 최근에 부스트 됐던 게시물은 새로 부스트 되어도 보여주지 않기 (새로 받은 부스트에만 적용됩니다)
         setting_always_send_emails: 기본적으로 마스토돈을 활동적으로 사용하고 있을 때에는 이메일 알림이 보내지지 않습니다
+        setting_boost_modal: 활성화하면 부스트하기 전에 부스트의 공개설정을 바꿀 수 있는 확인창이 먼저 뜨게 됩니다.
+        setting_default_quote_policy_private: 마스토돈에서 작성된 팔로워 전용 게시물은 다른 사용자가 인용할 수 없습니다.
+        setting_default_quote_policy_unlisted: 사람들에게 인용된 경우, 인용한 게시물도 유행 타임라인에서 감추게 됩니다.
         setting_default_sensitive: 민감한 미디어는 기본적으로 가려져 있으며 클릭해서 볼 수 있습니다
         setting_display_media_default: 민감함으로 표시된 미디어 가리기
         setting_display_media_hide_all: 모든 미디어를 가리기
         setting_display_media_show_all: 모든 미디어를 보이기
         setting_emoji_style: 에모지 표현 방식. "자동"은 시스템 기본 에모지를 적용하고 그렇지 못하는 오래된 브라우저의 경우 트웨모지를 사용합니다.
+        setting_quick_boosting_html: 활성화하면 %{boost_icon}부스트 아이콘을 클릭했을 때 부스트/인용 드롭다운 메뉴가 뜨지 않고 바로 부스트하게 됩니다. 인용은 %{options_icon} (옵션) 메뉴 안으로 이동합니다.
         setting_system_scrollbars_ui: 사파리와 크롬 기반의 데스크탑 브라우저만 적용됩니다
         setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다
         setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다
@@ -229,10 +233,12 @@ ko:
         setting_aggregate_reblogs: 타임라인의 부스트를 그룹화
         setting_always_send_emails: 항상 이메일 알림 보내기
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
+        setting_boost_modal: 부스트 공개범위 제어
         setting_default_language: 게시물 언어
         setting_default_privacy: 게시물 공개 범위
         setting_default_quote_policy: 인용할 수 있는 사람
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
+        setting_delete_modal: 게시물을 삭제하기 전 경고하기
         setting_disable_hover_cards: 호버시 프로필 미리보기를 비활성화
         setting_disable_swiping: 스와이프 모션 비활성화
         setting_display_media: 미디어 표시
@@ -242,6 +248,8 @@ ko:
         setting_emoji_style: 에모지 스타일
         setting_expand_spoilers: 내용 경고로 표시된 게시물을 항상 펼치기
         setting_hide_network: 내 인맥 숨기기
+        setting_missing_alt_text_modal: 대체텍스트가 없는 미디어를 포함하여 게시하기 전 경고
+        setting_quick_boosting: 빠른 부스트 활성화
         setting_reduce_motion: 애니메이션 줄이기
         setting_system_font_ui: 시스템의 기본 글꼴을 사용
         setting_system_scrollbars_ui: 시스템 기본 스크롤바 사용
@@ -275,12 +283,17 @@ ko:
         content_cache_retention_period: 리모트 콘텐츠 보유 기간
         custom_css: 사용자 정의 CSS
         favicon: 파비콘
+        landing_page: 새 방문자를 위한 랜딩 페이지
+        local_live_feed_access: 로컬 게시물에 대한 실시간 피드 접근
+        local_topic_feed_access: 로컬 게시물에 대한 해시태그와 링크 피드 접근
         mascot: 사용자 정의 마스코트 (legacy)
         media_cache_retention_period: 미디어 캐시 유지 기한
         min_age: 최소 연령 제한
         peers_api_enabled: API에 발견 된 서버들의 목록 발행
         profile_directory: 프로필 책자 활성화
         registrations_mode: 누가 가입할 수 있는지
+        remote_live_feed_access: 리모트 게시물에 대한 실시간 피드 접근
+        remote_topic_feed_access: 리모트 게시물에 대한 해시태그와 링크 피드 접근
         require_invite_text: 가입 하는 이유를 필수로 입력하게 하기
         show_domain_blocks: 도메인 차단 보여주기
         show_domain_blocks_rationale: 왜 도메인이 차단되었는지 보여주기

config/locales/simple_form.lad.yml

@@ -244,6 +244,7 @@ lad:
         favicon: Ikona de favoritos
         mascot: Maskota personalizada (legado)
         media_cache_retention_period: Periodo de retensyon de kashe multimedia
+        min_age: Edad minima rekerida
         peers_api_enabled: Publika lista de sirvidores diskuviertos en la API
         profile_directory: Kapasita katalogo de profiles
         registrations_mode: Ken puede enrejistrarse

lib/mastodon/version.rb

@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def default_prerelease
-      'beta.2'
+      'rc.1'
     end
 
     def prerelease