summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-02-04 13:01:14 -0800
committerCorey Hulen <corey@hulen.com>2016-02-04 13:01:14 -0800
commitaf6ade338002a215ff7c7771f7fe6bbbb06f0cd7 (patch)
treea8e696aaaf8fd4e483d52f356e848aafcf2a6c25 /i18n
parentec51c31c325b3dc648a261f0e8634b6d70d7ba73 (diff)
parente45282deaa1d78d7ff3a125e9fd11e3fdc120b07 (diff)
downloadchat-af6ade338002a215ff7c7771f7fe6bbbb06f0cd7.tar.gz
chat-af6ade338002a215ff7c7771f7fe6bbbb06f0cd7.tar.bz2
chat-af6ade338002a215ff7c7771f7fe6bbbb06f0cd7.zip
Merge pull request #2073 from mattermost/ee-updates
Some general updates to EE
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json24
-rw-r--r--i18n/es.json4
2 files changed, 20 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json
index c3484d76a..88d857fce 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -612,6 +612,10 @@
"translation": "License did not save properly."
},
{
+ "id": "api.license.add_license.save_active.app_error",
+ "translation": "Active license ID did not save properly."
+ },
+ {
"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."
},
@@ -1744,6 +1748,10 @@
"translation": "Unable to get channels"
},
{
+ "id": "mattermost.load_license.find.warn",
+ "translation": "Unable to find active license"
+ },
+ {
"id": "mattermost.bulletin.subject",
"translation": "Mattermost Security Bulletin"
},
@@ -2928,6 +2936,18 @@
"translation": "We encountered an error updating the system property"
},
{
+ "id": "store.sql_license.save.app_error",
+ "translation": "We encountered an error saving the license"
+ },
+ {
+ "id": "store.sql_license.get.app_error",
+ "translation": "We encountered an error getting the license"
+ },
+ {
+ "id": "store.sql_license.get.missing.app_error",
+ "translation": "A license with that ID was not found"
+ },
+ {
"id": "store.sql_team.get.find.app_error",
"translation": "We couldn't find the existing team"
},
@@ -3216,10 +3236,6 @@
"translation": "No valid enterprise license found"
},
{
- "id": "utils.license.load_license.open_find.warn",
- "translation": "Unable to open/find license file"
- },
- {
"id": "utils.license.remove_license.unable.error",
"translation": "Unable to remove license file, err=%v"
},
diff --git a/i18n/es.json b/i18n/es.json
index 8c150ba3b..6bc1fd602 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -3204,10 +3204,6 @@
"translation": "No se encontrĂ³ una licencia enterprise vĂ¡lida"
},
{
- "id": "utils.license.load_license.open_find.warn",
- "translation": "No pudimos encontrar/abrir el achivo de licencia"
- },
- {
"id": "utils.license.remove_license.unable.error",
"translation": "No se pudo remover el archivo de la licencia, err=%v"
},