From 407c33f7cfd2c6afe3fb304fb0efbb983e0b317b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Feb 2014 10:43:22 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/messages/messages/tools.properties | 1046 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 523 insertions(+), 523 deletions(-)

diff --git a/opendj3-server-dev/src/messages/messages/tools.properties b/opendj3-server-dev/src/messages/messages/tools.properties
index 7c81fa5..29128ad 100644
--- a/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj3-server-dev/src/messages/messages/tools.properties
@@ -47,18 +47,18 @@
 #
 # ORDINAL is an integer unique among other ordinals in this file
 #
-SEVERE_ERR_TOOLS_CANNOT_CREATE_SSL_CONNECTION_1=Unable to create an SSL \
+ERR_TOOLS_CANNOT_CREATE_SSL_CONNECTION_1=Unable to create an SSL \
  connection to the server: %s
-SEVERE_ERR_TOOLS_SSL_CONNECTION_NOT_INITIALIZED_2=Unable to create an SSL \
+ERR_TOOLS_SSL_CONNECTION_NOT_INITIALIZED_2=Unable to create an SSL \
  connection to the server because the connection factory has not been \
  initialized
-SEVERE_ERR_TOOLS_CANNOT_LOAD_KEYSTORE_FILE_3=Cannot load the key store file: \
+ERR_TOOLS_CANNOT_LOAD_KEYSTORE_FILE_3=Cannot load the key store file: \
  %s
-SEVERE_ERR_TOOLS_CANNOT_INIT_KEYMANAGER_4=Cannot initialize the key manager \
+ERR_TOOLS_CANNOT_INIT_KEYMANAGER_4=Cannot initialize the key manager \
  for the key store:%s
-SEVERE_ERR_TOOLS_CANNOT_LOAD_TRUSTSTORE_FILE_5=Cannot load the key store \
+ERR_TOOLS_CANNOT_LOAD_TRUSTSTORE_FILE_5=Cannot load the key store \
  file: %s
-SEVERE_ERR_TOOLS_CANNOT_INIT_TRUSTMANAGER_6=Cannot initialize the key manager \
+ERR_TOOLS_CANNOT_INIT_TRUSTMANAGER_6=Cannot initialize the key manager \
  for the key store:%s
 INFO_ENCPW_DESCRIPTION_LISTSCHEMES_7=List available password storage schemes
 INFO_ENCPW_DESCRIPTION_CLEAR_PW_8=Clear-text password to encode or to compare \
@@ -75,34 +75,34 @@
  configuration file
 INFO_ENCPW_DESCRIPTION_SCHEME_14=Scheme to use for the encoded password
 INFO_DESCRIPTION_USAGE_15=Displays this usage information
-SEVERE_ERR_CANNOT_INITIALIZE_ARGS_16=An unexpected error occurred while \
+ERR_CANNOT_INITIALIZE_ARGS_16=An unexpected error occurred while \
  attempting to initialize the command-line arguments:  %s
-SEVERE_ERR_ERROR_PARSING_ARGS_17=An error occurred while parsing the \
+ERR_ERROR_PARSING_ARGS_17=An error occurred while parsing the \
  command-line arguments:  %s
-SEVERE_ERR_ENCPW_NO_CLEAR_PW_18=No clear-text password was specified.  Use \
+ERR_ENCPW_NO_CLEAR_PW_18=No clear-text password was specified.  Use \
  --%s, --%s or --%s to specify the password to encode
-SEVERE_ERR_ENCPW_NO_SCHEME_19=No password storage scheme was specified.  Use \
+ERR_ENCPW_NO_SCHEME_19=No password storage scheme was specified.  Use \
  the --%s argument to specify the storage scheme
-SEVERE_ERR_SERVER_BOOTSTRAP_ERROR_20=An unexpected error occurred while \
+ERR_SERVER_BOOTSTRAP_ERROR_20=An unexpected error occurred while \
  attempting to bootstrap the Directory Server client-side code:  %s
-SEVERE_ERR_CANNOT_LOAD_CONFIG_21=An error occurred while trying to load the \
+ERR_CANNOT_LOAD_CONFIG_21=An error occurred while trying to load the \
  Directory Server configuration:  %s
-SEVERE_ERR_CANNOT_LOAD_SCHEMA_22=An error occurred while trying to load the \
+ERR_CANNOT_LOAD_SCHEMA_22=An error occurred while trying to load the \
  Directory Server schema:  %s
-SEVERE_ERR_CANNOT_INITIALIZE_CORE_CONFIG_23=An error occurred while trying to \
+ERR_CANNOT_INITIALIZE_CORE_CONFIG_23=An error occurred while trying to \
  initialize the core Directory Server configuration:  %s
-SEVERE_ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES_24=An error occurred while \
+ERR_ENCPW_CANNOT_INITIALIZE_STORAGE_SCHEMES_24=An error occurred while \
  trying to initialize the Directory Server password storage schemes:  %s
-SEVERE_ERR_ENCPW_NO_STORAGE_SCHEMES_25=No password storage schemes have been \
+ERR_ENCPW_NO_STORAGE_SCHEMES_25=No password storage schemes have been \
  configured for use in the Directory Server
-SEVERE_ERR_ENCPW_NO_SUCH_SCHEME_26=Password storage scheme "%s" is not \
+ERR_ENCPW_NO_SUCH_SCHEME_26=Password storage scheme "%s" is not \
  configured for use in the Directory Server
 INFO_ENCPW_PASSWORDS_MATCH_27=The provided clear-text and encoded passwords \
  match
 INFO_ENCPW_PASSWORDS_DO_NOT_MATCH_28=The provided clear-text and encoded \
  passwords do not match
-SEVERE_ERR_ENCPW_ENCODED_PASSWORD_29=Encoded Password:  "%s"
-SEVERE_ERR_ENCPW_CANNOT_ENCODE_30=An error occurred while attempting to \
+ERR_ENCPW_ENCODED_PASSWORD_29=Encoded Password:  "%s"
+ERR_ENCPW_CANNOT_ENCODE_30=An error occurred while attempting to \
  encode the clear-text password:  %s
 INFO_LDIFEXPORT_DESCRIPTION_LDIF_FILE_33=Path to the LDIF file to be written
 INFO_LDIFEXPORT_DESCRIPTION_APPEND_TO_LDIF_34=Append an existing LDIF file \
@@ -127,37 +127,37 @@
  exported
 INFO_LDIFEXPORT_DESCRIPTION_SIGN_HASH_44=Generate a signed hash of the export \
  data
-SEVERE_ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER_52=Unable to decode exclude \
+ERR_LDIFEXPORT_CANNOT_PARSE_EXCLUDE_FILTER_52=Unable to decode exclude \
  filter string "%s" as a valid search filter:  %s
-SEVERE_ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER_53=Unable to decode include \
+ERR_LDIFEXPORT_CANNOT_PARSE_INCLUDE_FILTER_53=Unable to decode include \
  filter string "%s" as a valid search filter:  %s
-SEVERE_ERR_CANNOT_DECODE_BASE_DN_54=Unable to decode base DN string "%s" as a \
+ERR_CANNOT_DECODE_BASE_DN_54=Unable to decode base DN string "%s" as a \
  valid distinguished name:  %s
-SEVERE_ERR_LDIFEXPORT_MULTIPLE_BACKENDS_FOR_ID_55=Multiple Directory Server \
+ERR_LDIFEXPORT_MULTIPLE_BACKENDS_FOR_ID_55=Multiple Directory Server \
  backends are configured with the requested backend ID "%s"
-SEVERE_ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID_56=None of the Directory Server \
+ERR_LDIFEXPORT_NO_BACKENDS_FOR_ID_56=None of the Directory Server \
  backends are configured with the requested backend ID "%s"
-SEVERE_ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE_57=Unable to decode exclude \
+ERR_LDIFEXPORT_CANNOT_DECODE_EXCLUDE_BASE_57=Unable to decode exclude \
  branch string "%s" as a valid distinguished name:  %s
-SEVERE_ERR_LDIFEXPORT_CANNOT_DECODE_WRAP_COLUMN_AS_INTEGER_58=Unable to \
+ERR_LDIFEXPORT_CANNOT_DECODE_WRAP_COLUMN_AS_INTEGER_58=Unable to \
  decode wrap column value "%s" as an integer
-SEVERE_ERR_LDIFEXPORT_ERROR_DURING_EXPORT_59=An error occurred while \
+ERR_LDIFEXPORT_ERROR_DURING_EXPORT_59=An error occurred while \
  attempting to process the LDIF export:  %s
-SEVERE_ERR_CANNOT_DECODE_BACKEND_BASE_DN_60=Unable to decode the backend \
+ERR_CANNOT_DECODE_BACKEND_BASE_DN_60=Unable to decode the backend \
  configuration base DN string "%s" as a valid DN:  %s
-SEVERE_ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY_61=Unable to retrieve the \
+ERR_CANNOT_RETRIEVE_BACKEND_BASE_ENTRY_61=Unable to retrieve the \
  backend configuration base entry "%s" from the server configuration:  %s
-SEVERE_ERR_CANNOT_DETERMINE_BACKEND_CLASS_62=Cannot determine the name of the \
+ERR_CANNOT_DETERMINE_BACKEND_CLASS_62=Cannot determine the name of the \
  Java class providing the logic for the backend defined in configuration entry \
  %s:  %s
-SEVERE_ERR_CANNOT_LOAD_BACKEND_CLASS_63=Unable to load class %s referenced in \
+ERR_CANNOT_LOAD_BACKEND_CLASS_63=Unable to load class %s referenced in \
  configuration entry %s for use as a Directory Server backend:  %s
-SEVERE_ERR_CANNOT_INSTANTIATE_BACKEND_CLASS_64=Unable to create an instance \
+ERR_CANNOT_INSTANTIATE_BACKEND_CLASS_64=Unable to create an instance \
  of class %s referenced in configuration entry %s as a Directory Server \
  backend:  %s
-SEVERE_ERR_NO_BASES_FOR_BACKEND_65=No base DNs have been defined in backend \
+ERR_NO_BASES_FOR_BACKEND_65=No base DNs have been defined in backend \
  configuration entry %s.  This backend will not be evaluated
-SEVERE_ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND_66=Unable to determine the set \
+ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND_66=Unable to determine the set \
  of base DNs defined in backend configuration entry %s:  %s
 INFO_LDIFIMPORT_DESCRIPTION_LDIF_FILE_69=Path to the LDIF file to be imported
 INFO_LDIFIMPORT_DESCRIPTION_APPEND_70=Append to an existing database rather \
@@ -182,22 +182,22 @@
  skip file rather than appending to it
 INFO_LDIFIMPORT_DESCRIPTION_IS_COMPRESSED_80=LDIF file is compressed
 INFO_LDIFIMPORT_DESCRIPTION_IS_ENCRYPTED_81=LDIF file is encrypted
-SEVERE_ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER_89=Unable to decode exclude \
+ERR_LDIFIMPORT_CANNOT_PARSE_EXCLUDE_FILTER_89=Unable to decode exclude \
  filter string "%s" as a valid search filter:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER_90=Unable to decode include \
+ERR_LDIFIMPORT_CANNOT_PARSE_INCLUDE_FILTER_90=Unable to decode include \
  filter string "%s" as a valid search filter:  %s
-SEVERE_ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID_92=Imported branches or \
+ERR_LDIFIMPORT_MULTIPLE_BACKENDS_FOR_ID_92=Imported branches or \
  backend IDs can not span across multiple Directory Server backends
-SEVERE_ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID_93=None of the Directory Server \
+ERR_LDIFIMPORT_NO_BACKENDS_FOR_ID_93=None of the Directory Server \
  backends are configured with the requested backend ID or base DNs that \
  include the specified branches
-SEVERE_ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE_94=Unable to decode exclude \
+ERR_LDIFIMPORT_CANNOT_DECODE_EXCLUDE_BASE_94=Unable to decode exclude \
  branch string "%s" as a valid distinguished name:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE_95=An error occurred while \
+ERR_LDIFIMPORT_CANNOT_OPEN_REJECTS_FILE_95=An error occurred while \
  trying to open the rejects file %s for writing:  %s
-SEVERE_ERR_LDIFIMPORT_ERROR_DURING_IMPORT_96=An error occurred while \
+ERR_LDIFIMPORT_ERROR_DURING_IMPORT_96=An error occurred while \
  attempting to process the LDIF import:  %s
-SEVERE_ERR_LDIFIMPORT_ERROR_CONSTRAINT_VIOLATION_97=One or more DN \
+ERR_LDIFIMPORT_ERROR_CONSTRAINT_VIOLATION_97=One or more DN \
 indexes could not be built due to invalid DNs or missing parent entries. \
 Please re-import the data without the --skipDNValidation option in order \
 to determine the exact cause
@@ -250,100 +250,100 @@
  or 'subordinate')
 INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY_135=Alias dereference policy \
  ('never', 'always', 'search', or 'find')
-SEVERE_ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND_136=Cannot send the simple bind \
+ERR_LDAPAUTH_CANNOT_SEND_SIMPLE_BIND_136=Cannot send the simple bind \
  request:  %s
-SEVERE_ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE_137=Cannot read the bind \
+ERR_LDAPAUTH_CANNOT_READ_BIND_RESPONSE_137=Cannot read the bind \
  response from the server. The port you are using may require a secured \
 communication (--useSSL). %s
