diff options
author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /config/locales/simple_form.en.yml | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 8386c8cf1..9b467f84e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -163,14 +163,14 @@ en: text: Why do you want to join? notification_emails: digest: Send digest e-mails - favourite: Someone favourited your status - follow: Someone followed you - follow_request: Someone requested to follow you - mention: Someone mentioned you - pending_account: New account needs review - reblog: Someone boosted your status - report: New report is submitted - trending_tag: An unreviewed hashtag is trending + favourite: Send e-mail when someone favourites your status + follow: Send e-mail when someone follows you + follow_request: Send e-mail when someone requests to follow you + mention: Send e-mail when someone mentions you + pending_account: Send e-mail when a new account needs review + reblog: Send e-mail when someone boosts your status + report: Send e-mail when a new report is submitted + trending_tag: Send e-mail when an unreviewed hashtag is trending tag: listable: Allow this hashtag to appear in searches and on the profile directory name: Hashtag |