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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
index 19b8cb705c559bfb9c33b610d194c383e592d2bd,1744c6e30cf2c971999b58366ae6840fa5834745..f66cf49f38f70868eb0859466101713fcb95cdbd
--- 1/app/javascript/mastodon/locales/ja.json
--- 2/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@@ -311,9 -307,8 +311,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.admin.sign_up": "{name} がサインアップしました",
    "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
    "notification.follow": "{name}さんにフォローされました",
    "notification.follow_request": "{name} さんがあなたにフォローリクエストしました",

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

diff --cc db/schema.rb
Simple merge