From 8b1e90837d520a178cad5e0e8668586495fd3dc3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 24 Feb 2016 22:24:28 +0000
Subject: [PATCH] OPENDJ-2333 - remove unused i18n messages

---
 opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties                    |   24 -
 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java             |    2 
 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java           |    4 
 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java              |    1 
 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java   |    2 
 opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties                       |  507 ---------------------------------------
 opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties     |  201 ---------------
 opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java |    8 
 opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java           |    5 
 9 files changed, 5 insertions(+), 749 deletions(-)

diff --git a/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
index e893a39..5961af0 100644
--- a/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
+++ b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -13,9 +13,6 @@
 #
 # Copyright 2014-2016 ForgeRock AS.
 
-#
-# CLI messages
-#
 ERR_ARG_NO_VALUE_PLACEHOLDER=The %s argument is configured to take \
  a value but no value placeholder has been defined for it
 ERR_ARG_NO_INT_VALUE=The %s argument does not have any value that \
@@ -24,18 +21,6 @@
  argument cannot be decoded as an integer
 ERR_ARG_INT_MULTIPLE_VALUES=The %s argument has multiple values and \
  therefore cannot be decoded as a single integer value
-ERR_ARG_NO_DOUBLE_VALUE=The %s argument does not have any value that \
- may be retrieved as a double
-ERR_ARG_CANNOT_DECODE_AS_DOUBLE=The provided value "%s" for the %s \
- argument cannot be decoded as a double
-ERR_ARG_DOUBLE_MULTIPLE_VALUES=The %s argument has multiple values and \
- therefore cannot be decoded as a single double value
-ERR_ARG_NO_BOOLEAN_VALUE=The %s argument does not have any value \
- that may be retrieved as a Boolean
-ERR_ARG_CANNOT_DECODE_AS_BOOLEAN=The provided value "%s" for the %s \
- argument cannot be decoded as a Boolean
-ERR_ARG_BOOLEAN_MULTIPLE_VALUES=The %s argument has multiple values \
- and therefore cannot be decoded as a single Boolean value
 ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND=The %s argument \
  configuration is invalid because the lower bound of %d is greater than the \
  upper bound of %d
@@ -109,21 +94,8 @@
 INFO_TIME_IN_DAYS_HOURS_MINUTES_SECONDS=%d days, %d hours, %d minutes, %d \
  seconds
 INFO_SUBCMDPARSER_WHERE_OPTIONS_INCLUDE=Command options:
-ERR_MENU_BAD_CHOICE_SINGLE=Invalid response. Please enter a valid \
-menu option
-INFO_MENU_PROMPT_SINGLE=Enter choice:
 INFO_MENU_PROMPT_RETURN_TO_CONTINUE=Press RETURN to continue
 ERR_CONSOLE_INPUT_ERROR=The response could not be read from the console due to the following error: %s
-INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate:
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate?
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO=No
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION=Yes, for this session only
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS=Yes, also add it to a truststore
-INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS=View certificate details
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN  : %s
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n             To '%s'
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer   : %s
 INFO_PROMPT_SINGLE_DEFAULT=%s [%s]:
 INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage:  java %s  {options}
 INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage:  %s  {options}
@@ -146,19 +118,6 @@
 #
 # Tools messages
 #
-ERR_CANNOT_INITIALIZE_ARGS=An unexpected error occurred while \
- attempting to initialize the command-line arguments:  %s
-ERR_ERROR_PARSING_ARGS=An error occurred while parsing the \
- command-line arguments: %s
-INFO_PROCESSING_OPERATION=Processing %s request for %s
-INFO_OPERATION_FAILED=%s operation failed
-INFO_OPERATION_SUCCESSFUL=%s operation successful for DN %s
-INFO_PROCESSING_COMPARE_OPERATION=Comparing type %s with value %s in \
- entry %s
-INFO_COMPARE_OPERATION_RESULT_FALSE=Compare operation returned false for \
- entry %s
-INFO_COMPARE_OPERATION_RESULT_TRUE=Compare operation returned true for \
- entry %s
 INFO_DESCRIPTION_TRUSTALL=Trust all server SSL certificates
 INFO_DESCRIPTION_BINDDN=DN to use to bind to the server
 INFO_DESCRIPTION_BINDPASSWORD=Password to use to bind to \
@@ -170,7 +129,6 @@
 INFO_DESCRIPTION_VERBOSE=Use verbose mode
 INFO_DESCRIPTION_KEYSTOREPATH=Certificate key store path
 INFO_DESCRIPTION_TRUSTSTOREPATH=Certificate trust store path
-INFO_DESCRIPTION_KEYSTOREPASSWORD=Certificate key store PIN
 INFO_DESCRIPTION_HOST=Directory server hostname or IP address
 INFO_DESCRIPTION_PORT=Directory server port number
 INFO_DESCRIPTION_SHOWUSAGE=Display this usage information
@@ -185,202 +143,25 @@
  control with the given authorization ID
 INFO_DESCRIPTION_RESTART=Attempt to automatically restart the \
  server once it has stopped
-INFO_DESCRIPTION_STOP_REASON=Reason the server is being stopped or \
- restarted
-INFO_CHECK_STOPPABILITY=Used to determine whether the server can \
- be stopped or not and the mode to be used to stop it
-INFO_DESCRIPTION_STOP_TIME=Indicates the date/time at which the \
- shutdown operation will begin as a server task expressed in format \
- YYYYMMDDhhmmssZ for UTC time or YYYYMMDDhhmmss for local time.  A value of \
- '0' will cause the shutdown to be scheduled for \
- 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
-INFO_DESCRIPTION_BACKUP_ALL=Back up all backends in the server
-INFO_MODIFY_DESCRIPTION_DEFAULT_ADD=Treat records with no changetype as \
- add operations
-INFO_SEARCH_DESCRIPTION_BASEDN=Search base DN
-INFO_SEARCH_DESCRIPTION_SIZE_LIMIT=Maximum number of entries to return \
- from the search
-INFO_SEARCH_DESCRIPTION_TIME_LIMIT=Maximum length of time in seconds to \
- allow for the search
 INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE=Search scope ('base', 'one', 'sub', \
  or 'subordinate')
-INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY=Alias dereference policy \
- ('never', 'always', 'search', or 'find')
 ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM=The requested SASL mechanism \
  "%s" is not supported by this client
 ERR_LDAPAUTH_SASL_AUTHID_REQUIRED=The "authid" SASL property is \
  required for use with the %s mechanism
 INFO_DESCRIPTION_VERSION=LDAP protocol version number
-ERR_DESCRIPTION_INVALID_VERSION=Invalid LDAP version number '%s'. \
- Allowed values are 2 and 3
-ERR_SEARCH_NO_FILTERS=No filters specified for the search request
-INFO_DESCRIPTION_DONT_WRAP=Do not wrap long lines
 INFO_DESCRIPTION_NOOP=Show what would be done but do not perform any \
  operation
-INFO_DESCRIPTION_TYPES_ONLY=Only retrieve attribute names but not their \
- values
-INFO_DESCRIPTION_ASSERTION_FILTER=Use the LDAP assertion control with the \
- provided filter
-ERR_LDAP_ASSERTION_INVALID_FILTER=The search filter provided for the \
- LDAP assertion control was invalid:  %s
-INFO_DESCRIPTION_PREREAD_ATTRS=Use the LDAP ReadEntry pre-read control
-INFO_DESCRIPTION_POSTREAD_ATTRS=Use the LDAP ReadEntry post-read control
-INFO_LDAPMODIFY_PREREAD_ENTRY=Target entry before the operation:
-INFO_LDAPMODIFY_POSTREAD_ENTRY=Target entry after the operation:
-INFO_DESCRIPTION_PROXY_AUTHZID=Use the proxied authorization control with \
- the given authorization ID
-INFO_DESCRIPTION_PSEARCH_INFO=Use the persistent search control
-ERR_PSEARCH_MISSING_DESCRIPTOR=The request to use the persistent \
- search control did not include a descriptor that indicates the options to use \
- with that control
-ERR_PSEARCH_DOESNT_START_WITH_PS=The persistent search descriptor %s \
- did not start with the required 'ps' string
-ERR_PSEARCH_INVALID_CHANGE_TYPE=The provided change type value %s is \
- invalid.  The recognized change types are add, delete, modify, modifydn, and \
- any
-ERR_PSEARCH_INVALID_CHANGESONLY=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
-ERR_PSEARCH_INVALID_RETURN_ECS=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
 INFO_DESCRIPTION_REPORT_AUTHZID=Use the authorization identity control
