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

app/javascript/mastodon/locales/en.json

@@ -603,6 +603,7 @@
   "keyboard_shortcuts.toggle_hidden": "Show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
   "keyboard_shortcuts.toot": "Start a new post",
+  "keyboard_shortcuts.translate": "to translate a post",
   "keyboard_shortcuts.unfocus": "Unfocus compose textarea/search",
   "keyboard_shortcuts.up": "Move up in the list",
   "lightbox.close": "Close",
@@ -1052,6 +1053,7 @@
   "status.redraft": "Delete & re-draft",
   "status.reference": "Quiet quote",
   "status.remove_bookmark": "Remove bookmark",
+  "status.remove_favourite": "Remove from favorites",
   "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",