Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.

app/javascript/mastodon/locales/ja.json

@@ -142,7 +142,7 @@
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
   "compose_form.publish": "投稿",
-  "compose_form.publish_form": "Publish",
+  "compose_form.publish_form": "投稿",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.save_changes": "変更を保存",
   "compose_form.sensitive.hide": "メディアを閲覧注意にする",