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, 16 insertions, 1 deletions

diff --git a/config/locales/activerecord.is.yml b/config/locales/activerecord.is.yml
index b5d656130..cdd803318 100644
--- a/config/locales/activerecord.is.yml
+++ b/config/locales/activerecord.is.yml
@@ -5,13 +5,28 @@ is:
       poll:
         expires_at: Lokadagur
         options: Valkostir
+      user:
+        agreement: Þjónustuskilmálar
+        email: Tölvupóstfang
+        locale: Staðfærsla
+        password: Lykilorð
+      user/account:
+        username: Notandanafn
+      user/invite_request:
+        text: Ástæða
     errors:
       models:
         account:
           attributes:
             username:
-              invalid: aðeins bókstafir, tölur og undirstrik
+              invalid: má aðeins innihalda bókstafi, tölur og undirstrik
+              reserved: er frátekið
         status:
           attributes:
             reblog:
               taken: af stöðu er þegar fyrirliggjandi
+        user:
+          attributes:
+            email:
+              blocked: notar óleyfilega tölvupóstþjónustu
+              unreachable: virðist ekki vera til