diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:12:59 +0100 |
| commit | 193250556cb4e6b1b3e2f9bd1ac023b290176fd4 (patch) | |
| tree | 3bd6148ff028b8fe089cae9d805a7e587eaeec11 /config/locales/ca.yml | |
| parent | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (diff) | |
| parent | 681dcd3fa35e886a21853ca829ff1be7f220e83a (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
Diffstat (limited to 'config/locales/ca.yml')
| -rw-r--r-- | config/locales/ca.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 2a459dbde..f722a2515 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1405,6 +1405,7 @@ ca: confirm_remove_selected_followers: Segur que vols esborrar els seguidors seleccionats? confirm_remove_selected_follows: Segur que vols esborrar els seguits seleccionats? dormant: Inactiu + follow_failure: No es poden seguir alguns dels comptes seleccionats. follow_selected_followers: Segueix als seguidors seleccionats followers: Seguidors following: Seguint @@ -1444,15 +1445,17 @@ ca: electron: Electron firefox: Firefox generic: Navegador desconegut + huawei_browser: Navegador Huawei ie: Internet Explorer micro_messenger: MicroMessenger - nokia: Nokia S40 Ovi Browser + nokia: Navegador Nokia S40 Ovi opera: Opera otter: Otter phantom_js: PhantomJS - qq: QQ Browser + qq: Navegador QQ safari: Safari uc_browser: Navegador UC + unknown_browser: Navegador Desconegut weibo: Weibo current_session: Sessió actual description: "%{browser} de %{platform}" @@ -1465,9 +1468,10 @@ ca: chrome_os: ChromeOS firefox_os: Firefox OS ios: iOS + kai_os: KaiOS linux: Linux mac: Mac - other: plataforma desconeguda + unknown_platform: Plataforma desconeguda windows: Windows windows_mobile: Windows Mobile windows_phone: Windows Phone |