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

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

1 files changed, 17 insertions, 2 deletions

diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml
index e7367a4af..513cb2a8f 100644
--- a/config/locales/activerecord.da.yml
+++ b/config/locales/activerecord.da.yml
@@ -3,15 +3,30 @@ da:
   activerecord:
     attributes:
       poll:
-        expires_at: Deadline
+        expires_at: Tidsfrist
         options: Valgmuligheder
+      user:
+        agreement: Tjenesteaftale
+        email: E-mailadresse
+        locale: Landestandard
+        password: Adgangskode
+      user/account:
+        username: Brugernavn
+      user/invite_request:
+        text: Årsag
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: kun tal, bogstaver og understreger
+              invalid: må kun indeholde cifre, bogstaver og understreger
+              reserved: er reserveret
         status:
           attributes:
             reblog:
               taken: af allerede eksisterende status
+        user:
+          attributes:
+            email:
+              blocked: bruger en ikke-tilladt e-mailudbyder
+              unreachable: synes ikke at findes