diff options
author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /config/locales/simple_form.en.yml | |
parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) |
Merge pull request #1193 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 82e129581..5da0cc45d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -125,6 +125,8 @@ en: setting_show_application: Disclose application used to send toots setting_skin: Skin setting_system_font_ui: Use system's default font + setting_theme: Site theme + setting_trends: Show today's trends setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_use_blurhash: Show colorful gradients for hidden media setting_use_pending_items: Slow mode |