-SEVERE_ERR_LDAPAUTH_SERVER_DISCONNECT_138=The Directory Server indicated that \
+ERR_LDAPAUTH_SERVER_DISCONNECT_138=The Directory Server indicated that \
  it was closing the connection to the client (result code %d, message "%s"
-SEVERE_ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE_139=The Directory Server \
+ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE_139=The Directory Server \
  sent an unexpected extended response message to the client:  %s
-SEVERE_ERR_LDAPAUTH_UNEXPECTED_RESPONSE_140=The Directory Server sent an \
+ERR_LDAPAUTH_UNEXPECTED_RESPONSE_140=The Directory Server sent an \
  unexpected response message to the client:  %s
-MILD_ERR_LDAPAUTH_SIMPLE_BIND_FAILED_141=The simple bind attempt failed
-SEVERE_ERR_LDAPAUTH_NO_SASL_MECHANISM_142=A SASL bind was requested but no \
+ERR_LDAPAUTH_SIMPLE_BIND_FAILED_141=The simple bind attempt failed
+ERR_LDAPAUTH_NO_SASL_MECHANISM_142=A SASL bind was requested but no \
  SASL mechanism was specified
-MILD_ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM_143=The requested SASL mechanism \
+ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM_143=The requested SASL mechanism \
  "%s" is not supported by this client
-MILD_ERR_LDAPAUTH_TRACE_SINGLE_VALUED_144=The trace SASL property may only be \
+ERR_LDAPAUTH_TRACE_SINGLE_VALUED_144=The trace SASL property may only be \
  given a single value
-MILD_ERR_LDAPAUTH_INVALID_SASL_PROPERTY_145=Property "%s" is not allowed for \
+ERR_LDAPAUTH_INVALID_SASL_PROPERTY_145=Property "%s" is not allowed for \
  the %s SASL mechanism
-SEVERE_ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND_146=Cannot send the SASL %S bind \
+ERR_LDAPAUTH_CANNOT_SEND_SASL_BIND_146=Cannot send the SASL %S bind \
  request:  %s
-MILD_ERR_LDAPAUTH_SASL_BIND_FAILED_147=The SASL %s bind attempt failed
-MILD_ERR_LDAPAUTH_NO_SASL_PROPERTIES_148=No SASL properties were provided for \
+ERR_LDAPAUTH_SASL_BIND_FAILED_147=The SASL %s bind attempt failed
+ERR_LDAPAUTH_NO_SASL_PROPERTIES_148=No SASL properties were provided for \
  use with the %s mechanism
-MILD_ERR_LDAPAUTH_AUTHID_SINGLE_VALUED_149=The "authid" SASL property only \
+ERR_LDAPAUTH_AUTHID_SINGLE_VALUED_149=The "authid" SASL property only \
  accepts a single value
-MILD_ERR_LDAPAUTH_SASL_AUTHID_REQUIRED_150=The "authid" SASL property is \
+ERR_LDAPAUTH_SASL_AUTHID_REQUIRED_150=The "authid" SASL property is \
  required for use with the %s mechanism
-MILD_ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND_151=Cannot send the initial \
+ERR_LDAPAUTH_CANNOT_SEND_INITIAL_SASL_BIND_151=Cannot send the initial \
  bind request in the multi-stage %s bind to the server:  %s
-MILD_ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE_152=Cannot read the \
+ERR_LDAPAUTH_CANNOT_READ_INITIAL_BIND_RESPONSE_152=Cannot read the \
  initial %s bind response from the server:  %s
-MILD_ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE_153=The client received an \
+ERR_LDAPAUTH_UNEXPECTED_INITIAL_BIND_RESPONSE_153=The client received an \
  unexpected intermediate bind response.  The "SASL bind in progress" result \
  was expected for the first response in the multi-stage %s bind process, but \
  the bind response had a result code of %d (%s) and an error message of "%s"
-MILD_ERR_LDAPAUTH_NO_CRAMMD5_SERVER_CREDENTIALS_154=The initial bind response \
+ERR_LDAPAUTH_NO_CRAMMD5_SERVER_CREDENTIALS_154=The initial bind response \
  from the server did not include any server SASL credentials containing the \
  challenge information needed to complete the CRAM-MD5 authentication
-MILD_ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST_155=An unexpected error \
+ERR_LDAPAUTH_CANNOT_INITIALIZE_MD5_DIGEST_155=An unexpected error \
  occurred while trying to initialize the MD5 digest generator:  %s
-MILD_ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND_156=Cannot send the second \
+ERR_LDAPAUTH_CANNOT_SEND_SECOND_SASL_BIND_156=Cannot send the second \
  bind request in the multi-stage %s bind to the server:  %s
-MILD_ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE_157=Cannot read the second \
+ERR_LDAPAUTH_CANNOT_READ_SECOND_BIND_RESPONSE_157=Cannot read the second \
  %s bind response from the server:  %s
-MILD_ERR_LDAPAUTH_NO_ALLOWED_SASL_PROPERTIES_158=One or more SASL properties \
+ERR_LDAPAUTH_NO_ALLOWED_SASL_PROPERTIES_158=One or more SASL properties \
  were provided, but the %s mechanism does not take any SASL properties
-MILD_ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED_159=The "authzid" SASL property only \
+ERR_LDAPAUTH_AUTHZID_SINGLE_VALUED_159=The "authzid" SASL property only \
  accepts a single value
-MILD_ERR_LDAPAUTH_REALM_SINGLE_VALUED_160=The "realm" SASL property only \
+ERR_LDAPAUTH_REALM_SINGLE_VALUED_160=The "realm" SASL property only \
  accepts a single value
-MILD_ERR_LDAPAUTH_QOP_SINGLE_VALUED_161=The "qop" SASL property only accepts \
+ERR_LDAPAUTH_QOP_SINGLE_VALUED_161=The "qop" SASL property only accepts \
  a single value
-MILD_ERR_LDAPAUTH_DIGESTMD5_QOP_NOT_SUPPORTED_162=The "%s" QoP mode is not \
+ERR_LDAPAUTH_DIGESTMD5_QOP_NOT_SUPPORTED_162=The "%s" QoP mode is not \
  supported by this client.  Only the "auth" mode is currently available for \
  use
-MILD_ERR_LDAPAUTH_DIGESTMD5_INVALID_QOP_163=The specified DIGEST-MD5 quality \
+ERR_LDAPAUTH_DIGESTMD5_INVALID_QOP_163=The specified DIGEST-MD5 quality \
  of protection mode "%s" is not valid.  The only QoP mode currently supported \
  is "auth"
-MILD_ERR_LDAPAUTH_DIGEST_URI_SINGLE_VALUED_164=The "digest-uri" SASL property \
+ERR_LDAPAUTH_DIGEST_URI_SINGLE_VALUED_164=The "digest-uri" SASL property \
  only accepts a single value
-MILD_ERR_LDAPAUTH_NO_DIGESTMD5_SERVER_CREDENTIALS_165=The initial bind \
+ERR_LDAPAUTH_NO_DIGESTMD5_SERVER_CREDENTIALS_165=The initial bind \
  response from the server did not include any server SASL credentials \
  containing the challenge information needed to complete the DIGEST-MD5 \
  authentication
-MILD_ERR_LDAPAUTH_DIGESTMD5_INVALID_TOKEN_IN_CREDENTIALS_166=The DIGEST-MD5 \
+ERR_LDAPAUTH_DIGESTMD5_INVALID_TOKEN_IN_CREDENTIALS_166=The DIGEST-MD5 \
  credentials provided by the server contained an invalid token of "%s" \
  starting at position %d
-MILD_ERR_LDAPAUTH_DIGESTMD5_INVALID_CHARSET_167=The DIGEST-MD5 credentials \
+ERR_LDAPAUTH_DIGESTMD5_INVALID_CHARSET_167=The DIGEST-MD5 credentials \
  provided by the server specified the use of the "%s" character set.  The \
  character set that may be specified in the DIGEST-MD5 credentials is "utf-8"
-MILD_ERR_LDAPAUTH_REQUESTED_QOP_NOT_SUPPORTED_BY_SERVER_168=The requested QoP \
+ERR_LDAPAUTH_REQUESTED_QOP_NOT_SUPPORTED_BY_SERVER_168=The requested QoP \
  mode of "%s" is not listed as supported by the Directory Server.  The \
  Directory Server's list of supported QoP modes is:  "%s"
-MILD_ERR_LDAPAUTH_DIGESTMD5_NO_NONCE_169=The server SASL credentials provided \
+ERR_LDAPAUTH_DIGESTMD5_NO_NONCE_169=The server SASL credentials provided \
  in response to the initial DIGEST-MD5 bind request did not include the nonce \
  to use to generate the authentication digests
-MILD_ERR_LDAPAUTH_DIGESTMD5_CANNOT_CREATE_RESPONSE_DIGEST_170=An error \
+ERR_LDAPAUTH_DIGESTMD5_CANNOT_CREATE_RESPONSE_DIGEST_170=An error \
  occurred while attempting to generate the response digest for the DIGEST-MD5 \
  bind request:  %s
-MILD_ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS_171=The DIGEST-MD5 bind response \
+ERR_LDAPAUTH_DIGESTMD5_NO_RSPAUTH_CREDS_171=The DIGEST-MD5 bind response \
  from the server did not include the "rspauth" element to provide a digest of \
  the response authentication information
-MILD_ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_DECODE_RSPAUTH_172=An error occurred \
+ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_DECODE_RSPAUTH_172=An error occurred \
  while trying to decode the rspauth element of the DIGEST-MD5 bind response \
  from the server as a hexadecimal string:  %s
-MILD_ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_CALCULATE_RSPAUTH_173=An error occurred \
+ERR_LDAPAUTH_DIGESTMD5_COULD_NOT_CALCULATE_RSPAUTH_173=An error occurred \
  while trying to calculate the expected rspauth element to compare against the \
  value included in the DIGEST-MD5 response from the server:  %s
-MILD_ERR_LDAPAUTH_DIGESTMD5_RSPAUTH_MISMATCH_174=The rpsauth element included \
+ERR_LDAPAUTH_DIGESTMD5_RSPAUTH_MISMATCH_174=The rpsauth element included \
  in the DIGEST-MD5 bind response from the Directory Server was different from \
  the expected value calculated by the client
-MILD_ERR_LDAPAUTH_DIGESTMD5_INVALID_CLOSING_QUOTE_POS_175=The DIGEST-MD5 \
+ERR_LDAPAUTH_DIGESTMD5_INVALID_CLOSING_QUOTE_POS_175=The DIGEST-MD5 \
  response challenge could not be parsed because it had an invalid quotation \
  mark at position %d
 INFO_LDAPAUTH_PROPERTY_DESCRIPTION_TRACE_176=Text string that may be written \
@@ -360,60 +360,60 @@
 INFO_DESCRIPTION_SASL_PROPERTIES_182=SASL bind options
 INFO_LDAPAUTH_PROPERTY_DESCRIPTION_KDC_183=KDC to use for the \
  Kerberos authentication
-MILD_ERR_LDAPAUTH_KDC_SINGLE_VALUED_184=The "kdc" SASL property only accepts \
+ERR_LDAPAUTH_KDC_SINGLE_VALUED_184=The "kdc" SASL property only accepts \
  a single value
-MILD_ERR_LDAPAUTH_GSSAPI_INVALID_QOP_185=The specified GSSAPI quality of \
+ERR_LDAPAUTH_GSSAPI_INVALID_QOP_185=The specified GSSAPI quality of \
  protection mode "%s" is not valid.  The only QoP mode currently supported is \
  "auth"
-SEVERE_ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_JAAS_CONFIG_186=An error occurred \
+ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_JAAS_CONFIG_186=An error occurred \
  while trying to create the temporary JAAS configuration for GSSAPI \
  authentication:  %s
-MILD_ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED_187=An error occurred \
+ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED_187=An error occurred \
  while attempting to perform local authentication to the Kerberos realm:  %s
-MILD_ERR_LDAPAUTH_GSSAPI_REMOTE_AUTHENTICATION_FAILED_188=An error occurred \
+ERR_LDAPAUTH_GSSAPI_REMOTE_AUTHENTICATION_FAILED_188=An error occurred \
  while attempting to perform GSSAPI authentication to the Directory Server: \
  %s
-SEVERE_ERR_LDAPAUTH_NONSASL_RUN_INVOCATION_189=The \
+ERR_LDAPAUTH_NONSASL_RUN_INVOCATION_189=The \
  LDAPAuthenticationHandler.run() method was called for a non-SASL bind.  The \
  backtrace for this call is %s
-SEVERE_ERR_LDAPAUTH_UNEXPECTED_RUN_INVOCATION_190=The \
+ERR_LDAPAUTH_UNEXPECTED_RUN_INVOCATION_190=The \
  LDAPAuthenticationHandler.run() method was called for a SASL bind with an \
  unexpected mechanism of "%s".  The backtrace for this call is %s
-SEVERE_ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_SASL_CLIENT_191=An error occurred \
+ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_SASL_CLIENT_191=An error occurred \
  while attempting to create a SASL client to process the GSSAPI \
  authentication:  %s
-SEVERE_ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_INITIAL_CHALLENGE_192=An error \
+ERR_LDAPAUTH_GSSAPI_CANNOT_CREATE_INITIAL_CHALLENGE_192=An error \
  occurred while attempting to create the initial challenge for GSSAPI \
  authentication:  %s
-MILD_ERR_LDAPAUTH_GSSAPI_CANNOT_VALIDATE_SERVER_CREDS_193=An error occurred \
+ERR_LDAPAUTH_GSSAPI_CANNOT_VALIDATE_SERVER_CREDS_193=An error occurred \
  while trying to validate the SASL credentials provided by the Directory \
  Server in the GSSAPI bind response:  %s
-MILD_ERR_LDAPAUTH_GSSAPI_UNEXPECTED_SUCCESS_RESPONSE_194=The Directory Server \
+ERR_LDAPAUTH_GSSAPI_UNEXPECTED_SUCCESS_RESPONSE_194=The Directory Server \
  unexpectedly returned a success response to the client even though the client \
  does not believe that the GSSAPI negotiation is complete
-MILD_ERR_LDAPAUTH_GSSAPI_BIND_FAILED_195=The GSSAPI bind attempt failed
-SEVERE_ERR_LDAPAUTH_NONSASL_CALLBACK_INVOCATION_196=The \
+ERR_LDAPAUTH_GSSAPI_BIND_FAILED_195=The GSSAPI bind attempt failed
+ERR_LDAPAUTH_NONSASL_CALLBACK_INVOCATION_196=The \
  LDAPAuthenticationHandler.handle() method was called for a non-SASL bind. \
  The backtrace for this call is %s
-SEVERE_ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK_197=The \
+ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK_197=The \
  LDAPAuthenticationHandler.handle() method was called during a GSSAPI bind \
  attempt with an unexpected callback type of %s
-SEVERE_ERR_LDAPAUTH_UNEXPECTED_CALLBACK_INVOCATION_198=The \
+ERR_LDAPAUTH_UNEXPECTED_CALLBACK_INVOCATION_198=The \
  LDAPAuthenticationHandler.handle() method was called for an unexpected SASL \
  mechanism of %s.  The backtrace for this call is %s
 INFO_LDAPAUTH_PASSWORD_PROMPT_199=Password for user '%s':
 INFO_DESCRIPTION_VERSION_200=LDAP protocol version number
-MILD_ERR_DESCRIPTION_INVALID_VERSION_201=Invalid LDAP version number '%s'. \
+ERR_DESCRIPTION_INVALID_VERSION_201=Invalid LDAP version number '%s'. \
  Allowed values are 2 and 3
-SEVERE_ERR_LDAPAUTH_CANNOT_SEND_WHOAMI_REQUEST_202=Cannot send the 'Who Am \
+ERR_LDAPAUTH_CANNOT_SEND_WHOAMI_REQUEST_202=Cannot send the 'Who Am \
  I?' request to the Directory Server:  %s
-SEVERE_ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE_203=Cannot read the 'Who Am \
+ERR_LDAPAUTH_CANNOT_READ_WHOAMI_RESPONSE_203=Cannot read the 'Who Am \
  I?' response from the Directory Server:  %s
-MILD_ERR_LDAPAUTH_WHOAMI_FAILED_204=The 'Who Am I?' request was rejected by \
+ERR_LDAPAUTH_WHOAMI_FAILED_204=The 'Who Am I?' request was rejected by \
  the Directory Server
-SEVERE_ERR_SEARCH_INVALID_SEARCH_SCOPE_205=Invalid scope '%s' specified for \
+ERR_SEARCH_INVALID_SEARCH_SCOPE_205=Invalid scope '%s' specified for \
  the search request
-SEVERE_ERR_SEARCH_NO_FILTERS_206=No filters specified for the search request
+ERR_SEARCH_NO_FILTERS_206=No filters specified for the search request
 INFO_VERIFYINDEX_DESCRIPTION_BASE_DN_207=Base DN of a backend \
  supporting indexing. Verification is performed on indexes within the scope of \
  the given base DN
@@ -426,32 +426,32 @@
  should be verified to ensure it is clean.  An index is clean if each index \
  value references only entries containing that value.  Only one index at a \
  time may be verified in this way
-SEVERE_ERR_VERIFYINDEX_ERROR_DURING_VERIFY_210=An error occurred while \
+ERR_VERIFYINDEX_ERROR_DURING_VERIFY_210=An error occurred while \
  attempting to perform index verification:  %s
-SEVERE_ERR_VERIFYINDEX_VERIFY_CLEAN_REQUIRES_SINGLE_INDEX_211=Only one index \
+ERR_VERIFYINDEX_VERIFY_CLEAN_REQUIRES_SINGLE_INDEX_211=Only one index \
  at a time may be verified for cleanliness
-SEVERE_ERR_BACKEND_NO_INDEXING_SUPPORT_212=The backend does not support \
+ERR_BACKEND_NO_INDEXING_SUPPORT_212=The backend does not support \
  indexing
-SEVERE_ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND_213=The Directory Server backend \
+ERR_LDIFEXPORT_CANNOT_EXPORT_BACKEND_213=The Directory Server backend \
  with backend ID "%s" does not provide a mechanism for performing LDIF exports
-SEVERE_ERR_LDIFIMPORT_CANNOT_IMPORT_214=The Directory Server backend with \
+ERR_LDIFIMPORT_CANNOT_IMPORT_214=The Directory Server backend with \
  backend ID %s does not provide a mechanism for performing LDIF imports
 INFO_DESCRIPTION_DONT_WRAP_215=Do not wrap long lines
 INFO_LDIFIMPORT_DESCRIPTION_INCLUDE_BRANCH_216=Base DN of a branch to include \
  in the LDIF import
-SEVERE_ERR_CANNOT_DETERMINE_BACKEND_ID_217=Cannot determine the backend ID \
+ERR_CANNOT_DETERMINE_BACKEND_ID_217=Cannot determine the backend ID \
  for the backend defined in configuration entry %s:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE_218=Unable to decode include \
+ERR_LDIFIMPORT_CANNOT_DECODE_INCLUDE_BASE_218=Unable to decode include \
  branch string "%s" as a valid distinguished name:  %s
-SEVERE_ERR_LDIFIMPORT_INVALID_INCLUDE_BASE_219=Provided include base DN "%s" \
+ERR_LDIFIMPORT_INVALID_INCLUDE_BASE_219=Provided include base DN "%s" \
  is not handled by the backend with backend ID %s
-SEVERE_ERR_MULTIPLE_BACKENDS_FOR_BASE_230=Multiple Directory Server backends \
+ERR_MULTIPLE_BACKENDS_FOR_BASE_230=Multiple Directory Server backends \
  are configured to support base DN "%s"
-SEVERE_ERR_NO_BACKENDS_FOR_BASE_231=None of the Directory Server backends are \
+ERR_NO_BACKENDS_FOR_BASE_231=None of the Directory Server backends are \
  configured to support the requested base DN "%s"
 INFO_LDIFEXPORT_DESCRIPTION_INCLUDE_BRANCH_240=Base DN of a branch to include \
  in the LDIF export
-SEVERE_ERR_LDIFEXPORT_INVALID_INCLUDE_BASE_242=Provided include base DN "%s" \
+ERR_LDIFEXPORT_INVALID_INCLUDE_BASE_242=Provided include base DN "%s" \
  is not handled by the backend with backend ID %s
 INFO_BACKUPDB_DESCRIPTION_BACKEND_ID_245=Backend ID for the backend to \
  archive
@@ -465,40 +465,40 @@
 INFO_BACKUPDB_DESCRIPTION_ENCRYPT_250=Encrypt the backup contents
 INFO_BACKUPDB_DESCRIPTION_HASH_251=Generate a hash of the backup contents
 INFO_BACKUPDB_DESCRIPTION_SIGN_HASH_252=Sign the hash of the backup contents
-SEVERE_ERR_BACKUPDB_NO_BACKENDS_FOR_ID_261=None of the Directory Server \
+ERR_BACKUPDB_NO_BACKENDS_FOR_ID_261=None of the Directory Server \
  backends are configured with the requested backend ID "%s"
-SEVERE_ERR_BACKUPDB_CANNOT_BACKUP_264=The target backend %s cannot be backed \
+ERR_BACKUPDB_CANNOT_BACKUP_264=The target backend %s cannot be backed \
  up using the requested configuration:  %s
-SEVERE_ERR_BACKUPDB_ERROR_DURING_BACKUP_265=An error occurred while \
+ERR_BACKUPDB_ERROR_DURING_BACKUP_265=An error occurred while \
  attempting to back up backend %s with the requested configuration:  %s
 INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL_274=Back up all backends in the server
-SEVERE_ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID_275=The %s and %s \
+ERR_BACKUPDB_CANNOT_MIX_BACKUP_ALL_AND_BACKEND_ID_275=The %s and %s \
  arguments may not be used together.  Exactly one of them must be provided
-SEVERE_ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID_276=Neither the %s argument \
+ERR_BACKUPDB_NEED_BACKUP_ALL_OR_BACKEND_ID_276=Neither the %s argument \
  nor the %s argument was provided.  Exactly one of them is required
-SEVERE_ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR_277=An error occurred while \
+ERR_BACKUPDB_CANNOT_CREATE_BACKUP_DIR_277=An error occurred while \
  attempting to create the backup directory %s:  %s
-SEVERE_WARN_BACKUPDB_BACKUP_NOT_SUPPORTED_278=Backend ID %s was included in \
+WARN_BACKUPDB_BACKUP_NOT_SUPPORTED_278=Backend ID %s was included in \
  the set of backends to archive, but this backend does not provide support for \
  a backup mechanism.  It will be skipped
-SEVERE_WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE_279=None of the target backends \
+WARN_BACKUPDB_NO_BACKENDS_TO_ARCHIVE_279=None of the target backends \
  provide a backup mechanism.  The backup operation has been aborted
-NOTICE_BACKUPDB_STARTING_BACKUP_280=Starting backup for backend %s
-SEVERE_ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR_281=An error occurred \
+NOTE_BACKUPDB_STARTING_BACKUP_280=Starting backup for backend %s
+ERR_BACKUPDB_CANNOT_PARSE_BACKUP_DESCRIPTOR_281=An error occurred \
  while attempting to parse the backup descriptor file %s:  %s
-NOTICE_BACKUPDB_COMPLETED_WITH_ERRORS_282=The backup process completed with \
+NOTE_BACKUPDB_COMPLETED_WITH_ERRORS_282=The backup process completed with \
  one or more errors
-NOTICE_BACKUPDB_COMPLETED_SUCCESSFULLY_283=The backup process completed \
+NOTE_BACKUPDB_COMPLETED_SUCCESSFULLY_283=The backup process completed \
  successfully
-SEVERE_ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER_284=An error occurred while \
+ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER_284=An error occurred while \
  attempting to initialize the crypto manager:  %s
-SEVERE_ERR_CANNOT_INITIALIZE_SUBENTRY_MANAGER_285=An error occurred while \
+ERR_CANNOT_INITIALIZE_SUBENTRY_MANAGER_285=An error occurred while \
  attempting to initialize the subentry manager:  %s
-SEVERE_ERR_CANNOT_INITIALIZE_ROOTDN_MANAGER_286=An error occurred while \
+ERR_CANNOT_INITIALIZE_ROOTDN_MANAGER_286=An error occurred while \
  attempting to initialize the root DN manager:  %s
 INFO_BACKUPDB_DESCRIPTION_INCREMENTAL_BASE_ID_287=Backup ID of the source \
  archive for an incremental backup
-SEVERE_ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL_288=The use of the \
+ERR_BACKUPDB_INCREMENTAL_BASE_REQUIRES_INCREMENTAL_288=The use of the \
  %s argument requires that the %s argument is also provided
 INFO_RESTOREDB_DESCRIPTION_BACKUP_ID_292=Backup ID of the backup to restore
 INFO_RESTOREDB_DESCRIPTION_BACKUP_DIR_293=Path to the directory containing \
@@ -507,7 +507,7 @@
  backup directory
 INFO_RESTOREDB_DESCRIPTION_VERIFY_ONLY_295=Verify the contents of the backup \
  but do not restore it
-SEVERE_ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY_304=An error occurred while \
+ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY_304=An error occurred while \
  attempting to examine the set of backups contained in backup directory %s: \
  %s
 INFO_RESTOREDB_LIST_BACKUP_ID_305=Backup ID:          %s
@@ -518,66 +518,66 @@
 INFO_RESTOREDB_LIST_HASHED_310=Has Unsigned Hash:  %s
 INFO_RESTOREDB_LIST_SIGNED_311=Has Signed Hash:    %s
 INFO_RESTOREDB_LIST_DEPENDENCIES_312=Dependent Upon:     %s
-SEVERE_ERR_RESTOREDB_INVALID_BACKUP_ID_313=The requested backup ID %s does \
+ERR_RESTOREDB_INVALID_BACKUP_ID_313=The requested backup ID %s does \
  not exist in %s
-SEVERE_ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY_314=There are no Directory \
+ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY_314=There are no Directory \
  Server backups contained in %s
-SEVERE_ERR_RESTOREDB_NO_BACKENDS_FOR_DN_315=The backups contained in \
+ERR_RESTOREDB_NO_BACKENDS_FOR_DN_315=The backups contained in \
  directory %s were taken from a Directory Server backend defined in \
  configuration entry %s but no such backend is available
-SEVERE_ERR_RESTOREDB_CANNOT_RESTORE_316=The Directory Server backend \
+ERR_RESTOREDB_CANNOT_RESTORE_316=The Directory Server backend \
  configured with backend ID %s does not provide a mechanism for restoring \
  backups
-SEVERE_ERR_RESTOREDB_ERROR_DURING_BACKUP_317=An unexpected error occurred \
+ERR_RESTOREDB_ERROR_DURING_BACKUP_317=An unexpected error occurred \
  while attempting to restore backup %s from %s:  %s
-SEVERE_ERR_RESTOREDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE_318=Restoring an \
+ERR_RESTOREDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE_318=Restoring an \
  encrypted or signed backup requires a connection to an online server
-SEVERE_ERR_BACKUPDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE_325=The use of the \
+ERR_BACKUPDB_ENCRYPT_OR_SIGN_REQUIRES_ONLINE_325=The use of the \
  %s argument or the %s argument requires a connection to an online server \
  instance
-SEVERE_ERR_BACKUPDB_SIGN_REQUIRES_HASH_326=The use of the %s argument \
+ERR_BACKUPDB_SIGN_REQUIRES_HASH_326=The use of the %s argument \
  requires that the %s argument is also provided
 INFO_DESCRIPTION_NOOP_327=Show what would be done but do not perform any \
  operation
-SEVERE_ERR_BACKUPDB_CANNOT_LOCK_BACKEND_328=An error occurred while \
+ERR_BACKUPDB_CANNOT_LOCK_BACKEND_328=An error occurred while \
  attempting to acquire a shared lock for backend %s:  %s.  This generally \
  means that some other process has exclusive access to this backend (e.g., a \
  restore or an LDIF import).  This backend will not be archived
-SEVERE_WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND_329=An error occurred while \
+WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND_329=An error occurred while \
  attempting to release the shared lock for backend %s:  %s.  This lock should \
  automatically be cleared when the backup process exits, so no further action \
  should be required
-SEVERE_ERR_RESTOREDB_CANNOT_LOCK_BACKEND_330=An error occurred while \
+ERR_RESTOREDB_CANNOT_LOCK_BACKEND_330=An error occurred while \
  attempting to acquire an exclusive lock for backend %s:  %s.  This generally \
  means some other process is still using this backend (e.g., it is in use by \
  the Directory Server or a backup or LDIF export is in progress).  The restore \
  cannot continue
-SEVERE_WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND_331=An error occurred while \
+WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND_331=An error occurred while \
  attempting to release the exclusive lock for backend %s:  %s.  This lock \
  should automatically be cleared when the restore process exits, so no further \
  action should be required
-SEVERE_ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND_332=An error occurred while \
+ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND_332=An error occurred while \
  attempting to acquire an exclusive lock for backend %s:  %s.  This generally \
  means some other process is still using this backend (e.g., it is in use by \
  the Directory Server or a backup or LDIF export is in progress).  The LDIF \
  import cannot continue
-SEVERE_WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND_333=An error occurred while \
+WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND_333=An error occurred while \
  attempting to release the exclusive lock for backend %s:  %s.  This lock \
  should automatically be cleared when the import process exits, so no further \
  action should be required
-SEVERE_ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND_334=An error occurred while \
+ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND_334=An error occurred while \
  attempting to acquire a shared lock for backend %s:  %s.  This generally \
  means that some other process has an exclusive lock on this backend (e.g., an \
  LDIF import or a restore).  The LDIF export cannot continue
-SEVERE_WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND_335=An error occurred while \
+WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND_335=An error occurred while \
  attempting to release the shared lock for backend %s:  %s.  This lock should \
  automatically be cleared when the export process exits, so no further action \
  should be required
-SEVERE_ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND_336=An error occurred while \
+ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND_336=An error occurred while \
  attempting to acquire a shared lock for backend %s:  %s.  This generally \
  means that some other process has an exclusive lock on this backend (e.g., an \
  LDIF import or a restore).  The index verification cannot continue
-SEVERE_WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND_337=An error occurred while \
+WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND_337=An error occurred while \
  attempting to release the shared lock for backend %s:  %s.  This lock should \
  automatically be cleared when the verification process exits, so no further \
  action should be required
@@ -585,40 +585,40 @@
  values
 INFO_LDIFIMPORT_DESCRIPTION_SKIP_SCHEMA_VALIDATION_339=Skip schema validation \
  during the LDIF import
-SEVERE_ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS_340=An error occurred while \
+ERR_LDIFEXPORT_CANNOT_INITIALIZE_PLUGINS_340=An error occurred while \
  attempting to initialize the LDIF export plugins:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_INITIALIZE_PLUGINS_341=An error occurred while \
+ERR_LDIFIMPORT_CANNOT_INITIALIZE_PLUGINS_341=An error occurred while \
  attempting to initialize the LDIF import plugins:  %s
 INFO_DESCRIPTION_ASSERTION_FILTER_342=Use the LDAP assertion control with the \
  provided filter
-MILD_ERR_LDAP_ASSERTION_INVALID_FILTER_343=The search filter provided for the \
+ERR_LDAP_ASSERTION_INVALID_FILTER_343=The search filter provided for the \
  LDAP assertion control was invalid:  %s
 INFO_DESCRIPTION_PREREAD_ATTRS_346=Use the LDAP ReadEntry pre-read control
 INFO_DESCRIPTION_POSTREAD_ATTRS_347=Use the LDAP ReadEntry post-read control
-MILD_ERR_LDAPMODIFY_PREREAD_CANNOT_DECODE_VALUE_349=An error occurred while \
+ERR_LDAPMODIFY_PREREAD_CANNOT_DECODE_VALUE_349=An error occurred while \
  trying to decode the entry contained in the value of the pre-read response \
  control:  %s
 INFO_LDAPMODIFY_PREREAD_ENTRY_350=Target entry before the operation:
-MILD_ERR_LDAPMODIFY_POSTREAD_CANNOT_DECODE_VALUE_352=An error occurred while \
+ERR_LDAPMODIFY_POSTREAD_CANNOT_DECODE_VALUE_352=An error occurred while \
  trying to decode the entry contained in the value of the post-read response \
  control:  %s
 INFO_LDAPMODIFY_POSTREAD_ENTRY_353=Target entry after the operation:
 INFO_DESCRIPTION_PROXY_AUTHZID_354=Use the proxied authorization control with \
  the given authorization ID
 INFO_DESCRIPTION_PSEARCH_INFO_355=Use the persistent search control
-MILD_ERR_PSEARCH_MISSING_DESCRIPTOR_356=The request to use the persistent \
+ERR_PSEARCH_MISSING_DESCRIPTOR_356=The request to use the persistent \
  search control did not include a descriptor that indicates the options to use \
  with that control
-MILD_ERR_PSEARCH_DOESNT_START_WITH_PS_357=The persistent search descriptor %s \
+ERR_PSEARCH_DOESNT_START_WITH_PS_357=The persistent search descriptor %s \
  did not start with the required 'ps' string
-MILD_ERR_PSEARCH_INVALID_CHANGE_TYPE_358=The provided change type value %s is \
+ERR_PSEARCH_INVALID_CHANGE_TYPE_358=The provided change type value %s is \
  invalid.  The recognized change types are add, delete, modify, modifydn, and \
  any
-MILD_ERR_PSEARCH_INVALID_CHANGESONLY_359=The provided changesOnly value %s is \
+ERR_PSEARCH_INVALID_CHANGESONLY_359=The provided changesOnly value %s is \
  invalid.  Allowed values are 1 to only return matching entries that have \
  changed since the beginning of the search, or 0 to also include existing \
  entries that match the search criteria
-MILD_ERR_PSEARCH_INVALID_RETURN_ECS_360=The provided returnECs value %s is \
+ERR_PSEARCH_INVALID_RETURN_ECS_360=The provided returnECs value %s is \
  invalid.  Allowed values are 1 to request that the entry change notification \
  control be included in updated entries, or 0 to exclude the control from \
  matching entries
@@ -628,21 +628,21 @@
  strings
 INFO_DESCRIPTION_MATCHED_VALUES_FILTER_364=Use the LDAP matched values \
  control with the provided filter
-MILD_ERR_LDAP_MATCHEDVALUES_INVALID_FILTER_365=The provided matched values \
+ERR_LDAP_MATCHEDVALUES_INVALID_FILTER_365=The provided matched values \
  filter was invalid:  %s
-FATAL_ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ_366=An error occurred while \
+ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ_366=An error occurred while \
  attempting to open the LDIF file %s for reading:  %s
-FATAL_ERR_LDIF_FILE_READ_ERROR_367=An error occurred while attempting to read \
+ERR_LDIF_FILE_READ_ERROR_367=An error occurred while attempting to read \
  the contents of LDIF file %s:  %s
-SEVERE_ERR_LDIF_FILE_INVALID_LDIF_ENTRY_368=Error at or near line %d in LDIF \
+ERR_LDIF_FILE_INVALID_LDIF_ENTRY_368=Error at or near line %d in LDIF \
  file %s:  %s
 INFO_ENCPW_DESCRIPTION_AUTHPW_369=Use the authentication password syntax \
  rather than the user password syntax
-SEVERE_ERR_ENCPW_NO_SUCH_AUTH_SCHEME_371=Authentication password storage \
+ERR_ENCPW_NO_SUCH_AUTH_SCHEME_371=Authentication password storage \
  scheme "%s" is not configured for use in the Directory Server
-SEVERE_ERR_ENCPW_INVALID_ENCODED_AUTHPW_372=The provided password is not a \
+ERR_ENCPW_INVALID_ENCODED_AUTHPW_372=The provided password is not a \
  valid encoded authentication password value:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_INITIALIZE_PWPOLICY_373=An error occurred while \
+ERR_LDIFIMPORT_CANNOT_INITIALIZE_PWPOLICY_373=An error occurred while \
  attempting to initialize the password policy components:  %s
 INFO_STOPDS_DESCRIPTION_HOST_374=Directory server hostname or IP address
 INFO_STOPDS_DESCRIPTION_PORT_375=Directory server administration port number
@@ -669,32 +669,32 @@
 INFO_STOPDS_DESCRIPTION_TSPW_390=Certificate trust store PIN
 INFO_STOPDS_DESCRIPTION_TSPWFILE_391=Certificate trust store PIN file
 INFO_STOPDS_DESCRIPTION_SHOWUSAGE_392=Display this usage information
-SEVERE_ERR_STOPDS_MUTUALLY_EXCLUSIVE_ARGUMENTS_395=ERROR:  You may not \
+ERR_STOPDS_MUTUALLY_EXCLUSIVE_ARGUMENTS_395=ERROR:  You may not \
  provide both the %s and the %s arguments
-SEVERE_ERR_STOPDS_CANNOT_DECODE_STOP_TIME_396=ERROR:  Unable to decode the \
+ERR_STOPDS_CANNOT_DECODE_STOP_TIME_396=ERROR:  Unable to decode the \
  provided stop time.  It should be in the form YYYYMMDDhhmmssZ for UTC time or \
  YYYYMMDDhhmmss for local time
-SEVERE_ERR_STOPDS_CANNOT_INITIALIZE_SSL_397=ERROR:  Unable to perform SSL \
+ERR_STOPDS_CANNOT_INITIALIZE_SSL_397=ERROR:  Unable to perform SSL \
  initialization:  %s
-SEVERE_ERR_STOPDS_CANNOT_PARSE_SASL_OPTION_398=ERROR:  The provided SASL \
+ERR_STOPDS_CANNOT_PARSE_SASL_OPTION_398=ERROR:  The provided SASL \
  option string "%s" could not be parsed in the form "name=value"
-SEVERE_ERR_STOPDS_NO_SASL_MECHANISM_399=ERROR:  One or more SASL options were \
+ERR_STOPDS_NO_SASL_MECHANISM_399=ERROR:  One or more SASL options were \
  provided, but none of them were the "mech" option to specify which SASL \
  mechanism should be used
-SEVERE_ERR_STOPDS_CANNOT_DETERMINE_PORT_400=ERROR:  Cannot parse the value of \
+ERR_STOPDS_CANNOT_DETERMINE_PORT_400=ERROR:  Cannot parse the value of \
  the %s argument as an integer value between 1 and 65535:  %s
-SEVERE_ERR_STOPDS_CANNOT_CONNECT_401=ERROR:  Cannot establish a connection to \
+ERR_STOPDS_CANNOT_CONNECT_401=ERROR:  Cannot establish a connection to \
  the Directory Server %s.  Verify that the server is running and that \
  the provided credentials are valid.  Details:  %s
-SEVERE_ERR_STOPDS_UNEXPECTED_CONNECTION_CLOSURE_402=NOTICE:  The connection \
+ERR_STOPDS_UNEXPECTED_CONNECTION_CLOSURE_402=NOTICE:  The connection \
  to the Directory Server was closed while waiting for a response to the \
  shutdown request.  This likely means that the server has started the shutdown \
  process
-SEVERE_ERR_STOPDS_IO_ERROR_403=ERROR:  An I/O error occurred while attempting \
+ERR_STOPDS_IO_ERROR_403=ERROR:  An I/O error occurred while attempting \
  to communicate with the Directory Server:  %s
-SEVERE_ERR_STOPDS_DECODE_ERROR_404=ERROR:  An error occurred while trying to \
+ERR_STOPDS_DECODE_ERROR_404=ERROR:  An error occurred while trying to \
  decode the response from the server:  %s
-SEVERE_ERR_STOPDS_INVALID_RESPONSE_TYPE_405=ERROR:  Expected an add response \
+ERR_STOPDS_INVALID_RESPONSE_TYPE_405=ERROR:  Expected an add response \
  message but got a %s message instead
 INFO_BIND_PASSWORD_EXPIRED_406=# Your password has expired
 INFO_BIND_PASSWORD_EXPIRING_407=# Your password will expire in %s
@@ -731,38 +731,38 @@
  matching entries to return
 INFO_LDIFSEARCH_DESCRIPTION_TIME_LIMIT_424=Maximum length of \
  time (in seconds) to spend processing
-SEVERE_ERR_LDIFSEARCH_NO_FILTER_428=No search filter was specified.  Either a \
+ERR_LDIFSEARCH_NO_FILTER_428=No search filter was specified.  Either a \
  filter file or an individual search filter must be provided
-SEVERE_ERR_LDIFSEARCH_CANNOT_INITIALIZE_CONFIG_429=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_INITIALIZE_CONFIG_429=An error occurred while \
  attempting to process the Directory Server configuration file %s:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_INITIALIZE_SCHEMA_430=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_INITIALIZE_SCHEMA_430=An error occurred while \
  attempting to initialize the Directory Server schema based on the information \
  in configuration file %s:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_PARSE_FILTER_431=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_PARSE_FILTER_431=An error occurred while \
  attempting to parse search filter '%s':  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_PARSE_BASE_DN_432=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_PARSE_BASE_DN_432=An error occurred while \
  attempting to parse base DN '%s':  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_PARSE_TIME_LIMIT_433=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_PARSE_TIME_LIMIT_433=An error occurred while \
  attempting to parse the time limit as an integer:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_PARSE_SIZE_LIMIT_434=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_PARSE_SIZE_LIMIT_434=An error occurred while \
  attempting to parse the size limit as an integer:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_CREATE_READER_435=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_CREATE_READER_435=An error occurred while \
  attempting to create the LDIF reader:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_CREATE_WRITER_436=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_CREATE_WRITER_436=An error occurred while \
  attempting to create the LDIF writer used to return matching entries:  %s
-MILD_WARN_LDIFSEARCH_TIME_LIMIT_EXCEEDED_437=The specified time limit has \
+WARN_LDIFSEARCH_TIME_LIMIT_EXCEEDED_437=The specified time limit has \
  been exceeded during search processing
-MILD_WARN_LDIFSEARCH_SIZE_LIMIT_EXCEEDED_438=The specified size limit has \
+WARN_LDIFSEARCH_SIZE_LIMIT_EXCEEDED_438=The specified size limit has \
  been exceeded during search processing
-SEVERE_ERR_LDIFSEARCH_CANNOT_READ_ENTRY_RECOVERABLE_439=An error occurred \
+ERR_LDIFSEARCH_CANNOT_READ_ENTRY_RECOVERABLE_439=An error occurred \
  while attempting to read an entry from the LDIF content:  %s.  Skipping this \
  entry and continuing processing
-SEVERE_ERR_LDIFSEARCH_CANNOT_READ_ENTRY_FATAL_440=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_READ_ENTRY_FATAL_440=An error occurred while \
  attempting to read an entry from the LDIF content:  %s.  Unable to continue \
  processing
-SEVERE_ERR_LDIFSEARCH_ERROR_DURING_PROCESSING_441=An unexpected error \
+ERR_LDIFSEARCH_ERROR_DURING_PROCESSING_441=An unexpected error \
  occurred during search processing:  %s
-SEVERE_ERR_LDIFSEARCH_CANNOT_INITIALIZE_JMX_442=An error occurred while \
+ERR_LDIFSEARCH_CANNOT_INITIALIZE_JMX_442=An error occurred while \
  attempting to initialize the Directory Server JMX subsystem based on the \
  information in configuration file %s:  %s
 INFO_LDIFDIFF_DESCRIPTION_SOURCE_LDIF_443=LDIF file to use as \
@@ -773,27 +773,27 @@
  output should be written
 INFO_LDIFDIFF_DESCRIPTION_OVERWRITE_EXISTING_446=Any existing \
  output file should be overwritten rather than appending to it
-SEVERE_ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX_452=An error occurred while \
+ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX_452=An error occurred while \
  attempting to initialize the Directory Server JMX subsystem based on the \
  information in configuration file %s:  %s
-SEVERE_ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG_453=An error occurred while \
+ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG_453=An error occurred while \
  attempting to process the Directory Server configuration file %s:  %s
-SEVERE_ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA_454=An error occurred while \
+ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA_454=An error occurred while \
  attempting to initialize the Directory Server schema based on the information \
  in configuration file %s:  %s
-SEVERE_ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF_455=An error occurred while \
+ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF_455=An error occurred while \
  attempting to open source LDIF %s:  %s
-SEVERE_ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF_456=An error occurred while \
+ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF_456=An error occurred while \
  reading the contents of source LDIF %s:  %s
-SEVERE_ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF_457=An error occurred while \
+ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF_457=An error occurred while \
  attempting to open target LDIF %s:  %s
-SEVERE_ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF_458=An error occurred while \
+ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF_458=An error occurred while \
  reading the contents of target LDIF %s:  %s
-SEVERE_ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT_459=An error occurred while attempting \
+ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT_459=An error occurred while attempting \
  to open the LDIF writer for the diff output:  %s
 INFO_LDIFDIFF_NO_DIFFERENCES_460=No differences were detected between the \
  source and target LDIF files
-SEVERE_ERR_LDIFDIFF_ERROR_WRITING_OUTPUT_461=An error occurred while \
+ERR_LDIFDIFF_ERROR_WRITING_OUTPUT_461=An error occurred while \
  attempting to write the diff output:  %s
 INFO_CONFIGDS_DESCRIPTION_LDAP_PORT_464=Port on which the \
  Directory Server should listen for LDAP communication
@@ -806,36 +806,36 @@
  root user for the Directory Server
 INFO_CONFIGDS_DESCRIPTION_ROOT_PW_FILE_468=Path to a file \
  containing the password for the initial root user for the Directory Server
-SEVERE_ERR_CONFIGDS_CANNOT_ACQUIRE_SERVER_LOCK_472=An error occurred while \
+ERR_CONFIGDS_CANNOT_ACQUIRE_SERVER_LOCK_472=An error occurred while \
  attempting to acquire the server-wide lock file %s:  %s.  This generally \
  means that the Directory Server is running, or another tool that requires \
  exclusive access to the server is in use
-SEVERE_ERR_CONFIGDS_CANNOT_INITIALIZE_JMX_473=An error occurred while \
+ERR_CONFIGDS_CANNOT_INITIALIZE_JMX_473=An error occurred while \
  attempting to initialize the Directory Server JMX subsystem based on the \
  information in configuration file %s:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_INITIALIZE_CONFIG_474=An error occurred while \
+ERR_CONFIGDS_CANNOT_INITIALIZE_CONFIG_474=An error occurred while \
  attempting to process the Directory Server configuration file %s:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_INITIALIZE_SCHEMA_475=An error occurred while \
+ERR_CONFIGDS_CANNOT_INITIALIZE_SCHEMA_475=An error occurred while \
  attempting to initialize the Directory Server schema based on the information \
  in configuration file %s:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_PARSE_BASE_DN_476=An error occurred while \
+ERR_CONFIGDS_CANNOT_PARSE_BASE_DN_476=An error occurred while \
  attempting to parse base DN value "%s" as a DN:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_PARSE_ROOT_DN_477=An error occurred while \
+ERR_CONFIGDS_CANNOT_PARSE_ROOT_DN_477=An error occurred while \
  attempting to parse root DN value "%s" as a DN:  %s
-SEVERE_ERR_CONFIGDS_NO_ROOT_PW_478=The DN for the initial root user was \
+ERR_CONFIGDS_NO_ROOT_PW_478=The DN for the initial root user was \
  provided, but no corresponding password was given.  If the root DN is \
  specified then the password must also be provided
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_BASE_DN_479=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_BASE_DN_479=An error occurred while \
  attempting to update the base DN(s) for user data in the Directory Server: \
  %s
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_LDAP_PORT_480=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_LDAP_PORT_480=An error occurred while \
  attempting to update the port on which to listen for LDAP communication:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_ROOT_USER_481=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_ROOT_USER_481=An error occurred while \
  attempting to update the entry for the initial Directory Server root user: \
  %s
-SEVERE_ERR_CONFIGDS_CANNOT_WRITE_UPDATED_CONFIG_482=An error occurred while \
+ERR_CONFIGDS_CANNOT_WRITE_UPDATED_CONFIG_482=An error occurred while \
  writing the updated Directory Server configuration:  %s
-SEVERE_ERR_CONFIGDS_NO_CONFIG_CHANGES_483=ERROR:  No configuration changes \
+ERR_CONFIGDS_NO_CONFIG_CHANGES_483=ERROR:  No configuration changes \
  were specified
 INFO_CONFIGDS_WROTE_UPDATED_CONFIG_484=Successfully wrote the updated \
  Directory Server configuration
@@ -864,141 +864,141 @@
 INFO_INSTALLDS_DESCRIPTION_ROOTPWFILE_497=Path to a file \
  containing the password for the initial root user for the Directory Server
 INFO_INSTALLDS_DESCRIPTION_HELP_498=Display this usage information
-SEVERE_ERR_INSTALLDS_CANNOT_PARSE_DN_503=An error occurred while attempting \
+ERR_INSTALLDS_CANNOT_PARSE_DN_503=An error occurred while attempting \
  to parse the string "%s" as a valid DN:  %s
 INFO_INSTALLDS_PROMPT_BASEDN_504=Provide the base DN for the directory data:
 INFO_INSTALLDS_PROMPT_IMPORT_505=Do you wish to populate the directory \
  database with information from an existing LDIF file?
 INFO_INSTALLDS_PROMPT_IMPORT_FILE_506=Please specify the path to the LDIF \
  file containing the data to import:
-SEVERE_ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS_507=ERROR:  You may not \
+ERR_INSTALLDS_TWO_CONFLICTING_ARGUMENTS_507=ERROR:  You may not \
  provide both the %s and the %s arguments at the same time
 INFO_INSTALLDS_PROMPT_LDAPPORT_509=On which port would you like the Directory \
  Server to accept connections from LDAP clients?
-SEVERE_ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT_510=ERROR:  Unable to \
+ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT_510=ERROR:  Unable to \
  bind to port %d.  This port may already be in use, or you may not have \
  permission to bind to it.  On UNIX-based operating systems, non-root users \
  may not be allowed to bind to ports 1 through 1024
-SEVERE_ERR_INSTALLDS_CANNOT_BIND_TO_PORT_511=ERROR:  Unable to bind to port \
+ERR_INSTALLDS_CANNOT_BIND_TO_PORT_511=ERROR:  Unable to bind to port \
  %d.  This port may already be in use, or you may not have permission to bind \
  to it
 INFO_INSTALLDS_PROMPT_ROOT_DN_512=What would you like to use as the initial \
  root user DN for the Directory Server?
-SEVERE_ERR_INSTALLDS_NO_ROOT_PASSWORD_513=ERROR:  No password was provided \
+ERR_INSTALLDS_NO_ROOT_PASSWORD_513=ERROR:  No password was provided \
  for the initial root user.  When performing a non-interactive installation, \
  this must be provided using either the %s or the %s argument
 INFO_INSTALLDS_PROMPT_ROOT_PASSWORD_514=Please provide the password to use \
  for the initial root user:
 INFO_INSTALLDS_PROMPT_CONFIRM_ROOT_PASSWORD_515=Please re-enter the password \
  for confirmation:
-MILD_ERR_INSTALLDS_INVALID_INTEGER_RESPONSE_524=ERROR:  The provided response \
+ERR_INSTALLDS_INVALID_INTEGER_RESPONSE_524=ERROR:  The provided response \
  could not be interpreted as an integer.  Please provide the response as an \
  integer value
-MILD_ERR_INSTALLDS_INTEGER_BELOW_LOWER_BOUND_525=ERROR:  The provided value \
+ERR_INSTALLDS_INTEGER_BELOW_LOWER_BOUND_525=ERROR:  The provided value \
  is less than the lowest allowed value of %d
-MILD_ERR_INSTALLDS_INTEGER_ABOVE_UPPER_BOUND_526=ERROR:  The provided value \
+ERR_INSTALLDS_INTEGER_ABOVE_UPPER_BOUND_526=ERROR:  The provided value \
  is greater than the largest allowed value of %d
-MILD_ERR_INSTALLDS_INVALID_DN_RESPONSE_527=ERROR:  The provided response \
+ERR_INSTALLDS_INVALID_DN_RESPONSE_527=ERROR:  The provided response \
  could not be interpreted as an LDAP DN
-MILD_ERR_INSTALLDS_PASSWORDS_DONT_MATCH_530=ERROR:  The provided password \
+ERR_INSTALLDS_PASSWORDS_DONT_MATCH_530=ERROR:  The provided password \
  values do not match
 INFO_LDIFIMPORT_DESCRIPTION_QUIET_532=Use quiet mode (no output)
-MILD_ERR_MAKELDIF_TAG_INVALID_ARGUMENT_COUNT_535=Invalid number of arguments \
+ERR_MAKELDIF_TAG_INVALID_ARGUMENT_COUNT_535=Invalid number of arguments \
  provided for tag %s on line number %d of the template file:  expected %d, got \
  %d
-MILD_ERR_MAKELDIF_TAG_INVALID_ARGUMENT_RANGE_COUNT_536=Invalid number of \
+ERR_MAKELDIF_TAG_INVALID_ARGUMENT_RANGE_COUNT_536=Invalid number of \
  arguments provided for tag %s on line number %d of the template file: \
  expected between %d and %d, got %d
-MILD_ERR_MAKELDIF_TAG_UNDEFINED_ATTRIBUTE_537=Undefined attribute %s \
+ERR_MAKELDIF_TAG_UNDEFINED_ATTRIBUTE_537=Undefined attribute %s \
  referenced on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_INTEGER_BELOW_LOWER_BOUND_538=Value %d is below the \
+ERR_MAKELDIF_TAG_INTEGER_BELOW_LOWER_BOUND_538=Value %d is below the \
  lowest allowed value of %d for tag %s on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_CANNOT_PARSE_AS_INTEGER_539=Cannot parse value "%s" as \
+ERR_MAKELDIF_TAG_CANNOT_PARSE_AS_INTEGER_539=Cannot parse value "%s" as \
  an integer for tag %s on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_INTEGER_ABOVE_UPPER_BOUND_540=Value %d is above the \
+ERR_MAKELDIF_TAG_INTEGER_ABOVE_UPPER_BOUND_540=Value %d is above the \
  largest allowed value of %d for tag %s on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_CANNOT_PARSE_AS_BOOLEAN_542=Cannot parse value "%s" as \
+ERR_MAKELDIF_TAG_CANNOT_PARSE_AS_BOOLEAN_542=Cannot parse value "%s" as \
  a Boolean value for tag %s on line %d of the template file.  The value must \
  be either 'true' or 'false'
-MILD_ERR_MAKELDIF_UNDEFINED_BRANCH_SUBORDINATE_543=The branch with entry DN \
+ERR_MAKELDIF_UNDEFINED_BRANCH_SUBORDINATE_543=The branch with entry DN \
  '%s' references a subordinate template named '%s' which is not defined in the \
  template file
-MILD_ERR_MAKELDIF_CANNOT_LOAD_TAG_CLASS_544=Unable to load class %s for use \
+ERR_MAKELDIF_CANNOT_LOAD_TAG_CLASS_544=Unable to load class %s for use \
  as a MakeLDIF tag
-MILD_ERR_MAKELDIF_CANNOT_INSTANTIATE_TAG_545=Cannot instantiate class %s as a \
+ERR_MAKELDIF_CANNOT_INSTANTIATE_TAG_545=Cannot instantiate class %s as a \
  MakeLDIF tag
-MILD_ERR_MAKELDIF_CONFLICTING_TAG_NAME_546=Cannot register the tag defined in \
+ERR_MAKELDIF_CONFLICTING_TAG_NAME_546=Cannot register the tag defined in \
  class %s because the tag name %s conflicts with the name of another tag that \
  has already been registered
-MILD_WARN_MAKELDIF_WARNING_UNDEFINED_CONSTANT_547=Possible reference to an \
+WARN_MAKELDIF_WARNING_UNDEFINED_CONSTANT_547=Possible reference to an \
  undefined constant %s on line %d
-MILD_ERR_MAKELDIF_DEFINE_MISSING_EQUALS_548=The constant definition on line \
+ERR_MAKELDIF_DEFINE_MISSING_EQUALS_548=The constant definition on line \
  %d is missing an equal sign to delimit the constant name from the value
-MILD_ERR_MAKELDIF_DEFINE_NAME_EMPTY_549=The constant definition on line %d \
+ERR_MAKELDIF_DEFINE_NAME_EMPTY_549=The constant definition on line %d \
  does not include a name for the constant
-MILD_ERR_MAKELDIF_CONFLICTING_CONSTANT_NAME_550=The definition for constant \
+ERR_MAKELDIF_CONFLICTING_CONSTANT_NAME_550=The definition for constant \
  %s on line %d conflicts with an earlier constant definition included in the \
  template
-MILD_ERR_MAKELDIF_WARNING_DEFINE_VALUE_EMPTY_551=Constant %s defined on line \
+ERR_MAKELDIF_WARNING_DEFINE_VALUE_EMPTY_551=Constant %s defined on line \
  %d has not been assigned a value
-MILD_ERR_MAKELDIF_CONFLICTING_BRANCH_DN_552=The branch definition %s starting \
+ERR_MAKELDIF_CONFLICTING_BRANCH_DN_552=The branch definition %s starting \
  on line %d conflicts with an earlier branch definition contained in the \
  template file
-MILD_ERR_MAKELDIF_CONFLICTING_TEMPLATE_NAME_553=The template definition %s \
+ERR_MAKELDIF_CONFLICTING_TEMPLATE_NAME_553=The template definition %s \
  starting on line %d conflicts with an earlier template definition contained \
  in the template file
-MILD_ERR_MAKELDIF_UNEXPECTED_TEMPLATE_FILE_LINE_554=Unexpected template line \
+ERR_MAKELDIF_UNEXPECTED_TEMPLATE_FILE_LINE_554=Unexpected template line \
  "%s" encountered on line %d of the template file
-MILD_ERR_MAKELDIF_UNDEFINED_TEMPLATE_SUBORDINATE_555=The template named %s \
+ERR_MAKELDIF_UNDEFINED_TEMPLATE_SUBORDINATE_555=The template named %s \
  references a subordinate template named %s which is not defined in the \
  template file
-MILD_ERR_MAKELDIF_CANNOT_DECODE_BRANCH_DN_556=Unable to decode branch DN "%s" \
+ERR_MAKELDIF_CANNOT_DECODE_BRANCH_DN_556=Unable to decode branch DN "%s" \
  on line %d of the template file
-MILD_ERR_MAKELDIF_BRANCH_SUBORDINATE_TEMPLATE_NO_COLON_557=Subordinate \
+ERR_MAKELDIF_BRANCH_SUBORDINATE_TEMPLATE_NO_COLON_557=Subordinate \
  template definition on line %d for branch %s is missing a colon to separate \
  the template name from the number of entries
-MILD_ERR_MAKELDIF_BRANCH_SUBORDINATE_INVALID_NUM_ENTRIES_558=Subordinate \
+ERR_MAKELDIF_BRANCH_SUBORDINATE_INVALID_NUM_ENTRIES_558=Subordinate \
  template definition on line %d for branch %s specified invalid number of \
  entries %d for template %s
-MILD_WARN_MAKELDIF_BRANCH_SUBORDINATE_ZERO_ENTRIES_559=Subordinate template \
+WARN_MAKELDIF_BRANCH_SUBORDINATE_ZERO_ENTRIES_559=Subordinate template \
  definition on line %d for branch %s specifies that zero entries of type %s \
  should be generated
-MILD_ERR_MAKELDIF_BRANCH_SUBORDINATE_CANT_PARSE_NUMENTRIES_560=Unable to \
+ERR_MAKELDIF_BRANCH_SUBORDINATE_CANT_PARSE_NUMENTRIES_560=Unable to \
  parse the number of entries for template %s as an integer for the subordinate \
  template definition on line %d for branch %s
-MILD_ERR_MAKELDIF_TEMPLATE_SUBORDINATE_TEMPLATE_NO_COLON_561=Subordinate \
+ERR_MAKELDIF_TEMPLATE_SUBORDINATE_TEMPLATE_NO_COLON_561=Subordinate \
  template definition on line %d for template %s is missing a colon to separate \
  the template name from the number of entries
-MILD_ERR_MAKELDIF_TEMPLATE_SUBORDINATE_INVALID_NUM_ENTRIES_562=Subordinate \
+ERR_MAKELDIF_TEMPLATE_SUBORDINATE_INVALID_NUM_ENTRIES_562=Subordinate \
  template definition on line %d for template %s specified invalid number of \
  entries %d for subordinate template %s
-MILD_WARN_MAKELDIF_TEMPLATE_SUBORDINATE_ZERO_ENTRIES_563=Subordinate template \
+WARN_MAKELDIF_TEMPLATE_SUBORDINATE_ZERO_ENTRIES_563=Subordinate template \
  definition on line %d for template %s specifies that zero entries of type %s \
  should be generated
-MILD_ERR_MAKELDIF_TEMPLATE_SUBORDINATE_CANT_PARSE_NUMENTRIES_564=Unable to \
+ERR_MAKELDIF_TEMPLATE_SUBORDINATE_CANT_PARSE_NUMENTRIES_564=Unable to \
  parse the number of entries for template %s as an integer for the subordinate \
  template definition on line %d for template %s
-MILD_ERR_MAKELDIF_TEMPLATE_MISSING_RDN_ATTR_565=The template named %s \
+ERR_MAKELDIF_TEMPLATE_MISSING_RDN_ATTR_565=The template named %s \
  includes RDN attribute %s that is not assigned a value in that template
-MILD_ERR_MAKELDIF_NO_COLON_IN_BRANCH_EXTRA_LINE_566=There is no colon to \
+ERR_MAKELDIF_NO_COLON_IN_BRANCH_EXTRA_LINE_566=There is no colon to \
  separate the attribute name from the value pattern on line %d of the template \
  file in the definition for branch %s
-MILD_ERR_MAKELDIF_NO_ATTR_IN_BRANCH_EXTRA_LINE_567=There is no attribute name \
+ERR_MAKELDIF_NO_ATTR_IN_BRANCH_EXTRA_LINE_567=There is no attribute name \
  before the colon on line %d of the template file in the definition for branch \
  %s
-MILD_WARN_MAKELDIF_NO_VALUE_IN_BRANCH_EXTRA_LINE_568=The value pattern for \
+WARN_MAKELDIF_NO_VALUE_IN_BRANCH_EXTRA_LINE_568=The value pattern for \
  line %d of the template file in the definition for branch %s is empty
-MILD_ERR_MAKELDIF_NO_COLON_IN_TEMPLATE_LINE_569=There is no colon to separate \
+ERR_MAKELDIF_NO_COLON_IN_TEMPLATE_LINE_569=There is no colon to separate \
  the attribute name from the value pattern on line %d of the template file in \
  the definition for template %s
-MILD_ERR_MAKELDIF_NO_ATTR_IN_TEMPLATE_LINE_570=There is no attribute name \
+ERR_MAKELDIF_NO_ATTR_IN_TEMPLATE_LINE_570=There is no attribute name \
  before the colon on line %d of the template file in the definition for \
  template %s
-MILD_WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=The value pattern for line \
+WARN_MAKELDIF_NO_VALUE_IN_TEMPLATE_LINE_571=The value pattern for line \
  %d of the template file in the definition for template %s is empty
-MILD_ERR_MAKELDIF_NO_SUCH_TAG_572=An undefined tag %s is referenced on line \
+ERR_MAKELDIF_NO_SUCH_TAG_572=An undefined tag %s is referenced on line \
  %d of the template file
-MILD_ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=An unexpected error occurred \
+ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG_573=An unexpected error occurred \
  while trying to create a new instance of tag %s referenced on line %d of the \
  template file:  %s
 INFO_MAKELDIF_DESCRIPTION_TEMPLATE_576=The path to the template file with \
@@ -1007,83 +1007,83 @@
 INFO_MAKELDIF_DESCRIPTION_SEED_578=The seed to use to initialize the random \
  number generator
 INFO_MAKELDIF_DESCRIPTION_HELP_579=Show this usage information
-SEVERE_ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=An error occurred while \
+ERR_MAKELDIF_CANNOT_INITIALIZE_JMX_582=An error occurred while \
  attempting to initialize the Directory Server JMX subsystem based on the \
  information in configuration file %s:  %s
-SEVERE_ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=An error occurred while \
+ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG_583=An error occurred while \
  attempting to process the Directory Server configuration file %s:  %s
-SEVERE_ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=An error occurred while \
+ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA_584=An error occurred while \
  attempting to initialize the Directory Server schema based on the information \
  in configuration file %s:  %s
-SEVERE_ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=An error occurred while \
+ERR_MAKELDIF_IOEXCEPTION_DURING_PARSE_585=An error occurred while \
  attempting to read the template file:  %s
-SEVERE_ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=An error occurred while \
+ERR_MAKELDIF_EXCEPTION_DURING_PARSE_586=An error occurred while \
  attempting to parse the template file:  %s
-MILD_ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=Cannot parse value "%s" as an \
+ERR_MAKELDIF_TAG_INVALID_FORMAT_STRING_587=Cannot parse value "%s" as an \
  valid format string for tag %s on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=The random tag on line %d \
+ERR_MAKELDIF_TAG_NO_RANDOM_TYPE_ARGUMENT_588=The random tag on line %d \
  of the template file does not include an argument to specify the type of \
  random value that should be generated
-MILD_WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=The value generated from the \
+WARN_MAKELDIF_TAG_WARNING_EMPTY_VALUE_589=The value generated from the \
  random tag on line %d of the template file will always be an empty string
-MILD_ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=The random tag on line %d of \
+ERR_MAKELDIF_TAG_UNKNOWN_RANDOM_TYPE_590=The random tag on line %d of \
  the template file references an unknown random type of %s
 INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH_591=Path to look for \
  MakeLDIF resources (e.g., data files) not found in the current working \
  directory or template directory path
-MILD_ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=Could not find template \
+ERR_MAKELDIF_COULD_NOT_FIND_TEMPLATE_FILE_592=Could not find template \
  file %s
-MILD_ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=The specified resource \
+ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY_593=The specified resource \
  directory %s could not be found
-MILD_ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=Cannot find file %s referenced by \
+ERR_MAKELDIF_TAG_CANNOT_FIND_FILE_595=Cannot find file %s referenced by \
  tag %s on line %d of the template file
-MILD_ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Invalid file access mode \
+ERR_MAKELDIF_TAG_INVALID_FILE_ACCESS_MODE_596=Invalid file access mode \
  %s for tag %s on line %d of the template file.  It must be either \
  "sequential" or "random"
-MILD_ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=An error occurred while trying to \
+ERR_MAKELDIF_TAG_CANNOT_READ_FILE_597=An error occurred while trying to \
  read file %s referenced by tag %s on line %d of the template file:  %s
-MILD_ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=An error occurred while \
+ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF_598=An error occurred while \
  attempting to open LDIF file %s for writing:  %s
-MILD_ERR_MAKELDIF_ERROR_WRITING_LDIF_599=An error occurred while writing data \
+ERR_MAKELDIF_ERROR_WRITING_LDIF_599=An error occurred while writing data \
  to LDIF file %s:  %s
 INFO_MAKELDIF_PROCESSED_N_ENTRIES_600=Processed %d entries
-MILD_ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=An error occurred while attempting \
+ERR_MAKELDIF_CANNOT_WRITE_ENTRY_601=An error occurred while attempting \
  to write entry %s to LDIF:  %s
 INFO_MAKELDIF_PROCESSING_COMPLETE_602=LDIF processing complete.  %d entries \
  written
 INFO_LDIFIMPORT_DESCRIPTION_TEMPLATE_FILE_603=Path to a MakeLDIF template to \
  use to generate the import data
-SEVERE_ERR_LDIFIMPORT_CONFLICTING_OPTIONS_604=The %s and %s arguments are \
+ERR_LDIFIMPORT_CONFLICTING_OPTIONS_604=The %s and %s arguments are \
  incompatible and may not be used together
-SEVERE_ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Neither the %s or the %s \
+ERR_LDIFIMPORT_MISSING_REQUIRED_ARGUMENT_605=Neither the %s or the %s \
  argument was provided.  One of these arguments must be given to specify the \
  source for the LDIF data to be imported
-SEVERE_ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=Unable to parse the \
+ERR_LDIFIMPORT_CANNOT_PARSE_TEMPLATE_FILE_606=Unable to parse the \
  specified file %s as a MakeLDIF template file:  %s
-MILD_ERR_MAKELDIF_INCOMPLETE_TAG_607=Line %d of the template file contains an \
+ERR_MAKELDIF_INCOMPLETE_TAG_607=Line %d of the template file contains an \
  incomplete tag that starts with either '<' or '{' but does get closed
-MILD_ERR_MAKELDIF_TAG_NOT_ALLOWED_IN_BRANCH_608=Tag %s referenced on line %d \
+ERR_MAKELDIF_TAG_NOT_ALLOWED_IN_BRANCH_608=Tag %s referenced on line %d \
  of the template file is not allowed for use in branch definitions
 INFO_LDIFIMPORT_DESCRIPTION_RANDOM_SEED_609=Seed for the MakeLDIF random \
  number generator
-MILD_ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE_610=Entry %s is added twice in the \
+ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE_610=Entry %s is added twice in the \
  set of changes to apply, which is not supported by the LDIF modify tool
-MILD_ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD_611=Entry %s cannot be deleted \
+ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD_611=Entry %s cannot be deleted \
  because it was previously added in the set of changes.  This is not supported \
  by the LDIF modify tool
-MILD_ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED_612=Cannot modify entry %s \
+ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED_612=Cannot modify entry %s \
  because it was previously added or deleted in the set of changes.  This is \
  not supported by the LDIF modify tool
-MILD_ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED_613=The modify DN operation targeted \
+ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED_613=The modify DN operation targeted \
  at entry %s cannot be processed because modify DN operations are not \
  supported by the LDIF modify tool
-MILD_ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE_614=Entry %s has an unknown changetype \
+ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE_614=Entry %s has an unknown changetype \
  of %s
-MILD_ERR_LDIFMODIFY_ADD_ALREADY_EXISTS_615=Unable to add entry %s because it \
+ERR_LDIFMODIFY_ADD_ALREADY_EXISTS_615=Unable to add entry %s because it \
  already exists in the data set
-MILD_ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY_616=Unable to delete entry %s \
+ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY_616=Unable to delete entry %s \
  because it does not exist in the data set
-MILD_ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY_617=Unable to modify entry %s \
+ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY_617=Unable to modify entry %s \
  because it does not exist in the data set
 INFO_LDIFMODIFY_DESCRIPTION_SOURCE_620=LDIF file containing the \
  data to be updated
@@ -1092,25 +1092,25 @@
 INFO_LDIFMODIFY_DESCRIPTION_TARGET_622=File to which the \
  updated data should be written
 INFO_LDIFMODIFY_DESCRIPTION_HELP_623=Displays this usage information
-SEVERE_ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX_626=An error occurred while \
+ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX_626=An error occurred while \
  attempting to initialize the Directory Server JMX subsystem based on the \
  information in configuration file %s:  %s
-SEVERE_ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG_627=An error occurred while \
+ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG_627=An error occurred while \
  attempting to process the Directory Server configuration file %s:  %s
-SEVERE_ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA_628=An error occurred while \
+ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA_628=An error occurred while \
  attempting to initialize the Directory Server schema based on the information \
  in configuration file %s:  %s
-SEVERE_ERR_LDIFMODIFY_SOURCE_DOES_NOT_EXIST_629=The source LDIF file %s does \
+ERR_LDIFMODIFY_SOURCE_DOES_NOT_EXIST_629=The source LDIF file %s does \
  not exist
-SEVERE_ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE_630=Unable to open the source LDIF \
+ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE_630=Unable to open the source LDIF \
  file %s:  %s
-SEVERE_ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST_631=The changes LDIF file %s \
+ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST_631=The changes LDIF file %s \
  does not exist
-SEVERE_ERR_LDIFMODIFY_CANNOT_OPEN_CHANGES_632=Unable to open the changes LDIF \
+ERR_LDIFMODIFY_CANNOT_OPEN_CHANGES_632=Unable to open the changes LDIF \
  file %s:  %s
-SEVERE_ERR_LDIFMODIFY_CANNOT_OPEN_TARGET_633=Unable to open the target LDIF \
+ERR_LDIFMODIFY_CANNOT_OPEN_TARGET_633=Unable to open the target LDIF \
  file %s for writing:  %s
-SEVERE_ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF_634=An error occurred while \
+ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF_634=An error occurred while \
  processing the requested changes:  %s
 INFO_LDAPPWMOD_DESCRIPTION_HOST_635=Address of the Directory \
  Server system
@@ -1146,35 +1146,35 @@
  when establishing SSL/TLS communication with the server
 INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PINFILE_652=Path to a file \
  containing the PIN needed to access the contents of the trust store
-SEVERE_ERR_LDAPPWMOD_CONFLICTING_ARGS_656=The %s and %s arguments may not be \
+ERR_LDAPPWMOD_CONFLICTING_ARGS_656=The %s and %s arguments may not be \
  provided together
-SEVERE_ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER_657=If either a bind DN \
+ERR_LDAPPWMOD_BIND_DN_AND_PW_MUST_BE_TOGETHER_657=If either a bind DN \
  or bind password is provided, then the other must be given as well
-SEVERE_ERR_LDAPPWMOD_ANON_REQUIRES_AUTHZID_AND_CURRENTPW_658=If a bind DN and \
+ERR_LDAPPWMOD_ANON_REQUIRES_AUTHZID_AND_CURRENTPW_658=If a bind DN and \
  password are not provided, then an authorization ID and current password must \
  be given
-SEVERE_ERR_LDAPPWMOD_DEPENDENT_ARGS_659=If the %s argument is provided, then \
+ERR_LDAPPWMOD_DEPENDENT_ARGS_659=If the %s argument is provided, then \
  the  %s argument must also be given
-SEVERE_ERR_LDAPPWMOD_ERROR_INITIALIZING_SSL_660=Unable to initialize SSL/TLS \
+ERR_LDAPPWMOD_ERROR_INITIALIZING_SSL_660=Unable to initialize SSL/TLS \
  support:  %s
-SEVERE_ERR_LDAPPWMOD_CANNOT_CONNECT_661=An error occurred while attempting to \
+ERR_LDAPPWMOD_CANNOT_CONNECT_661=An error occurred while attempting to \
  connect to the Directory Server:  %s
-SEVERE_ERR_LDAPPWMOD_CANNOT_SEND_PWMOD_REQUEST_662=Unable to send the LDAP \
+ERR_LDAPPWMOD_CANNOT_SEND_PWMOD_REQUEST_662=Unable to send the LDAP \
  password modify request:  %s
-SEVERE_ERR_LDAPPWMOD_CANNOT_READ_PWMOD_RESPONSE_663=Unable to read the LDAP \
+ERR_LDAPPWMOD_CANNOT_READ_PWMOD_RESPONSE_663=Unable to read the LDAP \
  password modify response:  %s
-SEVERE_ERR_LDAPPWMOD_FAILED_664=The LDAP password modify operation failed \
+ERR_LDAPPWMOD_FAILED_664=The LDAP password modify operation failed \
  with result code %d
-SEVERE_ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE_665=Error Message:  %s
-SEVERE_ERR_LDAPPWMOD_FAILURE_MATCHED_DN_666=Matched DN:  %s
+ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE_665=Error Message:  %s
+ERR_LDAPPWMOD_FAILURE_MATCHED_DN_666=Matched DN:  %s
 INFO_LDAPPWMOD_SUCCESSFUL_667=The LDAP password modify operation was \
  successful
 INFO_LDAPPWMOD_ADDITIONAL_INFO_668=Additional Info:  %s
 INFO_LDAPPWMOD_GENERATED_PASSWORD_669=Generated Password:  %s
-SEVERE_ERR_LDAPPWMOD_UNRECOGNIZED_VALUE_TYPE_670=Unable to decode the \
+ERR_LDAPPWMOD_UNRECOGNIZED_VALUE_TYPE_670=Unable to decode the \
  password modify response value because it contained an invalid element type \
  of %s
-SEVERE_ERR_LDAPPWMOD_COULD_NOT_DECODE_RESPONSE_VALUE_671=Unable to decode the \
+ERR_LDAPPWMOD_COULD_NOT_DECODE_RESPONSE_VALUE_671=Unable to decode the \
  password modify response value:  %s
 INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE_673=The assertion value was \
  indicated to be base64-encoded, but an error occurred while trying to decode \
@@ -1188,9 +1188,9 @@
 INFO_WAIT4DEL_DESCRIPTION_TIMEOUT_677=Maximum length of time in seconds \
  to wait for the target file to be deleted before exiting
 INFO_WAIT4DEL_DESCRIPTION_HELP_678=Displays this usage information
-SEVERE_WARN_WAIT4DEL_CANNOT_OPEN_LOG_FILE_681=WARNING:  Unable to open log \
+WARN_WAIT4DEL_CANNOT_OPEN_LOG_FILE_681=WARNING:  Unable to open log \
  file %s for reading:  %s
-SEVERE_ERR_LDAPCOMPARE_NO_DNS_682=No entry DNs provided for the compare \
+ERR_LDAPCOMPARE_NO_DNS_682=No entry DNs provided for the compare \
  operation
 INFO_BACKUPDB_TOOL_DESCRIPTION_683=This utility can be used to back up one or \
  more Directory Server backends
@@ -1232,17 +1232,17 @@
  Edition
 INFO_WAIT4DEL_TOOL_DESCRIPTION_701=This utility can be used to wait for a \
  file to be removed from the filesystem
-SEVERE_ERR_TOOL_CONFLICTING_ARGS_702=You may not provide both the --%s and \
+ERR_TOOL_CONFLICTING_ARGS_702=You may not provide both the --%s and \
  the --%s arguments
-SEVERE_ERR_LDAPCOMPARE_NO_ATTR_703=No attribute was specified to use as the \
+ERR_LDAPCOMPARE_NO_ATTR_703=No attribute was specified to use as the \
  target for the comparison
-SEVERE_ERR_LDAPCOMPARE_INVALID_ATTR_STRING_704=Invalid attribute string '%s'. \
+ERR_LDAPCOMPARE_INVALID_ATTR_STRING_704=Invalid attribute string '%s'. \
  The attribute string must be in one of the following forms: \
  'attribute:value', 'attribute::base64value', or 'attribute:<valueFilePath'
-SEVERE_ERR_TOOL_INVALID_CONTROL_STRING_705=Invalid control specification '%s'
-SEVERE_ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS_706=SASL EXTERNAL \
+ERR_TOOL_INVALID_CONTROL_STRING_705=Invalid control specification '%s'
+ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS_706=SASL EXTERNAL \
  authentication may only be requested if SSL or StartTLS is used
-SEVERE_ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE_707=SASL EXTERNAL authentication \
+ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE_707=SASL EXTERNAL authentication \
  may only be used if a client certificate key store is specified
 INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE_708=# Persistent search change type:  %s
 INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN_709=# Persistent search previous entry \
@@ -1271,9 +1271,9 @@
 INFO_LISTBACKENDS_DESCRIPTION_BASE_DN_727=Base DN for which to list the \
  backend ID
 INFO_LISTBACKENDS_DESCRIPTION_HELP_728=Display this usage information
-SEVERE_ERR_LISTBACKENDS_CANNOT_GET_BACKENDS_734=An error occurred while \
+ERR_LISTBACKENDS_CANNOT_GET_BACKENDS_734=An error occurred while \
  trying to read backend information from the server configuration:  %s
-SEVERE_ERR_LISTBACKENDS_INVALID_DN_735=The provided base DN value '%s' could \
+ERR_LISTBACKENDS_INVALID_DN_735=The provided base DN value '%s' could \
  not be parsed as a valid DN:  %s
 INFO_LISTBACKENDS_NOT_BASE_DN_736=The provided DN '%s' is not a base DN for \
  any backend configured in the Directory Server
@@ -1285,11 +1285,11 @@
  backend '%s'
 INFO_LISTBACKENDS_LABEL_BACKEND_ID_740=Backend ID
 INFO_LISTBACKENDS_LABEL_BASE_DN_741=Base DN
-SEVERE_ERR_LISTBACKENDS_NO_SUCH_BACKEND_742=There is no backend with ID '%s' \
+ERR_LISTBACKENDS_NO_SUCH_BACKEND_742=There is no backend with ID '%s' \
  in the server configuration
-SEVERE_ERR_LISTBACKENDS_NO_VALID_BACKENDS_743=None of the provided backend \
+ERR_LISTBACKENDS_NO_VALID_BACKENDS_743=None of the provided backend \
  IDs exist in the server configuration
-SEVERE_ERR_ENCPW_INVALID_ENCODED_USERPW_748=The provided password is not a \
+ERR_ENCPW_INVALID_ENCODED_USERPW_748=The provided password is not a \
  valid encoded user password value:  %s
 INFO_ENCPW_DESCRIPTION_USE_COMPARE_RESULT_749=Use the LDAP compare result as \
  an exit code for the password comparison
@@ -1309,7 +1309,7 @@
 INFO_INSTALLDS_POPULATE_OPTION_IMPORT_LDIF_757=Import data from an LDIF file
 INFO_INSTALLDS_POPULATE_OPTION_GENERATE_SAMPLE_758=Load \
  automatically-generated sample data
-SEVERE_ERR_INSTALLDS_NO_SUCH_LDIF_FILE_780=ERROR:  The specified LDIF file %s \
+ERR_INSTALLDS_NO_SUCH_LDIF_FILE_780=ERROR:  The specified LDIF file %s \
  does not exist
 INFO_INSTALLDS_PROMPT_NUM_ENTRIES_781=Please specify the number of user \
  entries to generate:
@@ -1321,38 +1321,38 @@
  attributes from the LDIF export
 INFO_LDAPPWMOD_PWPOLICY_WARNING_786=Password Policy Warning:  %s = %d
 INFO_LDAPPWMOD_PWPOLICY_ERROR_787=Password Policy Error:  %s
-MILD_ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL_788=Unable to decode the \
+ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL_788=Unable to decode the \
  password policy response control:  %s
-SEVERE_ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE_789=The \
+ERR_LDAPAUTH_CONNECTION_CLOSED_WITHOUT_BIND_RESPONSE_789=The \
  connection to the Directory Server was closed before the bind response could \
  be read
 INFO_DESCRIPTION_SIMPLE_PAGE_SIZE_790=Use the simple paged results control \
  with the given page size
-SEVERE_ERR_PAGED_RESULTS_REQUIRES_SINGLE_FILTER_791=The simple paged results \
+ERR_PAGED_RESULTS_REQUIRES_SINGLE_FILTER_791=The simple paged results \
  control may only be used with a single search filter
-SEVERE_ERR_PAGED_RESULTS_CANNOT_DECODE_792=Unable to decode the simple paged \
+ERR_PAGED_RESULTS_CANNOT_DECODE_792=Unable to decode the simple paged \
  results control from the search response:  %s
-SEVERE_ERR_PAGED_RESULTS_RESPONSE_NOT_FOUND_793=The simple paged results \
+ERR_PAGED_RESULTS_RESPONSE_NOT_FOUND_793=The simple paged results \
  response control was not found in the search result done message from the \
  server
 INFO_LDIFDIFF_DESCRIPTION_SINGLE_VALUE_CHANGES_794=Each \
  attribute-level change should be written as a separate modification per \
  attribute value rather than one modification per entry
-SEVERE_ERR_PROMPTTM_REJECTING_CLIENT_CERT_795=Rejecting client certificate \
+ERR_PROMPTTM_REJECTING_CLIENT_CERT_795=Rejecting client certificate \
  chain because the prompt trust manager may only be used to trust server \
  certificates
-SEVERE_WARN_PROMPTTM_NO_SERVER_CERT_CHAIN_796=WARNING:  The server did not \
+WARN_PROMPTTM_NO_SERVER_CERT_CHAIN_796=WARNING:  The server did not \
  present a certificate chain.  Do you still wish to attempt connecting to the \
  target server?
-SEVERE_WARN_PROMPTTM_CERT_EXPIRED_797=WARNING:  The server certificate is \
+WARN_PROMPTTM_CERT_EXPIRED_797=WARNING:  The server certificate is \
  expired (expiration time:  %s)
-SEVERE_WARN_PROMPTTM_CERT_NOT_YET_VALID_798=WARNING:  The server certificate \
+WARN_PROMPTTM_CERT_NOT_YET_VALID_798=WARNING:  The server certificate \
  will not be valid until %s
 INFO_PROMPTTM_SERVER_CERT_799=The server is using the following certificate: \
  \n    Subject DN:  %s\n    Issuer DN:  %s\n    Validity:  %s through %s\nDo \
  you wish to trust this certificate and continue connecting to the server?
 INFO_PROMPTTM_YESNO_PROMPT_800=Please enter "yes" or "no":
-SEVERE_ERR_PROMPTTM_USER_REJECTED_801=The server certificate has been \
+ERR_PROMPTTM_USER_REJECTED_801=The server certificate has been \
  rejected by the user
 INFO_STOPDS_SERVER_ALREADY_STOPPED_802=Server already stopped
 INFO_STOPDS_GOING_TO_STOP_803=Stopping Server...
@@ -1362,20 +1362,20 @@
  authentication
 INFO_CONFIGDS_DESCRIPTION_JMX_PORT_806=Port on which the \
  Directory Server should listen for JMX communication
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_JMX_PORT_807=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_JMX_PORT_807=An error occurred while \
  attempting to update the port on which to listen for JMX communication:  %s
 INFO_INSTALLDS_DESCRIPTION_JMXPORT_808=Port on which the \
  Directory Server should listen for JMX communication
 INFO_INSTALLDS_PROMPT_JMXPORT_809=On which port would you like the Directory \
  Server to accept connections from JMX clients?
-SEVERE_ERR_TOOL_RESULT_CODE_810=Result Code:  %d (%s)
-SEVERE_ERR_TOOL_ERROR_MESSAGE_811=Additional Information:  %s
-SEVERE_ERR_TOOL_MATCHED_DN_812=Matched DN:  %s
-SEVERE_ERR_WINDOWS_SERVICE_NOT_FOUND_813=Could not find the service name for \
+ERR_TOOL_RESULT_CODE_810=Result Code:  %d (%s)
+ERR_TOOL_ERROR_MESSAGE_811=Additional Information:  %s
+ERR_TOOL_MATCHED_DN_812=Matched DN:  %s
+ERR_WINDOWS_SERVICE_NOT_FOUND_813=Could not find the service name for \
  the server
-SEVERE_ERR_WINDOWS_SERVICE_START_ERROR_814=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_START_ERROR_814=An unexpected error occurred \
  starting the server as a windows service
-SEVERE_ERR_WINDOWS_SERVICE_STOP_ERROR_815=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_STOP_ERROR_815=An unexpected error occurred \
  stopping the server windows service
 INFO_CONFIGURE_WINDOWS_SERVICE_TOOL_DESCRIPTION_816=This utility can be used \
  to configure the server as a Windows service
@@ -1387,10 +1387,10 @@
  a Windows service and stops the server
 INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE_820=Provides information \
  about the state of the server as a Windows service
-SEVERE_ERR_CONFIGURE_WINDOWS_SERVICE_TOO_MANY_ARGS_823=You can only provide \
+ERR_CONFIGURE_WINDOWS_SERVICE_TOO_MANY_ARGS_823=You can only provide \
  one of the following arguments:\nenableService, disableService, serviceState \
  or cleanupService
-SEVERE_ERR_CONFIGURE_WINDOWS_SERVICE_TOO_FEW_ARGS_824=You must provide at \
+ERR_CONFIGURE_WINDOWS_SERVICE_TOO_FEW_ARGS_824=You must provide at \
  least one of the following arguments:\nenableService, disableService or \
  serviceState or cleanupService
 INFO_WINDOWS_SERVICE_NAME_825=%s
@@ -1400,9 +1400,9 @@
  enabled to run as a Windows service
 INFO_WINDOWS_SERVICE_ALREADY_ENABLED_828=The server was already enabled to run \
  as a Windows service
-SEVERE_ERR_WINDOWS_SERVICE_NAME_ALREADY_IN_USE_829=The server could not be \
+ERR_WINDOWS_SERVICE_NAME_ALREADY_IN_USE_829=The server could not be \
  enabled to run as a Windows service.  The service name is already in use
-SEVERE_ERR_WINDOWS_SERVICE_ENABLE_ERROR_830=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_ENABLE_ERROR_830=An unexpected error occurred \
  trying to enable the server as a Windows service.%nCheck that you have \
  administrator rights (only Administrators can enable the server to run as a \
  Windows Service)
@@ -1410,23 +1410,23 @@
  disabled as a Windows service
 INFO_WINDOWS_SERVICE_ALREADY_DISABLED_832=The server was already disabled as a \
  Windows service
-SEVERE_WARN_WINDOWS_SERVICE_MARKED_FOR_DELETION_833=The server has been marked \
+WARN_WINDOWS_SERVICE_MARKED_FOR_DELETION_833=The server has been marked \
  for deletion as a Windows Service
-SEVERE_ERR_WINDOWS_SERVICE_DISABLE_ERROR_834=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_DISABLE_ERROR_834=An unexpected error occurred \
  trying to disable the server as a Windows service%nCheck that you have \
  administrator rights (only Administrators can disable the server as a Windows \
  Service)
 INFO_WINDOWS_SERVICE_ENABLED_835=The server is enabled as a Windows service.  \
  The service name for the server is: %s
 INFO_WINDOWS_SERVICE_DISABLED_836=The server is disabled as a Windows service
-SEVERE_ERR_WINDOWS_SERVICE_STATE_ERROR_837=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_STATE_ERROR_837=An unexpected error occurred \
  trying to retrieve the state of the server as a Windows service
 INFO_STOPDS_DESCRIPTION_WINDOWS_NET_STOP_838=Used by the window service code \
  to inform that stop-ds is being called from the window services after a call \
  to net stop
 INFO_WAIT4DEL_DESCRIPTION_OUTPUT_FILE_839=Path to a file to \
  which the command will write the output
-SEVERE_WARN_WAIT4DEL_CANNOT_OPEN_OUTPUT_FILE_840=WARNING:  Unable to open \
+WARN_WAIT4DEL_CANNOT_OPEN_OUTPUT_FILE_840=WARNING:  Unable to open \
  output file %s for writing:  %s
 INFO_INSTALLDS_PROMPT_ENABLE_SERVICE_842=Enable the server to run as a Windows \
  Service?
@@ -1437,11 +1437,11 @@
  with the provided service name
 INFO_WINDOWS_SERVICE_CLEANUP_SUCCESS_845=Clean up of service %s was \
  successful
-SEVERE_ERR_WINDOWS_SERVICE_CLEANUP_NOT_FOUND_846=Could not find the service \
+ERR_WINDOWS_SERVICE_CLEANUP_NOT_FOUND_846=Could not find the service \
  with name %s
-SEVERE_WARN_WINDOWS_SERVICE_CLEANUP_MARKED_FOR_DELETION_847=Service %s has \
+WARN_WINDOWS_SERVICE_CLEANUP_MARKED_FOR_DELETION_847=Service %s has \
  been marked for deletion
-SEVERE_ERR_WINDOWS_SERVICE_CLEANUP_ERROR_848=An unexpected error occurred \
+ERR_WINDOWS_SERVICE_CLEANUP_ERROR_848=An unexpected error occurred \
  cleaning up the service %s
 INFO_REBUILDINDEX_TOOL_DESCRIPTION_849=This utility can be used to rebuild \
  index data within a backend based on the Berkeley DB Java Edition
@@ -1452,28 +1452,28 @@
  to rebuild. For an attribute index this is simply an attribute name.  At \
  least one index must be specified for rebuild. Cannot be used with the \
  "--rebuildAll" option
-SEVERE_ERR_REBUILDINDEX_ERROR_DURING_REBUILD_852=An error occurred while \
+ERR_REBUILDINDEX_ERROR_DURING_REBUILD_852=An error occurred while \
  attempting to perform index rebuild:  %s
-SEVERE_ERR_REBUILDINDEX_WRONG_BACKEND_TYPE_853=The backend does not support \
+ERR_REBUILDINDEX_WRONG_BACKEND_TYPE_853=The backend does not support \
  rebuilding of indexes
-SEVERE_ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX_854=At least one index \
+ERR_REBUILDINDEX_REQUIRES_AT_LEAST_ONE_INDEX_854=At least one index \
  must be specified for the rebuild process
-SEVERE_ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND_855=An error occurred \
+ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND_855=An error occurred \
  while attempting to acquire a exclusive lock for backend %s:  %s.  This \
  generally means that some other process has an lock on this backend or the \
  server is running with this backend online. The rebuild process cannot \
  continue
-SEVERE_WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND_856=An error occurred while \
+WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND_856=An error occurred while \
  attempting to release the shared lock for backend %s:  %s.  This lock should \
  automatically be cleared when the rebuild process exits, so no further action \
  should be required
-SEVERE_ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND_857=An error occurred \
+ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND_857=An error occurred \
  while attempting to acquire a shared lock for backend %s:  %s.  This \
  generally means that some other process has an exclusive lock on this backend \
  (e.g., an LDIF import or a restore). The rebuild process cannot continue
 INFO_CONFIGDS_DESCRIPTION_LDAPS_PORT_858=Port on which the \
  Directory Server should listen for LDAPS communication
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_LDAPS_PORT_859=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_LDAPS_PORT_859=An error occurred while \
  attempting to update the port on which to listen for LDAPS communication:  %s
 INFO_CONFIGDS_DESCRIPTION_ENABLE_START_TLS_860=Specifies whether to enable or \
  not StartTLS
@@ -1481,21 +1481,21 @@
  key manager provider to use for SSL and/or StartTLS
 INFO_CONFIGDS_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN_862=DN of \
  the trust manager provider to use for SSL and/or StartTLS
-SEVERE_ERR_CONFIGDS_CANNOT_PARSE_KEYMANAGER_PROVIDER_DN_863=An error occurred \
+ERR_CONFIGDS_CANNOT_PARSE_KEYMANAGER_PROVIDER_DN_863=An error occurred \
  while attempting to parse key manager provider DN value "%s" as a DN:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_PARSE_TRUSTMANAGER_PROVIDER_DN_864=An error \
+ERR_CONFIGDS_CANNOT_PARSE_TRUSTMANAGER_PROVIDER_DN_864=An error \
  occurred while attempting to parse trust manager provider DN value "%s" as a \
  DN:  %s
-SEVERE_ERR_CONFIGDS_CANNOT_ENABLE_STARTTLS_865=An error occurred while \
+ERR_CONFIGDS_CANNOT_ENABLE_STARTTLS_865=An error occurred while \
  attempting to enable StartTLS: %s
-SEVERE_ERR_CONFIGDS_CANNOT_ENABLE_KEYMANAGER_866=An error occurred while \
+ERR_CONFIGDS_CANNOT_ENABLE_KEYMANAGER_866=An error occurred while \
  attempting to enable key manager provider entry: %s
-SEVERE_ERR_CONFIGDS_CANNOT_ENABLE_TRUSTMANAGER_867=An error occurred while \
+ERR_CONFIGDS_CANNOT_ENABLE_TRUSTMANAGER_867=An error occurred while \
  attempting to enable trust manager provider entry: %s
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_KEYMANAGER_REFERENCE_868=An error occurred \
+ERR_CONFIGDS_CANNOT_UPDATE_KEYMANAGER_REFERENCE_868=An error occurred \
  while attempting to update the key manager provider DN used for LDAPS \
  communication: %s
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_TRUSTMANAGER_REFERENCE_869=An error \
+ERR_CONFIGDS_CANNOT_UPDATE_TRUSTMANAGER_REFERENCE_869=An error \
  occurred while attempting to update the trust manager provider DN used for \
  LDAPS communication: %s
 INFO_CONFIGDS_DESCRIPTION_KEYMANAGER_PATH_870=Path of the \
@@ -1503,26 +1503,26 @@
 INFO_CONFIGDS_DESCRIPTION_CERTNICKNAME_871=Nickname of the \
  certificate that the connection handler should use when accepting SSL-based \
  connections or performing StartTLS negotiation
-SEVERE_ERR_CONFIGDS_KEYMANAGER_PROVIDER_DN_REQUIRED_872=ERROR:  You must \
+ERR_CONFIGDS_KEYMANAGER_PROVIDER_DN_REQUIRED_872=ERROR:  You must \
  provide the %s argument when providing the %s argument
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME_873=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME_873=An error occurred while \
  attempting to update the nickname of the certificate that the connection \
  handler should use when accepting SSL-based connections or performing \
  StartTLS negotiation: %s
 INFO_LDAPMODIFY_DESCRIPTION_FILENAME_874=LDIF file containing \
  the changes to apply
-MILD_ERR_MAKELDIF_TEMPLATE_INVALID_PARENT_TEMPLATE_875=The parent template %s \
+ERR_MAKELDIF_TEMPLATE_INVALID_PARENT_TEMPLATE_875=The parent template %s \
  referenced on line %d for template %s is invalid because the referenced \
  parent template is not defined before the template that extends it
 INFO_DESCRIPTION_SORT_ORDER_876=Sort the results using the provided sort \
  order
-MILD_ERR_LDAP_SORTCONTROL_INVALID_ORDER_877=The provided sort order was \
+ERR_LDAP_SORTCONTROL_INVALID_ORDER_877=The provided sort order was \
  invalid:  %s
 INFO_DESCRIPTION_VLV_878=Use the virtual list view control to retrieve the \
  specified results page
-MILD_ERR_LDAPSEARCH_VLV_REQUIRES_SORT_879=If the --%s argument is provided, \
+ERR_LDAPSEARCH_VLV_REQUIRES_SORT_879=If the --%s argument is provided, \
  then the --%s argument must also be given
-MILD_ERR_LDAPSEARCH_VLV_INVALID_DESCRIPTOR_880=The provided virtual list view \
+ERR_LDAPSEARCH_VLV_INVALID_DESCRIPTOR_880=The provided virtual list view \
  descriptor was invalid.  It must be a value in the form \
  'beforeCount:afterCount:offset:contentCount' (where offset specifies the \
  index of the target entry and contentCount specifies the estimated total \
@@ -1532,22 +1532,22 @@
  assertionValue).  In either case, beforeCount is the number of entries to \
  return before the target value and afterCount is the number of entries to \
  return after the target value
-SEVERE_WARN_LDAPSEARCH_SORT_ERROR_881=# Server-side sort failed:  %s
-SEVERE_WARN_LDAPSEARCH_CANNOT_DECODE_SORT_RESPONSE_882=# Unable to decode the \
+WARN_LDAPSEARCH_SORT_ERROR_881=# Server-side sort failed:  %s
+WARN_LDAPSEARCH_CANNOT_DECODE_SORT_RESPONSE_882=# Unable to decode the \
  server-side sort response:  %s
 INFO_LDAPSEARCH_VLV_TARGET_OFFSET_883=# VLV Target Offset:  %d
 INFO_LDAPSEARCH_VLV_CONTENT_COUNT_884=# VLV Content Count:  %d
-SEVERE_WARN_LDAPSEARCH_VLV_ERROR_885=# Virtual list view processing failed: \
+WARN_LDAPSEARCH_VLV_ERROR_885=# Virtual list view processing failed: \
  %s
-SEVERE_WARN_LDAPSEARCH_CANNOT_DECODE_VLV_RESPONSE_886=# Unable to decode the \
+WARN_LDAPSEARCH_CANNOT_DECODE_VLV_RESPONSE_886=# Unable to decode the \
  virtual list view response:  %s
-SEVERE_ERR_LDIFIMPORT_CANNOT_READ_FILE_887=The specified LDIF file %s cannot \
+ERR_LDIFIMPORT_CANNOT_READ_FILE_887=The specified LDIF file %s cannot \
  be read
 INFO_DESCRIPTION_EFFECTIVERIGHTS_USER_888=Use geteffectiverights control with \
  the provided authzid
 INFO_DESCRIPTION_EFFECTIVERIGHTS_ATTR_889=Specifies geteffectiverights \
  control specific attribute list
-MILD_ERR_EFFECTIVERIGHTS_INVALID_AUTHZID_890=The authorization ID "%s" \
+ERR_EFFECTIVERIGHTS_INVALID_AUTHZID_890=The authorization ID "%s" \
  contained in the geteffectiverights control is invalid because it does not \
  start with "dn:" to indicate a user DN
 INFO_DESCRIPTION_PRODUCT_VERSION_891=Display Directory Server version \
@@ -1687,23 +1687,23 @@
  the length of time in seconds that the user has remaining to change his or \
  her password before the account becomes locked due to the required change \
  time
-SEVERE_ERR_PWPSTATE_NO_SUBCOMMAND_1155=No subcommand was provided to indicate \
+ERR_PWPSTATE_NO_SUBCOMMAND_1155=No subcommand was provided to indicate \
  which password policy state operation should be performed
-SEVERE_ERR_PWPSTATE_INVALID_BOOLEAN_VALUE_1156=The provided value '%s' was \
+ERR_PWPSTATE_INVALID_BOOLEAN_VALUE_1156=The provided value '%s' was \
  invalid for the requested operation.  A Boolean value of either 'true' or \
  'false' was expected
-SEVERE_ERR_PWPSTATE_NO_BOOLEAN_VALUE_1157=No value was specified, but the \
+ERR_PWPSTATE_NO_BOOLEAN_VALUE_1157=No value was specified, but the \
  requested operation requires a Boolean value of either 'true' or 'false'
-SEVERE_ERR_PWPSTATE_INVALID_SUBCOMMAND_1158=Unrecognized subcommand '%s'
-SEVERE_ERR_PWPSTATE_CANNOT_SEND_REQUEST_EXTOP_1159=An error occurred while \
+ERR_PWPSTATE_INVALID_SUBCOMMAND_1158=Unrecognized subcommand '%s'
+ERR_PWPSTATE_CANNOT_SEND_REQUEST_EXTOP_1159=An error occurred while \
  attempting to send the request to the server:  %s
-SEVERE_ERR_PWPSTATE_CONNECTION_CLOSED_READING_RESPONSE_1160=The Directory \
+ERR_PWPSTATE_CONNECTION_CLOSED_READING_RESPONSE_1160=The Directory \
  Server closed the connection before the response could be read
-SEVERE_ERR_PWPSTATE_REQUEST_FAILED_1161=The server was unable to process the \
+ERR_PWPSTATE_REQUEST_FAILED_1161=The server was unable to process the \
  request:  result code %d (%s), error message '%s'
-SEVERE_ERR_PWPSTATE_CANNOT_DECODE_RESPONSE_MESSAGE_1162=Unable \
+ERR_PWPSTATE_CANNOT_DECODE_RESPONSE_MESSAGE_1162=Unable \
  to decode the response message from the server:  %s
-SEVERE_ERR_PWPSTATE_CANNOT_DECODE_RESPONSE_OP_1163=Unable to decode \
+ERR_PWPSTATE_CANNOT_DECODE_RESPONSE_OP_1163=Unable to decode \
  information about an operation contained in the response:  %s
 INFO_PWPSTATE_LABEL_PASSWORD_POLICY_DN_1164=Password Policy DN
 INFO_PWPSTATE_LABEL_ACCOUNT_DISABLED_STATE_1165=Account Is Disabled
@@ -1735,20 +1735,20 @@
  by Required Time
 INFO_PWPSTATE_LABEL_SECONDS_UNTIL_REQUIRED_CHANGE_TIME_1182=Seconds Until \
  Required Change Time
-SEVERE_ERR_PWPSTATE_INVALID_RESPONSE_OP_TYPE_1183=Unrecognized or invalid \
+ERR_PWPSTATE_INVALID_RESPONSE_OP_TYPE_1183=Unrecognized or invalid \
  operation type:  %s
-SEVERE_ERR_PWPSTATE_MUTUALLY_EXCLUSIVE_ARGUMENTS_1184=ERROR:  You may not \
+ERR_PWPSTATE_MUTUALLY_EXCLUSIVE_ARGUMENTS_1184=ERROR:  You may not \
  provide both the %s and the %s arguments
-SEVERE_ERR_PWPSTATE_CANNOT_INITIALIZE_SSL_1185=ERROR:  Unable to perform SSL \
+ERR_PWPSTATE_CANNOT_INITIALIZE_SSL_1185=ERROR:  Unable to perform SSL \
  initialization:  %s
-SEVERE_ERR_PWPSTATE_CANNOT_PARSE_SASL_OPTION_1186=ERROR:  The provided SASL \
+ERR_PWPSTATE_CANNOT_PARSE_SASL_OPTION_1186=ERROR:  The provided SASL \
  option string "%s" could not be parsed in the form "name=value"
-SEVERE_ERR_PWPSTATE_NO_SASL_MECHANISM_1187=ERROR:  One or more SASL options \
+ERR_PWPSTATE_NO_SASL_MECHANISM_1187=ERROR:  One or more SASL options \
  were provided, but none of them were the "mech" option to specify which SASL \
  mechanism should be used
-SEVERE_ERR_PWPSTATE_CANNOT_DETERMINE_PORT_1188=ERROR:  Cannot parse the value \
+ERR_PWPSTATE_CANNOT_DETERMINE_PORT_1188=ERROR:  Cannot parse the value \
  of the %s argument as an integer value between 1 and 65535:  %s
-SEVERE_ERR_PWPSTATE_CANNOT_CONNECT_1189=ERROR:  Cannot establish a connection to \
+ERR_PWPSTATE_CANNOT_CONNECT_1189=ERROR:  Cannot establish a connection to \
  the Directory Server %s.  Verify that the server is running and that \
  the provided credentials are valid.  Details:  %s
 INFO_UPGRADE_DESCRIPTION_NO_PROMPT_1191=Use non-interactive mode.  Prompt for \
@@ -1758,7 +1758,7 @@
  will be reduced to 255 due to exit code restrictions)
 INFO_LDIFIMPORT_DESCRIPTION_SKIP_FILE_1197=Write skipped entries to the \
  specified file
