diff options
author | ThibG <thib@sitedethib.com> | 2018-08-11 15:28:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-11 15:28:06 +0200 |
commit | d787bcdeb1570e4d8d67f326dadaf321a6854e06 (patch) | |
tree | fa23a187b16bf07635312a7791013aacfc2c4474 /config/locales/en.yml | |
parent | 03afc365d530e6d57754ae9dbbdbd0c56431ee02 (diff) | |
parent | 7067b64de33f9cd491e97329df266fde5fb49e42 (diff) |
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 98fa3211a..4ed868c8b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,10 +10,7 @@ en: contact: Contact contact_missing: Not set contact_unavailable: N/A - description_headline: What is %{domain}? documentation: Documentation - domain_count_after: other instances - domain_count_before: Connected to extended_description_html: | <h3>A good place for rules</h3> <p>The extended description has not been set up yet.</p> @@ -39,6 +36,7 @@ en: user_count_before: Home to what_is_mastodon: What is Mastodon? accounts: + choices_html: "%{name}'s choices:" follow: Follow followers: Followers following: Following @@ -49,6 +47,8 @@ en: nothing_here: There is nothing here! people_followed_by: People whom %{name} follows people_who_follow: People who follow %{name} + pin_errors: + following: You must be already following the person you want to endorse posts: Toots posts_with_replies: Toots and replies reserved_username: The username is reserved |