-INFO_BIND_AUTHZID_RETURNED=# Bound with authorization ID %s
-INFO_SEARCH_DESCRIPTION_FILENAME=File containing a list of search filter \
- strings
-INFO_DESCRIPTION_MATCHED_VALUES_FILTER=Use the LDAP matched values \
- control with the provided filter
-ERR_LDAP_MATCHEDVALUES_INVALID_FILTER=The provided matched values \
- filter was invalid:  %s
-ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ=An error occurred while \
- attempting to open the LDIF file %s for reading:  %s
-ERR_LDIF_FILE_CANNOT_OPEN_FOR_WRITE=An error occurred while \
- attempting to open the LDIF file %s for writing:  %s
-ERR_LDIF_FILE_READ_ERROR=An error occurred while attempting to read \
- the contents of LDIF file %s:  %s
-INFO_BIND_PASSWORD_EXPIRED=# Your password has expired
-INFO_BIND_PASSWORD_EXPIRING=# Your password will expire in %s
-INFO_BIND_ACCOUNT_LOCKED=# Your account has been locked
-INFO_BIND_MUST_CHANGE_PASSWORD=# You must change your password before any \
- other operations will be allowed
-INFO_BIND_GRACE_LOGINS_REMAINING=# You have %d grace logins remaining
 INFO_DESCRIPTION_USE_PWP_CONTROL=Use the password policy request control
-INFO_LDAPPWMOD_DESCRIPTION_AUTHZID=Authorization ID for the \
- user entry whose password should be changed
-INFO_LDAPPWMOD_DESCRIPTION_NEWPW=New password to provide \
- for the target user
-INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE=Path to a file \
- containing the new password to provide for the target user
-INFO_LDAPPWMOD_DESCRIPTION_CURRENTPW=Current password for \
- the target user
-INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE=Path to a file \
- containing the current password for the target user
-ERR_LDAPPWMOD_CONFLICTING_ARGS=The %s and %s arguments may not be \
- provided together
-ERR_LDAPPWMOD_FAILED=The LDAP password modify operation failed: \
- %d (%s)
-ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE=Error Message:  %s
-ERR_LDAPPWMOD_FAILURE_MATCHED_DN=Matched DN:  %s
-INFO_LDAPPWMOD_SUCCESSFUL=The LDAP password modify operation was \
- successful
-INFO_LDAPPWMOD_ADDITIONAL_INFO=Additional Info:  %s
-INFO_LDAPPWMOD_GENERATED_PASSWORD=Generated Password:  %s
-INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE=The assertion value was \
- indicated to be base64-encoded, but an error occurred while trying to decode \
- the value
-INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE=Unable to read the \
- assertion value from the specified file:  %s
-ERR_LDAPCOMPARE_NO_DNS=No entry DNs provided for the compare \
- operation
-INFO_LDAPCOMPARE_TOOL_DESCRIPTION=This utility can be used to perform \
- LDAP compare operations in the Directory Server
-INFO_LDAPMODIFY_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
- modify, add, delete, and modify DN operations in the Directory Server
-INFO_LDAPPWMOD_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
- password modify operations in the Directory Server
-INFO_LDAPSEARCH_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
- search operations in the Directory Server
 ERR_TOOL_CONFLICTING_ARGS=You may not provide both the --%s and \
  the --%s arguments
-ERR_LDAPCOMPARE_NO_ATTR=No attribute was specified to use as the \
- target for the comparison
-ERR_LDAPCOMPARE_INVALID_ATTR_STRING=Invalid attribute string '%s'. \
- The attribute string must be in one of the following forms: \
- 'attribute:value', 'attribute::base64value', or 'attribute:<valueFilePath'
-ERR_TOOL_INVALID_CONTROL_STRING=Invalid control specification '%s'
 ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS=SASL EXTERNAL \
  authentication may only be requested if SSL or StartTLS is used
 ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE=SASL EXTERNAL authentication \
  may only be used if a client certificate key store is specified
-INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE=# Persistent search change type:  %s
-INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN=# Persistent search previous entry \
- DN:  %s
-INFO_LDAPSEARCH_ACCTUSABLE_HEADER=# Account Usability Response Control
-INFO_LDAPSEARCH_ACCTUSABLE_IS_USABLE=#   The account is usable
-INFO_LDAPSEARCH_ACCTUSABLE_TIME_UNTIL_EXPIRATION=#   Time until password \
- expiration:  %s
-INFO_LDAPSEARCH_ACCTUSABLE_NOT_USABLE=#   The account is not usable
-INFO_LDAPSEARCH_ACCTUSABLE_ACCT_INACTIVE=#   The account has been \
- deactivated
-INFO_LDAPSEARCH_ACCTUSABLE_PW_RESET=#   The password has been reset
-INFO_LDAPSEARCH_ACCTUSABLE_PW_EXPIRED=#   The password has expired
-INFO_LDAPSEARCH_ACCTUSABLE_REMAINING_GRACE=#   Number of grace logins \
- remaining:  %d
-INFO_LDAPSEARCH_ACCTUSABLE_LOCKED=#   The account is locked
-INFO_LDAPSEARCH_ACCTUSABLE_TIME_UNTIL_UNLOCK=#   Time until the account \
- is unlocked:  %s
-INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE=Certificate key store PIN file
 INFO_DESCRIPTION_TRUSTSTOREPASSWORD=Certificate trust store PIN
 INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE=Certificate trust store PIN file
