diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 12:17:22 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 12:17:22 +0000 |
| commit | e553905ba7915c4b20cbe35f7a3c7e1d8ca4c913 (patch) | |
| tree | b369353417ce808523ab50295eaec0a1314a1a7a /config/locales/simple_form.en.yml | |
| parent | 447d7e612753d69f043e08ebb228b21e411c8b4a (diff) | |
| parent | c1a41181c52216de9ebeecebf418e6d50172139b (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index c958431d3..7ffa59f46 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -3,7 +3,7 @@ en: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px + avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence display_name: one: <span class="name-counter">1</span> character left |