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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

1 files changed, 32 insertions, 0 deletions

diff --git a/config/locales/activerecord.kmr.yml b/config/locales/activerecord.kmr.yml
new file mode 100644
index 000000000..616c4966f
--- /dev/null
+++ b/config/locales/activerecord.kmr.yml
@@ -0,0 +1,32 @@
+---
+kmr:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Dîroka dawîbûnê
+        options: Hilbijark
+      user:
+        agreement: Peymana karûbarê
+        email: Navnîşana E-nameyê
+        locale: Herêm
+        password: Pêborîn
+      user/account:
+        username: Navê bikarhêneriyê
+      user/invite_request:
+        text: Sedem
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: pêdivî ye ku tenê tîp, hejmar û xêzikên jêrîn hebin
+              reserved: hatiye bikaranîn
+        status:
+          attributes:
+            reblog:
+              taken: ev nivîs berê heye jixwe
+        user:
+          attributes:
+            email:
+              blocked: dabînkerê e-nameya qedexe bi kar tîne
+              unreachable: xuya ye ku tune ye