From b54e25e8af0e73b7ddaca4eaec088803ea6a7e4f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 22 Feb 2007 09:30:33 +0000
Subject: [PATCH] Fix for Issues #1025 and #1248 ('stop-ds.bat should be able to stop server even if LDAP port' and 'cannot stop server through status panel').

---
 opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties |   53 +++++------------------------------------------------
 1 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 37bab6e..e2cbae8 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -69,22 +69,7 @@
 #
 # Uninstall command line messages
 #
-uninstall-launcher-usage-windows=This utility may be used to uninstall the \
-Directory Server.\n\Usage:  {0} {options}\n        where {options} include:\n\
---cli\n\    Specifies to use the command line uninstall.  If not specified the \
-graphical\n\    interface will be launched.\n\
--H  or   --help\n    Displays usage information for this program.\n\n\
-The following options will only be taken into account if the option --cli \n\
-(command line) is specified\n\
--D {rootDN}  or   --rootUserDN {rootDN}\n    Specifies the DN of the \
-Administrative User (Directory Manager) of the Directory Server.\n\
--w {password}  or   --rootUserPassword {password}\n    Specifies the password \
-of the Administrative User (Directory Manager) of the Directory Server.\n\
--W {filename}  or   --rootUserPasswordFile {filename}\n    Specifies the path \
-to a file containing the password for the Administrative\n\    User \
-of the Directory Server.\n\
--s  or   --silentUninstall\n    Perform a silent uninstall.
-uninstall-launcher-usage-unix=This utility may be used to uninstall the \
+uninstall-launcher-usage=This utility may be used to uninstall the \
 Directory Server.\n\
 Usage:  {0} {options}\n        where {options} include:\n\
 --cli\n\    Specifies to use the command line uninstall.  If not specified the \
@@ -97,22 +82,7 @@
 uninstall-launcher-launching-cli=Launching command line uninstall...
 uninstall-launcher-gui-launched-failed=\n\nThe graphical Uninstall launch \
 failed.\n\nLaunching command line Uninstall...
-cli-uninstall-root-user-dn-not-provided=You must provide a value for the \
-option -D (or --rootUserDN)
-cli-uninstall-root-user-pwd-not-provided=You must provide a value for the \
-option -w (or --rootUserPassword)
-cli-uninstall-root-user-pwd-file-not-provided=You must provide a value for the \
-option -W (or --rootUserPasswordFile)
-cli-uninstall-data-missing-to-shutdown-server=The server is currently running \
-and must be stopped before uninstallation can \
-continue.  You must provide the Authentication DN (option -D or \
---rootUserDN) and the password (option -w or --rootUserPassword) or the file \
-containing the password (option -W or --rootUserPasswordFile) of the \
-Administrative User.
 cli-uninstall-unknown-argument=Unknown argument {0}
-cli-uninstall-pwd-and-pwd-file-provided=You cannot provide Authentication User \
-Password (-w or --rootUserPassword) and Authentication User Password File \
-(-W or --rootUserPasswordFile) at the same time.
 cli-uninstall-yes-short=y
 cli-uninstall-yes-long=yes
 cli-uninstall-no-short=n
@@ -145,21 +115,7 @@
 permanently delete the files?
 cli-uninstall-confirm-delete-files=The files will be permanently deleted, are \
 you sure you want to continue?
-cli-uninstall-stop-authentication-generic-prompt1=The server is currently \
-running and must be stopped before uninstallation can continue.
-cli-uninstall-stop-authentication-generic-prompt2=You must provide an \
-Administrative User DN and password to stop the server.
-cli-uninstall-error-reading-pwd-file=Could not read the password from \
-file {0}.  Check that the file path is correct, that you have access rights to \
-it and that it contains a password. 
-cli-uninstall-prompt-dn=Administrative User DN
-cli-uninstall-prompt-pwd=Administrative User Password:
 cli-uninstall-server-stopped=The Server is Stopped.
-cli-uninstall-cannot-connect-to-shutdown-with-cause=Could not connect to the \
-Directory Server with the provided credentials.  The possible causes for this \
-are:\n{0}
-cli-uninstall-cannot-connect-to-shutdown-without-cause=Could not connect to \
-the Directory Server with the provided credentials.
 
 #
 # Dialog titles
@@ -205,12 +161,12 @@
 All selected files will be permanently deleted, are you sure you\n\
 want to continue?
 confirm-uninstall-server-not-running-title=Confirm Uninstall
-confirm-uninstall-server-running-unix-msg=Server is Running\n\
+confirm-uninstall-server-running-msg=Server is Running\n\
 The OpenDS server is currently running and must be stopped before\n\
 uninstallation can continue. Do you want the uninstaller to stop\n\
 the server for you and continue with the uninstall? If you click\n\
 No, you will need to stop the server manually to continue.
-confirm-uninstall-server-running-unix-title=Server is Running
+confirm-uninstall-server-running-title=Server is Running
 
 
 #
@@ -236,7 +192,8 @@
 error-browser-close-button-tooltip=Close this window
 
 #
-# Dialog asking Directory manager credentials to shutdown server in Windows.
+# Dialog asking Directory manager credentials to shutdown server through
+# Protocol.
 #
 shutdown-directory-manager-dialog-title=Authentication Required
 shutdown-directory-manager-dialog-msg=<b>Directory Server is Running</b><br>\

--
Gitblit v1.10.0