diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /config/locales/simple_form.en.yml | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 756f6b119..aa6940e91 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -13,7 +13,6 @@ en: note: one: <span class="note-counter">1</span> character left other: <span class="note-counter">%{count}</span> characters left - setting_flavour: Affects how Mastodon looks when you're logged in from any device setting_noindex: Affects your public profile and status pages setting_skin: Reskins the selected Mastodon flavour imports: @@ -46,7 +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_flavour: Flavour + setting_favourite_modal: Show confirmation dialog before favouriting setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_skin: Skin |