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

app/javascript/mastodon/locales/ja.json

@@ -666,8 +666,6 @@
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
-  "notifications.column_settings.beta.category": "実験段階の機能",
-  "notifications.column_settings.beta.grouping": "通知をグループにまとめる",
   "notifications.column_settings.emoji_reaction": "絵文字リアクション",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
@@ -930,7 +928,6 @@
   "status.edit": "編集",
   "status.edited": "最終更新日 {date}",
   "status.edited_x_times": "{count}回編集",
-  "status.embed": "埋め込み",
   "status.emoji_reaction": "絵文字リアクション",
   "status.emoji_reaction.pick": "絵文字を追加する",
   "status.emoji_reactions": "{count, plural, one {絵文字} other {絵文字}}",