Merge remote-tracking branch 'parent/main' into upstream-20240913

app/javascript/mastodon/locales/en.json

@@ -566,7 +566,7 @@
   "lists.with_antenna": "Antenna",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading…",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "media_gallery.hide": "Hide",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Hide from notifications",
   "mute_modal.hide_options": "Hide options",
@@ -936,6 +936,7 @@
   "status.cancel_reblog": "Unboost",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
+  "status.continued_thread": "Continued thread",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
@@ -944,7 +945,7 @@
   "status.edit": "Edit",
   "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
+  "status.embed": "Get embed code",
   "status.emoji_reaction": "Emoji reaction",
   "status.emoji_reaction.pick": "Pick emoji reaction",
   "status.emoji_reactions": "{count, plural, one {emoji} other {emojis}}",
@@ -986,6 +987,7 @@
   "status.redraft": "Delete & re-draft",
   "status.reference": "Quiet quote",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",