diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
| commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
| tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /config/locales/simple_form.en.yml | |
| parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
| parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) | |
Merge changes from upstream with the CSS reload fix
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 476ccc773..536bb06e1 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -42,6 +42,7 @@ en: setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_system_font_ui: Use system's default font + setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_noindex: Opt-out of search engine indexing severity: Severity type: Import type |