diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
| commit | 88d693a950fad663016a84407c90b8de280c0252 (patch) | |
| tree | 571d01753c39f320b3634eae5723b76904d6bd48 /i18n/en.json | |
| parent | 3fef21e350737c235e6dfc2d9f35311d65290c3e (diff) | |
| parent | 82209b9452f3241c879591bd29a163538cb70b5e (diff) | |
| download | chat-88d693a950fad663016a84407c90b8de280c0252.tar.gz chat-88d693a950fad663016a84407c90b8de280c0252.tar.bz2 chat-88d693a950fad663016a84407c90b8de280c0252.zip | |
Merge branch 'release-4.7' into icu753
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json index b31a6bd09..3f5d0b4d3 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2703,11 +2703,11 @@ "translation": "The signup link has expired" }, { - "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", + "id": "api.user.create_user.signup_link_invalid.app_error", "translation": "The signup link does not appear to be valid" }, { - "id": "api.user.create_user.signup_link_invalid.app_error", + "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", "translation": "The signup link does not appear to be valid" }, { @@ -3127,6 +3127,10 @@ "translation": "Invalid {{.Name}} parameter" }, { + "id": "app.team.join_user_to_team.max_accounts.app_error", + "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." + }, + { "id": "app.channel.create_channel.no_team_id.app_error", "translation": "Must specify the team ID to create a channel" }, |