Merge 5ed70fcfec into c442589593

# Conflicts:
#	config/locales/simple_form.en.yml

app/views/settings/preferences/appearance/show.html.haml

@@ -90,7 +90,7 @@
       = ff.input :'web.display_media',
                  as: :radio_buttons,
                  collection_wrapper_tag: 'ul',
-                 collection: %w(default show_all hide_all),
+                 collection: %w(show_all default hide_all),
                  hint: false,
                  item_wrapper_tag: 'li',
                  label_method: ->(item) { t("simple_form.hints.defaults.setting_display_media_#{item}") },

config/locales/simple_form.en.yml

@@ -59,8 +59,8 @@ en:
         setting_default_quote_policy: Mentioned users are always allowed to quote. This setting will only take effect for posts created with the next Mastodon version, but you can select your preference in preparation
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
-        setting_display_media_hide_all: Always hide media
+        setting_display_media_hide_all: Hide all media
-        setting_display_media_show_all: Always show media
+        setting_display_media_show_all: Show all media
         setting_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers.
         setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details