diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
| commit | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch) | |
| tree | 5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /config/locales/simple_form.en.yml | |
| parent | 136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff) | |
| parent | b8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff) | |
Merge remote-tracking branch 'origin/merge-upstream'
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 e097e80ae..c958431d3 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -45,6 +45,7 @@ en: setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot + setting_display_sensitive_media: Always show media marked as sensitive setting_favourite_modal: Show confirmation dialog before favouriting setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations |