From a9037949c175770a591d75624d4b282264dfcf5b Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 04 Jul 2007 16:48:57 +0000
Subject: [PATCH] This commit's design changes have been reviewed and approved by Brian Ehret.

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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 360f12e..06a7588 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
@@ -343,6 +343,7 @@
 data-options-step=Directory Data
 review-step=Review
 progress-step=Progress
+finished-step=Finished
 confirm-uninstall-step=Uninstall Options
 step-upgrade-choose-version=Choose Version
 
@@ -556,7 +557,8 @@
 certificate-not-trusted-text=The Certificate presented by the server {0}:{1} \
 could not be trusted.<br><br>Possible reasons for this error:\
 <br>&nbsp;&nbsp;&nbsp;&nbsp;-The Certificate Authority that issued the \
-certificate is not recognized.<br>&nbsp;&nbsp;&nbsp;&nbsp;-The server''s \
+certificate is not recognized (this is the case of the self-signed \
+certificates).<br>&nbsp;&nbsp;&nbsp;&nbsp;-The server''s \
 certificate is incomplete due to a misconfiguration.\
 <br>&nbsp;&nbsp;&nbsp;&nbsp;-The server''s certificate has expired.<br>Before \
 accepting this certificate, you should examine the server''s certificate \
@@ -769,6 +771,11 @@
 progressbar-tooltip=Progress Bar
 
 #
+# Finished Panel specific labels
+#
+finished-panel-title=Finished
+
+#
 # Confirm Uninstall Panel specific labels
 #
 confirm-uninstall-panel-title=Uninstall Options
@@ -948,6 +955,7 @@
 progress-cancel=Waiting to cancel operation.
 
 progress-configuring-replication-remote=Configuring Replication on {0}
+progress-unconfiguring-replication-remote=Unconfiguring Replication on {0}
 progress-import-automatically-generated=Importing Automatically-Generated Data \
 ({0} Entries):
 progress-starting=Starting Directory Server:
@@ -972,6 +980,7 @@
 administrator-already-registered=Administrator already registered.
 progress-creating-ads=Creating Registration Configuration
 progress-creating-ads-on-remote=Creating Registration Configuration on {0}
+progress-unconfiguring-ads-on-remote=Reverting Registration Configuration on {0}
 progress-initializing-ads=Initializing Registration information
 progress-initializing-suffix=Initializing suffix {0} with the contents from \
 {1}:
@@ -1240,6 +1249,27 @@
 upgrade-log-status-failure=Failure
 upgrade-log-status-cancel=Canceled
 
+#
+# Install and Upgrade merged welcome panel.
+#
+installandupgrade-welcome-panel-title=Welcome
+installandupgrade-welcome-panel-instructions=The OpenDS QuickSetup tool can \
+either install and configure a new server instance or upgrade an existing \
+server instance. In either case, QuickSetup will use the latest weekly build, \
+which in this case is: {0} (Build ID: {1}) <br><br> \
+You can also use QuickSetup to set up a weekly build you have downloaded \
+manually. To run QuickSetup in this case, use the setup command at the top \
+level of the OpenDS directory.<br><br> \
+OpenDS requires a Java SE 5.0 or higher runtime.<br><br> \
+Additional information on QuickSetup is available on the <a \
+href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool"> \
+OpenDS documentation wiki</a>.
+installandupgrader-rbinstall-label=Install New Server Instance
+installandupgrader-rbinstall-tooltip=Select to install a new server instance.
+installandupgrader-rbupgrade-label=Upgrade Existing Server Instance
+installandupgrader-rbupgrade-tooltip=Select to upgrade an existing server \
+instance.
+
 general-loading=Loading...
 general-see-for-details=See {0} for a detailed log of this operation.
 not-available-label=<not available>

--
Gitblit v1.10.0