diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-05 18:32:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-05 18:32:06 +0200 |
| commit | 9101254d0a70bc6f899c093f33300cffceb7c8ac (patch) | |
| tree | c8e9e95a36ffb2346e3168d00364e4b614bee92a /config/locales/simple_form.sk.yml | |
| parent | 6e426267a762f3cd1efa2c5fb120a13543567775 (diff) | |
| parent | 85f0e0a606905ecda1322a0f7b65d8b4ff91dd69 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream modified code that we split between multiple files due to glitch-soc's theming system. Ported those changes.
Diffstat (limited to 'config/locales/simple_form.sk.yml')
| -rw-r--r-- | config/locales/simple_form.sk.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index b8d3dd7a9..9e03d7254 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -147,7 +147,7 @@ sk: featured_tag: name: Haštag interactions: - must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenásledujú + must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenasledujú must_be_following: Blokuj oboznámenia od ľudí, ktorých nesledujem must_be_following_dm: Blokuj priame správy od ľudí, ktorých nesleduješ invite: |