diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-10 16:51:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-10 16:51:51 +0200 |
| commit | 50544627592db864cfe9c7ddb138b299344f0d44 (patch) | |
| tree | ce1d528ae605cc418303fb3268d0ccb2164b380e /app/javascript/mastodon/locales/en.json | |
| parent | d42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff) | |
| parent | a2abe35e0f55c96e8b8525ee25089751859d14c2 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/locales/en.json')
| -rw-r--r-- | app/javascript/mastodon/locales/en.json | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 77b9a4f62..cdd147191 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -15,7 +15,8 @@ "account.follow": "Follow", "account.followers": "Followers", "account.followers.empty": "No one follows this user yet.", - "account.follows": "Follows", + "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}", + "account.following_counter": "{count, plural, other {{counter} Following}}", "account.follows.empty": "This user doesn't follow anyone yet.", "account.follows_you": "Follows you", "account.hide_reblogs": "Hide boosts from @{name}", @@ -35,6 +36,7 @@ "account.requested": "Awaiting approval. Click to cancel follow request", "account.share": "Share @{name}'s profile", "account.show_reblogs": "Show boosts from @{name}", + "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}", "account.unblock": "Unblock @{name}", "account.unblock_domain": "Unblock domain {domain}", "account.unendorse": "Don't feature on profile", @@ -426,9 +428,12 @@ "timeline_hint.resources.followers": "Followers", "timeline_hint.resources.follows": "Follows", "timeline_hint.resources.statuses": "Older toots", - "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking", + "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking", "trends.trending_now": "Trending now", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", + "units.short.billion": "{count}B", + "units.short.million": "{count}M", + "units.short.thousand": "{count}K", "upload_area.title": "Drag & drop to upload", "upload_button.label": "Add images, a video or an audio file", "upload_error.limit": "File upload limit exceeded.", |