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/sr-Latn.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/sr-Latn.yml')
-rw-r--r-- | config/locales/sr-Latn.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 0d4b6581d..cd142af77 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -296,7 +296,6 @@ sr-Latn: activity: Poslednja aktivnost browser: Veb čitač browsers: - blackberry: Blekberi chrome: Hrom generic: Nepoznati veb čitač current_session: Trenutna sesija @@ -305,8 +304,6 @@ sr-Latn: platforms: adobe_air: Adobe Air-a android: Androida - blackberry: Blekberija - chrome_os: Hrom OS-a firefox_os: Fajerfoks OS-a linux: Linuksa mac: Mac-a |