From 88496c3a54b4c6e969cb0dce5cf67e5da6846740 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 13:59:39 +0000
Subject: [PATCH] OPENDJ-2772 Code cleanup

---
 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index eb1b3ca..e296870 100644
--- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -106,8 +106,6 @@
  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
@@ -296,6 +294,7 @@
 INFO_TOOL_WARMING_UP=Warming up for %d seconds...
 ERR_AUTHRATE_NO_BIND_DN_PROVIDED=Authentication information must be provided \
  to use this tool
+ERR_DECODE_CONTROL_CRITICALITY=Invalid format for criticality value '%s' in control '%s'
  #
  # MakeLDIF tool
  #
@@ -309,7 +308,6 @@
 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)
 INFO_MAKELDIF_PROCESSED_N_ENTRIES=Processed %d entries
@@ -326,6 +324,10 @@
 INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Maximum length of an output line \
  (0 for no wrapping)
 INFO_MAKELDIF_WRAP_COLUMN_PLACEHOLDER={wrapColumn}
+ERR_LDAPP_BIND_FAILED=The LDAP bind request failed: %d (%s)
+ERR_LDAP_SEARCH_FAILED=The LDAP search request failed: %d (%s)
+ERR_LDAP_MODIFY_FAILED=The LDAP modify request failed: %d (%s)
+ERR_LDAP_COMPARE_FAILED=The LDAP compare request failed: %d (%s)
 #
 # AddRate Tool
 #

--
Gitblit v1.10.0