-SEVERE_ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE_1198=An error occurred while \
+ERR_LDIFIMPORT_CANNOT_OPEN_SKIP_FILE_1198=An error occurred while \
  trying to open the skip file %s for writing:  %s
 INFO_VERIFYINDEX_DESCRIPTION_COUNT_ERRORS_1199=Count the number of errors \
  found during the verification and return that value as the exit code (values \
@@ -1768,69 +1768,69 @@
  state values for the user
 INFO_DESCRIPTION_PWPSTATE_CLEAR_PASSWORD_HISTORY_1203=Clear password history \
  state values for the user.  This should be used only for testing purposes
-SEVERE_ERR_CONFIGDS_PORT_ALREADY_SPECIFIED_1211=ERROR:  You have specified \
+ERR_CONFIGDS_PORT_ALREADY_SPECIFIED_1211=ERROR:  You have specified \
  the value %s for different ports
-SEVERE_ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED_1212=The property "%s" is not a \
+ERR_CLI_ERROR_PROPERTY_UNRECOGNIZED_1212=The property "%s" is not a \
  recognized property
-SEVERE_ERR_CLI_ERROR_MISSING_PROPERTY_1213=The mandatory property "%s" is \
+ERR_CLI_ERROR_MISSING_PROPERTY_1213=The mandatory property "%s" is \
  missing
-SEVERE_ERR_CLI_ERROR_INVALID_PROPERTY_VALUE_1214=The value "%s" specified for \
+ERR_CLI_ERROR_INVALID_PROPERTY_VALUE_1214=The value "%s" specified for \
  the property "%s" is invalid
 INFO_CLI_HEADING_PROPERTY_DEFAULT_VALUE_1215=Default value
 INFO_LDIFIMPORT_DESCRIPTION_CLEAR_BACKEND_1251=Remove all entries for all \
  base DNs in the backend before importing
-SEVERE_ERR_LDIFIMPORT_MISSING_BACKEND_ARGUMENT_1252=Neither the %s or the %s \
+ERR_LDIFIMPORT_MISSING_BACKEND_ARGUMENT_1252=Neither the %s or the %s \
  argument was provided.  One of these arguments must be given to specify the \
  backend for the LDIF data to be imported to
-SEVERE_ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND_1253=Importing to a backend \
+ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND_1253=Importing to a backend \
  without the append argument will remove all entries for all base DNs (%s) in \
  the backend. The %s argument must be given to continue with import
-MILD_ERR_MAKELDIF_TAG_LIST_NO_ARGUMENTS_1291=The list tag on line %d of the \
+ERR_MAKELDIF_TAG_LIST_NO_ARGUMENTS_1291=The list tag on line %d of the \
  template file does not contain any arguments to specify the list values.  At \
  least one list value must be provided
-MILD_WARN_MAKELDIF_TAG_LIST_INVALID_WEIGHT_1292=The list tag on line %d of \
+WARN_MAKELDIF_TAG_LIST_INVALID_WEIGHT_1292=The list tag on line %d of \
  the template file contains item '%s' that includes a semicolon but that \
  semicolon is not followed by an integer.  The semicolon will be assumed to be \
  part of the value and not a delimiter to separate the value from its relative \
  weight
-FATAL_ERR_INITIALIZE_SERVER_ROOT_1293=An unexpected error occurred \
+ERR_INITIALIZE_SERVER_ROOT_1293=An unexpected error occurred \
   attempting to set the server's root directory to %s: %s
-SEVERE_ERR_LDAP_CONN_MUTUALLY_EXCLUSIVE_ARGUMENTS_1294=ERROR:  You may not \
+ERR_LDAP_CONN_MUTUALLY_EXCLUSIVE_ARGUMENTS_1294=ERROR:  You may not \
  provide both the %s and the %s arguments
-SEVERE_ERR_LDAP_CONN_CANNOT_INITIALIZE_SSL_1295=ERROR:  Unable to perform SSL \
+ERR_LDAP_CONN_CANNOT_INITIALIZE_SSL_1295=ERROR:  Unable to perform SSL \
  initialization:  %s
-SEVERE_ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION_1296=ERROR:  The provided SASL \
+ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION_1296=ERROR:  The provided SASL \
  option string "%s" could not be parsed in the form "name=value"
-SEVERE_ERR_LDAP_CONN_NO_SASL_MECHANISM_1297=ERROR:  One or more SASL options \
+ERR_LDAP_CONN_NO_SASL_MECHANISM_1297=ERROR:  One or more SASL options \
  were provided, but none of them were the "mech" option to specify which SASL \
  mechanism should be used
 INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS_1307=SASL bind options
-SEVERE_ERR_TASK_CLIENT_UNEXPECTED_CONNECTION_CLOSURE_1315=NOTICE:  The \
+ERR_TASK_CLIENT_UNEXPECTED_CONNECTION_CLOSURE_1315=NOTICE:  The \
  connection to the Directory Server was closed while waiting for a response to \
  the shutdown request.  This likely means that the server has started the \
  shutdown process
-SEVERE_ERR_TASK_TOOL_IO_ERROR_1316=ERROR:  An I/O error occurred while \
+ERR_TASK_TOOL_IO_ERROR_1316=ERROR:  An I/O error occurred while \
  attempting to communicate with the Directory Server:  %s
-SEVERE_ERR_TASK_TOOL_DECODE_ERROR_1317=ERROR:  An error occurred while \
+ERR_TASK_TOOL_DECODE_ERROR_1317=ERROR:  An error occurred while \
  trying to decode the response from the server:  %s
-SEVERE_ERR_TASK_CLIENT_INVALID_RESPONSE_TYPE_1318=ERROR:  Expected an add \
+ERR_TASK_CLIENT_INVALID_RESPONSE_TYPE_1318=ERROR:  Expected an add \
  response message but got a %s message instead
 INFO_TASK_TOOL_TASK_SCHEDULED_NOW_1319=%s task %s scheduled to start \
   immediately
-SEVERE_ERR_LDAP_CONN_INCOMPATIBLE_ARGS_1320=ERROR:  argument %s is \
+ERR_LDAP_CONN_INCOMPATIBLE_ARGS_1320=ERROR:  argument %s is \
  incompatible with use of this tool to interact with the directory as a client
-SEVERE_ERR_CREATERC_ONLY_RUNS_ON_UNIX_1321=This tool may only be used on \
+ERR_CREATERC_ONLY_RUNS_ON_UNIX_1321=This tool may only be used on \
  UNIX-based systems
 INFO_CREATERC_TOOL_DESCRIPTION_1322=Create an RC script that may be used to \
  start, stop, and restart the Directory Server on UNIX-based systems
 INFO_CREATERC_OUTFILE_DESCRIPTION_1323=The path to the output file to create
-SEVERE_ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT_1324=Unable to determine \
+ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT_1324=Unable to determine \
  the path to the server root directory.  Please ensure that the %s system \
  property or the %s environment variable is set to the path of the server \
  root directory
-SEVERE_ERR_CREATERC_CANNOT_WRITE_1325=An error occurred while attempting to \
+ERR_CREATERC_CANNOT_WRITE_1325=An error occurred while attempting to \
  generate the RC script:  %s
-SEVERE_ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE_1326=If you specify \
+ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE_1326=If you specify \
  the {%s} argument you must also specify {%s}
 INFO_DESCRIPTION_DBTEST_TOOL_1327=This utility can be used to debug the JE \
   database
@@ -1847,7 +1847,7 @@
   to debug
 INFO_DESCRIPTION_DBTEST_SKIP_DECODE_1334=Do not try to decode the JE data to \
   their appropriate types
-MILD_ERR_DBTEST_DECODE_FAIL_1335=An error occurred while decoding data: %s
+ERR_DBTEST_DECODE_FAIL_1335=An error occurred while decoding data: %s
 INFO_DESCRIPTION_DBTEST_SUBCMD_LIST_INDEX_STATUS_1336=List the status of \
   indexes in an entry container
 INFO_DESCRIPTION_DBTEST_MAX_KEY_VALUE_1337=Only show records with keys that \
@@ -1867,17 +1867,17 @@
 INFO_LABEL_DBTEST_BASE_DN_1344=Base DN
 INFO_LABEL_DBTEST_JE_DATABASE_PREFIX_1345=JE Database Prefix
 INFO_LABEL_DBTEST_ENTRY_COUNT_1346=Entry Count
-SEVERE_ERR_DBTEST_NO_BACKENDS_FOR_ID_1347=None of the Directory Server \
+ERR_DBTEST_NO_BACKENDS_FOR_ID_1347=None of the Directory Server \
   backends are configured with the requested backend ID %s
-SEVERE_ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN_1348=None of the entry \
+ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN_1348=None of the entry \
   containers are configured with the requested base DN %s in backend %s
-SEVERE_ERR_DBTEST_NO_DATABASE_CONTAINERS_FOR_NAME_1349=No database container \
+ERR_DBTEST_NO_DATABASE_CONTAINERS_FOR_NAME_1349=No database container \
   exists with the requested name %s in entry container %s and backend %s
-SEVERE_ERR_DBTEST_ERROR_INITIALIZING_BACKEND_1350=An unexpected error occurred \
+ERR_DBTEST_ERROR_INITIALIZING_BACKEND_1350=An unexpected error occurred \
   while attempting to initialize the JE backend %s: %s
-SEVERE_ERR_DBTEST_ERROR_READING_DATABASE_1351=An unexpected error occurred \
+ERR_DBTEST_ERROR_READING_DATABASE_1351=An unexpected error occurred \
   while attempting to read and/or decode records from the database: %s
-SEVERE_ERR_DBTEST_DECODE_BASE_DN_1352=Unable to decode base DN string "%s" as \
+ERR_DBTEST_DECODE_BASE_DN_1352=Unable to decode base DN string "%s" as \
   a valid distinguished name:  %s
 INFO_LABEL_DBTEST_DATABASE_NAME_1353=Database Name
 INFO_LABEL_DBTEST_DATABASE_TYPE_1354=Database Type
@@ -1888,15 +1888,15 @@
 INFO_LABEL_DBTEST_INDEX_STATUS_1359=Index Valid
 INFO_LABEL_DBTEST_KEY_1360=Key
 INFO_LABEL_DBTEST_DATA_1361=Data
-SEVERE_WARN_DBTEST_CANNOT_UNLOCK_BACKEND_1362=An error occurred while \
+WARN_DBTEST_CANNOT_UNLOCK_BACKEND_1362=An error occurred while \
  attempting to release the shared lock for backend %s:  %s.  This lock should \
  automatically be cleared when the process exits, so no further action \
  should be required
-SEVERE_ERR_DBTEST_CANNOT_LOCK_BACKEND_1363=An error occurred while \
+ERR_DBTEST_CANNOT_LOCK_BACKEND_1363=An error occurred while \
  attempting to acquire a shared lock for backend %s:  %s.  This generally \
  means that some other process has exclusive access to this backend (e.g., a \
  restore or an LDIF import)
-SEVERE_ERR_DBTEST_CANNOT_DECODE_KEY_1364=An error occurred while decoding the \
+ERR_DBTEST_CANNOT_DECODE_KEY_1364=An error occurred while decoding the \
   min/max key value %s: %s. Values prefixed with "0x" will be decoded as raw \
   bytes in hex. When dumping the DN2ID database, the value must be a valid \
   distinguished name. When dumping the ID2Entry database, the value will be \
@@ -1909,16 +1909,16 @@
 INFO_LABEL_DBTEST_INDEX_VALUE_1369=Indexed Value
 INFO_LABEL_DBTEST_INDEX_ENTRY_ID_LIST_1370=Entry ID List
 INFO_LABEL_DBTEST_VLV_INDEX_LAST_SORT_KEYS_1371=Last Sort Keys
-SEVERE_ERR_DBTEST_CANNOT_DECODE_SIZE_1372=An error occurred while parsing the \
+ERR_DBTEST_CANNOT_DECODE_SIZE_1372=An error occurred while parsing the \
   min/max data size %s as a integer: %s
-SEVERE_ERR_DBTEST_MISSING_SUBCOMMAND_1374=A sub-command must be specified
+ERR_DBTEST_MISSING_SUBCOMMAND_1374=A sub-command must be specified
 INFO_CREATERC_USER_DESCRIPTION_1375=The name of the user account under which \
  the server should run
 INFO_CREATERC_JAVA_HOME_DESCRIPTION_1376=The path to the Java installation \
  that should be used to run the server
 INFO_CREATERC_JAVA_ARGS_DESCRIPTION_1377=A set of arguments that should be \
  passed to the JVM when running the server
-SEVERE_ERR_CREATERC_JAVA_HOME_DOESNT_EXIST_1378=The directory %s specified \
+ERR_CREATERC_JAVA_HOME_DOESNT_EXIST_1378=The directory %s specified \
  as the OPENDJ_JAVA_HOME path does not exist or is not a directory
 INFO_INSTALLDS_STATUS_COMMAND_LINE_1379=To see basic server configuration \
 status and configuration you can launch %s
@@ -1941,10 +1941,10 @@
  PKCS#11 token
 INFO_INSTALLDS_PROMPT_START_SERVER_1393=Do you want to start the server when \
  the configuration is completed?
-SEVERE_ERR_INSTALLDS_CERTNICKNAME_NOT_FOUND_1394=The provided certificate \
+ERR_INSTALLDS_CERTNICKNAME_NOT_FOUND_1394=The provided certificate \
  nickname could not be found.  The key store contains the following \
  certificate nicknames: %s
-SEVERE_ERR_INSTALLDS_MUST_PROVIDE_CERTNICKNAME_1395=The key store contains the \
+ERR_INSTALLDS_MUST_PROVIDE_CERTNICKNAME_1395=The key store contains the \
  following certificate nicknames: %s.%nYou have to provide the nickname of the \
  certificate you want to use
 INFO_INSTALLDS_DESCRIPTION_DO_NOT_START_1396=Do not start the server when the \
@@ -1975,22 +1975,22 @@
 INFO_INSTALLDS_DESCRIPTION_CERT_NICKNAME_1405=Nickname of the \
  certificate that the server should use when accepting SSL-based \
  connections or performing StartTLS negotiation
-SEVERE_ERR_INSTALLDS_SEVERAL_CERTIFICATE_TYPE_SPECIFIED_1406=You have \
+ERR_INSTALLDS_SEVERAL_CERTIFICATE_TYPE_SPECIFIED_1406=You have \
  specified several certificate types to be used.  Only one certificate type \
  (self-signed, JKS, JCEKS, PKCS#12 or PCKS#11) is allowed
-SEVERE_ERR_INSTALLDS_CERTIFICATE_REQUIRED_FOR_SSL_OR_STARTTLS_1407=You have \
+ERR_INSTALLDS_CERTIFICATE_REQUIRED_FOR_SSL_OR_STARTTLS_1407=You have \
  chosen to enable SSL or StartTLS.  You must specify which type of certificate \
  you want the server to use
-SEVERE_ERR_INSTALLDS_NO_KEYSTORE_PASSWORD_1408=You must provide the PIN of the \
+ERR_INSTALLDS_NO_KEYSTORE_PASSWORD_1408=You must provide the PIN of the \
  keystore to retrieve the certificate to be used by the server.  You can use \
  {%s} or {%s}
 INFO_INSTALLDS_DESCRIPTION_NO_PROMPT_1409=Perform an installation in \
  non-interactive mode.  If some data in the command is missing the user will \
  not be prompted and the tool will fail
-SEVERE_ERR_INSTALLDS_SSL_OR_STARTTLS_REQUIRED_1410=You have specified to use a \
+ERR_INSTALLDS_SSL_OR_STARTTLS_REQUIRED_1410=You have specified to use a \
  certificate as server certificate.  You must enable SSL (using option {%s}) \
  or Start TLS (using option %s)
-SEVERE_ERR_UPGRADE_INCOMPATIBLE_ARGS_1411=The argument '%s' is incompatible \
+ERR_UPGRADE_INCOMPATIBLE_ARGS_1411=The argument '%s' is incompatible \
  with '%s'
 INFO_TASKINFO_TOOL_DESCRIPTION_1412=This utility can be used to obtain a list \
  of tasks scheduled to run within the Directory Server as well as information \
@@ -2003,7 +2003,7 @@
 INFO_TASKINFO_CMD_VIEW_LOGS_1417=view logs
 INFO_TASKINFO_CMD_CANCEL_NUMBER_PROMPT_1419=Enter the number of a task to \
   cancel [%d]
-MILD_ERR_TASKINFO_INVALID_MENU_KEY_1422=Invalid menu item or task number '%s'
+ERR_TASKINFO_INVALID_MENU_KEY_1422=Invalid menu item or task number '%s'
 INFO_TASKINFO_FIELD_ID_1423=ID
 INFO_TASKINFO_FIELD_TYPE_1424=Type
 INFO_TASKINFO_FIELD_STATUS_1425=Status
@@ -2017,9 +2017,9 @@
 INFO_TASKINFO_FIELD_NOTIFY_ON_COMPLETION_1433=Email Upon Completion
 INFO_TASKINFO_FIELD_NOTIFY_ON_ERROR_1434=Email Upon Error
 INFO_TASKINFO_CMD_CANCEL_SUCCESS_1435=Task %s canceled
-SEVERE_ERR_TASKINFO_RETRIEVING_TASK_ENTRY_1437=Error retrieving task entry \
+ERR_TASKINFO_RETRIEVING_TASK_ENTRY_1437=Error retrieving task entry \
   %s:  %s
-MILD_ERR_TASKINFO_UNKNOWN_TASK_ENTRY_1438=There are no tasks with ID %s
+ERR_TASKINFO_UNKNOWN_TASK_ENTRY_1438=There are no tasks with ID %s
 INFO_TASKINFO_DETAILS_1439=Task Details
 INFO_TASKINFO_OPTIONS_1440=%s Options
 INFO_TASKINFO_NO_TASKS_1441=No tasks exist
@@ -2029,20 +2029,20 @@
 INFO_TASKINFO_LDAP_EXCEPTION_1445=Error connecting to the directory server: \
   '%s'. Verify that the connection options are correct and that the server is \
   running
-SEVERE_ERR_INCOMPATIBLE_ARGUMENTS_1446=Options '%s' and '%s' are incompatible \
+ERR_INCOMPATIBLE_ARGUMENTS_1446=Options '%s' and '%s' are incompatible \
   with each other and cannot be used together
 INFO_TASKINFO_TASK_ARG_CANCEL_1447=ID of a particular task to cancel
-SEVERE_ERR_TASKINFO_CANCELING_TASK_1448=Error canceling task '%s': %s
-SEVERE_ERR_TASKINFO_ACCESSING_LOGS_1449=Error accessing logs for task '%s': %s
-SEVERE_ERR_TASKINFO_NOT_CANCELABLE_TASK_INDEX_1450=Task at index %d is not \
+ERR_TASKINFO_CANCELING_TASK_1448=Error canceling task '%s': %s
+ERR_TASKINFO_ACCESSING_LOGS_1449=Error accessing logs for task '%s': %s
+ERR_TASKINFO_NOT_CANCELABLE_TASK_INDEX_1450=Task at index %d is not \
   cancelable
-SEVERE_ERR_TASKINFO_NOT_CANCELABLE_TASK_1451=Task %s has finished and cannot \
+ERR_TASKINFO_NOT_CANCELABLE_TASK_1451=Task %s has finished and cannot \
   be canceled
 INFO_TASKINFO_NO_CANCELABLE_TASKS_1452=There are currently no cancelable tasks
-SEVERE_ERR_TASK_CLIENT_UNKNOWN_TASK_1453=There are no tasks defined with ID '%s'
-SEVERE_ERR_TASK_CLIENT_UNCANCELABLE_TASK_1454=Task '%s' has finished and \
+ERR_TASK_CLIENT_UNKNOWN_TASK_1453=There are no tasks defined with ID '%s'
+ERR_TASK_CLIENT_UNCANCELABLE_TASK_1454=Task '%s' has finished and \
   cannot be canceled
-SEVERE_ERR_TASK_CLIENT_TASK_STATE_UNKNOWN_1455=State for task '%s' cannot be \
+ERR_TASK_CLIENT_TASK_STATE_UNKNOWN_1455=State for task '%s' cannot be \
   determined
 INFO_DESCRIPTION_START_DATETIME_1456=Indicates the date/time at which this \
   operation will start when scheduled as a server task expressed in \
@@ -2051,10 +2051,10 @@
   immediate execution.  When this option is specified the operation will be \
   scheduled to start at the specified time after which this utility will exit \
   immediately
-SEVERE_ERR_START_DATETIME_FORMAT_1457=The start date/time must in \
+ERR_START_DATETIME_FORMAT_1457=The start date/time must in \
   YYYYMMDDhhmmssZ format for UTC time or YYYYMMDDhhmmss for local time
 INFO_TASK_TOOL_TASK_SCHEDULED_FUTURE_1458=%s task %s scheduled to start %s
-SEVERE_ERR_TASK_TOOL_START_TIME_NO_LDAP_1459=You have provided options for \
+ERR_TASK_TOOL_START_TIME_NO_LDAP_1459=You have provided options for \
   scheduling this operation as a task but options provided for connecting to \
   the server's tasks backend resulted in the following error: '%s'
 INFO_DESCRIPTION_PROP_FILE_PATH_1461=Path to the file containing default \
@@ -2079,28 +2079,28 @@
 INFO_DESCRIPTION_TASK_FAILED_DEPENDENCY_ACTION_1472=Action this task will \
   take should one if its dependent tasks fail.  The value must be one of %s.  \
   If not specified defaults to %s
-SEVERE_ERR_TASKTOOL_OPTIONS_FOR_TASK_ONLY_1473=The option %s is only \
+ERR_TASKTOOL_OPTIONS_FOR_TASK_ONLY_1473=The option %s is only \
   applicable when scheduling this operation as a task
-SEVERE_ERR_TASKTOOL_INVALID_EMAIL_ADDRESS_1474=The value %s for option %s is \
+ERR_TASKTOOL_INVALID_EMAIL_ADDRESS_1474=The value %s for option %s is \
   not a valid email address
-SEVERE_ERR_TASKTOOL_INVALID_FDA_1475=The failed dependency action value %s is \
+ERR_TASKTOOL_INVALID_FDA_1475=The failed dependency action value %s is \
   invalid.  The value must be one of %s
-SEVERE_ERR_TASKTOOL_FDA_WITH_NO_DEPENDENCY_1476=The failed dependency action \
+ERR_TASKTOOL_FDA_WITH_NO_DEPENDENCY_1476=The failed dependency action \
   option is to be used in conjunction with one or more dependencies
-SEVERE_ERR_TASKINFO_TASK_NOT_CANCELABLE_TASK_1477=Error:  task %s is not in a \
+ERR_TASKINFO_TASK_NOT_CANCELABLE_TASK_1477=Error:  task %s is not in a \
   cancelable state
-NOTICE_BACKUPDB_CANCELLED_1478=The backup process was cancelled
+NOTE_BACKUPDB_CANCELLED_1478=The backup process was cancelled
 INFO_INSTALLDS_DESCRIPTION_REJECTED_FILE_1479=Write rejected entries to the \
  specified file
-MILD_ERR_INSTALLDS_CANNOT_WRITE_REJECTED_1480=Cannot write to rejected entries \
+ERR_INSTALLDS_CANNOT_WRITE_REJECTED_1480=Cannot write to rejected entries \
  file %s.  Verify that you have enough write rights on the file
 INFO_INSTALLDS_PROMPT_REJECTED_FILE_1481=Write rejected entries to file:
 INFO_INSTALLDS_DESCRIPTION_SKIPPED_FILE_1482=Write skipped entries to the \
  specified file
-MILD_ERR_INSTALLDS_CANNOT_WRITE_SKIPPED_1483=Cannot write to skipped entries \
+ERR_INSTALLDS_CANNOT_WRITE_SKIPPED_1483=Cannot write to skipped entries \
  file %s.  Verify that you have enough write rights on the file
 INFO_INSTALLDS_PROMPT_SKIPPED_FILE_1484=Write skipped entries to file:
-SEVERE_ERR_INSTALLDS_TOO_MANY_KEYSTORE_PASSWORD_TRIES_1485=The maximum number \
+ERR_INSTALLDS_TOO_MANY_KEYSTORE_PASSWORD_TRIES_1485=The maximum number \
  of tries to provide the certificate key store PIN is %s.  Install canceled
 INFO_JAVAPROPERTIES_TOOL_DESCRIPTION_1486=This utility can be used to change \
  the java arguments and java home that are used by the different server \
@@ -2117,11 +2117,11 @@
 INFO_JAVAPROPERTIES_DESCRIPTION_DESTINATION_FILE_1489=The script file that \
  will be written.  If not specified %s will be written
 INFO_JAVAPROPERTIES_DESCRIPTION_HELP_1490=Display this usage information
-SEVERE_ERR_JAVAPROPERTIES_WITH_PROPERTIES_FILE_1491=The file properties "%s" \
+ERR_JAVAPROPERTIES_WITH_PROPERTIES_FILE_1491=The file properties "%s" \
  cannot be read.  Check that it exists and that you have read rights to it
-SEVERE_ERR_JAVAPROPERTIES_WITH_DESTINATION_FILE_1492=The destination file "%s" \
+ERR_JAVAPROPERTIES_WITH_DESTINATION_FILE_1492=The destination file "%s" \
  cannot be written.  Check that you have write rights to it
-SEVERE_ERR_JAVAPROPERTIES_WRITING_DESTINATION_FILE_1493=The destination file \
+ERR_JAVAPROPERTIES_WRITING_DESTINATION_FILE_1493=The destination file \
  "%s" cannot be written.  Check that you have right reads to it
 INFO_JAVAPROPERTIES_SUCCESSFUL_NON_DEFAULT_1494=The script file %s was \
  successfully created.  For the command-lines to use the java properties \
@@ -2131,9 +2131,9 @@
  properties file located in %s
 INFO_DESCRIPTION_TEST_IF_OFFLINE_1496=When this is set test if the command \
  must be run in offline or online mode, returning the appropriate error code
-SEVERE_ERR_BACKUPDB_REPEATED_BACKEND_ID_1497=The backend ID '%s' has been \
+ERR_BACKUPDB_REPEATED_BACKEND_ID_1497=The backend ID '%s' has been \
  specified several times
-MILD_ERR_INSTALLDS_EMPTY_DN_RESPONSE_1498=ERROR:  The empty LDAP DN is not \
+ERR_INSTALLDS_EMPTY_DN_RESPONSE_1498=ERROR:  The empty LDAP DN is not \
  a valid value
 
 # Placeholders for values as they will be displayed in the usage
@@ -2247,22 +2247,22 @@
 INFO_INSTALLDS_CONFIRM_INSTALL_1604=Set up the server with the parameters above
 INFO_INSTALLDS_PROVIDE_DATA_AGAIN_1605=Provide the setup parameters again
 INFO_INSTALLDS_CANCEL_1606=Cancel and exit
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_CRYPTO_MANAGER_1607=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_CRYPTO_MANAGER_1607=An error occurred while \
  attempting to update the crypto manager in the Directory Server: %s
 INFO_TASK_TOOL_TASK_SUCESSFULL_1608=%s task %s has been successfully completed
 INFO_TASK_TOOL_TASK_NOT_SUCESSFULL_1609=%s task %s did not complete \
  successfully
-SEVERE_ERR_CANNOT_READ_TRUSTSTORE_1610=Cannot access trust store '%s'.  Verify \
+ERR_CANNOT_READ_TRUSTSTORE_1610=Cannot access trust store '%s'.  Verify \
  that the provided trust store exists and that you have read access rights to it
-SEVERE_ERR_CANNOT_READ_KEYSTORE_1611=Cannot access key store '%s'.  Verify \
+ERR_CANNOT_READ_KEYSTORE_1611=Cannot access key store '%s'.  Verify \
  that the provided key store exists and that you have read access rights to it
 INFO_LDIFDIFF_DESCRIPTION_IGNORE_ATTRS_1612=File containing a list of attributes \
  to ignore when computing the difference
 INFO_LDIFDIFF_DESCRIPTION_IGNORE_ENTRIES_1613=File containing a list of entries (DN) \
  to ignore when computing the difference
-SEVERE_ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES_1614=An error occurred while attempting \
+ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES_1614=An error occurred while attempting \
  to read the file '%s' containing the list of ignored entries: %s
-SEVERE_ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS_1615=An error occurred while attempting \
+ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS_1615=An error occurred while attempting \
  to read the file '%s' containing the list of ignored attributes: %s
 INFO_LDIFDIFF_CANNOT_PARSE_STRING_AS_DN_1616=The string '%s' from file '%s' could \
  not be parsed as a dn
@@ -2271,9 +2271,9 @@
  Administration Connector to accept connections?
 INFO_INSTALLDS_DESCRIPTION_ADMINCONNECTORPORT_1619=Port on which the \
  Administration Connector should listen for communication
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT_1620=An error occurred \
+ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT_1620=An error occurred \
  while attempting to update the administration connector port:  %s
-SEVERE_ERR_TASKINFO_LDAP_EXCEPTION_SSL_1621=Error connecting to the directory server at %s on %s. \
+ERR_TASKINFO_LDAP_EXCEPTION_SSL_1621=Error connecting to the directory server at %s on %s. \
 Check this port is an administration port
 INFO_DESCRIPTION_ADMIN_PORT_1622=Directory server administration port number
 INFO_INSTALLDS_DESCRIPTION_USE_JCEKS_1623=Path of a JCEKS containing a \
@@ -2281,11 +2281,11 @@
 INFO_INSTALLDS_CERT_OPTION_JCEKS_1624=Use an existing certificate located on a \
  JCEKS key store
 INFO_INSTALLDS_PROMPT_JCEKS_PATH_1625=JCEKS Key Store path:
-SEVERE_ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER_1626=Error creating \
+ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER_1626=Error creating \
  JCEKS Key Provider configuration:  %s
-SEVERE_ERR_STOPDS_CANNOT_CONNECT_SSL_1628=ERROR:  Cannot establish a connection to \
+ERR_STOPDS_CANNOT_CONNECT_SSL_1628=ERROR:  Cannot establish a connection to \
  the Directory Server at %s on port %s. Check this port is an administration port
-SEVERE_ERR_PWPSTATE_CANNOT_CONNECT_SSL_1629=ERROR:  Cannot establish a connection to \
+ERR_PWPSTATE_CANNOT_CONNECT_SSL_1629=ERROR:  Cannot establish a connection to \
  the Directory Server at %s on port %s. Check this port is an administration port
 
 
@@ -2293,15 +2293,15 @@
 
 
 
-SEVERE_ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY_1650=The target backend %s \
+ERR_BACKUPDB_CANNOT_BACKUP_IN_DIRECTORY_1650=The target backend %s \
  cannot be backed up to the backup directory %s: this directory is \
  already a backup location for backend %s
 
 INFO_RECURRING_TASK_PLACEHOLDER_1651={schedulePattern}
-SEVERE_ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS_1652=An error occurred \
+ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS_1652=An error occurred \
  while attempting to initialize server components to run the encode \
  password tool:  %s
-SEVERE_ERR_LDIFIMPORT_COUNT_REJECTS_REQUIRES_OFFLINE_1653=The %s \
+ERR_LDIFIMPORT_COUNT_REJECTS_REQUIRES_OFFLINE_1653=The %s \
  argument is not supported for online imports
 INFO_DESCRIPTION_RECURRING_TASK_1654=Indicates the task is recurring and will \
  be scheduled according to the value argument expressed in crontab(5) \
@@ -2309,7 +2309,7 @@
 INFO_TASK_TOOL_RECURRING_TASK_SCHEDULED_1655=Recurring %s task %s scheduled \
  successfully
 
-FATAL_ERR_INTERNAL_1658=Internal Error: %s
+ERR_INTERNAL_1658=Internal Error: %s
 INFO_LDIFEXPORT_PATH_TO_LDIF_FILE_1662=Exporting to %s
 
 #
@@ -2321,17 +2321,17 @@
 INFO_PROMPT_NO_COMPLETE_ANSWER_1665=no
 INFO_PROMPT_NO_FIRST_LETTER_ANSWER_1666=n
 
-SEVERE_ERR_START_DATETIME_ALREADY_PASSED_1667=The specified start time '%s' \
+ERR_START_DATETIME_ALREADY_PASSED_1667=The specified start time '%s' \
  has already passed
 
-SEVERE_ERR_LDAPCOMPARE_ERROR_READING_FILE_1668=An error occurred reading file \
+ERR_LDAPCOMPARE_ERROR_READING_FILE_1668=An error occurred reading file \
  '%s'.  Check that the file exists and that you have read access rights to \
  it.  Details: %s
 
-SEVERE_ERR_STOPDS_DATETIME_ALREADY_PASSED_1669=The specified stop time '%s' \
+ERR_STOPDS_DATETIME_ALREADY_PASSED_1669=The specified stop time '%s' \
  has already passed
 
-SEVERE_ERR_LDAPCOMPARE_FILENAME_AND_DNS_1670=Both entry DNs and a file name \
+ERR_LDAPCOMPARE_FILENAME_AND_DNS_1670=Both entry DNs and a file name \
  were provided for the compare operation.  These arguments are not compatible
 
 # The following chars correspond to the following properties:
@@ -2345,7 +2345,7 @@
 INFO_LDIFDIFF_DESCRIPTION_CHECK_SCHEMA_1674=Takes into account the syntax of \
  the attributes as defined in the schema to make the value comparison.  The \
  provided LDIF files must be conform to the server schema
-SEVERE_WARN_LDIFDIFF_NO_CONFIG_FILE_1675=WARNING:  no configuration file was \
+WARN_LDIFDIFF_NO_CONFIG_FILE_1675=WARNING:  no configuration file was \
  provided as argument.  No schema check will be performed.  If this is being \
  called throught the '%s' command-line, verify that the script has not been \
  modified
@@ -2355,10 +2355,10 @@
 INFO_BATCH_FILE_PATH_PLACEHOLDER_1677={batchFilePath}
 INFO_DESCRIPTION_BATCH_FILE_PATH_1678=Path to a batch file containing \
 a set of dsconfig commands to be executed
-SEVERE_ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE_1679=If you specify \
+ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE_1679=If you specify \
  the {%s} argument you must also specify {%s}
 
-SEVERE_ERR_TIMEOUT_DURING_STARTUP_1680=The timeout of '%d' seconds to start \
+ERR_TIMEOUT_DURING_STARTUP_1680=The timeout of '%d' seconds to start \
  the server has been reached.  You can use the argument '--%s' to increase \
  this timeout
 INFO_INSTALLDS_ENABLE_WINDOWS_SERVICE_1681=Enable the server to run as a \
@@ -2373,7 +2373,7 @@
 INFO_LDIFIMPORT_DESCRIPTION_THREAD_COUNT_1686=Number of threads used to \
  read LDIF file during import. Default value (0) equals: 2 x (number of CPUs)
 INFO_LDIFIMPORT_THREAD_COUNT_PLACEHOLDER_1687={count}
-SEVERE_ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT_1688=The value %s for \
+ERR_LDIFIMPORT_CANNOT_PARSE_THREAD_COUNT_1688=The value %s for \
 threadCount cannot be parsed: %s
 
 INFO_LDAPSEARCH_PUBLIC_CHANGELOG_COOKIE_EXC_1689=# Public \
@@ -2383,19 +2383,19 @@
  against an encoded password is interactively asked to the user
 INFO_ENCPW_INPUT_PWD_1_1691=Please enter the password :
 INFO_ENCPW_INPUT_PWD_2_1692=Please renter the password:
-SEVERE_ERR_ENCPW_NOT_SAME_PW_1693=Provided passwords don't matched
-SEVERE_ERR_ENCPW_CANNOT_READ_PW_1694=Cannot read password from the input: %s
+ERR_ENCPW_NOT_SAME_PW_1693=Provided passwords don't matched
+ERR_ENCPW_CANNOT_READ_PW_1694=Cannot read password from the input: %s
 INFO_REBUILDINDEX_DESCRIPTION_REBUILD_ALL_1695=Rebuild all indexes, including \
 any DN2ID, DN2URI, VLV and extensible indexes. Cannot be used \
 with the "-i" option or the "--rebuildDegraded" option
 INFO_REBUILDINDEX_TEMP_DIR_PLACEHOLDER_1697={directory}
 INFO_REBUILDINDEX_DESCRIPTION_TEMP_DIRECTORY_1698=Path to temporary directory \
 for index scratch files during index rebuilding
-SEVERE_ERR_REBUILDINDEX_REBUILD_ALL_ERROR_1699=Index "-i" option cannot be \
+ERR_REBUILDINDEX_REBUILD_ALL_ERROR_1699=Index "-i" option cannot be \
 specified with the "--rebuildAll" option
 INFO_INSTALLDS_PROVIDE_BASE_DN_PROMPT_1700=Do you want to create base DNs in \
  the server?
-SEVERE_ERR_INSTALLDS_NO_BASE_DN_AND_CONFLICTING_ARG_1701=You have specified \
+ERR_INSTALLDS_NO_BASE_DN_AND_CONFLICTING_ARG_1701=You have specified \
  not to create a base DN.  If no base DN is to be created you cannot specify \
  argument '%s'
 INFO_DESCRIPTION_SUBENTRIES_1702=Use subentries control to specify that \
@@ -2414,7 +2414,7 @@
  the period (in seconds) between two displays of the status
 INFO_INSTALLDS_PRINT_EQUIVALENT_COMMAND_LINE_1708=Print equivalent \
  non-interactive command-line
-MILD_ERR_WINDOWS_SERVICE_ENABLING_ERROR_STARTING_SERVER_1709=The Windows \
+ERR_WINDOWS_SERVICE_ENABLING_ERROR_STARTING_SERVER_1709=The Windows \
  Service was successfully configured but there was an error starting it.  \
  Error code starting Windows Service: %d
 INFO_DESCRIPTION_DBTEST_STATS_ONLY_1710=Do not display the JE data, \
@@ -2423,27 +2423,27 @@
 INFO_DESCRIPTION_CONNECTION_TIMEOUT_1712=Maximum length of time (in \
  milliseconds) that can be taken to establish a connection.  Use '0' to \
  specify no time out
-MILD_ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=An error occurred while \
+ERR_MAKELDIF_CANNOT_WRITE_ENTRY_WITHOUT_DN_1713=An error occurred while \
 attempting to write entry to LDIF:  Could not calculate the DN for the \
 entry (no value found for the RDN attribute %s)
-SEVERE_ERR_CLIENT_SIDE_TIMEOUT_1714=A client side timeout occurred.\
+ERR_CLIENT_SIDE_TIMEOUT_1714=A client side timeout occurred.\
  %nAdditional Information:  %s
 INFO_LABEL_DBTEST_INDEX_UNDEFINED_RECORD_COUNT_1715=Undefined
 INFO_MAXIMUM_DURATION_PLACEHOLDER_1716={maximum duration}
 INFO_DESCRIPTION_PURGE_HISTORICAL_MAXIMUM_DURATION_1717=This argument specifies \
 the maximum duration the purge processing must last expressed in seconds
-SEVERE_ERR_RECURRING_SCHEDULE_FORMAT_ERROR_1718=The provided schedule value \
+ERR_RECURRING_SCHEDULE_FORMAT_ERROR_1718=The provided schedule value \
  has an invalid format.  The schedule must be expressed using a crontab(5) \
  format.  Error details: %s
 INFO_DESCRIPTION_REMOTE_1719=Connect to a remote server
 INFO_REBUILDINDEX_DESCRIPTION_REBUILD_DEGRADED_1720=Rebuild all degraded \
  indexes, including any DN2ID, DN2URI, VLV and extensible indexes. Cannot be used \
  with the "-i" option or the "--rebuildAll" option
-SEVERE_ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR_1721=Option "--rebuildDegraded" cannot be \
+ERR_REBUILDINDEX_REBUILD_DEGRADED_ERROR_1721=Option "--rebuildDegraded" cannot be \
  specified with the "--%s" option
-SEVERE_ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR_1722=Option "--rebuildAll" \
+ERR_REBUILDINDEX_REBUILD_ALL_DEGRADED_ERROR_1722=Option "--rebuildAll" \
  cannot be specified with the "--%s" option
-SEVERE_ERR_CONFIGDS_CANNOT_UPDATE_DIGEST_MD5_FQDN_1733=An error occurred while \
+ERR_CONFIGDS_CANNOT_UPDATE_DIGEST_MD5_FQDN_1733=An error occurred while \
  attempting to update the FQDN for the DIGEST-MD5 SASL mechanism:  %s
 INFO_REBUILDINDEX_DESCRIPTION_CLEAR_DEGRADED_STATE_1734=Indicates that indexes do not need \
 rebuilding because they are known to be empty and forcefully marks them as valid. \
@@ -2455,12 +2455,12 @@
 as an exit code for reporting differences between the two LDIF files
 INFO_LDAPCOMPARE_DESCRIPTION_USE_COMPARE_RESULT_1736=Use the LDAP compare result \
 as an exit code for the LDAP compare operations
-SEVERE_ERR_BUILDVERSION_NOT_FOUND_1737=The version of the installed OpenDJ could not be determined \
+ERR_BUILDVERSION_NOT_FOUND_1737=The version of the installed OpenDJ could not be determined \
 because the version file '%s' could not be found. Restore it from backup before continuing
-SEVERE_ERR_BUILDVERSION_MALFORMED_1738=The version of the installed OpenDJ could not be determined \
+ERR_BUILDVERSION_MALFORMED_1738=The version of the installed OpenDJ could not be determined \
 because the version file '%s' exists but contains invalid data. \
 Restore it from backup before continuing
-SEVERE_ERR_BUILDVERSION_MISMATCH_1739=The OpenDJ binary version '%s' does not match the installed \
+ERR_BUILDVERSION_MISMATCH_1739=The OpenDJ binary version '%s' does not match the installed \
 version '%s'. Please run upgrade before continuing
 INFO_UPGRADE_OPTION_IGNORE_ERRORS_1740=Ignores any errors which occur during the upgrade. This option \
 should be used with caution and may be useful in automated deployments where potential errors are \
@@ -2468,7 +2468,7 @@
 INFO_UPGRADE_OPTION_FORCE_1741=Forces a non-interactive upgrade to continue even if it requires user \
 interaction. In particular, long running or critical upgrade tasks, such as re-indexing, which \
 require user confirmation will be skipped. This option may only be used with the '%s' option
-SEVERE_ERR_UPGRADE_USER_INTERACTION_REQUIRED_1742=The upgrade cannot be performed non-interactively \
+ERR_UPGRADE_USER_INTERACTION_REQUIRED_1742=The upgrade cannot be performed non-interactively \
 because one or more upgrade tasks are critical and require user interaction in order to complete. \
 Please re-run upgrade interactively by removing the '%s' option, or force the upgrade to complete \
 by specifying the '%s' option
@@ -2477,30 +2477,30 @@
 the OpenDJ binaries and before restarting the server.%n%nNOTE: this tool does not provide backup \
 or restore capabilities. Therefore, it is the responsibility of the OpenDJ administrator to take \
 necessary precautions before performing the upgrade
-SEVERE_ERR_UPGRADE_MAIN_UPGRADE_PROCESS_1800=The upgrade failed to complete for the following reason: %s
+ERR_UPGRADE_MAIN_UPGRADE_PROCESS_1800=The upgrade failed to complete for the following reason: %s
 INFO_UPGRADE_SUCCESSFUL_1801=OpenDJ was successfully upgraded from version %s to %s
 INFO_UPGRADE_PERFORMING_TASKS_1802=Performing upgrade
 INFO_UPGRADE_TITLE_1803=OpenDJ Upgrade Utility
 INFO_UPGRADE_SUMMARY_1804=OpenDJ will be upgraded from version %s to %s
-SEVERE_ERR_UPGRADE_REQUIRES_SERVER_OFFLINE_1805=OpenDJ cannot be upgraded because the server is currently \
+ERR_UPGRADE_REQUIRES_SERVER_OFFLINE_1805=OpenDJ cannot be upgraded because the server is currently \
 running. Please stop the server and try again
-SEVERE_ERR_UPGRADE_VERSION_UP_TO_DATE_1806=OpenDJ has already been upgraded to version %s
-SEVERE_ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR_1807=An unexpected error occurred \
+ERR_UPGRADE_VERSION_UP_TO_DATE_1806=OpenDJ has already been upgraded to version %s
+ERR_UPGRADE_DISPLAY_NOTIFICATION_ERROR_1807=An unexpected error occurred \
 while attempting to display a notification: %s
-SEVERE_ERR_UPGRADE_DISPLAY_CONFIRM_ERROR_1808=An unexpected error occurred \
+ERR_UPGRADE_DISPLAY_CONFIRM_ERROR_1808=An unexpected error occurred \
 while attempting to display a confirmation : %s
-SEVERE_ERR_UPGRADE_INVALID_USER_OPTIONS_SELECTED_1809=Invalid user's \
+ERR_UPGRADE_INVALID_USER_OPTIONS_SELECTED_1809=Invalid user's \
 options selected
 INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE_1810=...Change(s) done in %s (x%s)
 INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE_1811=...No change applied in %s
-SEVERE_ERR_UPGRADE_TASKS_FAIL_1812=\nAn error occurred while performing an upgrade task: %s
+ERR_UPGRADE_TASKS_FAIL_1812=\nAn error occurred while performing an upgrade task: %s
 INFO_UPGRADE_TASK_NEEDS_USER_CONFIRM_1813=%s.%nDo you want to make this configuration change?
 INFO_UPGRADE_DISPLAY_CONFIRM_START_1814=The upgrade is ready to proceed. Do you \
 wish to continue?
 INFO_UPGRADE_ABORTED_BY_USER_1815=The upgrade has been canceled
-SEVERE_ERR_UPGRADE_UNKNOWN_OC_ATT_1816=No %s with OID %s exists in \
+ERR_UPGRADE_UNKNOWN_OC_ATT_1816=No %s with OID %s exists in \
 the schema
-SEVERE_ERR_UPGRADE_CONFIG_ERROR_UPGRADE_FOLDER_1817=An error occurred when \
+ERR_UPGRADE_CONFIG_ERROR_UPGRADE_FOLDER_1817=An error occurred when \
 trying to upgrade the config/upgrade folder: %s
 INFO_UPGRADE_REQUIREMENTS_1818=Preparing to upgrade
 INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED_1819=This tool cannot be used for \
@@ -2518,39 +2518,39 @@
 INFO_ERROR_DELETING_FILE_1825=An error occurred while deleting file '%s'. Check \
 that you have the rights to delete this file and that there is no other application using it
 INFO_ERROR_RENAMING_FILE_1826=An error occurred while renaming file '%s' to '%s'
-SEVERE_ERR_UPGRADE_FAILS_1827=The upgrade failed because %d errors were \
+ERR_UPGRADE_FAILS_1827=The upgrade failed because %d errors were \
 encountered. Please check log for further details
-SEVERE_ERR_UPGRADE_COPYSCHEMA_FAILS_1828=An error occurred while copying \
+ERR_UPGRADE_COPYSCHEMA_FAILS_1828=An error occurred while copying \
 the schema file '%s': %s
-SEVERE_ERR_UPGRADE_ADDATTRIBUTE_FAILS_1829=An error occurred while adding \
+ERR_UPGRADE_ADDATTRIBUTE_FAILS_1829=An error occurred while adding \
 one or more attributes to the schema file '%s': %s
-SEVERE_ERR_UPGRADE_ADDOBJECTCLASS_FAILS_1830=An error occurred while adding \
+ERR_UPGRADE_ADDOBJECTCLASS_FAILS_1830=An error occurred while adding \
 one or more object classes to the schema file '%s': %s
 INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS_1831=See '%s' for a detailed log of this operation
 INFO_UPGRADE_TASK_REPLACE_SCHEMA_FILE_1832=Replacing schema file '%s'
 INFO_UPGRADE_TASK_REFRESH_UPGRADE_DIRECTORY_1833=Archiving concatenated schema
 INFO_UPGRADE_TASK_ADD_CONFIG_FILE_1834=Adding '%s' configuration file
-SEVERE_ERR_UPGRADE_ADD_CONFIG_FILE_FAILS_1835=An error occurred while adding \
+ERR_UPGRADE_ADD_CONFIG_FILE_FAILS_1835=An error occurred while adding \
 configuration file '%s': %s
 INFO_OPTION_ACCEPT_LICENSE_1836=Automatically accepts the product license \
 (if present)
-SEVERE_ERR_UPGRADE_RENAME_SNMP_SECURITY_CONFIG_FILE_1838=An error occurred when \
+ERR_UPGRADE_RENAME_SNMP_SECURITY_CONFIG_FILE_1838=An error occurred when \
 trying to rename the SNMP security config file: %s
 INFO_UPGRADE_REBUILD_INDEX_STARTS_1839=Rebuilding index(es) %s
 INFO_UPGRADE_REBUILD_INDEX_ENDS_1840=Rebuild index task ends
 INFO_UPGRADE_PERFORMING_POST_TASKS_1841=Performing post upgrade tasks
 INFO_UPGRADE_POST_TASKS_COMPLETE_1842=Post upgrade tasks complete
-SEVERE_ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL_1843=An error occured during post \
+ERR_UPGRADE_PERFORMING_POST_TASKS_FAIL_1843=An error occured during post \
 upgrade task. Process aborted. Please check log for further details
 INFO_UPGRADE_REBUILD_INDEX_DECLINED_1844 =You have to rebuild the '%s' index \
 manually to get a fully functional server
 INFO_UPGRADE_ALL_REBUILD_INDEX_DECLINED_1845=You have to rebuild all indexes \
 manually to get a fully functional server
-SEVERE_ERR_UPGRADE_INVALID_LOG_FILE_1846=Invalid log file %s
+ERR_UPGRADE_INVALID_LOG_FILE_1846=Invalid log file %s
 INFO_UPGRADE_REBUILD_INDEX_ARGUMENTS_1847=The rebuild index tool arguments are %s
 INFO_UPGRADE_REBUILD_ALL_1848=Rebuilding all indexes
 INFO_UPGRADE_PROCESS_END_1849=End of the upgrade process
-SEVERE_ERR_UPGRADE_CORRUPTED_TEMPLATE_1850='%s' is missing or empty, it is probably corrupted
+ERR_UPGRADE_CORRUPTED_TEMPLATE_1850='%s' is missing or empty, it is probably corrupted
 INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND_1851=No backend found. The rebuild index task \
 stops
 
@@ -2579,7 +2579,7 @@
 INFO_UPGRADE_TASK_9013_DESCRIPTION_10019=OpenDJ 2.5.0-Xpress1 introduced a \
  regression in the ds-sync-hist ordering index. This index has to be rebuilt and this could take a long time \
  to proceed. Do you want to launch this process at automatically at the end of the upgrade?
-SEVERE_ERR_TASK_TOOL_LDAP_ERROR_10020=ERROR:  The server rejected the task for the following reason: %s
+ERR_TASK_TOOL_LDAP_ERROR_10020=ERROR:  The server rejected the task for the following reason: %s
 INFO_UPGRADE_TASK_10133_1_SUMMARY_10021=Changing matching rule for 'userCertificate' and \
 'caCertificate' to CertificateExactMatch
 INFO_UPGRADE_TASK_10133_2_SUMMARY_10022=Configuring 'CertificateExactMatch' matching rule

--
Gitblit v1.10.0