diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /config/locales/sk.yml | |
parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'config/locales/sk.yml')
-rw-r--r-- | config/locales/sk.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/sk.yml b/config/locales/sk.yml index ef212f50e..31f735e19 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -108,6 +108,7 @@ sk: followers: Sledujúci followers_url: URL sledujúcich follows: Sledovania + header: Hlavička inbox_url: URL prijatých správ ip: IP location: @@ -138,6 +139,7 @@ sk: push_subscription_expires: PuSH odoberanie expiruje redownload: Obnoviť avatar remove_avatar: Odstrániť avatár + remove_header: Odstráň hlavičku resend_confirmation: already_confirmed: Tento užívateľ už je potvrdený send: Znovu odoslať potvrdzovací email @@ -156,7 +158,6 @@ sk: shared_inbox_url: URL zdieľanej schránky show: created_reports: Reportované týmto používateľom - report: report targeted_reports: Nahlásenia pre tento účet silence: Stíšiť silenced: Utíšení |