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/ast.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/ast.yml')
| -rw-r--r-- | config/locales/ast.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 18aa48947..acbdeb655 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -325,7 +325,6 @@ ast: browser: Restolador browsers: alipay: Alipay - blackberry: Blackberry chrome: Chrome edge: Microsoft Edge electron: Electron @@ -336,7 +335,6 @@ ast: opera: Opera otter: Otter phantom_js: PhantomJS - uc_browser: UCBrowser weibo: Weibo current_session: Sesión actual description: "%{browser} en %{platform}" @@ -344,8 +342,6 @@ ast: platforms: adobe_air: Adobe Air android: Android - blackberry: Blackberry - chrome_os: Chrome OS firefox_os: Firefox OS ios: iOS linux: GNU/Linux |