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

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.

1 files changed, 41 insertions, 0 deletions

diff --git a/config/locales/doorkeeper.zgh.yml b/config/locales/doorkeeper.zgh.yml
index 827155466..394184e76 100644
--- a/config/locales/doorkeeper.zgh.yml
+++ b/config/locales/doorkeeper.zgh.yml
@@ -1 +1,42 @@
+---
 zgh:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: ⵉⵙⵏ ⵏ ⵜⵙⵏⵙⵉ
+        website: ⴰⵙⵉⵜ ⵡⵉⴱ ⵏ ⵜⵙⵏⵙⵉ
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: ⵙⵙⵓⵔⴳ
+        cancel: ⵙⵔ
+        edit: ⵙⵏⴼⵍ
+        submit: ⴰⵣⵏ
+      confirmations:
+        destroy: ⵉⵙ ⵏⵉⵜ?
+      edit:
+        title: ⵙⵏⴼⵍ ⵜⵉⵙⵏⵙⵉ
+      index:
+        application: ⵜⵉⵙⵏⵙⵉ
+        delete: ⴽⴽⵙ
+        empty: ⵓⵔ ⵖⵓⵔⴽ ⴽⵔⴰ ⵏ ⵜⵙⵏⵙⵉⵡⵉⵏ.
+        name: ⵉⵙⵎ
+        new: ⵜⵉⵙⵏⵙⵉ ⵜⴰⵎⴰⵢⵏⵓⵜ
+        title: ⵜⵉⵙⵏⵙⵉⵡⵉⵏ ⵏⵏⴽ
+      new:
+        title: ⵜⵉⵙⵏⵙⵉ ⵜⴰⵎⴰⵢⵏⵓⵜ
+      show:
+        actions: ⵜⵉⴳⴰⵡⵉⵏ
+        title: ⵜⵉⵙⵏⵙⵉ %{name}
+    authorizations:
+      buttons:
+        authorize: ⵙⵙⵓⵔⴳ
+        deny: ⴰⴳⵢ
+    authorized_applications:
+      confirmations:
+        revoke: ⵉⵙ ⵏⵉⵜ?
+      index:
+        application: ⵜⵉⵙⵏⵙⵉ
+        created_at: ⵜⴻⵜⵜⵓⵙⵓⵔⴳ
+        date_format: "%d-%m-%Y %H:%M:%S"
+        title: ⵜⵉⵙⵏⵙⵉⵡⵉⵏ ⵏⵏⴽ ⵉⵜⵜⵓⵙⵓⵔⴷⵏ