diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
| commit | 0e74d4da592d6ac5e3c52b0f9c6b1906376aa707 (patch) | |
| tree | 66ae31bd3fd0228ebc6f92325cf43c7f02e4263d /config/locales/simple_form.sk.yml | |
| parent | 7a75bce1b43df290baf6842e2bb3d3eb0acd76d5 (diff) | |
| parent | 27f41768e8d66d97c8d705d764e534e52ea13af9 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.
Diffstat (limited to 'config/locales/simple_form.sk.yml')
| -rw-r--r-- | config/locales/simple_form.sk.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index 5ae4b2e04..bd482f778 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -111,7 +111,7 @@ sk: max_uses: Najviac možno použiť new_password: Nové heslo note: O tebe - otp_attempt: Dvoj-faktorový overovací (2FA) kód + otp_attempt: Dvoj-faktorový overovací kód password: Heslo phrase: Kľúčové slovo, alebo fráza setting_advanced_layout: Zapni pokročilé užívateľské rozhranie @@ -139,6 +139,7 @@ sk: setting_use_blurhash: Ukáž farebné prechody pre skryté médiá setting_use_pending_items: Pomalý režim severity: Závažnosť + sign_in_token_attempt: Bezpečnostný kód type: Typ importu username: Prezývka username_or_email: Prezývka, alebo email |