diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
| commit | dbb1fce94dbd877d795898933ca344359f9b74c1 (patch) | |
| tree | 06ab5f2ae7714b41aa9e5cc19ac8c234e0f394be /config/locales/simple_form.en.yml | |
| parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
| parent | aec70b44fc551db6471c8bc5210688b154ac661f (diff) | |
Merge remote-tracking branch 'upstream/master' into gs-master
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 86c80290c..aafae48ce 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -44,6 +44,7 @@ en: setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_noindex: Opt-out of search engine indexing + setting_reduce_motion: Reduce motion in animations setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone |