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/io.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/io.yml')
-rw-r--r-- | config/locales/io.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/locales/io.yml b/config/locales/io.yml index 5a513f4f7..f8d233475 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -605,7 +605,6 @@ io: other: "%{count} uzanti" categories: administration: Administro - devops: Developeri invites: Inviti moderation: Jero special: Specala @@ -656,7 +655,6 @@ io: view_audit_log_description: Permisez uzanti vidar historio di administrala agi en la servilo view_dashboard: Videz chefpanelo view_dashboard_description: Permisez uzanti uzar chefpanelo e diversa opcioni - view_devops: Developeri view_devops_description: Permisez uzanti uzar chefpaneli Sidekiq e pgHero title: Roli rules: @@ -1355,7 +1353,6 @@ io: browser: Vidilo browsers: alipay: Alipay - blackberry: Blackberry chrome: Chrome edge: Microsoft Edge electron: Electron @@ -1369,7 +1366,6 @@ io: phantom_js: PhantomJS qq: Vidilo QQ safari: Safari - uc_browser: UCBrowser weibo: Weibo current_session: Nuna sesiono description: "%{browser} che %{platform}" @@ -1378,8 +1374,6 @@ io: platforms: adobe_air: Adobe Air android: Android - blackberry: Blackberry - chrome_os: Chrome OS firefox_os: Firefox OS ios: iOS linux: Linux |