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

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
index 934857ed4734a1cf98c5e912c3a4ef7c0fbbbff4,c1418459e5759b79e605db657e4d344b58e8be8f..1a138d8938646b6c480e542ec26b07221512a27b
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -303,8 -306,8 +310,9 @@@
    "navigation_bar.pins": "固定した投稿",
    "navigation_bar.preferences": "ユーザー設定",
    "navigation_bar.public_timeline": "連合タイムライン",
 +  "navigation_bar.misc": "その他",
    "navigation_bar.security": "セキュリティ",
+   "notification.admin.sign_up": "{name} signed up",
    "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",
    "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge