diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-08 19:38:53 +0100 |
commit | c790ecb14d8b06c6242886ff4d2cdf06e70c5cac (patch) | |
tree | dff0bfefe5a1922c7227ea1ec0236b92e11db699 /config/locales/simple_form.en.yml | |
parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
parent | 764b89939fe2fcb8c4389738af8685949104c144 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index ca105defa..cf8f7120d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -46,8 +46,8 @@ en: setting_default_language: The language of your toots can be detected automatically, but it's not always accurate 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 all media - setting_display_media_show_all: Always show media marked as sensitive + setting_display_media_hide_all: Always hide media + setting_display_media_show_all: Always show media 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_show_application: The application you use to toot will be displayed in the detailed view of your toots |