weeeeeeeee

Merge remote-tracking branch 'upstream' into glitch

Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f

Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream

New Crowdin Translations (automated) (#27168)

Co-authored-by: GitHub Actions <noreply@github.com>

Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698

Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream

New Crowdin Translations (automated) (#27080)

Co-authored-by: GitHub Actions <noreply@github.com>

Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

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

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.

New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>

Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65

Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream

New Crowdin Translations (automated) (#26913)

Co-authored-by: GitHub Actions <noreply@github.com>

Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df

Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream

New Crowdin Translations (automated) (#26498)

Co-authored-by: GitHub Actions <noreply@github.com>

Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

New Crowdin Translations (automated) (#26373)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>