summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-04-01 12:04:40 -0400
committerChristopher Speller <crspeller@gmail.com>2016-04-01 12:04:40 -0400
commit9241f799dd59db14dd06b0536db9cb820b1b60db (patch)
tree93b07af94b7a3e086f6921b87688736bc9979d6e /i18n
parent763bfc780ae7dbdda78a0e40295d30844536abe3 (diff)
parent494d09a81eddec88ad48c7067d0b47a41cf7ed8b (diff)
downloadchat-9241f799dd59db14dd06b0536db9cb820b1b60db.tar.gz
chat-9241f799dd59db14dd06b0536db9cb820b1b60db.tar.bz2
chat-9241f799dd59db14dd06b0536db9cb820b1b60db.zip
Merge pull request #2609 from mattermost/plt-2311
PLT-2311 Update tutorial channel names to reflect actual display names
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json2
-rw-r--r--i18n/es.json4
-rw-r--r--i18n/fr.json4
-rw-r--r--i18n/pt.json4
4 files changed, 1 insertions, 13 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 821f5c946..52e4fca8a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1449,7 +1449,7 @@
},
{
"id": "api.user.ldap_to_email.not_ldap_account.app_error",
- "translation": "This user account does use LDAP"
+ "translation": "This user account does not use LDAP"
},
{
"id": "api.user.login.blank_pwd.app_error",
diff --git a/i18n/es.json b/i18n/es.json
index 019af088e..52654f4af 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1448,10 +1448,6 @@
"translation": "LDAP no está disponible en este servidor"
},
{
- "id": "api.user.ldap_to_email.not_ldap_account.app_error",
- "translation": "La cuenta de este usuario utiliza LDAP"
- },
- {
"id": "api.user.login.blank_pwd.app_error",
"translation": "El campo de contraseña no debe quedar en blanco"
},
diff --git a/i18n/fr.json b/i18n/fr.json
index c52e17af8..984c1ef93 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1540,10 +1540,6 @@
"translation": "LDAP n'est pas disponible sur ce serveur"
},
{
- "id": "api.user.ldap_to_email.not_ldap_account.app_error",
- "translation": "Ce compte utilisateur utilise LDAP"
- },
- {
"id": "api.user.ldap_to_email.not_available.app_error",
"translation": "LDAP n'est pas disponible sur ce serveur"
},
diff --git a/i18n/pt.json b/i18n/pt.json
index 476b3150f..631198e1f 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1452,10 +1452,6 @@
"translation": "LDAP não está disponível neste servidor"
},
{
- "id": "api.user.ldap_to_email.not_ldap_account.app_error",
- "translation": "Está conta de usuário não utiliza LDAP"
- },
- {
"id": "api.user.login.blank_pwd.app_error",
"translation": "Campo senha não pode estar em branco"
},