diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /config/locales/kk.yml | |
parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'config/locales/kk.yml')
-rw-r--r-- | config/locales/kk.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/kk.yml b/config/locales/kk.yml index f6284d191..4897bc095 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -400,9 +400,6 @@ kk: min_invite_role: disabled: Ешкім title: Allow шақырулар by - open: - desc_html: Allow anyone to create an аккаунт - title: Ашық тіркелу show_known_fediverse_at_about_page: desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show жергілікті toots. title: Show known fediverse on timeline превью |