summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-01-27 12:49:22 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-01-27 12:49:22 -0500
commite467241a10e75c583c4d9ee0a4c6205a1175fab1 (patch)
tree3be4e33decd0c898931b9a212b42fbe6834589f4 /i18n
parente50e26a2db6d7a4f42478b60f533a57dd33cc686 (diff)
parentc50b8661ec0c1925062d3d5584ed5899c9e7ff44 (diff)
downloadchat-e467241a10e75c583c4d9ee0a4c6205a1175fab1.tar.gz
chat-e467241a10e75c583c4d9ee0a4c6205a1175fab1.tar.bz2
chat-e467241a10e75c583c4d9ee0a4c6205a1175fab1.zip
Merge pull request #1997 from mattermost/PLT-7-server-final
PLT-7 Removing AppError ctor
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json12
1 files changed, 12 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 14a2e3148..12741fc68 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -588,6 +588,14 @@
"translation": "Could not open license file"
},
{
+ "id": "api.license.add_license.invalid_count.app_error",
+ "translation": "Unable to count total unique users."
+ },
+ {
+ "id": "api.license.add_license.unique_users.app_error",
+ "translation": "This license only supports {{.Users}} users, when your system has {{.Count}} unique users. Unique users are counted distinctly by email address. You can see total user count under Site Reports -> View Statistics."
+ },
+ {
"id": "api.license.add_license.save.app_error",
"translation": "License did not save properly."
},
@@ -1544,6 +1552,10 @@
"translation": "Could not encode profile image"
},
{
+ "id": "api.user.upload_profile_user.upload_profile.app_error",
+ "translation": "Couldn't upload profile image"
+ },
+ {
"id": "api.user.upload_profile_user.no_file.app_error",
"translation": "No file under 'image' in request"
},