diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 17:30:42 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-27 18:09:28 +0200 |
| commit | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (patch) | |
| tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /config/locales/en.yml | |
| parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
| parent | 81697997a3fdbb481202a179908958198baaf0dd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 2dbb82b9a..b185ae28a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -43,7 +43,9 @@ en: accounts: choices_html: "%{name}'s choices:" follow: Follow - followers: Followers + followers: + one: Follower + other: Followers following: Following joined: Joined %{date} media: Media @@ -54,7 +56,10 @@ en: people_who_follow: People who follow %{name} pin_errors: following: You must be already following the person you want to endorse - posts: Toots + posts: + one: Toot + other: Toots + posts_tab_heading: Toots posts_with_replies: Toots and replies reserved_username: The username is reserved roles: |