diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 08:35:55 +0100 |
| commit | 32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch) | |
| tree | 117e952f835329eadc0095e809427f7af5be9631 /config/locales/sl.yml | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | b59ce0a60ff4f90bb16a8c3338ad37218af052b8 (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/sl.yml')
| -rw-r--r-- | config/locales/sl.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 4b196cbf0..7967723ae 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -634,7 +634,7 @@ sl: two: "%{count} uporabnika" categories: administration: Upravljanje - devops: Razvojniki + devops: DevOps invites: Povabila moderation: Moderiranje special: Posebno @@ -687,7 +687,7 @@ sl: view_audit_log_description: Omogoča, da uporabnik vidi zgodovino skrbniških opravil na strežniku view_dashboard: Pokaži nadzorno ploščo view_dashboard_description: Omogoča uporabnikom, da dostopajo do nadzorne plošče in različnih meritev - view_devops: Razvojniki + view_devops: DevOps view_devops_description: Omogoča uporabnikom, da dostopajo do nadzornih plošč Sidekiq in phHero title: Vloge rules: @@ -1449,7 +1449,7 @@ sl: adobe_air: Adobe Air android: Android blackberry: BlackBerry - chrome_os: Chrome OS + chrome_os: ChromeOS firefox_os: Firefox OS ios: iOS linux: Linux |