-INFO_DESCRIPTION_COUNT_ENTRIES=Count the number of entries returned by \
- the server
-INFO_LDAPSEARCH_MATCHING_ENTRY_COUNT=# Total number of matching entries: \
- %d
-INFO_DESCRIPTION_SIMPLE_PAGE_SIZE=Use the simple paged results control \
- with the given page size
-ERR_PAGED_RESULTS_REQUIRES_SINGLE_FILTER=The simple paged results \
- control may only be used with a single search filter
-INFO_DESCRIPTION_CERT_NICKNAME=Nickname of certificate for SSL client \
- authentication
-ERR_TOOL_RESULT_CODE=Result Code:  %d (%s)
-ERR_TOOL_ERROR_MESSAGE=Additional Information:  %s
-ERR_TOOL_MATCHED_DN=Matched DN:  %s
-INFO_LDAPMODIFY_DESCRIPTION_FILENAME=LDIF file containing \
- the changes to apply
-INFO_DESCRIPTION_SORT_ORDER=Sort the results using the provided sort \
- order
-ERR_LDAP_SORTCONTROL_INVALID_ORDER=The provided sort order was \
- invalid:  %s
-INFO_DESCRIPTION_VLV=Use the virtual list view control to retrieve the \
- specified results page
-ERR_LDAPSEARCH_VLV_REQUIRES_SORT=If the --%s argument is provided, \
- then the --%s argument must also be given
-ERR_LDAPSEARCH_VLV_INVALID_DESCRIPTOR=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 \
- number of results or zero if it is not known), or \
- 'beforeCount:afterCount:assertionValue' (where the entry should be the first \
- entry whose primary sort value is greater than or equal to the provided \
- 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
-WARN_LDAPSEARCH_SORT_ERROR=# Server-side sort failed:  %s
-INFO_LDAPSEARCH_VLV_TARGET_OFFSET=# VLV Target Offset:  %d
-INFO_LDAPSEARCH_VLV_CONTENT_COUNT=# VLV Content Count:  %d
-WARN_LDAPSEARCH_VLV_ERROR=# Virtual list view processing failed: \
- %s
-INFO_DESCRIPTION_EFFECTIVERIGHTS_USER=Use geteffectiverights control with \
- the provided authzid
-INFO_DESCRIPTION_EFFECTIVERIGHTS_ATTR=Specifies geteffectiverights \
- control specific attribute list
-ERR_EFFECTIVERIGHTS_INVALID_AUTHZID=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=Display Directory Server version \
  information
 INFO_DESCRIPTION_SCRIPT_FRIENDLY=Use script-friendly mode
@@ -409,140 +190,29 @@
 INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER={path}
 INFO_TRUSTSTORE_PWD_PLACEHOLDER={trustStorePassword}
 INFO_NICKNAME_PLACEHOLDER={nickname}
-INFO_ASSERTION_FILTER_PLACEHOLDER={filter}
-INFO_FILTER_PLACEHOLDER={filter}
 INFO_PROXYAUTHID_PLACEHOLDER={authzID}
 INFO_SASL_OPTION_PLACEHOLDER={name=value}
 INFO_PROTOCOL_VERSION_PLACEHOLDER={version}
 INFO_PROP_FILE_PATH_PLACEHOLDER={propertiesFilePath}
-INFO_ATTRIBUTE_PLACEHOLDER={attribute}
 INFO_NUM_ENTRIES_PLACEHOLDER={numEntries}
 INFO_LDAP_CONTROL_PLACEHOLDER={controloid[:criticality[:value|::b64value|:<filePath]]}
 INFO_ENCODING_PLACEHOLDER={encoding}
-INFO_ATTRIBUTE_LIST_PLACEHOLDER={attrList}
-INFO_NEW_PASSWORD_PLACEHOLDER={newPassword}
-INFO_CURRENT_PASSWORD_PLACEHOLDER={currentPassword}
 INFO_SEARCH_SCOPE_PLACEHOLDER={searchScope}
-INFO_SORT_ORDER_PLACEHOLDER={sortOrder}
-INFO_VLV_PLACEHOLDER={before:after:index:count | before:after:value}
-INFO_DEREFERENCE_POLICE_PLACEHOLDER={dereferencePolicy}
-INFO_SIZE_LIMIT_PLACEHOLDER={sizeLimit}
-INFO_TIME_LIMIT_PLACEHOLDER={timeLimit}
-INFO_TARGETDN_PLACEHOLDER={targetDN}
 INFO_KEYSTORE_PWD_FILE_PLACEHOLDER={keyStorePasswordFile}
 INFO_PATH_PLACEHOLDER={path}
-INFO_NAME_PLACEHOLDER={name}
-INFO_PROPERTY_PLACEHOLDER={property}
-INFO_UNIT_PLACEHOLDER={unit}
 INFO_CONFIGCLASS_PLACEHOLDER={configClass}
 INFO_CONFIGFILE_PLACEHOLDER={configFile}
-INFO_STOP_REASON_PLACEHOLDER={stopReason}
-INFO_STOP_TIME_PLACEHOLDER={stopTime}
-INFO_BACKENDNAME_PLACEHOLDER={backendName}
-INFO_BACKUPID_PLACEHOLDER={backupID}
-INFO_BACKUPDIR_PLACEHOLDER={backupDir}
-INFO_KEY_MANAGER_PATH_PLACEHOLDER={keyManagerPath}
-INFO_KEY_MANAGER_PROVIDER_DN_PLACEHOLDER={keyManagerProviderDN}
-INFO_TRUST_MANAGER_PROVIDER_DN_PLACEHOLDER={trustManagerProviderDN}
-INFO_SERVER_ROOT_DIR_PLACEHOLDER={serverRootDir}
-INFO_SERVICE_NAME_PLACEHOLDER={serviceName}
-INFO_VALUE_SET_PLACEHOLDER={PROP:VALUE}
-INFO_TYPE_PLACEHOLDER={type}
-INFO_CATEGORY_PLACEHOLDER={category}
-INFO_PSEARCH_PLACEHOLDER=ps[:changetype[:changesonly[:entrychgcontrols]]]
 INFO_ADMINUID_PLACEHOLDER={adminUID}
-INFO_NOT_AVAILABLE_LABEL=<not available>
 ERR_CANNOT_READ_TRUSTSTORE=Cannot access trust store '%s'.  Verify \
  that the provided trust store exists and that you have read access rights to it
 ERR_CANNOT_READ_KEYSTORE=Cannot access key store '%s'.  Verify \
  that the provided key store exists and that you have read access rights to it
 INFO_DESCRIPTION_ADMIN_PORT=Directory server administration port number
 INFO_DESCRIPTION_ADMIN_BINDDN=Administrator user bind DN
-ERR_LDAPCOMPARE_ERROR_READING_FILE=An error occurred reading file \
- '%s'.  Check that the file exists and that you have read access rights to \
- it.  Details: %s
-ERR_LDAPCOMPARE_FILENAME_AND_DNS=Both entry DNs and a file name \
- were provided for the compare operation.  These arguments are not compatible
 INFO_ERROR_EMPTY_RESPONSE=ERROR: a response must be provided in order to continue
-ERR_DECODE_CONTROL_FAILURE=# %s
-INFO_SEARCHRATE_TOOL_DESCRIPTION=This utility can be used to measure \
-  search throughput and response time of a directory service using \
-  user-defined searches.\n\n\
-  Example:\n\n\ \ searchrate -p 1389 -D "cn=directory manager" -w password \\\n\
-  \ \ \ \ -F -c 4 -t 4 -b "dc=example,dc=com" -g "rand(0,2000)" "(uid=user.%%d)"
-INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN=Base DN format string.
-INFO_MODRATE_TOOL_DESCRIPTION=This utility can be used to measure \
-  modify throughput and response time of a directory service using \
-  user-defined modifications.\n\n\
-  Example:\n\n\ \ modrate -p 1389 -D "cn=directory manager" -w password \\\n\
-  \ \ \ \ -F -c 4 -t 4 -b "uid=user.%%d,ou=people,dc=example,dc=com" \\\n\
-  \ \ \ \ -g "rand(0,2000)" -g "randstr(16)" 'description:%%2$s'
-INFO_MODRATE_TOOL_DESCRIPTION_TARGETDN=Target entry DN format string
-INFO_AUTHRATE_TOOL_DESCRIPTION=This utility can be used to measure \
-  bind throughput and response time of a directory service using \
-  user-defined bind or search-then-bind operations.\n\nFormat strings may be \
-  used in the bind DN option as well as the authid and authzid SASL bind \
-  options. A search operation may be used to retrieve the bind DN by \
-  specifying the base DN and a filter. The retrieved entry DN will be appended \
-  as the last argument in the argument list when evaluating format strings.\n\n\
-  Example (bind only):\n\n\ \ authrate -p 1389 -D "uid=user.%%d,ou=people,dc=example,dc=com" \\\n\
-  \ \ \ \  -w password -f -c 10 -g "rand(0,2000)"\n\n\
-  Example (search then bind):\n\n\ \ authrate -p 1389 -D '%%2$s' -w password -f -c 10 \\\n\
-  \ \ \ \ -b "ou=people,dc=example,dc=com" -s one -g "rand(0,2000)" "(uid=user.%%d)"
-INFO_OUTPUT_LDIF_FILE_PLACEHOLDER={file}
-INFO_LDIFMODIFY_DESCRIPTION_OUTPUT_FILENAME=Write updated entries to %s \
- instead of stdout
-INFO_LDIFDIFF_DESCRIPTION_OUTPUT_FILENAME=Write differences to %s \
- instead of stdout
-INFO_LDIFSEARCH_DESCRIPTION_OUTPUT_FILENAME=Write search results to %s \
- instead of stdout
-ERR_LDIFMODIFY_MULTIPLE_USES_OF_STDIN=Unable to use stdin for both the source \
- LDIF and changes LDIF
-ERR_LDIFDIFF_MULTIPLE_USES_OF_STDIN=Unable to use stdin for both the source \
- LDIF and target LDIF
-ERR_LDIFMODIFY_PATCH_FAILED=The changes could not be applied for the following \
- reason: %s
-ERR_LDIFDIFF_DIFF_FAILED=The differences could not be computed for the following \
- reason: %s
-ERR_LDIFSEARCH_FAILED=The search could not be performed for the following \
- reason: %s
-INFO_LDIFMODIFY_TOOL_DESCRIPTION=This utility can be used to apply a set of \
- modify, add, and delete operations to entries contained in an LDIF file
-INFO_LDIFDIFF_TOOL_DESCRIPTION=This utility can be used to compare two LDIF \
- files and report the differences in LDIF format
-INFO_LDIFSEARCH_TOOL_DESCRIPTION=This utility can be used to perform search \
- operations against entries contained in an LDIF file
  #
  # MakeLDIF tool
  #
-INFO_MAKELDIF_TOOL_DESCRIPTION=This utility can be used to generate LDIF \
- data based on a definition in a template file
-INFO_CONSTANT_PLACEHOLDER={name=value}
-INFO_SEED_PLACEHOLDER={seed}
-INFO_BATCH_FILE_PATH_PLACEHOLDER={batchFilePath}
-INFO_MAKELDIF_DESCRIPTION_CONSTANT=A constant that overrides the value \
- set in the template file
-INFO_MAKELDIF_DESCRIPTION_LDIF=The path to the LDIF file to be written
-INFO_MAKELDIF_DESCRIPTION_SEED=The seed to use to initialize the random \
- number generator
-INFO_MAKELDIF_DESCRIPTION_HELP=Show this usage information
-INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH=Path to look for \
- MakeLDIF resources (e.g., data files)
-ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY=The specified resource \
- directory %s could not be found
-INFO_MAKELDIF_PROCESSED_N_ENTRIES=Processed %d entries
-INFO_MAKELDIF_PROCESSING_COMPLETE=LDIF processing complete. %d entries \
- written
-ERR_MAKELDIF_EXCEPTION_DURING_PARSE=An error occurred while \
- parsing template file :  %s
-ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF=An error occurred while \
- attempting to open LDIF file %s for writing:  %s
-ERR_MAKELDIF_ERROR_WRITING_LDIF=An error occurred while writing data \
- to LDIF file %s:  %s
-ERR_MAKELDIF_EXCEPTION_DURING_PROCESSING=An error occurred while \
- processing :  %s
-ERR_CONSTANT_ARG_CANNOT_DECODE=Unable to parse a constant argument, \
- expecting name=value but got %s
 INFO_DESCRIPTION_QUIET=Use quiet mode
 INFO_DESCRIPTION_NO_PROMPT=Use non-interactive mode.  If data in \
 the command is missing, the user is not prompted and the tool will fail
@@ -551,8 +221,6 @@
 #
 # Setup messages
 #
-INFO_SETUP_TITLE=OPENDJ3 Setup tool
-INFO_SETUP_DESCRIPTION=This utility can be used to setup the Directory Server
 INFO_ARGUMENT_DESCRIPTION_CLI=Use the command line install. \
  If not specified the graphical interface will be launched.  The rest of the \
  options (excluding help and version) will only be taken into account if this \
@@ -562,9 +230,6 @@
  using this option multiple times
 INFO_ARGUMENT_DESCRIPTION_ADDBASE=Indicates whether to create the base \
  entry in the Directory Server database
-INFO_ARGUMENT_DESCRIPTION_IMPORTLDIF=Path to an LDIF file \
- containing data that should be added to the Directory Server database. \
- Multiple LDIF files may be provided by using this option multiple times
 INFO_LDIFFILE_PLACEHOLDER={ldifFile}
 INFO_REJECT_FILE_PLACEHOLDER={rejectFile}
 INFO_SKIP_FILE_PLACEHOLDER={skipFile}
@@ -572,7 +237,6 @@
 INFO_ROOT_USER_DN_PLACEHOLDER={rootUserDN}
 INFO_ROOT_USER_PWD_PLACEHOLDER={rootUserPassword}
 INFO_ROOT_USER_PWD_FILE_PLACEHOLDER={rootUserPasswordFile}
-INFO_HOST_PLACEHOLDER={host}
 INFO_TIMEOUT_PLACEHOLDER={timeout}
 INFO_GENERAL_DESCRIPTION_REJECTED_FILE=Write rejected entries to the \
  specified file
@@ -584,14 +248,10 @@
  Directory Server should listen for LDAP communication
 INFO_ARGUMENT_DESCRIPTION_ADMINCONNECTORPORT=Port on which the \
  Administration Connector should listen for communication
-INFO_ARGUMENT_DESCRIPTION_JMXPORT=Port on which the \
- Directory Server should listen for JMX communication
 INFO_ARGUMENT_DESCRIPTION_SKIPPORT=Skip the check to determine whether \
  the specified ports are usable
 INFO_ARGUMENT_DESCRIPTION_ROOTDN=DN for the initial root \
  user for the Directory Server
-INFO_ARGUMENT_DESCRIPTION_ROOTPW=Password for the initial \
- root user for the Directory Server
 INFO_ARGUMENT_DESCRIPTION_ROOTPWFILE=Path to a file \
  containing the password for the initial root user for the Directory Server
  INFO_ARGUMENT_DESCRIPTION_ENABLE_WINDOWS_SERVICE=Enable the server to run \
@@ -617,8 +277,6 @@
 INFO_ARGUMENT_DESCRIPTION_USE_PKCS12=Path of a PKCS#12 key \
  store containing the certificate that the server should use when accepting \
  SSL-based connections or performing StartTLS negotiation
-INFO_ARGUMENT_CERT_OPTION_JCEKS=Use an existing certificate located on a \
- JCEKS key store
 INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME=Nickname of the \
  certificate that the server should use when accepting SSL-based \
  connections or performing StartTLS negotiation
@@ -666,8 +324,6 @@
 ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT=Failed to add argument %s to \
  subcommand %s because there is already one argument with the same long identifier \
  associated to this subcommand.
-ERR_SUBCMDPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred \
- while attempting to read the contents of the argument properties file %s:  %s
 ERR_SUBCMDPARSER_LONG_ARG_WITHOUT_NAME=The provided command-line \
  argument %s does not contain an argument name
 ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_LONG_ID=The provided \
@@ -701,46 +357,11 @@
  the same block as at least one other argument that does not require a value
 ERR_SUBCMDPARSER_INVALID_ARGUMENT=The provided argument "%s" is \
  not recognized
-ERR_SUBCMDPARSER_NO_VALUE_FOR_REQUIRED_ARG=The argument %s is \
- required to have a value but none was provided in the argument list and no \
- default value is available
-ERR_ARGUMENT_NO_BASE_DN_SPECIFIED=You have specified \
- not to create a base DN.  If no base DN is to be created you cannot specify \
- argument '%s'
-ERR_PORT_ALREADY_SPECIFIED=ERROR:  You have specified \
- the value %s for different ports
-ERR_SEVERAL_CERTIFICATE_TYPE_SPECIFIED=You have \
- specified several certificate types to be used.  Only one certificate type \
- is allowed
-ERR_CERTIFICATE_REQUIRED_FOR_SSL_OR_STARTTLS=You have \
- chosen to enable SSL or StartTLS.  You must specify which type of certificate \
- you want the server to use
-ERR_TWO_CONFLICTING_ARGUMENTS=ERROR:  You may not \
- provide both the %s and the %s arguments at the same time
-ERR_NO_KEYSTORE_PASSWORD=You must provide the PIN of the \
- keystore to retrieve the certificate to be used by the server.  You can use \
- {%s} or {%s}
-ERR_SSL_OR_STARTTLS_REQUIRED=You have specified to use a \
- certificate as server certificate.  You must enable SSL (using option {%s}) \
- or Start TLS (using option %s)
-ERR_NO_ROOT_PASSWORD=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_BACKUPDB_DESCRIPTION_BACKEND_ID=Backend ID for the backend to \
- archive
-INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL=Back up all backends in the server
-INFO_SETUP_SUBCOMMAND_CREATE_DIRECTORY_SERVER=Can be used with global arguments \
-to setup a directory server
-INFO_SETUP_SUBCOMMAND_CREATE_PROXY=Can be used with global arguments \
-to setup a proxy
 ERR_INCOMPATIBLE_JAVA_VERSION=The minimum Java version required is %s.%n%n\
  The detected version is %s.%nThe binary detected is %s%n%nPlease set \
  OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \
  java.properties file and then run the dsjavaproperties script to specify the \
  java version to be used.
-INFO_INSTANCE_DIRECTORY=Instance Directory:      %s
-INFO_INSTALLATION_DIRECTORY=Installation Directory:      %s
-ERR_INVALID_LOG_FILE=Invalid log file %s
 INFO_DESCRIPTION_CONNECTION_TIMEOUT=Maximum length of time (in \
  milliseconds) that can be taken to establish a connection.  Use '0' to \
  specify no time out
@@ -788,14 +409,6 @@
  server is running and that the provided credentials are valid.%nError \
  details:%n%s
 ERR_CONFIRMATION_TRIES_LIMIT_REACHED=Confirmation tries limit reached (%d)
-INFO_ADMINISTRATOR_UID_PROMPT=Global Administrator User ID
-INFO_ADMINISTRATOR_PWD_PROMPT=Global Administrator Password:
-INFO_ADMINISTRATOR_PWD_CONFIRM_PROMPT=Confirm Password:
-ERR_ADMINISTRATOR_PWD_DO_NOT_MATCH=The provided passwords do not match.
-ERR_BAD_INTEGER=Invalid integer number "%s". Please enter a valid integer
-INFO_DESCRIPTION_BATCH=Reads from standard input a set of commands to be executed
-INFO_DESCRIPTION_BATCH_FILE_PATH=Path to a batch file containing \
-a set of commands to be executed
 INFO_DESCRIPTION_DISPLAY_EQUIVALENT=Display the equivalent \
  non-interactive argument in the standard output when this command is run in \
  interactive mode
@@ -808,103 +421,16 @@
  will be used
 INFO_DESCRIPTION_CONFIG_FILE=Path to the Directory Server \
  configuration file
-INFO_DESCRIPTION_BACKUP_ID=Use the provided identifier for the \
- backup
-INFO_DESCRIPTION_BACKUP_DIR=Path to the target directory for the \
- backup file(s)
-INFO_DESCRIPTION_KEYMANAGER_PROVIDER_DN=DN of the \
- key manager provider to use for SSL and/or StartTLS
-INFO_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN=DN of \
- the trust manager provider to use for SSL and/or StartTLS
-INFO_DESCRIPTION_KEYMANAGER_PATH=Path of the \
- key store to be used by the key manager provider
-INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_DISABLE=Disables the server as \
- a Windows service and stops the server
-INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE=Provides information \
- about the state of the server as a Windows service
-INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP=Allows to disable the \
- server service and to clean up the windows registry information associated \
- with the provided service name
-INFO_COMPARE_DESCRIPTION_FILENAME=File containing the DNs of the entries \
- to compare
-INFO_DESCRIPTION_USE_SASL_EXTERNAL=Use the SASL EXTERNAL authentication \
- mechanism
-INFO_DELETE_DESCRIPTION_FILENAME=File containing the DNs of the entries \
- to delete
-INFO_DESCRIPTION_TIME_LIMIT=Maximum length of \
- time (in seconds) to spend processing
-INFO_DESCRIPTION_IMPORTLDIF=Path to an LDIF file \
- containing data that should be added to the Directory Server database. \
- Multiple LDIF files may be provided by using this option multiple times
 INFO_LDAPAUTH_PASSWORD_PROMPT=Password for user '%s':
-INFO_DESCRIPTION_ADMIN_UID=User ID of the Global Administrator \
- to use to bind to the server
 #
 # Uninstall messages
 #
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_ALL=Remove all components of \
- the server (this option is not compatible with the rest of remove options)
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_SERVER_LIBRARIES=Remove Server Libraries \
- and Administrative Tools
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_DATABASES=Remove database contents
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LOG_FILES=Remove log files
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_CONFIGURATION_FILES=Remove configuration \
- files
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_BACKUP_FILES=Remove backup files
-INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LDIF_FILES=Remove LDIF files
-INFO_DESCRIPTION_REFERENCED_HOST=The name of this host (or IP address) as \
- it is referenced in remote servers for replication
-INFO_UNINSTALLDS_DESCRIPTION_FORCE=Specifies whether the uninstall should \
- continue if there is an error updating references to this server in remote \
- server instances or not.  This option can only be used with the %s no \
- prompt option.
 #
 # Connection messages
 #
-ERR_FAILED_TO_CONNECT=Unable to connect to the server at "%s" on port %s
-ERR_SIMPLE_BIND_NOT_SUPPORTED=Unable to authenticate using simple \
-authentication
-ERR_FAILED_TO_CONNECT_WRONG_PORT=Unable to connect to the \
- server at %s on port %s. Check this port is an administration port
-ERR_CANNOT_BIND_TO_PRIVILEGED_PORT=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
-ERR_CANNOT_BIND_TO_PORT=ERROR:  Unable to bind to port \
- %d.  This port may already be in use, or you may not have permission to bind \
- to it
-ERR_FAILED_TO_CONNECT_NOT_TRUSTED=Unable to connect to the \
- server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \
- you must use the '--trustAll' option for remote connections
 INFO_EXCEPTION_OUT_OF_MEMORY_DETAILS=Not enough memory to perform the \
  operation.  Details: %s
 INFO_EXCEPTION_DETAILS=Details: %s
-INFO_LDAP_CONN_PROMPT_SECURITY_LDAP=LDAP
-INFO_LDAP_CONN_PROMPT_SECURITY_USE_SSL=LDAP with SSL
-INFO_LDAP_CONN_PROMPT_SECURITY_USE_START_TLS=LDAP with StartTLS
-INFO_LDAP_CONN_PROMPT_SECURITY_USE_TRUST_ALL=Automatically \
-  trust
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PATH=Truststore path:
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PASSWORD=Password for \
-  truststore '%s':
-INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PATH=Keystore path:
-INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD=Password for keystore \
-  '%s':
-INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS=>>>> Specify OpenDJ LDAP \
-  connection parameters
-ERR_LDAP_CONN_BAD_HOST_NAME=The hostname "%s" could not be \
-  resolved. Please check you have provided the correct address
-ERR_LDAP_CONN_BAD_PORT_NUMBER=Invalid port number "%s". Please \
-  enter a valid port number between 1 and 65535
-INFO_LDAP_CONN_PROMPT_HOST_NAME=Directory server hostname or IP address \
-  [%s]:
-INFO_LDAP_CONN_PROMPT_SECURITY_USE_SECURE_CTX=How do you want to connect?
-INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE=%d
-ERR_LDAP_CONN_PROMPT_SECURITY_INVALID_FILE_PATH=The provided path \
-  is not valid
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_METHOD=How do you want to trust the server certificate?
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE=Use a truststore
-INFO_LDAP_CONN_PROMPT_SECURITY_MANUAL_CHECK=Manually validate
 INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate:
 INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s
 INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate?
@@ -915,38 +441,6 @@
 INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN  : %s
 INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n             To '%s'
 INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer   : %s
-INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_ALIASES=Which certificate do you want to use?
-INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_ALIAS=%s (%s)
-INFO_LDAP_CONN_PROMPT_ADMINISTRATOR_UID=Global Administrator User ID [%s]:
-INFO_LDAP_CONN_GLOBAL_ADMINISTRATOR_OR_BINDDN_PROMPT=Global Administrator \
- User ID, or bind DN if no Global Administrator is defined [%s]:
-INFO_LDAP_CONN_PROMPT_PORT_NUMBER=Directory server port number [%d]:
-INFO_LDAP_CONN_PROMPT_BIND_DN=Administrator user bind DN [%s]:
-INFO_ADMIN_CONN_PROMPT_PORT_NUMBER=Directory server administration port number [%d]:
-INFO_ERROR_CONNECTING_TO_LOCAL=An error occurred connecting to the server
-INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI=The Certificate presented by the server \
- %s:%s could not be trusted.\nPossible reasons for this error:\n\
- -The Certificate Authority that issued the certificate is not recognized (this \
- is the case of the self-signed certificates).\n-The server's certificate is \
- incomplete due to a misconfiguration.\n-The server's certificate has \
- expired.\n-There is a time difference between the server machine clock and \
- the local machine clock.\nBefore accepting this certificate, you should \
- examine the server's certificate carefully.
-INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI=The Certificate presented by the server \
- %s:%s could not be trusted.\nThere is a name mismatch between the name of \
- the server (%s) and the subject DN of the certificate.  This could be caused \
- because you are connected to a server pretending to be %s:%s.\n\
- Before accepting this certificate, you should examine the server's \
- certificate carefully.
-ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS=The connection \
- parameters could not be read due to the following error: %s
-ERR_ERROR_NO_ADMIN_PASSWORD=No password was specified for \
- administrator "%s"
-ERR_ERROR_BIND_PASSWORD_NONINTERACTIVE=The LDAP bind \
- password was not specified and cannot be read interactively
-ERR_ERROR_INCOMPATIBLE_PROPERTY_MOD=The property \
- modification "%s" is incompatible with another modification to the same \
- property
 INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS=>>>> Specify OpenDJ LDAP \
   connection parameters
 ERR_ERROR_CANNOT_READ_PASSWORD=Unable to read password
@@ -962,7 +456,6 @@
 REF_INTRO_SUBCOMMANDS=The <command>%s</command> command supports the following subcommands:
 REF_PART_TITLE_SUBCOMMANDS=%s Subcommands Reference
 REF_PART_INTRO_SUBCOMMANDS=This section covers <command>%s</command> subcommands.
-REF_SHORT_DESC_UNINSTALL=remove OpenDJ directory server software
 REF_DEFAULT_BACKEND_TYPE=Depends on the distribution
 
 # Supplements to descriptions for generated reference documentation.
diff --git a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
index 79f26e1..863fa2b 100644
--- a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
+++ b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java
@@ -12,12 +12,10 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.cli;
 
-import static com.forgerock.opendj.cli.CliMessages.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,9 +49,9 @@
     public void setup() throws Exception {
         parser = new SubCommandArgumentParser(getClass().getName(), LocalizableMessage.raw("test description"), true);
 
-        sc1 = new SubCommand(parser, "sub-command1", INFO_BACKUPDB_DESCRIPTION_BACKEND_ID.get());
+        sc1 = new SubCommand(parser, "sub-command1", LocalizableMessage.raw("sub-command1"));
         sc2 = new SubCommand(parser, "sub-command2", true, 2, 4, "args1 arg2 [arg3 arg4]",
-                INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL.get());
+                             LocalizableMessage.raw("sub-command2"));
     }
 
     /**
diff --git a/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties
index 19d586b..44a2bc0 100644
--- a/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties
+++ b/opendj-sdk/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties
@@ -12,8 +12,9 @@
 # information: "Portions Copyright [year] [name of copyright owner]".
 #
 # Copyright 2010 Sun Microsystems, Inc.
-# Portions copyright 2011-2015 ForgeRock AS.
+# Portions copyright 2011-2016 ForgeRock AS.
 # Portions Copyright 2014 Manuel Gaupp
+
 ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE=Unable to retrieve \
  approximate matching rule %s used as the default for the %s attribute syntax. \
  Approximate matching will not be allowed by default for attributes with this \
@@ -1498,30 +1499,12 @@
 ERR_ENTRY_GENERATOR_UNDEFINED_BRANCH_SUBORDINATE=The branch with entry DN \
  '%s' references a subordinate template named '%s' which is not defined in the \
  template file
-ERR_ENTRY_GENERATOR_SUBORDINATE_TEMPLATE_NO_COLON=Subordinate \
- template definition on line %d for %s %s is missing a colon to separate \
- the template name from the number of entries
-ERR_ENTRY_GENERATOR_SUBORDINATE_INVALID_NUM_ENTRIES=Subordinate \
- template definition on line %d for %s %s specified invalid number of \
- entries %d for template %s
 WARN_ENTRY_GENERATOR_SUBORDINATE_ZERO_ENTRIES=Subordinate template \
  definition on line %d for %s %s specifies that zero entries of type %s \
  should be generated
 ERR_ENTRY_GENERATOR_SUBORDINATE_CANT_PARSE_NUMENTRIES=Unable to \
  parse the number of entries for template %s as an integer for the subordinate \
  template definition on line %d for %s %s
-ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_TEMPLATE_NO_COLON=Subordinate \
- template definition on line %d for template %s is missing a colon to separate \
- the template name from the number of entries
-ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_INVALID_NUM_ENTRIES=Subordinate \
- template definition on line %d for template %s specified invalid number of \
- entries %d for subordinate template %s
-WARN_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_ZERO_ENTRIES=Subordinate template \
- definition on line %d for template %s specifies that zero entries of type %s \
- should be generated
-ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_CANT_PARSE_NUMENTRIES=Unable to \
- parse the number of entries for template %s as an integer for the subordinate \
- template definition on line %d for template %s
 ERR_ENTRY_GENERATOR_TEMPLATE_MISSING_RDN_ATTR=The template named %s \
  includes RDN attribute %s that is not assigned a value in that template
 ERR_ENTRY_GENERATOR_NO_COLON_IN_TEMPLATE_LINE=There is no colon to separate \
@@ -1572,11 +1555,8 @@
  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
-ERR_ENTRY_GENERATOR_IOEXCEPTION_DURING_PARSE=An error occurred while \
- attempting to read the template file:  %s
 ERR_ENTRY_GENERATOR_EXCEPTION_DURING_PARSE=An error occurred while \
  attempting to parse the template file:  %s
-ERR_ENTRY_GENERATOR_MISSING_TEMPLATE_FILE=Unexpected error when initializing config : no template file provided as input
 ERR_ADDRESSMASK_PREFIX_DECODE_ERROR=Cannot decode the provided \
  address mask prefix because an invalid value was specified. The permitted \
  values for IPv4are 0 to32 and for IPv6 0 to128
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index 5eadde0..95327e0 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -16,7 +16,6 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.MultiColumnPrinter.column;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER;
 import static java.util.concurrent.TimeUnit.*;
 import static com.forgerock.opendj.cli.CommonArguments.*;
 
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index 7d7f2f8..f422b24 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -17,8 +17,6 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER;
-import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE;
-import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 import static com.forgerock.opendj.cli.Utils.filterExitCode;
 import static com.forgerock.opendj.cli.CommonArguments.*;
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index c2a0774..e7a6dfb 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -73,12 +73,7 @@
 import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;
 import com.forgerock.opendj.util.StaticUtils;
 
-import static com.forgerock.opendj.cli.CliMessages.INFO_DESCRIPTION_SIMPLE_PAGE_SIZE;
 import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER;
-import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER;
 import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
 import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults;
 import static org.forgerock.util.Utils.*;
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
index 3be9685..9dac709 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java
@@ -16,10 +16,6 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER;
-import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 import static com.forgerock.opendj.cli.Utils.filterExitCode;
 import static com.forgerock.opendj.cli.CommonArguments.*;
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
index 9593e31..a993675 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java
@@ -17,8 +17,6 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.cli.CliMessages.INFO_MAKELDIF_DESCRIPTION_SEED;
-import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 import static com.forgerock.opendj.cli.Utils.filterExitCode;
 import static org.forgerock.util.Utils.closeSilently;
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index 25b2e75..ad61aba 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -14,127 +14,7 @@
 # Copyright 2010 Sun Microsystems, Inc.
 # Portions copyright 2012-2016 ForgeRock AS.
 
-#
-# Utility messages
-#
-ERR_ARG_NO_IDENTIFIER=The %s argument does not have either a \
- single-character or a long identifier that may be used to specify it.  At \
- least one of these must be specified for each argument
-ERR_ARG_NO_VALUE_PLACEHOLDER=The %s argument is configured to take \
- a value but no value placeholder has been defined for it
-ERR_ARG_NO_INT_VALUE=The %s argument does not have any value that \
- may be retrieved as an integer
-ERR_ARG_CANNOT_DECODE_AS_INT=The provided value "%s" for the %s \
- argument cannot be decoded as an integer
-ERR_ARG_INT_MULTIPLE_VALUES=The %s argument has multiple values and \
- therefore cannot be decoded as a single integer value
-ERR_ARG_NO_BOOLEAN_VALUE=The %s argument does not have any value \
- that may be retrieved as a Boolean
-ERR_ARG_CANNOT_DECODE_AS_BOOLEAN=The provided value "%s" for the %s \
- argument cannot be decoded as a Boolean
-ERR_ARG_BOOLEAN_MULTIPLE_VALUES=The %s argument has multiple values \
- and therefore cannot be decoded as a single Boolean value
-ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND=The %s argument \
- configuration is invalid because the lower bound of %d is greater than the \
- upper bound of %d
-ERR_INTARG_VALUE_BELOW_LOWER_BOUND=The provided %s value %d is \
- unacceptable because it is below the lower bound of %d
-ERR_INTARG_VALUE_ABOVE_UPPER_BOUND=The provided %s value %d is \
- unacceptable because it is above the upper bound of %d
-ERR_BOOLEANARG_NO_VALUE_ALLOWED=The provided %s value is \
- unacceptable because Boolean arguments are never allowed to have values
-ERR_MCARG_VALUE_NOT_ALLOWED=The provided %s value %s is \
- unacceptable because it is not included in the set of allowed values for that \
- argument
-ERR_FILEARG_NO_SUCH_FILE=The file %s specified for argument %s does \
- not exist
-ERR_FILEARG_CANNOT_VERIFY_FILE_EXISTENCE=An error occurred while \
- trying to verify the existence of file %s specified for argument %s:  %s
-ERR_FILEARG_CANNOT_OPEN_FILE=An error occurred while trying to open \
- file %s specified for argument %s for reading:  %s
-ERR_FILEARG_CANNOT_READ_FILE=An error occurred while trying to read \
- from file %s specified for argument %s:  %s
-ERR_FILEARG_EMPTY_FILE=The file %s specified for argument %s exists \
- but is empty
-ERR_ARGPARSER_DUPLICATE_SHORT_ID=Cannot add argument %s to the \
- argument list because its short identifier -%s conflicts with the %s argument \
- that has already been defined
-ERR_ARGPARSER_DUPLICATE_LONG_ID=Cannot add argument %s to the \
- argument list because its long identifier --%s conflicts with the %s argument \
- that has already been defined
-ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred while \
- attempting to read the contents of the argument properties file %s:  %s
-ERR_ARGPARSER_TOO_MANY_TRAILING_ARGS=The provided set of \
- command-line arguments contained too many unnamed trailing arguments.  The \
- maximum number of allowed trailing arguments is %d
-ERR_ARGPARSER_LONG_ARG_WITHOUT_NAME=The provided argument "%s" is \
- invalid because it does not include the argument name
-ERR_ARGPARSER_NO_ARGUMENT_WITH_LONG_ID=Argument --%s is not allowed \
- for use with this program
-ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID=Argument --%s \
- requires a value but none was provided
-ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID=The provided value \
- "%s" for argument --%s is not acceptable:  %s
-ERR_ARGPARSER_NOT_MULTIVALUED_FOR_LONG_ID=The argument --%s was \
- included multiple times in the provided set of arguments but it does not \
- allow multiple values
-ERR_ARGPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE=A value was \
- provided for argument --%s but that argument does not take a value
-ERR_ARGPARSER_INVALID_DASH_AS_ARGUMENT=The dash character by itself \
- is invalid for use as an argument name
-ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID=Argument -%s is not allowed \
- for use with this program
-ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID=Argument -%s \
- requires a value but none was provided
-ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID=The provided value \
- "%s" for argument -%s is not acceptable:  %s
-ERR_ARGPARSER_NOT_MULTIVALUED_FOR_SHORT_ID=The argument -%s was \
- included multiple times in the provided set of arguments but it does not \
- allow multiple values
-ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES=The provided argument block \
- '-%s%s' is illegal because the '%s' argument requires a value but is in the \
- same block as at least one other argument that doesn't require a value
-ERR_ARGPARSER_DISALLOWED_TRAILING_ARGUMENT=Argument "%s" does not \
- start with one or two dashes and unnamed trailing arguments are not allowed
-ERR_ARGPARSER_TOO_FEW_TRAILING_ARGUMENTS=At least %d unnamed \
- trailing arguments are required in the argument list, but too few were \
- provided
-ERR_ARGPARSER_NO_VALUE_FOR_REQUIRED_ARG=The argument %s is required \
- to have a value but none was provided in the argument list and no default \
- value is available
-INFO_TIME_IN_SECONDS=%d seconds
-INFO_TIME_IN_MINUTES_SECONDS=%d minutes, %d seconds
-INFO_TIME_IN_HOURS_MINUTES_SECONDS=%d hours, %d minutes, %d seconds
-INFO_TIME_IN_DAYS_HOURS_MINUTES_SECONDS=%d days, %d hours, %d minutes, %d \
- seconds
-INFO_SUBCMDPARSER_WHERE_OPTIONS_INCLUDE=Command options:
-ERR_MENU_BAD_CHOICE_SINGLE=Invalid response. Please enter a valid \
-menu option
-INFO_MENU_PROMPT_SINGLE=Enter choice:
-INFO_MENU_PROMPT_RETURN_TO_CONTINUE=Press RETURN to continue
-ERR_CONSOLE_INPUT_ERROR=The response could not be read from the console due to the following error: %s
-INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate:
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate?
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO=No
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION=Yes, for this session only
-INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS=Yes, also add it to a truststore
-INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS=View certificate details
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN  : %s
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n             To '%s'
-INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer   : %s
-INFO_PROMPT_SINGLE_DEFAULT=%s [%s]:
-INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage:  java %s  {options}
-INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage:  %s  {options}
-INFO_ARGPARSER_USAGE_TRAILINGARGS={trailing-arguments}
-INFO_ARGPARSER_USAGE_DEFAULT_VALUE=Default value: %s
 ERROR_RATE_TOOLS_CANNOT_GET_CONNECTION=%s\nStopping...
-#
-# Extension messages
-#
-#
-# Tools messages
-#
 ERR_CANNOT_INITIALIZE_ARGS=An unexpected error occurred while \
  attempting to initialize the command-line arguments:  %s
 ERR_ERROR_PARSING_ARGS=An error occurred while parsing the \
@@ -148,50 +28,19 @@
  entry %s
 INFO_COMPARE_OPERATION_RESULT_TRUE=Compare operation returned true for \
  entry %s
-INFO_DESCRIPTION_TRUSTALL=Trust all server SSL certificates
-INFO_DESCRIPTION_BINDDN=DN to use to bind to the server
-INFO_DESCRIPTION_BINDPASSWORD=Password to use to bind to \
- the server
-INFO_DESCRIPTION_BINDPASSWORDFILE=Bind password file
-INFO_DESCRIPTION_ENCODING=Use the specified character set for \
- command-line input
-INFO_DESCRIPTION_VERBOSE=Use verbose mode
-INFO_DESCRIPTION_KEYSTOREPATH=Certificate key store path
-INFO_DESCRIPTION_TRUSTSTOREPATH=Certificate trust store path
-INFO_DESCRIPTION_KEYSTOREPASSWORD=Certificate key store PIN
-INFO_DESCRIPTION_HOST=Directory server hostname or IP address
-INFO_DESCRIPTION_PORT=Directory server port number
-INFO_DESCRIPTION_SHOWUSAGE=Display this usage information
 INFO_DESCRIPTION_CONTROLS=Use a request control with the provided \
  information
-INFO_DESCRIPTION_CONTINUE_ON_ERROR=Continue processing even if there are \
- errors
-INFO_DESCRIPTION_USE_SSL=Use SSL for secure communication with the server
-INFO_DESCRIPTION_START_TLS=Use StartTLS to secure communication with the \
- server
-INFO_MODIFY_DESCRIPTION_DEFAULT_ADD=Treat records with no changetype as \
- add operations
 INFO_SEARCH_DESCRIPTION_BASEDN=Search base DN
 INFO_SEARCH_DESCRIPTION_SIZE_LIMIT=Maximum number of entries to return \
  from the search
 INFO_SEARCH_DESCRIPTION_TIME_LIMIT=Maximum length of time in seconds to \
  allow for the search
-INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE=Search scope ('base', 'one', 'sub', \
- or 'subordinate'). Note: 'subordinate' is an LDAP extension \
- that might not work with all LDAP servers
 INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY=Alias dereference policy \
  ('never', 'always', 'search', or 'find')
-ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM=The requested SASL mechanism \
- "%s" is not supported by this client
-ERR_LDAPAUTH_SASL_AUTHID_REQUIRED=The "authid" SASL property is \
- required for use with the %s mechanism
-INFO_DESCRIPTION_VERSION=LDAP protocol version number
 ERR_DESCRIPTION_INVALID_VERSION=Invalid LDAP version number '%s'. \
  Allowed values are 2 and 3
 ERR_SEARCH_NO_FILTERS=No filters specified for the search request
 INFO_DESCRIPTION_DONT_WRAP=Do not wrap long lines
-INFO_DESCRIPTION_NOOP=Show what would be done but do not perform any \
- operation
 INFO_DESCRIPTION_TYPES_ONLY=Only retrieve attribute names but not their \
  values
 INFO_DESCRIPTION_ASSERTION_FILTER=Use the LDAP assertion control with the \
@@ -221,7 +70,6 @@
  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
-INFO_DESCRIPTION_REPORT_AUTHZID=Use the authorization identity control
 INFO_BIND_AUTHZID_RETURNED=# Bound with authorization ID %s
 INFO_SEARCH_DESCRIPTION_FILENAME=File containing a list of search filter \
  strings
@@ -241,7 +89,6 @@
 INFO_BIND_MUST_CHANGE_PASSWORD=# You must change your password before any \
  other operations will be allowed
 INFO_BIND_GRACE_LOGINS_REMAINING=# You have %d grace logins remaining
-INFO_DESCRIPTION_USE_PWP_CONTROL=Use the password policy request control
 INFO_LDAPPWMOD_DESCRIPTION_AUTHZID=Authorization ID for the \
  user entry whose password should be changed. \
  The authorization ID is a string having either \
@@ -286,18 +133,12 @@
  password modify operations in the Directory Server
 INFO_LDAPSEARCH_TOOL_DESCRIPTION=This utility can be used to perform LDAP \
  search operations in the Directory Server
-ERR_TOOL_CONFLICTING_ARGS=You may not provide both the --%s and \
- the --%s arguments
 ERR_LDAPCOMPARE_NO_ATTR=No attribute was specified to use as the \
  target for the comparison
 ERR_LDAPCOMPARE_INVALID_ATTR_STRING=Invalid attribute string '%s'. \
  The attribute string must be in one of the following forms: \
  'attribute:value', 'attribute::base64value', or 'attribute:<valueFilePath'
 ERR_TOOL_INVALID_CONTROL_STRING=Invalid control specification '%s'
-ERR_TOOL_SASLEXTERNAL_NEEDS_SSL_OR_TLS=SASL EXTERNAL \
- authentication may only be requested if SSL or StartTLS is used
-ERR_TOOL_SASLEXTERNAL_NEEDS_KEYSTORE=SASL EXTERNAL authentication \
- may only be used if a client certificate key store is specified
 INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE=# Persistent search change type:  %s
 INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN=# Persistent search previous entry \
  DN:  %s
@@ -315,9 +156,6 @@
 INFO_LDAPSEARCH_ACCTUSABLE_LOCKED=#   The account is locked
 INFO_LDAPSEARCH_ACCTUSABLE_TIME_UNTIL_UNLOCK=#   Time until the account \
  is unlocked:  %s
-INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE=Certificate key store PIN file
-INFO_DESCRIPTION_TRUSTSTOREPASSWORD=Certificate trust store PIN
-INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE=Certificate trust store PIN file
 INFO_DESCRIPTION_COUNT_ENTRIES=Count the number of entries returned by \
  the server
 INFO_LDAPSEARCH_MATCHING_ENTRY_COUNT=# Total number of matching entries: \
@@ -326,8 +164,6 @@
  with the given page size
 ERR_PAGED_RESULTS_REQUIRES_SINGLE_FILTER=The simple paged results \
  control may only be used with a single search filter
-INFO_DESCRIPTION_CERT_NICKNAME=Nickname of certificate for SSL client \
- authentication
 ERR_TOOL_RESULT_CODE=Result Code:  %d (%s)
 ERR_TOOL_ERROR_MESSAGE=Additional Information:  %s
 ERR_TOOL_MATCHED_DN=Matched DN:  %s
@@ -363,67 +199,30 @@
 ERR_EFFECTIVERIGHTS_INVALID_AUTHZID=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=Display Directory Server version \
- information
 INFO_DESCRIPTION_SCRIPT_FRIENDLY=Use script-friendly mode
-ERR_LDAP_CONN_CANNOT_INITIALIZE_SSL=ERROR:  Unable to perform SSL \
- initialization:  %s
-ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION=ERROR:  The provided SASL \
- option string "%s" could not be parsed in the form "name=value"
-INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS=SASL bind options
-INFO_DESCRIPTION_PROP_FILE_PATH=Path to the file containing default \
-  property values used for command line arguments
-INFO_DESCRIPTION_NO_PROP_FILE=No properties file will be \
-  used to get default command line argument values
-INFO_DESCRIPTION_GENERAL_ARGS=General options:
-INFO_DESCRIPTION_IO_ARGS=Utility input/output options:
-INFO_DESCRIPTION_LDAP_CONNECTION_ARGS=LDAP connection options:
 INFO_FILE_PLACEHOLDER={file}
-INFO_KEYSTOREPATH_PLACEHOLDER={keyStorePath}
-INFO_TRUSTSTOREPATH_PLACEHOLDER={trustStorePath}
-INFO_BINDPWD_FILE_PLACEHOLDER={bindPasswordFile}
-INFO_HOST_PLACEHOLDER={host}
-INFO_PORT_PLACEHOLDER={port}
 INFO_BASEDN_PLACEHOLDER={baseDN}
-INFO_BINDDN_PLACEHOLDER={bindDN}
-INFO_BINDPWD_PLACEHOLDER={bindPassword}
-INFO_KEYSTORE_PWD_PLACEHOLDER={keyStorePassword}
-INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER={path}
-INFO_TRUSTSTORE_PWD_PLACEHOLDER={trustStorePassword}
-INFO_NICKNAME_PLACEHOLDER={nickname}
 INFO_ASSERTION_FILTER_PLACEHOLDER={filter}
 INFO_FILTER_PLACEHOLDER={filter}
 INFO_PROXYAUTHID_PLACEHOLDER={authzID}
-INFO_SASL_OPTION_PLACEHOLDER={name=value}
-INFO_PROTOCOL_VERSION_PLACEHOLDER={version}
-INFO_PROP_FILE_PATH_PLACEHOLDER={propertiesFilePath}
 INFO_ATTRIBUTE_PLACEHOLDER={attribute}
 INFO_NUM_ENTRIES_PLACEHOLDER={numEntries}
 INFO_LDAP_CONTROL_PLACEHOLDER={controloid[:criticality[:value|::b64value|:<filePath]]}
-INFO_ENCODING_PLACEHOLDER={encoding}
 INFO_ATTRIBUTE_LIST_PLACEHOLDER={attrList}
 INFO_NEW_PASSWORD_PLACEHOLDER={newPassword}
 INFO_CURRENT_PASSWORD_PLACEHOLDER={currentPassword}
-INFO_SEARCH_SCOPE_PLACEHOLDER={searchScope}
 INFO_SORT_ORDER_PLACEHOLDER={sortOrder}
 INFO_VLV_PLACEHOLDER={before:after:index:count | before:after:value}
 INFO_DEREFERENCE_POLICE_PLACEHOLDER={dereferencePolicy}
 INFO_SIZE_LIMIT_PLACEHOLDER={sizeLimit}
 INFO_TIME_LIMIT_PLACEHOLDER={timeLimit}
 INFO_TARGETDN_PLACEHOLDER={targetDN}
-INFO_KEYSTORE_PWD_FILE_PLACEHOLDER={keyStorePasswordFile}
 INFO_PSEARCH_PLACEHOLDER=ps[:changetype[:changesonly[:entrychgcontrols]]]
-ERR_CANNOT_READ_TRUSTSTORE=Cannot access trust store '%s'.  Verify \
- that the provided trust store exists and that you have read access rights to it
-ERR_CANNOT_READ_KEYSTORE=Cannot access key store '%s'.  Verify \
- that the provided key store exists and that you have read access rights to it
-INFO_DESCRIPTION_ADMIN_PORT=Directory server administration port number
 ERR_LDAPCOMPARE_ERROR_READING_FILE=An error occurred reading file \
  '%s'.  Check that the file exists and that you have read access rights to \
  it.  Details: %s
 ERR_LDAPCOMPARE_FILENAME_AND_DNS=Both entry DNs and a file name \
  were provided for the compare operation.  These arguments are not compatible
-INFO_ERROR_EMPTY_RESPONSE=ERROR: a response must be provided in order to continue
 ERR_DECODE_CONTROL_FAILURE=# %s
 INFO_SEARCHRATE_TOOL_DESCRIPTION=This utility can be used to measure \
   search throughput and response time of a directory service using \

--
Gitblit v1.10.0