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

34 files changed, 12 insertions, 60 deletions

diff --git a/config/locales/af.yml b/config/locales/af.yml
index dadb61c75..ed8661991 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -96,9 +96,7 @@ af:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     bookmarks: Boekmerke
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 5a40fad8f..1f2550d29 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -232,9 +232,7 @@ bn:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   verification:
     verification: সত্যতা নির্ধারণ
diff --git a/config/locales/br.yml b/config/locales/br.yml
index c53fac24f..6be93d292 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -342,9 +342,7 @@ br:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     archive_takeout:
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index adb1ccc2a..2709636c9 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -6,7 +6,5 @@ bs:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/csb.yml b/config/locales/csb.yml
index 0d4e4b36b..e2a6dd4de 100644
--- a/config/locales/csb.yml
+++ b/config/locales/csb.yml
@@ -6,7 +6,5 @@ csb:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b02e00bf0..496d240a0 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -190,9 +190,7 @@ en-GB:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   sessions:
     browsers:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 7f1a2b6fe..073f2bad0 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -369,9 +369,7 @@ ga:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     archive_takeout:
@@ -437,6 +435,8 @@ ga:
     prev: Ceann roimhe seo
   preferences:
     other: Eile
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   relationships:
     follow_selected_followers: Lean leantóirí roghnaithe
     followers: Leantóirí
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 7678edc38..50fae82bd 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -6,7 +6,5 @@ hi:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 7a9ee2dc3..056371226 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -81,9 +81,7 @@ hr:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     archive_takeout:
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index df7dd3e2e..de995c5b5 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -539,7 +539,6 @@ hy:
     '404': Էջը, որը փնտրում ես գոյութիւն չունի։
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Չափազանց շատ հարցումներ
     '500':
       title: Էջը ճիշտ չէ
diff --git a/config/locales/ig.yml b/config/locales/ig.yml
index c32706518..645939638 100644
--- a/config/locales/ig.yml
+++ b/config/locales/ig.yml
@@ -6,7 +6,5 @@ ig:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 41a51a8b0..ff08987d9 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -394,6 +394,8 @@ ka:
     prev: წინა
   preferences:
     other: სხვა
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   remote_follow:
     missing_resource: საჭირო გადამისამართების ურლ თქვენი ანგარიშისთვის ვერ მოიძებნა
   sessions:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 235aad5b3..7f77b2be7 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -508,7 +508,6 @@ kab:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
     '500':
       title: Asebter-ayi d arameγtu
@@ -630,6 +629,8 @@ kab:
     prev: Win iɛeddan
   preferences:
     other: Wiyaḍ
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   privacy_policy:
     title: Tasertit tabaḍnit
   relationships:
diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index d44eb868f..998f613ef 100644
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -6,7 +6,5 @@ kn:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/kw.yml b/config/locales/kw.yml
index 7683e3042..4085046cf 100644
--- a/config/locales/kw.yml
+++ b/config/locales/kw.yml
@@ -11,9 +11,7 @@ kw:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   settings:
     account: Akont
diff --git a/config/locales/la.yml b/config/locales/la.yml
index 0a4bec9ee..244938ef6 100644
--- a/config/locales/la.yml
+++ b/config/locales/la.yml
@@ -6,7 +6,5 @@ la:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 58d0ae4f4..28c941959 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -426,6 +426,8 @@ lt:
     prev: Ankstesnis
   preferences:
     other: Kita
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   remote_follow:
     missing_resource: Jūsų paskyros nukreipimo URL nerasta
   scheduled_statuses:
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index b538272de..9504dc972 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -6,7 +6,5 @@ mk:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index d5442c96c..ae3991145 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -87,9 +87,7 @@ ml:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   filters:
     contexts:
diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 9d7609ea4..161e5e571 100644
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -6,7 +6,5 @@ mr:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 848580f0c..1fc856c64 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -827,7 +827,6 @@ ms:
     '422':
       title: Pengesahan keselamatan gagal
     '429': Terlalu banyak permintaan
-    '500': 
     '503': Halaman tidak dapat disampaikan kerana kegagalan pelayan sementara.
   exports:
     archive_takeout:
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 399105ce0..ae5a59e09 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -6,7 +6,5 @@ my:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 0fc957a99..1a9193796 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -6,7 +6,5 @@ pa:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/sa.yml b/config/locales/sa.yml
index 229e4568c..f8c64a785 100644
--- a/config/locales/sa.yml
+++ b/config/locales/sa.yml
@@ -6,7 +6,5 @@ sa:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index dc62f2220..1a4a2b7b1 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -209,7 +209,6 @@ sr-Latn:
     '404': Strana koju ste tražili ne postoji.
     '406': This page is not available in the requested format.
     '410': Strana koju ste tražili više ne postoji.
-    '422': 
     '429': Uspored
     '500':
       content: Izvinjavamo se, nešto je pošlo po zlu sa ove strane.
@@ -289,6 +288,8 @@ sr-Latn:
     prev: Prethodni
   preferences:
     other: Ostali
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   remote_follow:
     missing_resource: Ne mogu da nađem zahtevanu adresu preusmeravanja za Vaš nalog
   sessions:
diff --git a/config/locales/szl.yml b/config/locales/szl.yml
index 4359f4d61..2e059c51a 100644
--- a/config/locales/szl.yml
+++ b/config/locales/szl.yml
@@ -6,7 +6,5 @@ szl:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index d691c0ec8..2d2bce86a 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -203,9 +203,7 @@ ta:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   filters:
     index:
diff --git a/config/locales/tai.yml b/config/locales/tai.yml
index 3b22e9999..f347ac620 100644
--- a/config/locales/tai.yml
+++ b/config/locales/tai.yml
@@ -6,7 +6,5 @@ tai:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/te.yml b/config/locales/te.yml
index d325d0fba..e3b3f97ab 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -76,7 +76,5 @@ te:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index b2986602d..01b491b11 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -136,9 +136,7 @@ tt:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     archive_takeout:
@@ -183,6 +181,8 @@ tt:
     truncate: "…"
   preferences:
     other: Башка
+    posting_defaults: Posting defaults
+    public_timelines: Public timelines
   relationships:
     following: Язылгансыз
   sessions:
diff --git a/config/locales/ug.yml b/config/locales/ug.yml
index 779d4d226..ea5bdb5c8 100644
--- a/config/locales/ug.yml
+++ b/config/locales/ug.yml
@@ -6,7 +6,5 @@ ug:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 31c2292bb..a5ae83fd4 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -6,7 +6,5 @@ ur:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/uz.yml b/config/locales/uz.yml
index 94260c666..caed654ec 100644
--- a/config/locales/uz.yml
+++ b/config/locales/uz.yml
@@ -45,7 +45,5 @@ uz:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index d29daf18c..4750a6cee 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -89,9 +89,7 @@ zgh:
     '404': The page you are looking for isn't here.
     '406': This page is not available in the requested format.
     '410': The page you were looking for doesn't exist here anymore.
-    '422': 
     '429': Too many requests
-    '500': 
     '503': The page could not be served due to a temporary server failure.
   exports:
     archive_takeout: