From bb1b4f1a882179359bf027bdf6acb8e9c40e5ab7 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 10 May 2007 14:16:11 +0000
Subject: [PATCH] This commit addresses several issues that Brian brought up regarding the upgrader.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 1e3fa06..387a351 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -186,7 +186,7 @@
#
frame-install-title=OpenDS QuickSetup
frame-uninstall-title=OpenDS Uninstall
-frame-upgrade-title=OpenDS Upgrade
+frame-upgrade-title=OpenDS QuickUpgrade
#
# Wizard buttons (labels and tooltips)
@@ -200,18 +200,20 @@
finish-button-uninstall-label=Uninstall
finish-button-install-tooltip=Finish Installation and Setup
finish-button-uninstall-tooltip=Finish Uninstall
-finish-button-tooltip=Finish QuickSetup
+finish-button-upgrade-tooltip=Finish Upgrade
+finish-button-tooltip=Finish Setup
close-button-label=Close
-close-button-tooltip=Close QuickSetup Window
-close-button-install-tooltip=Close QuickSetup Window
+close-button-tooltip=Close Setup Window
+close-button-install-tooltip=Close Setup Window
close-button-uninstall-tooltip=Close Uninstall Window
quit-button-label=Quit
-quit-button-install-tooltip=Quit QuickSetup Tool
+quit-button-install-tooltip=Quit Setup
+quit-button-upgrade-tooltip=Quit Upgrade
cancel-button-label=Cancel
cancel-button-uninstall-tooltip=Cancel Uninstall
shutdown-button-label=Shutdown
continue-button-label=Continue
-continue-button-install-tooltip=Continue with the QuickSetup Tool
+continue-button-install-tooltip=Continue with Setup
ok-button-label=OK
#
@@ -226,6 +228,13 @@
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 \
+ 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
+confirm-quit-upgrade-msg=Are you sure you want to quit OpenDS \
+QuickUpgrade?\nIf you click 'Yes' nothing will be upgraded on your system.
confirm-uninstall-server-not-running-msg=Confirm Uninstall\n\
All selected files will be permanently deleted, are you sure you\n\
want to continue?
@@ -288,7 +297,8 @@
# Data validation errors
#
# Server Settings
-empty-server-location=You must provide the installation path.
+empty-server-location=Invalid Directory Selected\nYou must provide a valid \
+ OpenDS root installation directory.
parent-directory-could-not-be-found=Could not find a parent directory for {0}.
parent-directory-does-not-exist-confirmation=The parent directory of {0} does \
not exist.\nWould you like to create this directory?
@@ -801,14 +811,22 @@
summary-upgrade-verifying=Verifying Upgrade...
summary-upgrade-history=Recording Upgrade History...
summary-upgrade-cleanup=Cleaning Up...
-summary-upgrade-abort=Aborting Upgrade...
+summary-upgrade-abort=Canceling Upgrade...
summary-upgrade-finished-successfully=<b>OpenDS QuickSetup Completed \
Successfully.</b><br>The OpenDS installation at {0} has now been upgraded \
to version {1}.
summary-upgrade-finished-successfully-cli=OpenDS QuickSetup Completed \
Successfully. The OpenDS installation at {0} has now been upgraded \
to version {1}.
-summary-upgrade-finished-with-errors=Upgrade Operation Failed
+summary-upgrade-finished-with-errors=<b>OpenDS QuickUpgrade Failed</b><br>\
+ 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.
+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 \
+ operation. See the logs for details on why the upgrade operation failed.
#
# Progress messages
@@ -917,8 +935,8 @@
upgrade-hypothetical-reversion-failure=Reversion from version {0} to version \
{1} is not supported. To revert versions you must uninstall the current \
server, install the new server, and manually migrate your data.
-upgrade-hypothetical-versions-the-same=Both \
- new current and proposed version numbers are the same: {0}
+upgrade-hypothetical-versions-the-same=Both the 'upgrade to' and 'upgrade from' \
+ numbers are the same: {0}
upgrade-mod-no-schema=Processed server modifications \
(schema checking disabled): {0}
upgrade-mod=Processed server modifications: {0}
@@ -936,28 +954,29 @@
# have to modify it or not: if the server uses the locale of the browser to display
# a language there is no translation to be done but if we have specific URL for
# each language the URL must be localized.
-upgrade-welcome-panel-offline-instructions=The OpenDS Upgrade tool will upgrade \
+upgrade-welcome-panel-offline-instructions=The OpenDS QuickUpgrade tool will upgrade \
an existing build in place.<br><br>You will be prompted to choose among a list \
- of available builds to which you can upgrade or you can specify an install\
- package (.zip) file that you have already downloaded. You can also use this tool to set up a build you have \
- downloaded manually.<br><br> \
+ of available builds to which you can upgrade or you can specify an install \
+ package (.zip) file that you have already downloaded. You can also use this tool to upgrade to a build \
+ whose install package you have already downloaded manually.<br><br> \
Additional information on this tool is available on the <a href="https://www.opends.org/wiki/"> \
OpenDS documentation wiki</a>.<br><br>\
- <i>Note:</i> the upgrade tool will be stop and start the OpenDS server
-upgrade-welcome-panel-webstart-instructions=The OpenDS Upgrade tool will upgrade \
+ <b><i>Note:</i></b> the upgrade tool will need to stop and start the OpenDS server
+upgrade-welcome-panel-webstart-instructions=The OpenDS QuickUpgrade tool will upgrade \
an existing build in place.<br><br>You will be prompted to choose among a list \
of available builds to which you can upgrade or you can specify an install\
- package (.zip) file that you have already downloaded. You can also use this tool to set up a build you have \
- downloaded manually.<br><br> \
+ package (.zip) file that you have already downloaded. You can also use this tool to upgrade to a build \
+ whose install package you have already downloaded manually.<br><br> \
Additional information on this tool is available on the <a href="https://www.opends.org/wiki/"> \
- OpendS documentation wiki</a>.<br><br>\
- <i>Note:</i> the upgrade tool will be stop and start the OpenDS server
+ OpenDS documentation wiki</a>.<br><br>\
+ <b><i>Note:</i></b> the upgrade tool will need to stop and start the OpenDS server
upgrade-location-label=Server to Upgrade:
upgrade-location-tooltip=File system location of the build that will be upgraded
upgrade-build-id-label=Build Version:
upgrade-build-id-tooltip=The ID of the build version installed in the above location
upgrade-build-id-unknown=Unknown
-error-invalid-server-location=Invalid server location: {0}
+error-invalid-server-location=Invalid Directory Selected\nThe selected directory \
+ {0} is not a valid OpenDS root installation directory.
#
# Upgrader Choose Version Panel
@@ -1003,3 +1022,4 @@
general-loading=Loading...
general-see-for-details=See {0} for a detailed log of this operation.
+general-build-id=Build ID
\ No newline at end of file
--
Gitblit v1.10.0