diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-17 16:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 16:56:10 +0200 |
| commit | e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791 (patch) | |
| tree | 21f25d570ea6f57d58c24eec6e65aab8b96f816b /config/locales/simple_form.en.yml | |
| parent | 5ccd011cc3bafc00a557dabbb47da004f3d4a381 (diff) | |
| parent | e91bf82083ac390a0cf229d8e94fa412fdec57ff (diff) | |
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
Cherry-pick changes from upstream
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 b35b9b6ec..3db07cb8b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -40,6 +40,7 @@ en: setting_show_application: The application you use to toot will be displayed in the detailed view of your toots setting_skin: Reskins the selected Mastodon flavour setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details + setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word featured_tag: @@ -122,6 +123,7 @@ en: setting_system_font_ui: Use system's default font setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_use_blurhash: Show colorful gradients for hidden media + setting_use_pending_items: Slow mode severity: Severity type: Import type username: Username |