From 320fe1c39240644ce15fa2a436ac4a5591b95083 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 2 Feb 2016 08:31:37 -0500 Subject: EE Fixes --- i18n/en.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index c6d705819..7b7ee344a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3406,5 +3406,37 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" + }, + { + "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.unable_to_connect.app_error", + "translation": "Unable to connect to LDAP server" + }, + { + "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.search_ldap_server.app_error", + "translation": "Failed to search LDAP server" + }, + { + "id": "ent.ldap.do_login.user_not_registered.app_error", + "translation": "User not registered on LDAP server" + }, + { + "id": "ent.ldap.do_login.matched_to_many_users.app_error", + "translation": "Username given matches multiple users" + }, + { + "id": "ent.ldap.do_login.invalid_password.app_error", + "translation": "Invalid Password" + }, + { + "id": "ent.ldap.do_login.unable_to_create_user.app_error", + "translation": "Credentials valid but unable to create user." } ] -- cgit v1.2.3-1-g7c22 From 3d03bdf2f1af5385c2150544977fbba89650b1ee Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 2 Feb 2016 08:41:02 -0500 Subject: Added extra system-wide statistics for EE --- i18n/en.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index c6d705819..b1848e163 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3047,6 +3047,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}}" -- cgit v1.2.3-1-g7c22 From d424c9eaf12653332f15afa2cb9dfc6684fa95d8 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Tue, 2 Feb 2016 19:39:56 -0300 Subject: PLT-7: Refactoring frontend (chunk 10) - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE --- i18n/en.json | 66 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 7b7ee344a..8cbdd4993 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1647,6 +1647,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" @@ -3406,37 +3438,5 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" - }, - { - "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.unable_to_connect.app_error", - "translation": "Unable to connect to LDAP server" - }, - { - "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.search_ldap_server.app_error", - "translation": "Failed to search LDAP server" - }, - { - "id": "ent.ldap.do_login.user_not_registered.app_error", - "translation": "User not registered on LDAP server" - }, - { - "id": "ent.ldap.do_login.matched_to_many_users.app_error", - "translation": "Username given matches multiple users" - }, - { - "id": "ent.ldap.do_login.invalid_password.app_error", - "translation": "Invalid Password" - }, - { - "id": "ent.ldap.do_login.unable_to_create_user.app_error", - "translation": "Credentials valid but unable to create user." } -] +] \ No newline at end of file -- cgit v1.2.3-1-g7c22