diff options
author | ThibG <thib@sitedethib.com> | 2019-02-12 20:29:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 20:29:55 +0100 |
commit | a3ba28eb17d75af37396359e8c37675e06605ccf (patch) | |
tree | 20d81ffc7b01b132e1683685a0176ede6374c13c /config/locales/simple_form.en.yml | |
parent | b89e003c4d049d64d2d4015357b8b931370bc5f0 (diff) | |
parent | b47a53f90299a1fb52423aacbc0c23427e2eb132 (diff) |
Merge pull request #913 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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 674abff63..ad9ae7417 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -37,8 +37,10 @@ en: setting_skin: Reskins the selected Mastodon flavour username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word + featured_tag: + name: 'You might want to use one of these:' imports: - data: CSV file exported from another Mastodon instance + data: CSV file exported from another Mastodon server sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: @@ -112,6 +114,8 @@ en: username: Username username_or_email: Username or Email whole_word: Whole word + featured_tag: + name: Hashtag interactions: must_be_follower: Block notifications from non-followers must_be_following: Block notifications from people you don't follow |