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

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.

1 files changed, 3 insertions, 3 deletions

diff --git a/config/locales/doorkeeper.ku.yml b/config/locales/doorkeeper.ku.yml
index c4e66aef1..fdc1c0da4 100644
--- a/config/locales/doorkeeper.ku.yml
+++ b/config/locales/doorkeeper.ku.yml
@@ -131,7 +131,7 @@ ku:
         filters: Parzûn
         follow: Pêwendî
         follows: Dişopîne
-        lists: Rêzok
+        lists: Lîste
         media: Pêvekên medya
         mutes: Bêdengkirin
         notifications: Agahdarî
@@ -163,7 +163,7 @@ ku:
       read:favourites: bijarteyên xwe bibîne
       read:filters: parzûnûn xwe bibîne
       read:follows: ên tu dişopînî bibîne
-      read:lists: rêzoka xwe bibîne
+      read:lists: lîsteyên xwe bibîne
       read:mutes: ajimêrên bêdeng kirî bibîne
       read:notifications: agahdariyên xwe bibîne
       read:reports: ragihandinên xwe bibîne
@@ -177,7 +177,7 @@ ku:
       write:favourites: şandiyên bijarte
       write:filters: parzûnan çê bike
       write:follows: kesan bişopîne
-      write:lists: rêzokan çê bike
+      write:lists: lîsteyan biafirîne
       write:media: pelên medya bar bike
       write:mutes: mirovan û axaftinan bêdeng bike
       write:notifications: agahdariyên xwe pak bike