diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-10 17:29:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 17:29:43 +0200 |
| commit | ddf7cc1ab56b888fdf61ee8cb1456c71cd9c33c9 (patch) | |
| tree | b2e64f065128f5df5d910d7ea393ebc2575be54b /app/javascript/mastodon/locales/defaultMessages.json | |
| parent | d42a23fdbe59f5a8f2beed4201ccd6d797fbd5f4 (diff) | |
| parent | 66c0953c33d6d872e720eb8dedc5ab94bb3cd69a (diff) | |
Merge pull request #1380 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
| -rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 641699880..02399a1e6 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -142,6 +142,23 @@ { "descriptors": [ { + "defaultMessage": "{count, plural, one {{counter} Toot} other {{counter} Toots}}", + "id": "account.statuses_counter" + }, + { + "defaultMessage": "{count, plural, other {{counter} Following}}", + "id": "account.following_counter" + }, + { + "defaultMessage": "{count, plural, one {{counter} Follower} other {{counter} Followers}}", + "id": "account.followers_counter" + } + ], + "path": "app/javascript/mastodon/components/common_counter.json" + }, + { + "descriptors": [ + { "defaultMessage": "Unblock domain {domain}", "id": "account.unblock_domain" } @@ -172,8 +189,8 @@ { "descriptors": [ { - "defaultMessage": "{count} {rawCount, plural, one {person} other {people}} talking", - "id": "trends.count_by_accounts" + "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} talking", + "id": "trends.counter_by_accounts" } ], "path": "app/javascript/mastodon/components/hashtag.json" @@ -343,6 +360,23 @@ { "descriptors": [ { + "defaultMessage": "{count}K", + "id": "units.short.thousand" + }, + { + "defaultMessage": "{count}M", + "id": "units.short.million" + }, + { + "defaultMessage": "{count}B", + "id": "units.short.billion" + } + ], + "path": "app/javascript/mastodon/components/short_number.json" + }, + { + "descriptors": [ + { "defaultMessage": "Delete", "id": "status.delete" }, @@ -833,18 +867,6 @@ { "defaultMessage": "Group", "id": "account.badges.group" - }, - { - "defaultMessage": "Toots", - "id": "account.posts" - }, - { - "defaultMessage": "Follows", - "id": "account.follows" - }, - { - "defaultMessage": "Followers", - "id": "account.followers" } ], "path": "app/javascript/mastodon/features/account/components/header.json" |