Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

2017-04-18 01:25:50 +02:00 · 2017-04-18 01:25:50 +02:00 · 57d784f1e4
commit 57d784f1e4
parent 16d50f60d1 ffb99325ca
12 changed files with 65 additions and 28 deletions
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -28,6 +28,7 @@ en:
        note: Bio
        otp_attempt: Two-factor code
        password: Password
+        setting_auto_play_gif: Auto-play animated GIFs
        setting_boost_modal: Show confirmation dialog before boosting
        setting_default_privacy: Post privacy
        severity: Severity