Merge branch 'master' into PLT-1429

i18n/en.json

@@ -1667,6 +1667,38 @@
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Inappropriate permissions to regenerate outcoming webhook token"
   },
+  {
+    "id": "ent.ldap.do_login.bind_admin_user.app_error",
+    "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
+  },
+  {
+    "id": "ent.ldap.do_login.invalid_password.app_error",
+    "translation": "Invalid Password"
+  },
+  {
+    "id": "ent.ldap.do_login.licence_disable.app_error",
+    "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+  },
+  {
+    "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+    "translation": "Username given matches multiple users"
+  },
+  {
+    "id": "ent.ldap.do_login.search_ldap_server.app_error",
+    "translation": "Failed to search LDAP server"
+  },
+  {
+    "id": "ent.ldap.do_login.unable_to_connect.app_error",
+    "translation": "Unable to connect to LDAP server"
+  },
+  {
+    "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+    "translation": "Credentials valid but unable to create user."
+  },
+  {
+    "id": "ent.ldap.do_login.user_not_registered.app_error",
+    "translation": "User not registered on LDAP server"
+  },
   {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilites searched"
@@ -3131,6 +3163,14 @@
     "id": "store.sql_webhooks.update_outgoing.app_error",
     "translation": "We couldn't update the webhook"
   },
+  {
+    "id": "store.sql_webhooks.analytics_incoming_count.app_error",
+    "translation": "We couldn't count the incoming webhooks"
+  },
+  {
+    "id": "store.sql_webhooks.analytics_outgoing_count.app_error",
+    "translation": "We couldn't count the outgoing webhooks"
+  },
   {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
@@ -3491,4 +3531,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
   }
-]
+]

i18n/es.json

@@ -1531,6 +1531,38 @@
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
     "translation": "Permisos inapropiados para regenerar un token para el Webhook saliente"
   },
+  {
+    "id": "ent.ldap.do_login.bind_admin_user.app_error",
+    "translation": "No se pudo enlazar con el servidor LDAP. Revisa las opciones de BindUsername y BindPassword."
+  },
+  {
+    "id": "ent.ldap.do_login.invalid_password.app_error",
+    "translation": "Contraseña inválida"
+  },
+  {
+    "id": "ent.ldap.do_login.licence_disable.app_error",
+    "translation": "Las funcionalidades de LDAP están deshabilitadas con la licencia actual. Por favor contacta a un administrador del sistema acerca de mejorar la licencia enterprise."
+  },
+  {
+    "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+    "translation": "Nombre de usuario dado coincide con varios usuarios"
+  },
+  {
+    "id": "ent.ldap.do_login.search_ldap_server.app_error",
+    "translation": "Falla al buscar en el servidor LDAP"
+  },
+  {
+    "id": "ent.ldap.do_login.unable_to_connect.app_error",
+    "translation": "No se pudo conectar con el servidor LDAP"
+  },
+  {
+    "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+    "translation": "Credenciales válidas pero no se pudo crear el usuario."
+  },
+  {
+    "id": "ent.ldap.do_login.user_not_registered.app_error",
+    "translation": "Usuario no registrado en el servidor LDAP"
+  },
   {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "No pudimos encontrar el canal: %v, búsqueda realizada con estas posibilidades %v"
@@ -3287,4 +3319,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Falla al agregar el directorio a ser vigilado %v"
   }
-]
+]