diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-01 12:43:20 +0200 |
commit | c91d9b7389c489980fe98812a8f3884b2d41e19e (patch) | |
tree | 78509567984a32411c661167e254c8645eba2919 /config/locales/simple_form.fi.yml | |
parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
parent | 5d5d1b528eda560191b2813714c9e461fda3c9d8 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
Diffstat (limited to 'config/locales/simple_form.fi.yml')
-rw-r--r-- | config/locales/simple_form.fi.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml index 190790ca5..e90bd2e0b 100644 --- a/config/locales/simple_form.fi.yml +++ b/config/locales/simple_form.fi.yml @@ -47,7 +47,6 @@ fi: setting_default_privacy: Julkaisun näkyvyys setting_default_sensitive: Merkitse media aina arkaluontoiseksi setting_delete_modal: Kysy vahvistusta ennen tuuttauksen poistamista - setting_display_sensitive_media: Näytä aina arkaluontoiseksi merkitty media setting_noindex: Jättäydy pois hakukoneindeksoinnista setting_reduce_motion: Vähennä animaatioiden liikettä setting_system_font_ui: Käytä järjestelmän oletusfonttia |