diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
| commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
| tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /config/locales/simple_form.en.yml | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) | |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge 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 |