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

Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.

1 files changed, 8 insertions, 0 deletions

diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index d1703d58e..335271f3f 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -671,18 +671,26 @@ ku:
     settings:
       about:
         manage_rules: Rêzikên rajekaran bi rê ve bibe
+        preamble: Zanyariyên kûr peyda bike li ser ka rajekar çawa tê xebitandin, çavdêrîkirin, fînansekirin.
+        rules_hint: Ji bo rêbazên ku ji bikarhênerên ve tê hêvîkirin ku pê ve girêdayî bin deverek veqetandî heye.
         title: Derbar
+      appearance:
+        preamble: Navrûya tevnê ya Mastodon kesane bike.
+        title: Xuyang
       discovery:
         trends: Rojev
       domain_blocks:
         all: Bo herkesî
         disabled: Bo tu kesî
         users: Ji bo bikarhênerên herêmî yên xwe tomar kirine
+      registrations:
+        title: Tomarkirin
       registrations_mode:
         modes:
           approved: Ji bo têketinê erêkirin pêwîste
           none: Kesek nikare tomar bibe
           open: Herkes dikare tomar bibe
+      title: Sazkariyên rajekarê
     site_uploads:
       delete: Pela barkirî jê bibe
       destroyed_msg: Barkirina malperê bi serkeftî hate jêbirin!