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/ru.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/ru.yml')
| -rw-r--r-- | config/locales/ru.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 4ad5fc83a..aa656b927 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -619,6 +619,7 @@ ru: other: "%{count} пользователей" categories: administration: Администрация + devops: DevOps invites: Приглашения moderation: Модерация special: Особые @@ -652,6 +653,7 @@ ru: view_audit_log: Посмотреть журнал аудита view_audit_log_description: Позволяет пользователям просматривать историю административных действий на сервере view_dashboard: Открыть панель управления + view_devops: DevOps title: Роли rules: add_new: Добавить правило @@ -1311,6 +1313,7 @@ ru: browser: Браузер browsers: alipay: Alipay + blackberry: Blackberry chrome: Chrome edge: Microsoft Edge electron: Electron @@ -1324,6 +1327,7 @@ ru: phantom_js: PhantomJS qq: QQ Browser safari: Safari + uc_browser: UC браузер weibo: Weibo current_session: Текущая сессия description: "%{browser} на %{platform}" @@ -1332,6 +1336,8 @@ ru: platforms: adobe_air: Adobe Air android: Android + blackberry: Blackberry + chrome_os: ChromeOS firefox_os: Firefox OS ios: iOS linux: Linux |