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.en.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.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 3ef992ef0..b25ff26f4 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -25,6 +25,9 @@ en: phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. setting_default_language: The language of your toots can be detected automatically, but it's not always accurate + setting_display_media_default: Hide media marked as sensitive + setting_display_media_hide_all: Always hide all media + setting_display_media_show_all: Always show media marked as sensitive setting_hide_network: Who you follow and who follows you will not be shown on your profile setting_noindex: Affects your public profile and status pages setting_skin: Reskins the selected Mastodon flavour @@ -72,7 +75,11 @@ 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_display_media: Media display + setting_display_media_default: Default + setting_display_media_hide_all: Hide all + setting_display_media_show_all: Show all + setting_expand_spoilers: Always expand toots marked with content warnings setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only) setting_hide_network: Hide your network setting_noindex: Opt-out of search engine indexing |