From 03889ce7e5a3006559920ea368b7378b6fb730de Mon Sep 17 00:00:00 2001 From: lfrost <lfrost@localhost> Date: Mon, 26 Nov 2007 08:50:01 +0000 Subject: [PATCH] Fix for Issue #1961 (reviewed by Josu) * Remove instances of "Specifies the..." * Remove instances of "Indicates that..." * Reword instances of "Specifies to..." (which doesn't really make sense anyway) * Change instances of "This utility may be used..." to "This utility can be used..." as discussed in a previous issue * Change some erroneous instances of "may" to "might" or "can". This might sound like a pointless change but it has implications for localization - "may" is generally ambiguous. --- opends/src/messages/messages/protocol.properties | 82 ++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/opends/src/messages/messages/protocol.properties b/opends/src/messages/messages/protocol.properties index 2d40d08..394799e 100644 --- a/opends/src/messages/messages/protocol.properties +++ b/opends/src/messages/messages/protocol.properties @@ -605,7 +605,7 @@ MILD_ERR_ASN1_READER_MAX_SIZE_EXCEEDED_191=Cannot decode the data read as an \ ASN.1 element because the decoded element length of %d bytes was larger than \ the maximum allowed element length of %d bytes. The underlying input stream \ - has been closed and this reader may no longer be used + has been closed and this reader can no longer be used MILD_ERR_LDAP_FILTER_STRING_NULL_192=Cannot decode the provided string as an \ LDAP search filter because the string was null MILD_ERR_LDAP_FILTER_UNCAUGHT_EXCEPTION_193=Cannot decode the provided string \ @@ -624,7 +624,7 @@ MILD_ERR_LDAP_FILTER_COMPOUND_MISSING_PARENTHESES_197=The provided search \ filter "%s" could not be decoded because the compound filter between \ positions %d and %d did not start with an open parenthesis and end with a \ - close parenthesis (they may be parentheses for different filter components) + close parenthesis (they might be parentheses for different filter components) MILD_ERR_LDAP_FILTER_NO_CORRESPONDING_OPEN_PARENTHESIS_198=The provided \ search filter "%s" could not be decoded because the closing parenthesis at \ position %d did not have a corresponding open parenthesis @@ -679,45 +679,45 @@ the thread to die: %s. The error has been caught and the request handler \ should continue operating as normal MILD_ERR_LDAP_CONNHANDLER_REJECTED_BY_SERVER_214=The attempt to register this \ - connection with the Directory Server was rejected. This may indicate that \ + connection with the Directory Server was rejected. This might indicate that \ the server already has the maximum allowed number of concurrent connections \ established, or that it is in a restricted access mode -INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_ADDRESS_215=Specifies the address or \ - set of addresses on which this connection handler may accept client \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_ADDRESS_215=Address or \ + set of addresses on which this connection handler can accept client \ connections. If no value is specified, then the server will accept \ connections on all active addresses. Changes to this configuration attribute \ will not take effect until the connection handler is disabled and re-enabled, \ or until the Directory Server is restarted -INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT_216=Specifies the TCP port on \ - which this connection handler may accept client connections. Changes to this \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_LISTEN_PORT_216=TCP port on \ + which this connection handler can accept client connections. Changes to this \ configuration attribute will not take effect until the connection handler is \ disabled and re-enabled, or until the Directory Server is restarted INFO_LDAP_CONNHANDLER_DESCRIPTION_ALLOWED_CLIENTS_217=Specifies a set of \ - address masks that may be used to determine the addresses of the clients that \ + address masks that can be used to determine the addresses of the clients that \ are allowed to establish connections to this connection handler. If no \ values are specified, then all clients with addresses that do not match an \ address on the deny list will be allowed. Changes to this configuration \ attribute will take effect immediately but will not interfere with \ - connections that may already be established + connections that might already be established INFO_LDAP_CONNHANDLER_DESCRIPTION_DENIED_CLIENTS_218=Specifies a set of \ - address masks that may be used to determine the set of addresses of the \ + address masks that can be used to determine the set of addresses of the \ clients that are not allowed to establish connections to this connection \ handler. If both allowed and denied client masks are defined and a client \ connection matches one or more masks in both lists, then the connection will \ be denied. If only a denied list is specified, then any client not matching \ a mask in that list will be allowed. Changes to this configuration attribute \ - will take effect immediately but will not interfere with connections that may \ + will take effect immediately but will not interfere with connections that might \ already be established INFO_LDAP_CONNHANDLER_DESCRIPTION_ALLOW_LDAPV2_219=Indicates whether to allow \ communication with LDAPv2 clients. LDAPv2 is considered an obsolete \ protocol, and clients using it will not be allowed to take advantage of all \ features offered by the server. Changes to this configuration attribute will \ - take effect immediately, but will not interfere with connections that may \ + take effect immediately, but will not interfere with connections that might \ already be established -INFO_LDAP_CONNHANDLER_DESCRIPTION_NUM_REQUEST_HANDLERS_220=Specifies the \ - number of threads that should be used to read requests from clients and place \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_NUM_REQUEST_HANDLERS_220=Number of threads \ + that should be used to read requests from clients and place \ them in the work queue for processing. On large systems accepting many \ - concurrent requests, it may be more efficient to have multiple threads \ + concurrent requests, it might be more efficient to have multiple threads \ reading requests from clients. Changes to this configuration attribute will \ not take effect until the connection handler is disabled and re-enabled, or \ until the Directory Server is restarted @@ -727,8 +727,8 @@ attribute will take effect immediately INFO_LDAP_CONNHANDLER_DESCRIPTION_USE_TCP_KEEPALIVE_222=Indicates whether to \ use the TCP KeepAlive feature for client connections established through this \ - connection handler. This is recommended because it may help the server \ - detect client connections that are no longer valid, and may help prevent \ + connection handler. This is recommended because it might help the server \ + detect client connections that are no longer valid, and might help prevent \ intermediate network devices from closing connections due to a lack of \ communication. Changes to this configuration attribute will take effect \ immediately but will only be applied to connections established after the \ @@ -737,7 +737,7 @@ use the TCP NoDelay feature for client connections established through this \ connection handler. This is recommended because it will generally allow \ faster responses to clients, although directories that frequently process \ - searches that match multiple entries may be able to achieve higher throughput \ + searches that match multiple entries might be able to achieve higher throughput \ if it is disabled. Changes to this configuration attribute will take effect \ immediately but will only be applied to connections established after the \ change @@ -747,7 +747,7 @@ been instructed to disable it by support engineers. Changes to this \ configuration attribute will not take effect until the connection handler is \ disabled and re-enabled, or until the Directory Server is restarted -INFO_LDAP_CONNHANDLER_DESCRIPTION_MAX_REQUEST_SIZE_225=Specifies the maximum \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_MAX_REQUEST_SIZE_225=Maximum \ size in bytes that will be allowed when reading requests from clients. This \ can be used to prevent denial of service attacks from clients that send \ extremely large requests. A value of zero indicates that no limit should be \ @@ -761,17 +761,17 @@ INFO_LDAP_CONNHANDLER_DESCRIPTION_ALLOW_STARTTLS_227=Indicates whether this \ connection handler should allow clients to use the StartTLS extended \ operation to initiate secure communication over a non-SSL LDAP connection. \ - This may not be used if SSL is enabled for the connection handler. Changes \ + This can not be used if SSL is enabled for the connection handler. Changes \ to this configuration attribute will take effect immediately for LDAP clients -INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_CLIENT_AUTH_POLICY_228=Specifies the \ - policy that should be used regarding requesting or requiring the client to \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_CLIENT_AUTH_POLICY_228=Policy that \ + should be used regarding requesting or requiring the client to \ present its own certificate when establishing an SSL-based connection or \ using StartTLS to initiate a secure channel in an established connection. \ Changes to this configuration attribute will not take effect until the \ connection handler is disabled and re-enabled, or until the Directory Server \ is restarted -INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_229=Specifies the \ - nickname of the certificate that the connection handler should use when \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_229=Nickname of the \ + certificate that the connection handler should use when \ accepting SSL-based connections or performing StartTLS negotiation. Changes \ to this configuration attribute will not take effect until the connection \ handler is disabled and re-enabled, or until the Directory Server is \ @@ -827,7 +827,7 @@ SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_MAX_REQUEST_SIZE_242=An \ unexpected error occurred while processing the ds-cfg-max-request-size \ attribute in configuration entry %s, which is used to determine the maximum \ - size in bytes that may be used for a client request: %s + size in bytes that can be used for a client request: %s SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_USE_SSL_243=An unexpected error \ occurred while processing the ds-cfg-use-ssl attribute in configuration entry \ %s, which is used to indicate whether to use SSL when accepting client \ @@ -835,11 +835,11 @@ SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_HAVE_SSL_AND_STARTTLS_244=The LDAP \ connection handler defined in configuration entry %s is configured to \ communicate over SSL and also to allow clients to use the StartTLS extended \ - operation. These options may not be used at the same time, so clients will \ + operation. These options can not be used at the same time, so clients will \ not be allowed to use the StartTLS operation SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_ALLOW_STARTTLS_245=An unexpected \ error occurred while processing the ds-cfg-allow-start-tls attribute in \ - configuration entry %s, which is used to indicate whether clients may use the \ + configuration entry %s, which is used to indicate whether clients can use the \ StartTLS extended operation: %s SEVERE_ERR_LDAP_CONNHANDLER_INVALID_SSL_CLIENT_AUTH_POLICY_246=The SSL client \ authentication policy "%s" specified in attribute \ @@ -880,11 +880,11 @@ entry %s INFO_LDAP_CONNHANDLER_DESCRIPTION_KEEP_STATS_258=Indicates whether the \ connection handler should keep statistics regarding LDAP client \ - communication. Maintaining this information may cause a slight decrease in \ + communication. Maintaining this information can cause a slight decrease in \ performance, but can be useful for understanding client usage patterns. \ Changes to this configuration attribute will take effect immediately, but \ will only apply for new connections and will have the side effect of clearing \ - any existing statistical data that may have been collected + any existing statistical data that might have been collected SEVERE_ERR_LDAP_CONNHANDLER_CANNOT_DETERMINE_KEEP_STATS_259=An unexpected \ error occurred while processing the ds-cfg-keep-stats attribute in \ configuration entry %s, which is used to indicate whether LDAP usage \ @@ -902,15 +902,15 @@ between 1 and 8 bytes (decoded length was %d) SEVERE_ERR_INTERNAL_CANNOT_DECODE_DN_264=An unexpected error occurred while \ trying to decode the DN %s used for internal operations as a root user: %s -INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_ENABLED_PROTOCOLS_265=Specifies the \ - names of the SSL protocols that will be allowed for use in SSL or StartTLS \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_ENABLED_PROTOCOLS_265=Names of the \ + SSL protocols that will be allowed for use in SSL or StartTLS \ 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-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 \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_SSL_ENABLED_CIPHERS_267=Names \ of the SSL cipher suites that will be allowed for use in SSL or StartTLS \ communication. Changes to this configuration attribute will take immediately \ but will only impact new SSL/TLS-based sessions created after the change @@ -926,10 +926,10 @@ 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 \ - using the %s provider. StartTLS may only be used on clear-text connections + using the %s provider. StartTLS can only be used on clear-text connections MILD_ERR_LDAP_TLS_STARTTLS_NOT_ALLOWED_272=StartTLS cannot be enabled on this \ LDAP client connection because the corresponding LDAP connection handler is \ - configured to reject StartTLS requests. The use of StartTLS may be enabled \ + configured to reject StartTLS requests. The use of StartTLS can be enabled \ using the ds-cfg-allow-start-tls configuration attribute MILD_ERR_LDAP_TLS_CANNOT_CREATE_TLS_PROVIDER_273=An error occurred while \ attempting to create a TLS connection security provider for this client \ @@ -1030,7 +1030,7 @@ of elements (expected between 1 and 3, got %d) MILD_ERR_ECN_ILLEGAL_PREVIOUS_DN_310=Cannot decode the provided entry change \ notification control because it contains a previous DN element but had a \ - change type of %s. The previous DN element may only be provided with the \ + change type of %s. The previous DN element can only be provided with the \ modify DN change type MILD_ERR_ECN_INVALID_ELEMENT_TYPE_311=Cannot decode the provided entry change \ notification control because the second element in the value sequence has an \ @@ -1055,7 +1055,7 @@ MILD_ERR_LDAP_INTERMEDIATE_RESPONSE_INVALID_ELEMENT_TYPE_318=The intermediate \ response sequence element contained an invalid BER type %s that was not \ appropriate for either the OID or the value -INFO_LDAP_CONNHANDLER_DESCRIPTION_BACKLOG_319=Specifies the accept queue \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_BACKLOG_319=Accept queue \ size, which controls the number of new connection attempts that may be \ allowed to queue up in the backlog before being rejected. This should only \ need to be changed if it is expected that the Directory Server will receive \ @@ -1142,7 +1142,7 @@ MILD_WARN_LDAP_CLIENT_CANNOT_ENQUEUE_346=The Directory Server encountered an \ unexpected error while attempting to add the client request to the work \ queue: %s -INFO_JMX_CONNHANDLER_DESCRIPTION_LISTEN_PORT_347=Specifies the TCP port on \ +INFO_JMX_CONNHANDLER_DESCRIPTION_LISTEN_PORT_347=TCP port on \ which this connection handler may accept administrative connections. Changes \ to this configuration attribute will not take effect until the connection \ handler is disabled and re-enabled, or until the Directory Server is \ @@ -1163,7 +1163,7 @@ occurred while processing the ds-cfg-use-ssl attribute in configuration entry \ %s, which is used to indicate whether to use SSL when accepting client \ connections: %s -INFO_JMX_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_352=Specifies the nickname \ +INFO_JMX_CONNHANDLER_DESCRIPTION_SSL_CERT_NICKNAME_352=Nickname \ of the certificate that the connection handler should use when accepting \ SSL-based connections or performing StartTLS negotiation. Changes to this \ configuration attribute will not take effect until the connection handler is \ @@ -1256,7 +1256,7 @@ because it contains a proxied authorization V2 control which is not marked \ critical. The proxied authorization control must always have a criticality \ of "true" -INFO_LDAP_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN_390=Specifies the DN of the \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN_390=DN of the \ configuration entry for the key manager provider that should be used with \ this LDAP connection handler. Changes to this attribute will take effect \ immediately, but only for subsequent attempts to access the key manager \ @@ -1268,7 +1268,7 @@ 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 \ +INFO_LDAP_CONNHANDLER_DESCRIPTION_TRUSTMANAGER_DN_393=DN of the \ configuration entry for the trust manager provider that should be used with \ this LDAP connection handler. Changes to this attribute will take effect \ immediately, but only for subsequent attempts to access the trust manager \ @@ -1286,7 +1286,7 @@ INFO_LDAP_CONNHANDLER_NEW_TRUSTMANAGER_DN_397=The value of the \ 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 \ +INFO_JMX_CONNHANDLER_DESCRIPTION_KEYMANAGER_DN_398=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 -- Gitblit v1.10.0