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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.

diff --cc .github/workflows/build-image.yml
index 2d1df72112bac1591f08ce9b040f2405cff40e29,f8b4a751dc26fb46406ab4f9b35735d3e0a90583..281fa33b73947458732f13a19129162f9356c938
--- 1/.github/workflows/build-image.yml
--- 2/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -19,9 -19,9 +19,10 @@@ jobs
        - uses: docker/setup-buildx-action@v1
        - uses: docker/login-action@v1
          with:
 -          username: ${{ secrets.DOCKERHUB_USERNAME }}
 -          password: ${{ secrets.DOCKERHUB_TOKEN }}
 +          registry: ghcr.io
 +          username: ${{ github.repository_owner }}
 +          password: ${{ secrets.GITHUB_TOKEN }}
+         if: github.event_name != 'pull_request'
        - uses: docker/metadata-action@v3
          id: meta
          with:

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

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

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc config/i18n-tasks.yml
index e09f4262b3825a38d51f4712074edbe4491ff1fb,7f879b1aa35e58c9bd5f4434f5a46d651484ec0f..a3d7baecdec7a4e0d89dc6354bb51b91e765a7e8
--- 1/config/i18n-tasks.yml
--- 2/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@@ -59,9 -59,9 +59,10 @@@ ignore_unused
    - 'errors.429'
    - 'admin.accounts.roles.*'
    - 'admin.action_logs.actions.*'
 +  - 'themes.*'
    - 'statuses.attached.*'
    - 'move_handler.carry_{mutes,blocks}_over_text'
+   - 'notification_mailer.*'
  
  ignore_inconsistent_interpolations:
    - '*.one'