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

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
Simple merge

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

diff --cc app/serializers/rest/account_serializer.rb
Simple merge

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