diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-16 08:30:00 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-16 08:30:00 +0100 |
| commit | 1901829f9ab20cecd0e011d73c1af1e9a9eb6c40 (patch) | |
| tree | 541e664f02e70cf3e062477a86f412e6ea3d73d8 /config/locales/gd.yml | |
| parent | eb675af0fb0d73b697e066100c4faf066c0baff7 (diff) | |
| parent | 4d85c27d1adc83aadd219767dbdc7e17b05230b0 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `config/initializers/content_security_policy.rb`: Our config file is pretty different from upstream. Upstream changed CSP directive `script-src` to include `wasm-unsafe-eval` instead of `unsafe-eval`, which we did not include. Added `wasm-unsafe-eval` to `script-src` to fix execution of the OCR web worker. - `package.json`: Upstream updated a dependency (`array-includes`) textually adjacent to a glitch-soc-only dependency (`atrament`). Updated `array-includes` as upstream did.
Diffstat (limited to 'config/locales/gd.yml')
| -rw-r--r-- | config/locales/gd.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 24dc6e7ca..034dce19d 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -634,6 +634,7 @@ gd: two: "%{count} chleachdaiche" categories: administration: Rianachd + devops: DevOps invites: Cuiridhean moderation: Maorsainneachd special: Sònraichte @@ -686,6 +687,7 @@ gd: view_audit_log_description: Leigidh seo le cleachdaichean coimhead air eachdraidh gnìomhan na rianachd air an fhrithealaiche view_dashboard: Coimhead air an deas-bhòrd view_dashboard_description: Leigidh seo le cleachdaichean an deas-bhòrd agus meatrachdan inntrigeadh + view_devops: DevOps view_devops_description: Leigidh seo le cleachdaichean na deas-bhùird aig Sidekiq is pgHero inntrigeadh title: Dreuchdan rules: @@ -1423,6 +1425,7 @@ gd: browser: Brabhsair browsers: alipay: Alipay + blackberry: BlackBerry chrome: Chrome edge: Microsoft Edge electron: Electron @@ -1436,6 +1439,7 @@ gd: phantom_js: PhantomJS qq: QQ Browser safari: Safari + uc_browser: UC Browser weibo: Weibo current_session: An seisean làithreach description: "%{browser} air %{platform}" @@ -1444,6 +1448,8 @@ gd: platforms: adobe_air: Adobe Air android: Android + blackberry: BlackBerry + chrome_os: ChromeOS firefox_os: Firefox OS ios: iOS linux: Linux |