From d21d7b779d43921236670129d460d3503fbe8907 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 27 Sep 2011 19:48:47 +0000
Subject: [PATCH] Fix OPENDJ-222: More rebranding work, fix some messages

---
 opends/src/messages/messages/quicksetup.properties |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 00c3987..26da605 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -366,7 +366,7 @@
 INFO_ERROR_DETERMINING_UPGRADE_BUILD=Error determining upgrade build \
  information.
 INFO_ERROR_DISABLING_WINDOWS_SERVICE=Error Disabling Windows service.  Try to \
- kill the process opends_service.exe and then running the \
+ kill the process opendj_service.exe and then running the \
  %s\bat\windows-service.bat -d command-line to disable the service manually.
 INFO_ERROR_DURING_INITIALIZATION_LOG=Error during the initialization with \
  contents from server %s.  Last log details: %s.  Task state: %s.  Check the \
@@ -1199,7 +1199,7 @@
 INFO_UPGRADE_CHOOSE_VERSION_READING_BUILD_INFO=Reading remote build \
  information...
 INFO_UPGRADE_CHOOSE_VERSION_REMOTE_LABEL=Choose New Version from \
- forgerock.com/downloads-opendj.html
+ www.forgerock.org/opendj.html
 INFO_UPGRADE_CHOOSE_VERSION_REMOTE_NIGHTLY=Nightly Builds
 INFO_UPGRADE_CHOOSE_VERSION_REMOTE_TOOLTIP=Download and upgrade to a build \
  publicly available on the OpenDJ website.
@@ -1229,7 +1229,7 @@
  install package (.zip) file and specify its location using the -f/--file \
  option.  You can also upgrade your server using the Java \
  Web Start version of this tool by visiting the OpenDJ web site at \
- www.forgerock.org/downloads-opendj.html.%n%n\
+ www.forgerock.org/opendj.html.%n%n\
  When using the tool to revert to a previous version you must either indicate \
  that you want to revert to the version before the most recent upgrade using \
  the -r/--revertMostRecent option or specify the location of a reversion \
@@ -1341,17 +1341,16 @@
  higher runtime.<br><br> Additional information on QuickSetup is available on \
  the <a href="%s"> %s documentation site</a>.
 INFO_WELCOME_PANEL_TITLE=Welcome
-INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS=The OpenDJ QuickSetup tool will ask \
+INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS=The %s QuickSetup tool will ask \
  you for some basic server and data configuration settings and will get your \
- server up and running quickly.<br><br>QuickSetup will install and configure \
- the latest weekly build. You can also use QuickSetup to set up a weekly build \
- you have downloaded manually. To run QuickSetup in this case, use the %s \
- command at the top level of the OpenDJ directory.  This instance of \
- QuickSetup will use the following OpenDJ build: %s (Build ID: %s) <br><br> \
- OpenDJ requires a Java SE 6.0 or higher runtime.<br><br> Additional \
+ directory server up and running quickly.<br><br>You can also use QuickSetup \
+ to set up a version of %s you have downloaded manually. To run QuickSetup \
+ in this case, use the %s command at the top level of the OpenDJ directory.  \
+ This instance of QuickSetup will use the following %s build: %s (Build ID: %s) <br><br> \
+ %s requires a Java SE 6.0 or higher runtime.<br><br> Additional \
  information on QuickSetup is available on the <a \
  href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide.html#chap-install-gui"> \
- OpenDJ installation guide</a>.
+ %s installation guide</a>.
 INFO_WELCOME_STEP=Welcome
 INFO_LICENSE_PANEL_TITLE=License
 INFO_LICENSE_PANEL_WEBSTART_INSTRUCTIONS=bla bla

--
Gitblit v1.10.0