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/sk.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/sk.yml')
| -rw-r--r-- | config/locales/sk.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/sk.yml b/config/locales/sk.yml index f1b021127..53ef48fe5 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -229,6 +229,7 @@ sk: destroy_domain_block_html: "%{name} odblokoval/i doménu %{target}" destroy_ip_block_html: "%{name} vymazal/a pravidlo pre IP %{target}" destroy_status_html: "%{name} zmazal/a príspevok od %{target}" + memorialize_account_html: "%{name} zmenil/a účet %{target} na pamätnú stránku" reject_appeal_html: "%{name} zamietol/la námietku moderovacieho rozhodnutia od %{target}" deleted_account: zmazaný účet empty: Žiadne záznamy nenájdené. @@ -1012,6 +1013,7 @@ sk: otter: Prehliadač Otter qq: QQ Prehliadač safari: Apple Safari + unknown_browser: Neznámy prehliadač weibo: Sina/Tencent Weibo current_session: Aktuálna sezóna description: "%{browser} na %{platform}" @@ -1021,7 +1023,7 @@ sk: ios: Apple iOS linux: GNU/Linux mac: MacOSX - other: neznáma platforma + unknown_platform: Neznáma platforma windows: Microsoft Windows revoke: Zamietni revoke_success: Sezóna úspešne zamietnutá |