diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/sk.yml | |
parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/sk.yml')
-rw-r--r-- | config/locales/sk.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/locales/sk.yml b/config/locales/sk.yml index b6e3e9cbd..b444122ea 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -26,7 +26,7 @@ sk: within_reach_title: Stále v dosahu generic_description: "%{domain} je jeden server v sieti" hosted_on: Mastodon hostovaný na %{domain} - learn_more: Dozvedieť sa viac + learn_more: Zisti viac other_instances: Zoznam ďalších inštancií source_code: Zdrojový kód status_count_after: príspevkov @@ -435,10 +435,11 @@ sk: about_x_years: "%{count}rok" almost_x_years: "%{count}rok" half_a_minute: Práve teraz + less_than_x_minutes: "%{count}min" less_than_x_seconds: Práve teraz over_x_years: "%{count}rok" x_days: "%{count}dni" - x_minutes: '' + x_minutes: "%{count}min" x_months: "%{count}mesiace" x_seconds: "%{count}sek" deletes: @@ -516,6 +517,7 @@ sk: '86400': 1 deň expires_in_prompt: Nikdy generate: Vygeneruj + invited_by: 'Bol/a si pozvan/á užívateľom:' max_uses: few: "%{count} použitia" one: jedno použitie @@ -660,6 +662,7 @@ sk: disallowed_hashtags: one: 'obsahuje nepovolený haštag: %{tags}' other: 'obsahuje nepovolené haštagy: %{tags}' + language_detection: Zisti jazyk automaticky open_in_web: Otvor v okne prehliadača over_character_limit: limit počtu %{max} znakov bol presiahnutý pin_errors: |