Merge commit '6d2493ca7c39a5d60edd7109de0c24256f8fff8c' into glitch-soc/merge-upstream

Gemfile.lock

@@ -10,29 +10,29 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.2.1)
+    actioncable (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.2.1)
+    actionmailbox (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      activejob (= 8.0.2.1)
+      activejob (= 8.0.3)
-      activerecord (= 8.0.2.1)
+      activerecord (= 8.0.3)
-      activestorage (= 8.0.2.1)
+      activestorage (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
-    actionmailer (8.0.2.1)
+    actionmailer (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      actionview (= 8.0.2.1)
+      actionview (= 8.0.3)
-      activejob (= 8.0.2.1)
+      activejob (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.2.1)
+    actionpack (8.0.3)
-      actionview (= 8.0.2.1)
+      actionview (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -40,15 +40,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.2.1)
+    actiontext (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      activerecord (= 8.0.2.1)
+      activerecord (= 8.0.3)
-      activestorage (= 8.0.2.1)
+      activestorage (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.2.1)
+    actionview (8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -58,22 +58,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (8.0.2.1)
+    activejob (8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.2.1)
+    activemodel (8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
-    activerecord (8.0.2.1)
+    activerecord (8.0.3)
-      activemodel (= 8.0.2.1)
+      activemodel (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       timeout (>= 0.4.0)
-    activestorage (8.0.2.1)
+    activestorage (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      activejob (= 8.0.2.1)
+      activejob (= 8.0.3)
-      activerecord (= 8.0.2.1)
+      activerecord (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       marcel (~> 1.0)
-    activesupport (8.0.2.1)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -150,7 +150,7 @@ GEM
       playwright-ruby-client (>= 1.16.0)
     case_transform (0.2)
       activesupport
-    cbor (0.5.9.8)
+    cbor (0.5.10.1)
     cgi (0.4.2)
     charlock_holmes (0.7.9)
     chewy (7.6.0)
@@ -300,8 +300,8 @@ GEM
     highline (3.1.2)
       reline
     hiredis (0.6.3)
-    hiredis-client (0.25.3)
+    hiredis-client (0.26.0)
-      redis-client (= 0.25.3)
+      redis-client (= 0.26.0)
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http (5.3.1)
@@ -447,7 +447,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.9)
+    net-imap (0.5.10)
       date
       net-protocol
     net-ldap (0.20.0)
@@ -629,7 +629,7 @@ GEM
     prism (1.4.0)
     prometheus_exporter (2.3.0)
       webrick
-    propshaft (1.2.1)
+    propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -637,13 +637,13 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (7.0.3)
+    puma (7.0.4)
       nio4r (~> 2.0)
-    pundit (2.5.1)
+    pundit (2.5.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (3.0.0)
@@ -669,20 +669,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.2.1)
+    rails (8.0.3)
-      actioncable (= 8.0.2.1)
+      actioncable (= 8.0.3)
-      actionmailbox (= 8.0.2.1)
+      actionmailbox (= 8.0.3)
-      actionmailer (= 8.0.2.1)
+      actionmailer (= 8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      actiontext (= 8.0.2.1)
+      actiontext (= 8.0.3)
-      actionview (= 8.0.2.1)
+      actionview (= 8.0.3)
-      activejob (= 8.0.2.1)
+      activejob (= 8.0.3)
-      activemodel (= 8.0.2.1)
+      activemodel (= 8.0.3)
-      activerecord (= 8.0.2.1)
+      activerecord (= 8.0.3)
-      activestorage (= 8.0.2.1)
+      activestorage (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       bundler (>= 1.15.0)
-      railties (= 8.0.2.1)
+      railties (= 8.0.3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -693,13 +693,14 @@ GEM
     rails-i18n (8.0.2)
       i18n (>= 0.7, < 2)
       railties (>= 8.0.0, < 9)
-    railties (8.0.2.1)
+    railties (8.0.3)
-      actionpack (= 8.0.2.1)
+      actionpack (= 8.0.3)
-      activesupport (= 8.0.2.1)
+      activesupport (= 8.0.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.0)
@@ -719,7 +720,7 @@ GEM
       reline
     redcarpet (3.6.1)
     redis (4.8.1)
-    redis-client (0.25.3)
+    redis-client (0.26.0)
       connection_pool
     regexp_parser (2.11.2)
     reline (0.6.2)
@@ -814,8 +815,8 @@ GEM
     rubyzip (3.1.0)
     rufus-scheduler (3.9.2)
       fugit (~> 1.1, >= 1.11.1)
-    safety_net_attestation (0.4.0)
+    safety_net_attestation (0.5.0)
-      jwt (~> 2.0)
+      jwt (>= 2.0, < 4.0)
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
@@ -879,6 +880,7 @@ GEM
       bindata (~> 2.4)
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
+    tsort (0.2.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -918,13 +920,13 @@ GEM
       zeitwerk (~> 2.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.4.1)
+    webauthn (3.4.2)
       android_key_attestation (~> 0.3.0)
       bindata (~> 2.4)
       cbor (~> 0.5.9)
       cose (~> 1.1)
       openssl (>= 2.2)
-      safety_net_attestation (~> 0.4.0)
+      safety_net_attestation (~> 0.5.0)
       tpm-key_attestation (~> 0.14.0)
     webfinger (2.1.3)
       activesupport

app/javascript/mastodon/actions/compose.js

@@ -194,8 +194,10 @@ export function submitCompose(successCallback) {
     const status   = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
     const statusId = getState().getIn(['compose', 'id'], null);
+    const hasQuote = !!getState().getIn(['compose', 'quoted_status_id']);
+    const spoiler_text = getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '';
 
-    if ((!status || !status.length) && media.size === 0) {
+    if (!(status?.length || media.size !== 0 || (hasQuote && spoiler_text?.length))) {
       return;
     }
 
@@ -227,11 +229,11 @@ export function submitCompose(successCallback) {
       method: statusId === null ? 'post' : 'put',
       data: {
         status,
+        spoiler_text,
         in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
         media_ids: media.map(item => item.get('id')),
         media_attributes,
         sensitive: getState().getIn(['compose', 'sensitive']),
-        spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
         visibility: visibility,
         poll: getState().getIn(['compose', 'poll'], null),
         language: getState().getIn(['compose', 'language']),

app/javascript/mastodon/components/blurhash.tsx

@@ -30,9 +30,12 @@ const Blurhash: React.FC<Props> = ({
     try {
       const pixels = decode(hash, width, height);
       const ctx = canvas.getContext('2d');
-      const imageData = new ImageData(pixels, width, height);
+      const imageData = ctx?.createImageData(width, height);
+      imageData?.data.set(pixels);
 
-      ctx?.putImageData(imageData, 0, 0);
+      if (imageData) {
+        ctx?.putImageData(imageData, 0, 0);
+      }
     } catch (err) {
       console.error('Blurhash decoding failure', { err, hash });
     }

app/javascript/mastodon/components/hashtag_bar.tsx

@@ -33,7 +33,7 @@ function isNodeLinkHashtag(element: Node): element is HTMLLinkElement {
   return (
     element instanceof HTMLAnchorElement &&
     // it may be a <a> starting with a hashtag
-    (element.textContent?.[0] === '#' ||
+    (element.textContent.startsWith('#') ||
       // or a #<a>
       element.previousSibling?.textContent?.[
         element.previousSibling.textContent.length - 1

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

@@ -64,7 +64,7 @@ export const EmbeddedStatusContent: React.FC<{
           link.setAttribute('title', `@${mention.get('acct')}`);
           link.setAttribute('href', `/@${mention.get('acct')}`);
         } else if (
-          link.textContent?.[0] === '#' ||
+          link.textContent.startsWith('#') ||
           link.previousSibling?.textContent?.endsWith('#')
         ) {
           link.addEventListener(

app/javascript/mastodon/features/onboarding/profile.tsx

@@ -54,9 +54,7 @@ export const Profile: React.FC<{
     me ? state.accounts.get(me) : undefined,
   );
   const [displayName, setDisplayName] = useState(account?.display_name ?? '');
-  const [note, setNote] = useState(
+  const [note, setNote] = useState(account ? unescapeHTML(account.note) : '');
-    account ? (unescapeHTML(account.note) ?? '') : '',
-  );
   const [avatar, setAvatar] = useState<File>();
   const [header, setHeader] = useState<File>();
   const [discoverable, setDiscoverable] = useState(

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

@@ -36,6 +36,7 @@ const EmbedModal: React.FC<{
         }
 
         iframeDocument.open();
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         iframeDocument.write(data.html);
         iframeDocument.close();
 

app/javascript/mastodon/hooks/useLinks.ts

@@ -12,7 +12,7 @@ const isMentionClick = (element: HTMLAnchorElement) =>
   !element.classList.contains('hashtag');
 
 const isHashtagClick = (element: HTMLAnchorElement) =>
-  element.textContent?.[0] === '#' ||
+  element.textContent.startsWith('#') ||
   element.previousSibling?.textContent?.endsWith('#');
 
 export const useLinks = (skipHashtags?: boolean) => {

app/javascript/mastodon/locales/ar.json

@@ -861,8 +861,6 @@
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
   "status.cannot_quote": "غير مصرح لك باقتباس هذا المنشور",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
-  "status.context.load_new_replies": "الردود الجديدة المتاحة",
-  "status.context.loading": "التحقق من المزيد من الردود",
   "status.continued_thread": "تكملة للخيط",
   "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",

app/javascript/mastodon/locales/az.json

@@ -829,8 +829,6 @@
   "status.bookmark": "Əlfəcin",
   "status.cancel_reblog_private": "Təkrar paylaşımı geri al",
   "status.cannot_reblog": "Bu göndəriş təkrar paylaşıla bilməz",
-  "status.context.load_new_replies": "Yeni cavablar mövcuddur",
-  "status.context.loading": "Daha çox cavab yoxlanılır",
   "status.continued_thread": "Davam edən mövzu",
   "status.copy": "Göndəriş keçidini kopyala",
   "status.delete": "Sil",

app/javascript/mastodon/locales/be.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Прыбраць",
   "status.cannot_quote": "Вы не маеце дазвол цытаваць гэты допіс",
   "status.cannot_reblog": "Гэты допіс нельга пашырыць",
-  "status.context.load_new_replies": "Даступныя новыя адказы",
-  "status.context.loading": "Правяраюцца новыя адказы",
   "status.continued_thread": "Працяг ланцужка",
   "status.copy": "Скапіраваць спасылку на допіс",
   "status.delete": "Выдаліць",

app/javascript/mastodon/locales/bg.json

@@ -832,8 +832,6 @@
   "status.bookmark": "Отмятане",
   "status.cancel_reblog_private": "Край на подсилването",
   "status.cannot_reblog": "Публикацията не може да се подсилва",
-  "status.context.load_new_replies": "Има нови отговори",
-  "status.context.loading": "Проверка за още отговори",
   "status.continued_thread": "Продължена нишка",
   "status.copy": "Копиране на връзката към публикация",
   "status.delete": "Изтриване",

app/javascript/mastodon/locales/br.json

@@ -653,8 +653,6 @@
   "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Nac'hañ ar skignadenn",
   "status.cannot_reblog": "Ar c'hannad-se na c'hall ket bezañ skignet",
-  "status.context.load_new_replies": "Respontoù nevez zo",
-  "status.context.loading": "O kerc'hat muioc'h a respontoù",
   "status.copy": "Eilañ liamm ar c'hannad",
   "status.delete": "Dilemel",
   "status.delete.success": "Embannadur dilamet",

app/javascript/mastodon/locales/ca.json

@@ -844,8 +844,6 @@
   "status.bookmark": "Marca",
   "status.cancel_reblog_private": "Desfés l'impuls",
   "status.cannot_reblog": "No es pot impulsar aquest tut",
-  "status.context.load_new_replies": "Hi ha respostes noves",
-  "status.context.loading": "Comprovació de més respostes",
   "status.continued_thread": "Continuació del fil",
   "status.copy": "Copia l'enllaç al tut",
   "status.delete": "Elimina",

app/javascript/mastodon/locales/cs.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Nemáte oprávnění citovat tento příspěvek",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
   "status.contains_quote": "Obsahuje citaci",
-  "status.context.load_new_replies": "K dispozici jsou nové odpovědi",
-  "status.context.loading": "Hledání dalších odpovědí",
   "status.continued_thread": "Pokračuje ve vlákně",
   "status.copy": "Zkopírovat odkaz na příspěvek",
   "status.delete": "Smazat",

app/javascript/mastodon/locales/cy.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Does dim caniatâd i chi ddyfynnu'r postiad hwn",
   "status.cannot_reblog": "Does dim modd hybu'r postiad hwn",
   "status.contains_quote": "Yn cynnwys dyfyniad",
-  "status.context.load_new_replies": "Mae atebion newydd ar gael",
-  "status.context.loading": "Yn chwilio am fwy o atebion",
   "status.continued_thread": "Edefyn parhaus",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",

app/javascript/mastodon/locales/da.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Du har ikke tilladelse til at citere dette indlæg",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
   "status.contains_quote": "Indeholder citat",
-  "status.context.load_new_replies": "Nye svar tilgængelige",
+  "status.context.loading": "Indlæser flere svar",
-  "status.context.loading": "Tjekker for flere svar",
+  "status.context.loading_error": "Kunne ikke indlæse nye svar",
+  "status.context.loading_more": "Indlæser flere svar",
+  "status.context.loading_success": "Alle svar indlæst",
+  "status.context.more_replies_found": "Flere svar fundet",
+  "status.context.retry": "Prøv igen",
+  "status.context.show": "Vis",
   "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",

app/javascript/mastodon/locales/de.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Dir ist es nicht gestattet, diesen Beitrag zu zitieren",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.contains_quote": "Enthält Zitat",
-  "status.context.load_new_replies": "Neue Antworten verfügbar",
+  "status.context.loading": "Weitere Antworten werden geladen",
-  "status.context.loading": "Weitere Antworten werden abgerufen",
+  "status.context.loading_error": "Neue Antworten konnten nicht geladen werden",
+  "status.context.loading_more": "Weitere Antworten werden geladen",
+  "status.context.loading_success": "Alle Antworten geladen",
+  "status.context.more_replies_found": "Weitere Antworten verfügbar",
+  "status.context.retry": "Wiederholen",
+  "status.context.show": "Anzeigen",
   "status.continued_thread": "Fortgeführter Thread",
   "status.copy": "Link zum Beitrag kopieren",
   "status.delete": "Beitrag löschen",

app/javascript/mastodon/locales/el.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Δε σας επιτρέπετε να παραθέσετε αυτή την ανάρτηση",
   "status.cannot_reblog": "Αυτή η ανάρτηση δεν μπορεί να ενισχυθεί",
   "status.contains_quote": "Περιέχει παράθεση",
-  "status.context.load_new_replies": "Νέες απαντήσεις διαθέσιμες",
+  "status.context.loading": "Φόρτωση περισσότερων απαντήσεων",
-  "status.context.loading": "Γίνεται έλεγχος για περισσότερες απαντήσεις",
+  "status.context.loading_error": "Αδυναμία φόρτωσης νέων απαντήσεων",
+  "status.context.loading_more": "Φόρτωση περισσότερων απαντήσεων",
+  "status.context.loading_success": "Όλες οι απαντήσεις φορτώθηκαν",
+  "status.context.more_replies_found": "Βρέθηκαν περισσότερες απαντήσεις",
+  "status.context.retry": "Επανάληψη",
+  "status.context.show": "Εμφάνιση",
   "status.continued_thread": "Συνεχιζόμενο νήματος",
   "status.copy": "Αντιγραφή συνδέσμου ανάρτησης",
   "status.delete": "Διαγραφή",

app/javascript/mastodon/locales/eo.json

@@ -849,8 +849,6 @@
   "status.cancel_reblog_private": "Ne plu diskonigi",
   "status.cannot_quote": "Vi ne rajtas citi ĉi tiun afiŝon",
   "status.cannot_reblog": "Ĉi tiun afiŝon ne eblas diskonigi",
-  "status.context.load_new_replies": "Disponeblaj novaj respondoj",
-  "status.context.loading": "Serĉante pliajn respondojn",
   "status.continued_thread": "Daŭrigis fadenon",
   "status.copy": "Kopii la ligilon al la afiŝo",
   "status.delete": "Forigi",

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

@@ -865,8 +865,13 @@
   "status.cannot_quote": "No te es permitido citar este mensaje",
   "status.cannot_reblog": "No se puede adherir a este mensaje",
   "status.contains_quote": "Contiene cita",
-  "status.context.load_new_replies": "Hay nuevas respuestas",
+  "status.context.loading": "Cargando más respuestas",
-  "status.context.loading": "Buscando más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_more": "Cargando más respuestas",
+  "status.context.loading_success": "Se cargaron todas las respuestas",
+  "status.context.more_replies_found": "Se encontraron más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuación de hilo",
   "status.copy": "Copiar enlace al mensaje",
   "status.delete": "Eliminar",

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

@@ -865,8 +865,13 @@
   "status.cannot_quote": "No está permitido citar esta publicación",
   "status.cannot_reblog": "Esta publicación no puede ser impulsada",
   "status.contains_quote": "Contiene cita",
-  "status.context.load_new_replies": "Nuevas respuestas disponibles",
+  "status.context.loading": "Cargando más respuestas",
-  "status.context.loading": "Comprobando si hay más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_more": "Cargando más respuestas",
+  "status.context.loading_success": "Todas las respuestas cargadas",
+  "status.context.more_replies_found": "Se han encontrado más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Hilo continuado",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",

app/javascript/mastodon/locales/es.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "No tienes permiso para citar esta publicación",
   "status.cannot_reblog": "Esta publicación no se puede impulsar",
   "status.contains_quote": "Contiene cita",
-  "status.context.load_new_replies": "Hay nuevas respuestas",
+  "status.context.loading": "Cargando más respuestas",
-  "status.context.loading": "Buscando más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_more": "Cargando más respuestas",
+  "status.context.loading_success": "Se cargaron todas las respuestas",
+  "status.context.more_replies_found": "Se encontraron más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace a la publicación",
   "status.delete": "Borrar",

app/javascript/mastodon/locales/et.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Sul pole õigust seda postitust tsiteerida",
   "status.cannot_reblog": "Seda postitust ei saa jagada",
   "status.contains_quote": "Sisaldab tsitaati",
-  "status.context.load_new_replies": "Leidub uusi vastuseid",
-  "status.context.loading": "Kontrollin täiendavate vastuste olemasolu",
   "status.continued_thread": "Jätkatud lõim",
   "status.copy": "Kopeeri postituse link",
   "status.delete": "Kustuta",

app/javascript/mastodon/locales/fa.json

@@ -842,8 +842,6 @@
   "status.bookmark": "نشانک",
   "status.cancel_reblog_private": "ناتقویت",
   "status.cannot_reblog": "این فرسته قابل تقویت نیست",
-  "status.context.load_new_replies": "پاسخ‌های جدیدی موجودند",
-  "status.context.loading": "بررسی کردن برای پاسخ‌های بیش‌تر",
   "status.continued_thread": "رشتهٔ دنباله دار",
   "status.copy": "رونوشت از پیوند فرسته",
   "status.delete": "حذف",

app/javascript/mastodon/locales/fi.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Sinulla ei ole oikeutta lainata tätä julkaisua",
   "status.cannot_reblog": "Tätä julkaisua ei voi tehostaa",
   "status.contains_quote": "Sisältää lainauksen",
-  "status.context.load_new_replies": "Uusia vastauksia saatavilla",
+  "status.context.loading": "Ladataan lisää vastauksia",
-  "status.context.loading": "Tarkistetaan lisävastauksia",
+  "status.context.loading_error": "Ei voitu ladata lisää vastauksia",
+  "status.context.loading_more": "Ladataan lisää vastauksia",
+  "status.context.loading_success": "Kaikki vastaukset ladattu",
+  "status.context.more_replies_found": "Löytyi lisää vastauksia",
+  "status.context.retry": "Yritä uudelleen",
+  "status.context.show": "Näytä",
   "status.continued_thread": "Jatkoi ketjua",
   "status.copy": "Kopioi linkki julkaisuun",
   "status.delete": "Poista",

app/javascript/mastodon/locales/fo.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Tú hevur ikki loyvi at sitera hendan postin",
   "status.cannot_reblog": "Tað ber ikki til at stimbra hendan postin",
   "status.contains_quote": "Inniheldur sitat",
-  "status.context.load_new_replies": "Nýggj svar tøk",
-  "status.context.loading": "Kanni um tað eru fleiri svar",
   "status.continued_thread": "Framhaldandi tráður",
   "status.copy": "Kopiera leinki til postin",
   "status.delete": "Strika",

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

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Débooster",
   "status.cannot_quote": "Vous n'êtes pas autorisé à citer ce message",
   "status.cannot_reblog": "Cette publication ne peut pas être boostée",
-  "status.context.load_new_replies": "Nouvelles réponses disponibles",
-  "status.context.loading": "Vérification de plus de réponses",
   "status.continued_thread": "Suite du fil",
   "status.copy": "Copier un lien vers cette publication",
   "status.delete": "Supprimer",

app/javascript/mastodon/locales/fr.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Annuler le partage",
   "status.cannot_quote": "Vous n'êtes pas autorisé à citer ce message",
   "status.cannot_reblog": "Ce message ne peut pas être partagé",
-  "status.context.load_new_replies": "Nouvelles réponses disponibles",
-  "status.context.loading": "Vérification de plus de réponses",
   "status.continued_thread": "Suite du fil",
   "status.copy": "Copier le lien vers le message",
   "status.delete": "Supprimer",

app/javascript/mastodon/locales/fy.json

@@ -834,8 +834,6 @@
   "status.bookmark": "Blêdwizer tafoegje",
   "status.cancel_reblog_private": "Net langer booste",
   "status.cannot_reblog": "Dit berjocht kin net boost wurde",
-  "status.context.load_new_replies": "Nije reaksjes beskikber",
-  "status.context.loading": "Op nije reaksjes oan it kontrolearjen",
   "status.continued_thread": "Ferfolgje it petear",
   "status.copy": "Copy link to status",
   "status.delete": "Fuortsmite",

app/javascript/mastodon/locales/ga.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Ní cheadaítear duit an post seo a lua",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
   "status.contains_quote": "Tá luachan ann",
-  "status.context.load_new_replies": "Freagraí nua ar fáil",
-  "status.context.loading": "Ag seiceáil le haghaidh tuilleadh freagraí",
   "status.continued_thread": "Snáithe ar lean",
   "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",

app/javascript/mastodon/locales/gd.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Na brosnaich tuilleadh",
   "status.cannot_quote": "Chan fhaod thu am post seo a luaidh",
   "status.cannot_reblog": "Cha ghabh am post seo brosnachadh",
-  "status.context.load_new_replies": "Tha freagairt no dhà ùr ri fhaighinn",
-  "status.context.loading": "A’ toirt sùil airson barrachd fhreagairtean",
   "status.continued_thread": "Pàirt de shnàithlean",
   "status.copy": "Dèan lethbhreac dhen cheangal dhan phost",
   "status.delete": "Sguab às",

app/javascript/mastodon/locales/gl.json

@@ -851,7 +851,7 @@
   "server_banner.is_one_of_many": "{domain} é un dos moitos servidores Mastodon independentes que podes usar para participar do Fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Crear conta",
-  "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares engañosos.",
+  "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares enganosos.",
   "sign_in_banner.mastodon_is": "Mastodon é o mellor xeito de estar ao día do que acontece.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Acceder ou Crear conta",
@@ -865,8 +865,13 @@
   "status.cannot_quote": "Non tes permiso para citar esta publicación",
   "status.cannot_reblog": "Esta publicación non pode ser promovida",
   "status.contains_quote": "Contén unha cita",
-  "status.context.load_new_replies": "Non hai respostas dispoñibles",
+  "status.context.loading": "Cargando máis respostas",
-  "status.context.loading": "Mirando se hai máis respostas",
+  "status.context.loading_error": "Non se puideron mostrar novas respostas",
+  "status.context.loading_more": "Cargando máis respostas",
+  "status.context.loading_success": "Móstranse todas as respostas",
+  "status.context.more_replies_found": "Existen máis respostas",
+  "status.context.retry": "Volver tentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continua co fío",
   "status.copy": "Copiar ligazón á publicación",
   "status.delete": "Eliminar",

app/javascript/mastodon/locales/he.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "אין לך הרשאה לצטט את ההודעה הזו",
   "status.cannot_reblog": "לא ניתן להדהד חצרוץ זה",
   "status.contains_quote": "הודעה מכילה ציטוט",
-  "status.context.load_new_replies": "הגיעו תגובות חדשות",
+  "status.context.loading": "נטענות תשובות נוספות",
-  "status.context.loading": "מחפש תגובות חדשות",
+  "status.context.loading_error": "טעינת תשובות נוספות נכשלה",
+  "status.context.loading_more": "נטענות תשובות נוספות",
+  "status.context.loading_success": "כל התשובות נטענו",
+  "status.context.more_replies_found": "תשובות נוספות נמצאו",
+  "status.context.retry": "נסה שוב",
+  "status.context.show": "הצג",
   "status.continued_thread": "שרשור מתמשך",
   "status.copy": "העתק/י קישור להודעה זו",
   "status.delete": "מחיקה",

app/javascript/mastodon/locales/hu.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Nem idézheted ezt a bejegyzést",
   "status.cannot_reblog": "Ezt a bejegyzést nem lehet megtolni",
   "status.contains_quote": "Idézést tartalmaz",
-  "status.context.load_new_replies": "Új válaszok érhetőek el",
-  "status.context.loading": "További válaszok keresése",
   "status.continued_thread": "Folytatott szál",
   "status.copy": "Link másolása bejegyzésbe",
   "status.delete": "Törlés",

app/javascript/mastodon/locales/ia.json

@@ -864,8 +864,14 @@
   "status.cancel_reblog_private": "Disfacer impulso",
   "status.cannot_quote": "Tu non es autorisate a citar iste message",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
-  "status.context.load_new_replies": "Nove responsas disponibile",
+  "status.contains_quote": "Contine un citation",
-  "status.context.loading": "Cercante plus responsas",
+  "status.context.loading": "Cargante plus responsas",
+  "status.context.loading_error": "Non poteva cargar nove responsas",
+  "status.context.loading_more": "Cargante plus responsas",
+  "status.context.loading_success": "Tote le responsas cargate",
+  "status.context.more_replies_found": "Plus responsas trovate",
+  "status.context.retry": "Tentar de novo",
+  "status.context.show": "Monstrar",
   "status.continued_thread": "Continuation del discussion",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
@@ -895,12 +901,15 @@
   "status.quote": "Citar",
   "status.quote.cancel": "Cancellar le citation",
   "status.quote_error.filtered": "Celate a causa de un de tu filtros",
+  "status.quote_error.limited_account_hint.action": "Monstrar in omne caso",
+  "status.quote_error.limited_account_hint.title": "Iste conto ha essite celate per le moderatores de {domain}.",
   "status.quote_error.not_available": "Message indisponibile",
   "status.quote_error.pending_approval": "Message pendente",
   "status.quote_error.pending_approval_popout.body": "Sur Mastodon, tu pote controlar si on pote citar te. Iste message attende ora le approbation del autor original.",
   "status.quote_error.revoked": "Message removite per le autor",
   "status.quote_followers_only": "Solmente sequitores pote citar iste message",
   "status.quote_manual_review": "Le autor lo examinara manualmente",
+  "status.quote_noun": "Citation",
   "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",

app/javascript/mastodon/locales/is.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
   "status.cannot_quote": "Þú hefur ekki heimild til að vitna í þessa færslu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
-  "status.context.load_new_replies": "Ný svör hafa borist",
-  "status.context.loading": "Athuga með fleiri svör",
   "status.continued_thread": "Hélt samtali áfram",
   "status.copy": "Afrita tengil í færslu",
   "status.delete": "Eyða",

app/javascript/mastodon/locales/it.json

@@ -864,8 +864,14 @@
   "status.cancel_reblog_private": "Annulla reblog",
   "status.cannot_quote": "Non ti è consentito citare questo post",
   "status.cannot_reblog": "Questo post non può essere condiviso",
-  "status.context.load_new_replies": "Nuove risposte disponibili",
+  "status.contains_quote": "Contiene una citazione",
-  "status.context.loading": "Controllo per altre risposte",
+  "status.context.loading": "Caricamento di altre risposte",
+  "status.context.loading_error": "Impossibile caricare nuove risposte",
+  "status.context.loading_more": "Caricamento di altre risposte",
+  "status.context.loading_success": "Tutte le risposte caricate",
+  "status.context.more_replies_found": "Sono state trovate altre risposte",
+  "status.context.retry": "Riprova",
+  "status.context.show": "Mostra",
   "status.continued_thread": "Discussione continua",
   "status.copy": "Copia link al post",
   "status.delete": "Elimina",
@@ -903,6 +909,7 @@
   "status.quote_error.revoked": "Post rimosso dall'autore",
   "status.quote_followers_only": "Solo i seguaci possono citare questo post",
   "status.quote_manual_review": "L'autore esaminerà manualmente",
+  "status.quote_noun": "Citazione",
   "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",

app/javascript/mastodon/locales/ja.json

@@ -844,7 +844,6 @@
   "status.cancel_reblog_private": "ブースト解除",
   "status.cannot_quote": "この投稿は引用できません",
   "status.cannot_reblog": "この投稿はブーストできません",
-  "status.context.load_new_replies": "新しい返信があります",
   "status.continued_thread": "続きのスレッド",
   "status.copy": "投稿へのリンクをコピー",
   "status.delete": "削除",

app/javascript/mastodon/locales/kab.json

@@ -639,7 +639,6 @@
   "status.bookmark": "Creḍ",
   "status.cancel_reblog_private": "Sefsex beṭṭu",
   "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
-  "status.context.load_new_replies": "Llant tririyin timaynutin",
   "status.continued_thread": "Asqerdec yettkemmil",
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",

app/javascript/mastodon/locales/ko.json

@@ -861,8 +861,6 @@
   "status.bookmark": "북마크",
   "status.cancel_reblog_private": "부스트 취소",
   "status.cannot_reblog": "이 게시물은 부스트 할 수 없습니다",
-  "status.context.load_new_replies": "새 답글 보기",
-  "status.context.loading": "추가 답글 확인중",
   "status.continued_thread": "이어지는 글타래",
   "status.copy": "게시물 링크 복사",
   "status.delete": "삭제",

app/javascript/mastodon/locales/lt.json

@@ -784,8 +784,6 @@
   "status.bookmark": "Pridėti į žymės",
   "status.cancel_reblog_private": "Nebepasidalinti",
   "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
-  "status.context.load_new_replies": "Yra naujų atsakymų",
-  "status.context.loading": "Tikrinama dėl daugiau atsakymų",
   "status.continued_thread": "Tęsiama gijoje",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",

app/javascript/mastodon/locales/lv.json

@@ -725,7 +725,6 @@
   "status.bookmark": "Grāmatzīme",
   "status.cancel_reblog_private": "Nepastiprināt",
   "status.cannot_reblog": "Šo ierakstu nevar pastiprināt",
-  "status.context.loading": "Pārbauda, vai ir vairāk atbilžu",
   "status.continued_thread": "Turpināts pavediens",
   "status.copy": "Ievietot ieraksta saiti starpliktuvē",
   "status.delete": "Dzēst",

app/javascript/mastodon/locales/nan.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "取消轉送",
   "status.cannot_quote": "Lí bô允准引用tsit篇PO文。",
   "status.cannot_reblog": "Tsit篇PO文bē當轉送",
-  "status.context.load_new_replies": "有新ê回應",
-  "status.context.loading": "Leh檢查其他ê回應",
   "status.continued_thread": "接續ê討論線",
   "status.copy": "Khóo-pih PO文ê連結",
   "status.delete": "Thâi掉",

app/javascript/mastodon/locales/nl.json

@@ -865,8 +865,6 @@
   "status.cannot_quote": "Je bent niet gemachtigd om dit bericht te citeren",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
   "status.contains_quote": "Bevat citaat",
-  "status.context.load_new_replies": "Nieuwe reacties beschikbaar",
-  "status.context.loading": "Op nieuwe reacties aan het controleren",
   "status.continued_thread": "Vervolg van gesprek",
   "status.copy": "Link naar bericht kopiëren",
   "status.delete": "Verwijderen",

app/javascript/mastodon/locales/nn.json

@@ -864,8 +864,6 @@
   "status.cancel_reblog_private": "Opphev framheving",
   "status.cannot_quote": "Du har ikkje løyve til å sitera dette innlegget",
   "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
-  "status.context.load_new_replies": "Nye svar finst",
-  "status.context.loading": "Ser etter fleire svar",
   "status.continued_thread": "Framhald til tråden",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",

app/javascript/mastodon/locales/pl.json

@@ -849,8 +849,6 @@
   "status.bookmark": "Dodaj zakładkę",
   "status.cancel_reblog_private": "Cofnij podbicie",
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
-  "status.context.load_new_replies": "Dostępne są nowe odpowiedzi",
-  "status.context.loading": "Sprawdzanie kolejnych odpowiedzi",
   "status.continued_thread": "Ciąg dalszy wątku",
   "status.copy": "Skopiuj odnośnik do wpisu",
   "status.delete": "Usuń",

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

@@ -855,8 +855,6 @@
   "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Desfazer boost",
   "status.cannot_reblog": "Este toot não pode receber boost",
-  "status.context.load_new_replies": "Novas respostas disponíveis",
-  "status.context.loading": "Verificando mais respostas",
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar link",
   "status.delete": "Excluir",

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

@@ -864,8 +864,14 @@
   "status.cancel_reblog_private": "Retirar impulso",
   "status.cannot_quote": "Não lhe é permitido citar esta publicação",
   "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
-  "status.context.load_new_replies": "Novas respostas disponíveis",
+  "status.contains_quote": "Contém citação",
-  "status.context.loading": "A verificar por mais respostas",
+  "status.context.loading": "A carregar mais respostas",
+  "status.context.loading_error": "Não foi possível carregar novas respostas",
+  "status.context.loading_more": "A carregar mais respostas",
+  "status.context.loading_success": "Todas as respostas carregadas",
+  "status.context.more_replies_found": "Foram encontradas mais respostas",
+  "status.context.retry": "Repetir",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar hiperligação da publicação",
   "status.delete": "Eliminar",
@@ -903,6 +909,7 @@
   "status.quote_error.revoked": "Publicação removida pelo autor",
   "status.quote_followers_only": "Apenas seguidores podem citar esta publicação",
   "status.quote_manual_review": "O autor vai proceder a uma revisão manual",
+  "status.quote_noun": "Citação",
   "status.quote_policy_change": "Alterar quem pode citar",
   "status.quote_post_author": "Citou uma publicação de @{name}",
   "status.quote_private": "Publicações privadas não podem ser citadas",

app/javascript/mastodon/locales/ru.json

@@ -863,8 +863,6 @@
   "status.bookmark": "Добавить в закладки",
   "status.cancel_reblog_private": "Отменить продвижение",
   "status.cannot_reblog": "Этот пост не может быть продвинут",
-  "status.context.load_new_replies": "Доступны новые ответы",
-  "status.context.loading": "Проверяем, есть ли ещё ответы",
   "status.continued_thread": "Продолжение предыдущего поста",
   "status.copy": "Скопировать ссылку на пост",
   "status.delete": "Удалить",

app/javascript/mastodon/locales/sv.json

@@ -843,8 +843,6 @@
   "status.bookmark": "Bokmärk",
   "status.cancel_reblog_private": "Sluta boosta",
   "status.cannot_reblog": "Detta inlägg kan inte boostas",
-  "status.context.load_new_replies": "Nya svar finns",
-  "status.context.loading": "Letar efter fler svar",
   "status.continued_thread": "Fortsatt tråd",
   "status.copy": "Kopiera inläggslänk",
   "status.delete": "Radera",

app/javascript/mastodon/locales/tr.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Bu gönderiyi alıntılamaya izniniz yok",
   "status.cannot_reblog": "Bu gönderi yeniden paylaşılamaz",
   "status.contains_quote": "Alıntı içeriyor",
-  "status.context.load_new_replies": "Yeni yanıtlar mevcut",
+  "status.context.loading": "Daha fazla yanıt yükleniyor",
-  "status.context.loading": "Daha fazla yanıt için kontrol ediliyor",
+  "status.context.loading_error": "Yeni yanıtlar yüklenemiyor",
+  "status.context.loading_more": "Daha fazla yanıt yükleniyor",
+  "status.context.loading_success": "Tüm yanıtlar yüklendi",
+  "status.context.more_replies_found": "Daha fazla yanıt bulundu",
+  "status.context.retry": "Yeniden dene",
+  "status.context.show": "Göster",
   "status.continued_thread": "Devam eden akış",
   "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",

app/javascript/mastodon/locales/uk.json

@@ -814,8 +814,6 @@
   "status.bookmark": "Додати до закладок",
   "status.cancel_reblog_private": "Скасувати поширення",
   "status.cannot_reblog": "Цей допис не може бути поширений",
-  "status.context.load_new_replies": "Доступні нові відповіді",
-  "status.context.loading": "Перевірка додаткових відповідей",
   "status.continued_thread": "Продовження у потоці",
   "status.copy": "Копіювати посилання на допис",
   "status.delete": "Видалити",

app/javascript/mastodon/locales/vi.json

@@ -865,8 +865,13 @@
   "status.cannot_quote": "Bạn không được phép trích dẫn tút này",
   "status.cannot_reblog": "Không thể đăng lại tút này",
   "status.contains_quote": "Chứa trích dẫn",
-  "status.context.load_new_replies": "Có những trả lời mới",
+  "status.context.loading": "Tải thêm các trả lời",
-  "status.context.loading": "Kiểm tra nhiều trả lời hơn",
+  "status.context.loading_error": "Không thể tải những trả lời mới",
+  "status.context.loading_more": "Tải thêm các trả lời",
+  "status.context.loading_success": "Đã tải toàn bộ trả lời",
+  "status.context.more_replies_found": "Có trả lời mới",
+  "status.context.retry": "Thử lại",
+  "status.context.show": "Hiện",
   "status.continued_thread": "Tiếp tục chủ đề",
   "status.copy": "Sao chép URL",
   "status.delete": "Xóa",

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

@@ -862,11 +862,16 @@
   "status.block": "屏蔽 @{name}",
   "status.bookmark": "添加到书签",
   "status.cancel_reblog_private": "取消转嘟",
-  "status.cannot_quote": "你无法引用此嘟文",
+  "status.cannot_quote": "你无权引用这条嘟文",
   "status.cannot_reblog": "不能转嘟这条嘟文",
   "status.contains_quote": "包含引用",
-  "status.context.load_new_replies": "有新回复",
+  "status.context.loading": "正在加载更多回复",
-  "status.context.loading": "正在检查更多回复",
+  "status.context.loading_error": "无法加载新回复",
+  "status.context.loading_more": "正在加载更多回复",
+  "status.context.loading_success": "已加载所有回复",
+  "status.context.more_replies_found": "已找到更多回复",
+  "status.context.retry": "重试",
+  "status.context.show": "显示",
   "status.continued_thread": "上接嘟文串",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",

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

@@ -865,8 +865,13 @@
   "status.cannot_quote": "您不被允許引用此嘟文",
   "status.cannot_reblog": "這則嘟文無法被轉嘟",
   "status.contains_quote": "包含引用嘟文",
-  "status.context.load_new_replies": "有新回嘟",
+  "status.context.loading": "讀取更多回嘟",
-  "status.context.loading": "正在檢查更多回嘟",
+  "status.context.loading_error": "無法讀取新回嘟",
+  "status.context.loading_more": "讀取更多回嘟",
+  "status.context.loading_success": "已讀取所有回嘟",
+  "status.context.more_replies_found": "已有更多回嘟",
+  "status.context.retry": "再試一次",
+  "status.context.show": "顯示",
   "status.continued_thread": "接續討論串",
   "status.copy": "複製嘟文連結",
   "status.delete": "刪除",

config/locales/da.yml

@@ -1634,7 +1634,7 @@ da:
       not_found: kunne ikke findes
       on_cooldown: Du er på nedkøling
     followers_count: Følgere på flytningstidspunktet
-    incoming_migrations: Flytter fra en anden konto
+    incoming_migrations: Flytning fra en anden konto
     incoming_migrations_html: For at flytte fra en anden konto til denne skal der først <a href="%{path}">oprettes et kontoalias</a>.
     moved_msg: Din konto omdirigeres nu til %{acct} og dine følgere overflyttes.
     not_redirecting: Din konto omdirigerer pt. ikke til nogen anden konto.

eslint.config.mjs

@@ -5,7 +5,6 @@ import path from 'node:path';
 import js from '@eslint/js';
 import { globalIgnores } from 'eslint/config';
 import formatjs from 'eslint-plugin-formatjs';
-// @ts-expect-error -- No typings
 import importPlugin from 'eslint-plugin-import';
 import jsdoc from 'eslint-plugin-jsdoc';
 import jsxA11Y from 'eslint-plugin-jsx-a11y';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.9.4",
+  "packageManager": "yarn@4.10.3",
   "engines": {
     "node": ">=20"
   },
@@ -192,7 +192,7 @@
     "stylelint": "^16.19.1",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^15.0.1",
-    "typescript": "~5.7.3",
+    "typescript": "~5.9.0",
     "typescript-eslint": "^8.29.1",
     "vitest": "^3.2.4"
   },

streaming/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.9.4",
+  "packageManager": "yarn@4.10.3",
   "engines": {
     "node": ">=20"
   },
@@ -27,7 +27,7 @@
     "pino": "^9.0.0",
     "pino-http": "^10.0.0",
     "prom-client": "^15.0.0",
-    "uuid": "^11.0.0",
+    "uuid": "^13.0.0",
     "ws": "^8.12.1"
   },
   "devDependencies": {
@@ -35,11 +35,10 @@
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
     "@types/pg": "^8.6.6",
-    "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.9",
     "globals": "^16.0.0",
     "pino-pretty": "^13.0.0",
-    "typescript": "~5.7.3",
+    "typescript": "~5.9.0",
     "typescript-eslint": "^8.28.0"
   },
   "optionalDependencies": {

yarn.lock

@@ -2595,10 +2595,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ioredis/commands@npm:^1.3.0":
+"@ioredis/commands@npm:1.4.0":
-  version: 1.3.0
+  version: 1.4.0
-  resolution: "@ioredis/commands@npm:1.3.0"
+  resolution: "@ioredis/commands@npm:1.4.0"
-  checksum: 10c0/5ab990a8f69c20daf3d7d64307aa9f13ee727c92ab4c7664a6943bb500227667a0c368892e9c4913f06416377db47dba78d58627fe723da476d25f2c04a6d5aa
+  checksum: 10c0/99afe21fba794f84a2b84cceabcc370a7622e7b8b97a6589456c07c9fa62a15d54c5546f6f7214fb9a2458b1fa87579d5c531aaf48e06cc9be156d5923892c8d
   languageName: node
   linkType: hard
 
@@ -2861,7 +2861,7 @@ __metadata:
     tesseract.js: "npm:^6.0.0"
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
-    typescript: "npm:~5.7.3"
+    typescript: "npm:~5.9.0"
     typescript-eslint: "npm:^8.29.1"
     use-debounce: "npm:^10.0.0"
     vite: "npm:^7.1.1"
@@ -2894,7 +2894,6 @@ __metadata:
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
     "@types/pg": "npm:^8.6.6"
-    "@types/uuid": "npm:^10.0.0"
     "@types/ws": "npm:^8.5.9"
     bufferutil: "npm:^4.0.7"
     cors: "npm:^2.8.5"
@@ -2909,10 +2908,10 @@ __metadata:
     pino-http: "npm:^10.0.0"
     pino-pretty: "npm:^13.0.0"
     prom-client: "npm:^15.0.0"
-    typescript: "npm:~5.7.3"
+    typescript: "npm:~5.9.0"
     typescript-eslint: "npm:^8.28.0"
     utf-8-validate: "npm:^6.0.3"
-    uuid: "npm:^11.0.0"
+    uuid: "npm:^13.0.0"
     ws: "npm:^8.12.1"
   dependenciesMeta:
     bufferutil:
@@ -4490,13 +4489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@types/uuid@npm:10.0.0"
-  checksum: 10c0/9a1404bf287164481cb9b97f6bb638f78f955be57c40c6513b7655160beb29df6f84c915aaf4089a1559c216557dc4d2f79b48d978742d3ae10b937420ddac60
-  languageName: node
-  linkType: hard
-
 "@types/warning@npm:^3.0.0":
   version: 3.0.2
   resolution: "@types/warning@npm:3.0.2"
@@ -8380,10 +8372,10 @@ __metadata:
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.7.0
+  version: 5.8.0
-  resolution: "ioredis@npm:5.7.0"
+  resolution: "ioredis@npm:5.8.0"
   dependencies:
-    "@ioredis/commands": "npm:^1.3.0"
+    "@ioredis/commands": "npm:1.4.0"
     cluster-key-slot: "npm:^1.1.0"
     debug: "npm:^4.3.4"
     denque: "npm:^2.1.0"
@@ -8392,7 +8384,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/c63c521a953bfaf29f8c8871b122af38e439328336fa238f83bfbb066556f64daf69ed7a4ec01fc7b9ee1f0862059dd188b8c684150125d362d36642399b30ee
+  checksum: 10c0/66fad6283c6d9052b4aa0987d592c1bf6c9471304eb0edf0c9d18024b1b38028adf29c05f1cf114b90f5bdb516576f897a654946e8c29568f404ac33cd3b9d19
   languageName: node
   linkType: hard
 
@@ -12034,8 +12026,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.93.0
+  version: 1.93.2
-  resolution: "sass@npm:1.93.0"
+  resolution: "sass@npm:1.93.2"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -12046,7 +12038,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/51dcb4e65a69f97b4c200ee154ca45f81b748a45f8ef0ec3236b774bb143590a9304038e9ab09f809f734d4edb3add96a0a690b2e8451ff66b9f57c469b2685e
+  checksum: 10c0/5a19f12dbe8c142e40c1e0473d1e624898242b1c21010301e169b528be8c580df6356329c798522b525eb11eda4b04b9b77422badc55c47889600f8477201d2b
   languageName: node
   linkType: hard
 
@@ -13475,43 +13467,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.6.0":
+"typescript@npm:^5.6.0, typescript@npm:~5.9.0":
-  version: 5.8.2
+  version: 5.9.2
-  resolution: "typescript@npm:5.8.2"
+  resolution: "typescript@npm:5.9.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/5c4f6fbf1c6389b6928fe7b8fcd5dc73bb2d58cd4e3883f1d774ed5bd83b151cbac6b7ecf11723de56d4676daeba8713894b1e9af56174f2f9780ae7848ec3c6
+  checksum: 10c0/cd635d50f02d6cf98ed42de2f76289701c1ec587a363369255f01ed15aaf22be0813226bff3c53e99d971f9b540e0b3cc7583dbe05faded49b1b0bed2f638a18
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.7.3":
+"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.9.0#optional!builtin<compat/typescript>":
-  version: 5.7.3
+  version: 5.9.2
-  resolution: "typescript@npm:5.7.3"
+  resolution: "typescript@patch:typescript@npm%3A5.9.2#optional!builtin<compat/typescript>::version=5.9.2&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
+  checksum: 10c0/34d2a8e23eb8e0d1875072064d5e1d9c102e0bdce56a10a25c0b917b8aa9001a9cf5c225df12497e99da107dc379360bc138163c66b55b95f5b105b50578067e
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>":
-  version: 5.8.2
-  resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A~5.7.3#optional!builtin<compat/typescript>":
-  version: 5.7.3
-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
   languageName: node
   linkType: hard
 
@@ -13827,12 +13799,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^11.0.0":
+"uuid@npm:^13.0.0":
-  version: 11.1.0
+  version: 13.0.0
-  resolution: "uuid@npm:11.1.0"
+  resolution: "uuid@npm:13.0.0"
   bin:
-    uuid: dist/esm/bin/uuid
+    uuid: dist-node/bin/uuid
-  checksum: 10c0/34aa51b9874ae398c2b799c88a127701408cd581ee89ec3baa53509dd8728cbb25826f2a038f9465f8b7be446f0fbf11558862965b18d21c993684297628d4d3
+  checksum: 10c0/950e4c18d57fef6c69675344f5700a08af21e26b9eff2bf2180427564297368c538ea11ac9fb2e6528b17fc3966a9fd2c5049361b0b63c7d654f3c550c9b3d67
   languageName: node
   linkType: hard