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/es.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/es.yml')
| -rw-r--r-- | config/locales/es.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/es.yml b/config/locales/es.yml index 94478df9b..ef314275c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -608,6 +608,7 @@ es: other: "%{count} usuarios" categories: administration: Administración + devops: DevOps invites: Invitaciones moderation: Moderación special: Especial @@ -658,6 +659,7 @@ es: view_audit_log_description: Permite a los usuarios ver un historial de acciones administrativas en el servidor view_dashboard: Ver Panel de Control view_dashboard_description: Permite a los usuarios acceder al panel de control y varias métricas + view_devops: DevOps view_devops_description: Permite a los usuarios acceder a los paneles de control Sidekiq y pgHero title: Roles rules: @@ -1371,6 +1373,7 @@ es: browser: Navegador browsers: alipay: Alipay + blackberry: BlackBerry chrome: Chrome edge: Microsoft Edge electron: Electron @@ -1384,6 +1387,7 @@ es: phantom_js: PhantomJS qq: Navegador QQ safari: Safari + uc_browser: Navegador UC weibo: Weibo current_session: Sesión actual description: "%{browser} en %{platform}" @@ -1392,6 +1396,8 @@ es: platforms: adobe_air: Adobe Air android: Android + blackberry: BlackBerry + chrome_os: ChromeOS firefox_os: Firefox OS ios: iOS linux: GNU Linux |