From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001 From: matthew_swift <matthew_swift@localhost> Date: Wed, 26 Sep 2007 12:21:02 +0000 Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208. --- opends/src/messages/messages/protocol.properties | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/opends/src/messages/messages/protocol.properties b/opends/src/messages/messages/protocol.properties index 14e6455..2d40d08 100644 --- a/opends/src/messages/messages/protocol.properties +++ b/opends/src/messages/messages/protocol.properties @@ -801,7 +801,7 @@ clients that are not allowed to establish connections to this connection \ handler: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_ALLOW_LDAPV2_236=An unexpected \ - error occurred while processing the ds-cfg-allow-ldapv2 attribute in \ + error occurred while processing the ds-cfg-allow-ldap-v2 attribute in \ configuration entry %s, which is used to indicate whether LDAPv2 clients will \ be allowed to access this connection handler: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_NUM_REQUEST_HANDLERS_237=An \ @@ -813,11 +813,11 @@ attribute in configuration entry %s, which is used to indicate whether to \ send a notice of disconnection message to rejected client connections: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_USE_TCP_KEEPALIVE_239=An \ - unexpected error occurred while processing the ds-cfg-use-tcp-keepalive \ + unexpected error occurred while processing the ds-cfg-use-tcp-keep-alive \ attribute in configuration entry %s, which is used to periodically send TCP \ Keep-Alive messages over idle connections: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_USE_TCP_NODELAY_240=An \ - unexpected error occurred while processing the ds-cfg-use-tcp-nodelay \ + unexpected error occurred while processing the ds-cfg-use-tcp-no-delay \ attribute in configuration entry %s, which is used to determine whether to \ immediately flush responses to clients: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_ALLOW_REUSE_ADDRESS_241=An \ @@ -861,16 +861,16 @@ INFO_LDAP_CONNHANDLER_NEW_DENIED_CLIENTS_251=A new set of denied client \ address masks has been applied for configuration entry %s INFO_LDAP_CONNHANDLER_NEW_ALLOW_LDAPV2_252=The value of the \ - ds-cfg-allow-ldapv2 attribute has been updated to %s in configuration entry \ + ds-cfg-allow-ldap-v2 attribute has been updated to %s in configuration entry \ %s INFO_LDAP_CONNHANDLER_NEW_SEND_REJECTION_NOTICE_253=The value of the \ ds-cfg-send-rejection-notice attribute has been updated to %s in \ configuration entry %s INFO_LDAP_CONNHANDLER_NEW_USE_KEEPALIVE_254=The value of the \ - ds-cfg-use-tcp-keepalive attribute has been updated to %s in configuration \ + ds-cfg-use-tcp-keep-alive attribute has been updated to %s in configuration \ entry %s INFO_LDAP_CONNHANDLER_NEW_USE_TCP_NODELAY_255=The value of the \ - ds-cfg-use-tcp-nodelay attribute has been updated to %s in configuration \ + ds-cfg-use-tcp-no-delay attribute has been updated to %s in configuration \ entry %s INFO_LDAP_CONNHANDLER_NEW_MAX_REQUEST_SIZE_256=The value of the \ ds-cfg-max-request-size attribute has been updated to %s in configuration \ @@ -907,7 +907,7 @@ communication. Changes to this configuration attribute will take immediately \ but will only impact new SSL/TLS-based sessions created after the change SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_SSL_PROTOCOLS_266=An unexpected \ - error occurred while processing the ds-cfg-ssl-protocols attribute in \ + error occurred while processing the ds-cfg-ssl-protocol attribute in \ configuration entry %s, which is used to specify the names of the SSL \ protocols to allow for SSL/TLS sessions: %s INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_ENABLED_CIPHERS_267=Specifies the names \ @@ -915,14 +915,14 @@ communication. Changes to this configuration attribute will take immediately \ but will only impact new SSL/TLS-based sessions created after the change SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_SSL_CIPHERS_268=An unexpected \ - error occurred while processing the ds-cfg-ssl-protocols attribute in \ + error occurred while processing the ds-cfg-ssl-protocol attribute in \ configuration entry %s, which is used to specify the names of the SSL cipher \ suites to allow for SSL/TLS sessions: %s INFO_LDAP_CONNHANDLER_NEW_SSL_PROTOCOLS_269=The value of the \ - ds-cfg-ssl-protocols attribute has been updated to %s in configuration entry \ + ds-cfg-ssl-protocol attribute has been updated to %s in configuration entry \ %s INFO_LDAP_CONNHANDLER_NEW_SSL_CIPHERS_270=The value of the \ - ds-cfg-ssl-cipher-suites attribute has been updated to %s in configuration \ + ds-cfg-ssl-cipher-suite attribute has been updated to %s in configuration \ entry %s MILD_ERR_LDAP_TLS_EXISTING_SECURITY_PROVIDER_271=The TLS connection security \ provider cannot be enabled on this client connection because it is already \ @@ -1262,10 +1262,10 @@ immediately, but only for subsequent attempts to access the key manager \ provider for associated client connections SEVERE_ERR_LDAP_CONNHANDLER_INVALID_KEYMANAGER_DN_391=Configuration attribute \ - ds-cfg-key-manager-provider-dn of configuration entry %s has an invalid value \ + ds-cfg-key-manager-provider of configuration entry %s has an invalid value \ %s which does not reference an enabled key manager provider SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_KEYMANAGER_DN_392=An error \ - occurred while processing the ds-cfg-key-manager-provider-dn attribute in \ + occurred while processing the ds-cfg-key-manager-provider attribute in \ configuration entry %s, which is used to specify the key manager provider for \ use with the LDAP connection handler: %s INFO_LDAP_CONNHANDLER_DESCRIPTION_TRUSTMANAGER_DN_393=Specifies the DN of the \ @@ -1274,28 +1274,28 @@ immediately, but only for subsequent attempts to access the trust manager \ provider for associated client connections SEVERE_ERR_LDAP_CONNHANDLER_INVALID_TRUSTMANAGER_DN_394=Configuration \ - attribute ds-cfg-trust-manager-provider-dn of configuration entry %s has an \ + attribute ds-cfg-trust-manager-provider of configuration entry %s has an \ invalid value %s which does not reference an enabled trust manager provider SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_TRUSTMANAGER_DN_395=An error \ - occurred while processing the ds-cfg-trust-manager-provider-dn attribute in \ + occurred while processing the ds-cfg-trust-manager-provider attribute in \ configuration entry %s, which is used to specify the trust manager provider \ for use with the LDAP connection handler: %s INFO_LDAP_CONNHANDLER_NEW_KEYMANAGER_DN_396=The value of the \ - ds-cfg-key-manager-provider-dn attribute has been updated to %s in \ + ds-cfg-key-manager-provider attribute has been updated to %s in \ configuration entry %s INFO_LDAP_CONNHANDLER_NEW_TRUSTMANAGER_DN_397=The value of the \ - ds-cfg-trust-manager-provider-dn attribute has been updated to %s in \ + ds-cfg-trust-manager-provider attribute has been updated to %s in \ configuration entry %s INFO_JMX_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN_398=Specifies the DN of the \ key manager provider that the connection handler should use when accepting \ SSL-based connections or performing StartTLS negotiation. Changes to this \ configuration attribute will take effect immediately SEVERE_ERR_JMX_CONNHANDLER_INVALID_KEYMANAGER_DN_399=An error occurred while \ - processing the ds-cfg-key-manager-provider-dn attribute in configuration \ + processing the ds-cfg-key-manager-provider attribute in configuration \ entry %s, because the provided key manager DN %s does not refer to an enabled \ key manager provider SEVERE_ERR_JMX_CONNHANDLER_CANNOT_DETERMINE_KEYMANAGER_DN_400=An unexpected \ - error occurred while processing the ds-cfg-key-manager-provider-dn attribute \ + error occurred while processing the ds-cfg-key-manager-provider attribute \ in configuration entry %s, which is used to specify the DN of the key manager \ provider to use for accepting SSL/TLS connections: %s MILD_ERR_LDAP_CONNHANDLER_CANNOT_SET_SECURITY_PROVIDER_401=An error occurred \ -- Gitblit v1.10.0