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

Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.

diff --cc CONTRIBUTING.md
Simple merge

diff --cc Vagrantfile
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
index c74282b1db51a4155f306811fa8711f968052a57,ae0e0f5da7364150cd21fb81d41a7f131d28e8ca..18fa04c5e761a166179cf936a4c347beeaa73415
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -291,12 -287,11 +291,12 @@@
    "navigation_bar.logout": "ログアウト",
    "navigation_bar.mutes": "ミュートしたユーザー",
    "navigation_bar.personal": "個人用",
-   "navigation_bar.pins": "固定したトゥート",
+   "navigation_bar.pins": "固定した投稿",
    "navigation_bar.preferences": "ユーザー設定",
    "navigation_bar.public_timeline": "連合タイムライン",
 +  "navigation_bar.misc": "その他",
    "navigation_bar.security": "セキュリティ",
-   "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
+   "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",
    "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",
    "notification.mention": "{name}さんがあなたに返信しました",

diff --cc app/serializers/activitypub/note_serializer.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge