diff options
author | ThibG <thib@sitedethib.com> | 2018-05-16 23:10:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 23:10:12 +0200 |
commit | 4bf43e6f3e93643d989a2872763b41505fab2206 (patch) | |
tree | e1b781fe4fae9d02284e5e836338cc598431413f /config/locales/simple_form.en.yml | |
parent | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (diff) | |
parent | 78ac246b877072bb5f94da34d29612fafde3a8ae (diff) |
Merge pull request #486 from ThibG/glitch-soc/merge-upstream
Merge 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, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 16ecc7c9e..c0c3b4b85 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -4,7 +4,7 @@ en: hints: defaults: avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px - bot: Warns people that the account does not represent a person + bot: This account mainly performs automated actions and might not be monitored 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 |