diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:38:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 01:38:26 -0600 |
| commit | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /config/locales/simple_form.en.yml | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
| parent | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff) | |
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index aafae48ce..faf41f316 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -54,6 +54,7 @@ en: interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow + must_be_following_dm: Block direct messages from people you don't follow notification_emails: digest: Send digest e-mails favourite: Send e-mail when someone favourites your status |