From f6bff1e8c31ae6ebfabfdb478771216b9773a3c4 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 24 May 2007 00:37:30 +0000
Subject: [PATCH] This commit addresses issue 1599 as well as introduces some other changes suggested by Brian after reviewing the SWAED guidelines:

---
 opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index e2716e6..27ef222 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -215,6 +215,7 @@
 quit-button-install-tooltip=Quit Setup
 quit-button-upgrade-tooltip=Quit Upgrade
 cancel-button-label=Cancel
+cancel-button-tooltip=Cancel the currently running operation
 cancel-button-uninstall-tooltip=Cancel Uninstall
 shutdown-button-label=Shutdown
 continue-button-label=Continue
@@ -227,14 +228,14 @@
 confirm-close-install-title=Confirmation Required
 confirm-close-install-msg=OpenDS QuickSetup has not yet completed.\nAre you \
 sure you want to close the QuickSetup Window?
-confirm-quit-install-title=Confirmation Required
-confirm-quit-install-msg=Are you sure you want to quit OpenDS \
+confirm-cancel-install-title=Confirmation Required
+confirm-cancel-install-msg=Are you sure you want to cancel OpenDS \
 QuickSetup?\nIf you click 'Yes' nothing will be installed on your system.
 confirm-close-uninstall-title=Confirmation Required
 confirm-close-uninstall-msg=OpenDS Uninstall has not yet completed.\nAre you \
 sure you want to close the Uninstall Window?
-confirm-close-upgrade-title=Confirmation Required
-confirm-close-upgrade-msg=OpenDS QuickUpgrade has not yet completed.\nIf you \
+confirm-cancel-upgrade-title=Confirmation Required
+confirm-cancel-upgrade-msg=OpenDS QuickUpgrade has not yet completed.\nIf you \
   click 'Yes' any changes that have been\nmade to the server being upgraded \
   will\nbe backed out.\n\nAre you sure you want to close the QuickUpgrade Window?\n
 confirm-quit-upgrade-title=Confirmation Required
@@ -250,6 +251,8 @@
 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-title=Server is Running
+confirm-cancel-title=Confirmation Required
+confirm-cancel-prompt=Cancel the running operation?
 
 
 #
@@ -820,7 +823,7 @@
 summary-upgrade-abort=Canceling Upgrade...
 summary-upgrade-finished-successfully=<b>OpenDS QuickUpgrade Completed \
   Successfully.</b><br>The OpenDS installation at {0} has now been upgraded \
-  to version {1}.
+  to version {1}.<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
 summary-upgrade-finished-successfully-cli=OpenDS QuickUpgrade Completed \
   Successfully.  The OpenDS installation at {0} has now been upgraded \
   to version {1}.
@@ -828,7 +831,7 @@
   The upgrade operation could not complete successfully due to errors and \
   the installation has been restored to the state it was in before the upgrade \
   operation.  See the 'Details' text for more information on why the upgrade \
-  operation failed.
+  operation failed.<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
 summary-upgrade-finished-with-errors-cli=OpenDS QuickUpgrade Failed. \
   The upgrade operation could not complete successfully due to errors and \
   the installation has been restored to the state it was in before the upgrade \
@@ -836,12 +839,18 @@
 summary-upgrade-finished-with-warnings=<b>OpenDS QuickUpgrade Succeeded With \
   Warnings</b><br>The upgrade operation completed successfully but the upgrader \
   had problems that require attention. See the 'Details' text for more \
-  information on the problems.
+  information on the problems.<br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
 summary-upgrade-finished-with-warnings-cli=OpenDS QuickUpgrade Succeeded With \
   Warnings. The upgrade operation completed successfully but the upgrader \
   had problems that require attention. See the logs for details on the \
   problems.
-
+summary-upgrade-finished-canceled=<b>OpenDS QuickUpgrade Canceled.</b> \
+  <br>The upgrade operation was canceled and the installation has been \
+  restored to the state it was in before the upgrade operation.\
+  <br><br><INPUT type="submit" value="Launch Status Panel"></INPUT>
+summary-upgrade-finished-canceled-cli=<b>OpenDS QuickUpgrade Canceled. \
+  The upgrade operation was canceled and the installation has been \
+  restored to the state it was in before the upgrade operation.
 #
 # Progress messages
 #

--
Gitblit v1.10.0