From 6281e8e00d295b65c677a32dbccee688210cb81f Mon Sep 17 00:00:00 2001 From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com> Date: Tue, 17 Feb 2015 11:52:22 +0000 Subject: [PATCH] *.properties: occured => occurred is cannot => cannot --- opendj-config/src/main/resources/com/forgerock/opendj/ldap/protocol.properties | 4 ++-- opendj-server-legacy/src/messages/org/opends/messages/logger.properties | 7 ++++--- opendj-server-legacy/src/messages/org/opends/messages/protocol.properties | 4 ++-- opendj-server-legacy/src/messages/org/opends/messages/utility.properties | 8 ++++---- opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties | 4 ++-- opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties | 4 ++-- opendj-server-legacy/src/messages/org/opends/messages/schema.properties | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/opendj-config/src/main/resources/com/forgerock/opendj/ldap/protocol.properties b/opendj-config/src/main/resources/com/forgerock/opendj/ldap/protocol.properties index e6c9d1a..255e7de 100644 --- a/opendj-config/src/main/resources/com/forgerock/opendj/ldap/protocol.properties +++ b/opendj-config/src/main/resources/com/forgerock/opendj/ldap/protocol.properties @@ -20,7 +20,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. -# Portions copyright 2013 ForgeRock AS +# Portions copyright 2013-2015 ForgeRock AS # @@ -849,7 +849,7 @@ SNMP Connection Handler. Please check the configuration attributes ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=No valid trap \ destinations has been found. No trap will be sent -ERR_ASN1_READ_ERROR_1500=An error occured while accessing the \ +ERR_ASN1_READ_ERROR_1500=An error occurred while accessing the \ underlying data source: %s ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=Cannot decode the provided \ subtree delete control because it contains a value diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 835d19b..3afb767 100755 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -22,7 +22,7 @@ # # # Copyright 2010 Sun Microsystems, Inc. -# Portions copyright 2011-2014 ForgeRock AS +# Portions copyright 2011-2015 ForgeRock AS # Portions Copyright 2014 Manuel Gaupp # ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE=Unable to retrieve \ @@ -517,7 +517,7 @@ found at the correct position ERR_MR_CERTIFICATE_MATCH_EXPECTED_END=The GSER value contains additional \ characters at the end of the assertion -ERR_MR_CERTIFICATE_MATCH_GSER_INVALID=An error occured while parsing the GSER \ +ERR_MR_CERTIFICATE_MATCH_GSER_INVALID=An error occurred while parsing the GSER \ String: "%s" ERR_SYNTAX_CERTIFICATE_NOTVALID=The provided value is not a valid X.509 \ Certificate: %s diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties index 399d3d6..638d7d3 100644 --- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties +++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties @@ -20,7 +20,7 @@ # CDDL HEADER END # # Copyright 2006-2010 Sun Microsystems, Inc. -# Portions Copyright 2011-2014 ForgeRock AS. +# Portions Copyright 2011-2015 ForgeRock AS. # Portions copyright 2012 profiq s.r.o. @@ -2758,7 +2758,7 @@ INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED_REMOTE=Importing \ Automatically-Generated Data (%s Entries) ERR_NOT_SAME_PRODUCT_IN_REMOTE_SERVER_NOT_FOUND=The remote server in \ - '%s' is cannot be managed by this control panel. The remote server product \ + '%s' cannot be managed by this control panel. The remote server product \ name is '%s' and the control panel product name is '%s'. ERR_INCOMPATIBLE_VERSION_IN_REMOTE_SERVER=The remote server in '%s' has \ not the same version as the control panel. The remote server version is \ diff --git a/opendj-server-legacy/src/messages/org/opends/messages/logger.properties b/opendj-server-legacy/src/messages/org/opends/messages/logger.properties index edb6b5e..8625a26 100644 --- a/opendj-server-legacy/src/messages/org/opends/messages/logger.properties +++ b/opendj-server-legacy/src/messages/org/opends/messages/logger.properties @@ -20,6 +20,7 @@ # CDDL HEADER END # # Copyright 2006-2008 Sun Microsystems, Inc. +# Portions Copyright 2015 ForgeRock AS. @@ -62,9 +63,9 @@ permissions for the log file %s: %s WARN_LOGGER_UNABLE_SET_PERMISSIONS_9=This platform does not support \ setting file permissions %s to the log file %s -ERR_LOGGER_ERROR_LISTING_FILES_10=Error occured while listing log files \ +ERR_LOGGER_ERROR_LISTING_FILES_10=Error occurred while listing log files \ named by policy with initial file name %s -ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE_11=Error occured while obtaining \ +ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE_11=Error occurred while obtaining \ free disk space in the partition containing log file %s: %s -ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY_12=Error occured while \ +ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY_12=Error occurred while \ enforcing retention policy %s for logger %s: %s diff --git a/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties b/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties index e77b6af..01faa20 100644 --- a/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties +++ b/opendj-server-legacy/src/messages/org/opends/messages/protocol.properties @@ -20,7 +20,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. -# Portions Copyright 2013-2014 ForgeRock AS +# Portions Copyright 2013-2015 ForgeRock AS # Portions copyright 2013-2014 Manuel Gaupp @@ -859,7 +859,7 @@ SNMP Connection Handler. Please check the configuration attributes ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS_1466=No valid trap \ destinations has been found. No trap will be sent -ERR_ASN1_READ_ERROR_1500=An error occured while accessing the \ +ERR_ASN1_READ_ERROR_1500=An error occurred while accessing the \ underlying data source: %s ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE_1503=Cannot decode the provided \ subtree delete control because it contains a value diff --git a/opendj-server-legacy/src/messages/org/opends/messages/schema.properties b/opendj-server-legacy/src/messages/org/opends/messages/schema.properties index 5ef6363..f0c80e2 100644 --- a/opendj-server-legacy/src/messages/org/opends/messages/schema.properties +++ b/opendj-server-legacy/src/messages/org/opends/messages/schema.properties @@ -20,7 +20,7 @@ # CDDL HEADER END # # Copyright 2006-2010 Sun Microsystems, Inc. -# Portions Copyright 2011-2014 ForgeRock AS +# Portions Copyright 2011-2015 ForgeRock AS # Portions Copyright 2012-2014 Manuel Gaupp @@ -904,5 +904,5 @@ not be found at the correct position ERR_CERTIFICATE_MATCH_EXPECTED_END_338=The GSER value contains additional \ characters at the end of the assertion -ERR_CERTIFICATE_MATCH_GSER_INVALID_339=An error occured while parsing the \ +ERR_CERTIFICATE_MATCH_GSER_INVALID_339=An error occurred while parsing the \ GSER String: "%s" diff --git a/opendj-server-legacy/src/messages/org/opends/messages/utility.properties b/opendj-server-legacy/src/messages/org/opends/messages/utility.properties index b526441..23f191a 100644 --- a/opendj-server-legacy/src/messages/org/opends/messages/utility.properties +++ b/opendj-server-legacy/src/messages/org/opends/messages/utility.properties @@ -535,17 +535,17 @@ be a positive integer ERR_CERTMGR_ALIAS_ALREADY_EXISTS_278= A certificate with the alias \ %s already exists in the key store -ERR_CERTMGR_ADD_CERT_279=The following error occured when \ +ERR_CERTMGR_ADD_CERT_279=The following error occurred when \ adding a certificate with alias %s to the keystore: %s -ERR_CERTMGR_ALIAS_INVALID_280=The alias %s is cannot be added to the \ +ERR_CERTMGR_ALIAS_INVALID_280=The alias %s cannot be added to the \ keystore for one of the following reasons: it already exists in the \ keystore, or, it is not an instance of a trusted certificate class ERR_CERTMGR_CERT_REPLIES_INVALID_281=The alias %s is an instance of \ a private key entry, which is not supported being added to the keystore \ at this time -ERR_CERTMGR_DELETE_ALIAS_282=The following error occured when \ +ERR_CERTMGR_DELETE_ALIAS_282=The following error occurred when \ deleting a certificate with alias %s from the keystore: %s -ERR_CERTMGR_GEN_SELF_SIGNED_CERT_284=The following error occured when \ +ERR_CERTMGR_GEN_SELF_SIGNED_CERT_284=The following error occurred when \ generating a self-signed certificate using the alias %s: %s ERR_CERTMGR_INVALID_CERT_FILE_285=The certificate file %s is \ invalid because it does not exists, or exists, but is not a file -- Gitblit v1.10.0