summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-02-14 00:46:43 -0500
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-02-14 00:46:43 -0500
commit963150b6ec81b2fc4118ab4291aa4b93866e4475 (patch)
tree34b8d49619a7d1a5cc8582517482f10f752efd6d /i18n/en.json
parent63d45a0ada41e8491ff218822dfa86551cb5e946 (diff)
parentafa7f70f53f6db6afbe7a00bc38aa8ce39352f7e (diff)
downloadchat-963150b6ec81b2fc4118ab4291aa4b93866e4475.tar.gz
chat-963150b6ec81b2fc4118ab4291aa4b93866e4475.tar.bz2
chat-963150b6ec81b2fc4118ab4291aa4b93866e4475.zip
Merge branch 'jespino-XYZ-111' into release-4.7
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 4365a44fb..cecec7e1b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -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"
},