about summary refs log tree commit diff
path: root/config/locales/el.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-14 08:35:55 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-14 08:35:55 +0100
commit32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch)
tree117e952f835329eadc0095e809427f7af5be9631 /config/locales/el.yml
parent81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff)
parentb59ce0a60ff4f90bb16a8c3338ad37218af052b8 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
Diffstat (limited to 'config/locales/el.yml')
-rw-r--r--config/locales/el.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 499347866..20d74a6a4 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -438,6 +438,8 @@ el:
         devops: Devops
         invites: Προσκλήσεις
       delete: Διαγραφή
+      privileges:
+        view_devops: DevOps
     rules:
       add_new: Προσθήκη κανόνα
       delete: Διαγραφή
@@ -936,11 +938,15 @@ el:
     activity: Τελευταία δραστηριότητα
     browser: Φυλλομετρητής (Browser)
     browsers:
+      blackberry: BlackBerry
       generic: Άγνωστος φυλλομετρητής
+      uc_browser: UC Browser
     current_session: Τρέχουσα σύνδεση
     description: "%{browser} σε %{platform}"
     explanation: Αυτοί είναι οι φυλλομετρητές (browsers) που είναι συνδεδεμένοι στον λογαριασμό σου στο Mastodon αυτή τη στιγμή.
     platforms:
+      blackberry: BlackBerry
+      chrome_os: ChromeOS
       mac: Mac
       other: άγνωστη πλατφόρμα
     revoke: Ανακάλεσε