diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-30 18:13:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 18:13:53 +0100 |
| commit | 7f6315841c98a1eee6cb57171a91a88f5c5343df (patch) | |
| tree | 02bc3eae22390ba267410c3e134067669ad3c805 /config/locales/simple_form.en.yml | |
| parent | 93b8aec7b7cd6af1b6ef6385cfe138fb32dee6e9 (diff) | |
| parent | b509b8812a8f08f59f3b0303f7d8e98de86e3590 (diff) | |
Merge pull request #1249 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 9b467f84e..8386c8cf1 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: 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 + 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 tag: listable: Allow this hashtag to appear in searches and on the profile directory name: Hashtag |