From 46cddb74ab9f9fd5c99a7aac6ed4330e9474ecb9 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 05 Jun 2013 10:54:28 +0000
Subject: [PATCH] Fix issue OPENDJ-108, CR-1791. Also fix minor issues with URLs in the install.html and .txt files.
---
opends/resource/webstart/images/opendjsplash.png | 0
opends/src/messages/messages/quicksetup_fr.properties | 10 +-
opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDJ_Inst.icns | 0
opends/resource/mac/ControlPanel.app/Contents/Info.plist | 2
opends/resource/install.txt | 10 +-
opends/resource/mac/QuickSetup.app/Contents/Info.plist | 2
opends/src/quicksetup/org/opends/quicksetup/images/opendjbackground.png | 0
opends/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif | 0
opends/src/messages/messages/quicksetup_es.properties | 10 +-
opends/src/messages/messages/quicksetup_zh_TW.properties | 10 +-
opends/src/quicksetup/org/opends/quicksetup/images/opendjsplash.png | 0
opends/src/messages/messages/quicksetup_zh_CN.properties | 10 +-
opends/src/messages/messages/quicksetup_ko.properties | 10 +-
opends/src/messages/messages/quicksetup.properties | 10 +-
opends/resource/mac/Uninstall.app/Contents/Resources/OpenDJ_Uninst.icns | 0
opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java | 4
opends/resource/images/opendj_logo.png | 0
opends/resource/install.html | 14 ++--
opends/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png | 0
opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDJ.icns | 0
/dev/null | 0
opends/src/messages/messages/quicksetup_de.properties | 10 +-
opends/src/messages/messages/quicksetup_ja.properties | 10 +-
opends/build.xml | 2
opends/resource/mac/Uninstall.app/Contents/Info.plist | 2
opends/resource/webstart/images/opendjhref.png | 0
opends/resource/admin/config-guide/opendj_logo_sm.png | 0
opends/resource/webstart/create-webstart-standalone.sh | 6 +-
28 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 0892d25..e344c62 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1199,7 +1199,7 @@
</copy>
<copy todir="${pdir}">
- <fileset file="${resource.dir}/images/opends_logo.png" />
+ <fileset file="${resource.dir}/images/opendj_logo.png" />
</copy>
<fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup,uninstall,upgrade"
diff --git a/opends/resource/admin/config-guide/opends_logo_sm.png b/opends/resource/admin/config-guide/opendj_logo_sm.png
similarity index 100%
rename from opends/resource/admin/config-guide/opends_logo_sm.png
rename to opends/resource/admin/config-guide/opendj_logo_sm.png
Binary files differ
diff --git a/opends/resource/images/opends_logo.png b/opends/resource/images/opendj_logo.png
similarity index 100%
rename from opends/resource/images/opends_logo.png
rename to opends/resource/images/opendj_logo.png
Binary files differ
diff --git a/opends/resource/install.html b/opends/resource/install.html
index cf949c0..75fad57 100644
--- a/opends/resource/install.html
+++ b/opends/resource/install.html
@@ -25,7 +25,7 @@
<body>
-<img src="images/opends_logo.png" alt="OpenDJ pictogram" border="0" align=right>
+<img src="opendj_logo.png" alt="OpenDJ pictogram" border="0" align=right>
<br>
@@ -49,15 +49,15 @@
256MB of free memory to run OpenDJ for evaluation purposes. Note that
you can configure OpenDJ in such a way that it requires substantially
less, or more, disk space. For more information, see the
-<a href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-before-you-install.html">OpenDJ System Requirements</a>.
+<a href="http://opendj.forgerock.org/doc/release-notes/index/chap-before-you-install.html">OpenDJ System Requirements</a>.
<h3>To Install OpenDJ in GUI mode</h3>
You can run QuickSetup remotely via Java Web Start, or locally from within the
build that you have downloaded and unzipped.
<p>If you run QuickSetup remotely, it automatically downloads and
-unzips the latest weekly build, and handles server configuration.
+unzips the latest nightly build, and handles server configuration.
-<a class="external" href="http://www.forgerock.org/downloads/opendj/2.4.4/install/QuickSetup.jnlp">Launch QuickSetup via Java Web Start</a><img class="outlink" src="Install_files/out.png" alt="">.
+You can find the link to Launch QuickSetup via Java Web Start on <a class="external" href="http://www.forgerock.org/opendj.html">OpenDJ builds page</a>, click [Nightly Build].
</p>
<p>To run QuickSetup locally:
</p>
@@ -90,12 +90,12 @@
<h3>See Also</h3>
<ul>
- <li><a href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide.html">Installing the OpenDJ directory server</a>
+ <li><a href="http://opendj.forgerock.org/doc/install-guide/index.html">Installing the OpenDJ directory server</a>
<br>
- <li> <a href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-install-gui.html">Installing OpenDJ with the QuickSetup Wizard</a>
+ <li> <a href="http://opendj.forgerock.org/doc/install-guide/index/chap-install-gui.html">Installing OpenDJ with the QuickSetup Wizard</a>
<br>
</li>
- <li> <a href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-install-cli.html">Installing OpenDJ from the Command Line</a>
+ <li> <a href="http://opendj.forgerock.org/doc/install-guide/index/chap-install-cli.html">Installing OpenDJ from the Command Line</a>
</li>
</ul>
</body>
diff --git a/opends/resource/install.txt b/opends/resource/install.txt
index 0f34e26..f0c443d 100644
--- a/opends/resource/install.txt
+++ b/opends/resource/install.txt
@@ -17,7 +17,7 @@
recommended that your system have at least 100MB of disk space and 256MB of free memory to run
OpenDJ for evaluation purposes. Note that you can configure OpenDJ in such a way that it requires
substantially less, or more, disk space. For more information, see the OpenDJ System Requirements
-at http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-before-you-install.html.
+at http://opendj.forgerock.org/doc/release-notes/index/chap-before-you-install.html.
To Install OpenDJ in GUI mode
-----------------------------
@@ -26,7 +26,7 @@
If you run QuickSetup remotely, it automatically downloads and unzips the latest weekly build,
and handles server configuration. To launch QuickSetup via Java Web Start, point your
-browser to http://www.forgerock.org/downloads/opendj/2.4.4/install/QuickSetup.jnlp.
+browser to http://www.forgerock.org/opendj.html and click on the [Nightly build] link.
To run QuickSetup locally:
@@ -45,9 +45,9 @@
See Also
--------
* Installing the OpenDJ directory server
- (http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide.html)
+ (http://opendj.forgerock.org/doc/install-guide/index.html)
* Installing OpenDJ with the QuickSetup Wizard
- (http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-install-gui.html)
+ (http://opendj.forgerock.org/doc/install-guide/index/chap-install-gui.html)
* Installing OpenDJ from the Command Line
- (http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide/chap-install-cli.html)
+ (http://opendj.forgerock.org/doc/install-guide/index/chap-install-cli.html)
diff --git a/opends/resource/mac/ControlPanel.app/Contents/Info.plist b/opends/resource/mac/ControlPanel.app/Contents/Info.plist
index ed7ce1d..74b49b1 100644
--- a/opends/resource/mac/ControlPanel.app/Contents/Info.plist
+++ b/opends/resource/mac/ControlPanel.app/Contents/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
+ <string>OpenDJ.icns</string>
<key>Java</key>
<dict>
<key>VMOptions</key>
diff --git a/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDJ.icns b/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDJ.icns
new file mode 100644
index 0000000..9b0d0a0
--- /dev/null
+++ b/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDJ.icns
Binary files differ
diff --git a/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns b/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns
deleted file mode 100644
index dad9cbb..0000000
--- a/opends/resource/mac/ControlPanel.app/Contents/Resources/OpenDS.icns
+++ /dev/null
Binary files differ
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Info.plist b/opends/resource/mac/QuickSetup.app/Contents/Info.plist
index c6fdfa0..4c17181 100644
--- a/opends/resource/mac/QuickSetup.app/Contents/Info.plist
+++ b/opends/resource/mac/QuickSetup.app/Contents/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
+ <string>OpenDJ_Inst.icns</string>
<key>Java</key>
<dict>
<key>VMOptions</key>
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDJ_Inst.icns b/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDJ_Inst.icns
new file mode 100644
index 0000000..8646e63
--- /dev/null
+++ b/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDJ_Inst.icns
Binary files differ
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDS.icns b/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDS.icns
deleted file mode 100644
index b20be96..0000000
--- a/opends/resource/mac/QuickSetup.app/Contents/Resources/OpenDS.icns
+++ /dev/null
Binary files differ
diff --git a/opends/resource/mac/Uninstall.app/Contents/Info.plist b/opends/resource/mac/Uninstall.app/Contents/Info.plist
index 9faa476..3d6d8e8 100644
--- a/opends/resource/mac/Uninstall.app/Contents/Info.plist
+++ b/opends/resource/mac/Uninstall.app/Contents/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
+ <string>OpenDJ_Uninst.icns</string>
<key>Java</key>
<dict>
<key>VMOptions</key>
diff --git a/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDJ_Uninst.icns b/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDJ_Uninst.icns
new file mode 100644
index 0000000..fdb6c96
--- /dev/null
+++ b/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDJ_Uninst.icns
Binary files differ
diff --git a/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDS.icns b/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDS.icns
deleted file mode 100644
index e0c99d8..0000000
--- a/opends/resource/mac/Uninstall.app/Contents/Resources/OpenDS.icns
+++ /dev/null
Binary files differ
diff --git a/opends/resource/webstart/create-webstart-standalone.sh b/opends/resource/webstart/create-webstart-standalone.sh
index f24b128..f9f5baf 100755
--- a/opends/resource/webstart/create-webstart-standalone.sh
+++ b/opends/resource/webstart/create-webstart-standalone.sh
@@ -91,7 +91,7 @@
JAVA_HOME=`java -cp "${ROOT_DIR}/resource" FindJavaHome 2> /dev/null`
if test -z "${JAVA_HOME}"
then
- echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
+ echo "Please set JAVA_HOME to the root of a Java 6.0 installation."
exit 1
else
export JAVA_HOME
@@ -200,8 +200,8 @@
<homepage href="${HOMEPAGE}"/>
<description>${PRODUCT_NAME} QuickSetup Application</description>
<description kind="short">${PRODUCT_NAME} Web Start Installer</description>
- <icon href="images/opendshref.png" height="128" width="128"/>
- <icon kind="splash" href="images/opendssplash.png" height="114" width="479"/>
+ <icon href="images/opendjhref.png" height="128" width="128"/>
+ <icon kind="splash" href="images/opendjsplash.png" height="114" width="479"/>
</information>
<security>
diff --git a/opends/resource/webstart/images/opendjhref.png b/opends/resource/webstart/images/opendjhref.png
new file mode 100644
index 0000000..79d8eb2
--- /dev/null
+++ b/opends/resource/webstart/images/opendjhref.png
Binary files differ
diff --git a/opends/resource/webstart/images/opendssplash.png b/opends/resource/webstart/images/opendjsplash.png
similarity index 100%
rename from opends/resource/webstart/images/opendssplash.png
rename to opends/resource/webstart/images/opendjsplash.png
Binary files differ
diff --git a/opends/resource/webstart/images/opendshref.png b/opends/resource/webstart/images/opendshref.png
deleted file mode 100644
index 7e8c236..0000000
--- a/opends/resource/webstart/images/opendshref.png
+++ /dev/null
Binary files differ
diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties
index 5f8fe9e..0e7f118 100644
--- a/opends/src/messages/messages/quicksetup.properties
+++ b/opends/src/messages/messages/quicksetup.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2012 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -53,7 +53,7 @@
INFO_ADS_EXCEPTION=An unexpected error occurred managing the registration \
information.%nThe error is: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=The provided Directory Base DN is used for \
@@ -643,11 +643,11 @@
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=Do not create any entry for the Directory \
Base DN
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup minimized.
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Network Error
INFO_NEXT_BUTTON_LABEL=Next >
INFO_NEXT_BUTTON_TOOLTIP=Go to Next Step
@@ -981,7 +981,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=Click here to \
shutdown the server with the provided authentication
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=QuickSetup Launching.
INFO_SPLASH_ICON_TOOLTIP=QuickSetup Launching
INFO_SSL_ACCESS_LABEL=SSL Access:
diff --git a/opends/src/messages/messages/quicksetup_de.properties b/opends/src/messages/messages/quicksetup_de.properties
index c4f66f1..3aa2d81 100644
--- a/opends/src/messages/messages/quicksetup_de.properties
+++ b/opends/src/messages/messages/quicksetup_de.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=Administrator bereits registriert.
INFO_ADS_EXCEPTION=Beim Verwalten der Registrierungsinformationen ist ein unerwarteter Fehler aufgetreten.%nDer Fehler lautet: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=Der angegebene Directory-Basis-DN wird zum Speichern der Serverkonfigurationsdaten verwendet. Sie m\u00fcssen einen anderen DN angeben.
@@ -431,11 +431,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=Datenbank leer lassen
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=Keinen Eintrag f\u00fcr den Directory-Basis-DN erstellen
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup minimiert.
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Netzwerkfehler
INFO_NEXT_BUTTON_LABEL=Weiter >
INFO_NEXT_BUTTON_TOOLTIP=Zum n\u00e4chsten Schritt gehen
@@ -657,7 +657,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Geben Sie das Passwort des administrativen Server-Benutzerkontos ein
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=Klicken Sie auf diese Option, um den Server mit der angegebenen Authentifizierung zu beenden
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=Starten von QuickSetup.
INFO_SPLASH_ICON_TOOLTIP=Starten von QuickSetup
INFO_SSL_ACCESS_LABEL=SSL-Zugriff:
diff --git a/opends/src/messages/messages/quicksetup_es.properties b/opends/src/messages/messages/quicksetup_es.properties
index c53ea3e..0451cac 100644
--- a/opends/src/messages/messages/quicksetup_es.properties
+++ b/opends/src/messages/messages/quicksetup_es.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=El administrador ya est\u00e1 registrado.
INFO_ADS_EXCEPTION=Se ha producido un error inesperado al gestionar la informaci\u00f3n de registro.%nEl error es: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=Configuraci\u00f3n r\u00e1pida.
INFO_BACKGROUND_ICON_TOOLTIP=Configuraci\u00f3n r\u00e1pida
INFO_BASE_DN_IS_CONFIGURATION_DN=El ND de base de directorios proporcionado se utiliza para almacenar los datos de configuraci\u00f3n del servidor. Debe especificar un ND distinto.
@@ -431,11 +431,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=Dejar la base de datos vac\u00eda
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=No crear ninguna entrada para el ND de base de directorio
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=Configuraci\u00f3n r\u00e1pida minimizada.
INFO_MINIMIZED_ICON_TOOLTIP=Configuraci\u00f3n r\u00e1pida
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Error de red
INFO_NEXT_BUTTON_LABEL=Siguiente >
INFO_NEXT_BUTTON_TOOLTIP=Ir a la etapa siguiente
@@ -657,7 +657,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Introduzca la contrase\u00f1a de la cuenta de usuario administrativo del servidor
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=Haga clic para cerrar el servidor con la autenticaci\u00f3n especificada
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=Inicio de Configuraci\u00f3n r\u00e1pida.
INFO_SPLASH_ICON_TOOLTIP=Inicio de Configuraci\u00f3n r\u00e1pida
INFO_SSL_ACCESS_LABEL=Acceso SSL:
diff --git a/opends/src/messages/messages/quicksetup_fr.properties b/opends/src/messages/messages/quicksetup_fr.properties
index 9391e93..7220dd9 100644
--- a/opends/src/messages/messages/quicksetup_fr.properties
+++ b/opends/src/messages/messages/quicksetup_fr.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=Administrateur d\u00e9j\u00e0 enregistr\u00e9.
INFO_ADS_EXCEPTION=Une erreur inattendue s'est produite lors de la gestion des informations d'enregistrement.%nL'erreur est\u00a0: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=Le DN de base de r\u00e9pertoire sert \u00e0 stocker les donn\u00e9es de configuration du serveur. Vous devez sp\u00e9cifier un DN diff\u00e9rent.
@@ -431,11 +431,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=Conserver la base de donn\u00e9es vide
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=Ne pas cr\u00e9er d'entr\u00e9e pour le DN de base de r\u00e9pertoire
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup r\u00e9duit.
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Erreur r\u00e9seau
INFO_NEXT_BUTTON_LABEL=Suivant >
INFO_NEXT_BUTTON_TOOLTIP=\u00c9tape suivante
@@ -657,7 +657,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Saisir le mot de passe du compte Utilisateur administratif du serveur
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=Cliquer ici pour \u00e9teindre le serveur avec l'authentification fournie
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=D\u00e9marrage de QuickSetup.
INFO_SPLASH_ICON_TOOLTIP=D\u00e9marrage de QuickSetup
INFO_SSL_ACCESS_LABEL=Acc\u00e8s SSL :
diff --git a/opends/src/messages/messages/quicksetup_ja.properties b/opends/src/messages/messages/quicksetup_ja.properties
index 053cfa8..7b7d219 100644
--- a/opends/src/messages/messages/quicksetup_ja.properties
+++ b/opends/src/messages/messages/quicksetup_ja.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=\u7ba1\u7406\u8005\u306f\u3059\u3067\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u307e\u3059\u3002
INFO_ADS_EXCEPTION=\u767b\u9332\u60c5\u5831\u306e\u7ba1\u7406\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002%n\u30a8\u30e9\u30fc: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup\u3002
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=\u6307\u5b9a\u3055\u308c\u305f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d9\u30fc\u30b9 DN \u304c\u3001\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30c7\u30fc\u30bf\u306e\u683c\u7d0d\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002 \u5225\u306e DN \u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -431,11 +431,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u7a7a\u306e\u307e\u307e\u306b\u3059\u308b
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30d9\u30fc\u30b9 DN \u306e\u30a8\u30f3\u30c8\u30ea\u3092\u4f5c\u6210\u3057\u307e\u305b\u3093
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup \u306f\u6700\u5c0f\u5316\u3055\u308c\u3066\u3044\u307e\u3059\u3002
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=Network \u30a8\u30e9\u30fc
INFO_NEXT_BUTTON_LABEL=\u6b21\u3078 >
INFO_NEXT_BUTTON_TOOLTIP=\u6b21\u306e\u624b\u9806\u306b\u9032\u3080
@@ -657,7 +657,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=\u30b5\u30fc\u30d0\u30fc\u7ba1\u7406\u30e6\u30fc\u30b6\u30fc\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u307e\u3059
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=\u6307\u5b9a\u3055\u308c\u305f\u8a8d\u8a3c\u3092\u4f7f\u3063\u3066\u30b5\u30fc\u30d0\u30fc\u3092\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3059\u308b\u306b\u306f\u3001\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af\u3057\u307e\u3059
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=QuickSetup \u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059\u3002
INFO_SPLASH_ICON_TOOLTIP=QuickSetup \u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059
INFO_SSL_ACCESS_LABEL=SSL \u30a2\u30af\u30bb\u30b9:
diff --git a/opends/src/messages/messages/quicksetup_ko.properties b/opends/src/messages/messages/quicksetup_ko.properties
index 644b9f1..ba6e113 100644
--- a/opends/src/messages/messages/quicksetup_ko.properties
+++ b/opends/src/messages/messages/quicksetup_ko.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=\uad00\ub9ac\uc790\uac00 \uc774\ubbf8 \ub4f1\ub85d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
INFO_ADS_EXCEPTION=\ub4f1\ub85d \uc815\ubcf4\ub97c \uad00\ub9ac\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.%n\uc624\ub958: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=\uc81c\uacf5\ub41c \ub514\ub809\ud1a0\ub9ac \uae30\ubcf8 DN\uc740 \uc11c\ubc84 \uad6c\uc131 \ub370\uc774\ud130\ub97c \uc800\uc7a5\ud558\ub294 \ub370 \uc0ac\uc6a9\ub429\ub2c8\ub2e4. \ub2e4\ub978 DN\uc744 \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4.
@@ -420,11 +420,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=\ub370\uc774\ud130\ubca0\uc774\uc2a4 \ube44\uc6cc \ub450\uae30
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=\ub514\ub809\ud1a0\ub9ac \uae30\ubcf8 DN\uc5d0 \ub300\ud55c \ud56d\ubaa9\uc744 \ub9cc\ub4e4\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup minimized.
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=\ub124\ud2b8\uc6cc\ud06c \uc624\ub958
INFO_NEXT_BUTTON_LABEL=\ub2e4\uc74c >
INFO_NEXT_BUTTON_TOOLTIP=\ub2e4\uc74c \ub2e8\uacc4\ub85c \uc774\ub3d9
@@ -634,7 +634,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter the password of the server Administrative User account
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=\uc81c\uacf5\ub41c \uc778\uc99d\uc744 \uc0ac\uc6a9\ud558\uc5ec \uc11c\ubc84\ub97c \uc885\ub8cc\ud558\ub824\uba74 \uc5ec\uae30\ub97c \ub204\ub985\ub2c8\ub2e4.
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=QuickSetup Launching.
INFO_SPLASH_ICON_TOOLTIP=QuickSetup Launching
INFO_SSL_ACCESS_LABEL=SSL \uc561\uc138\uc2a4:
diff --git a/opends/src/messages/messages/quicksetup_zh_CN.properties b/opends/src/messages/messages/quicksetup_zh_CN.properties
index b200a25..23071d6 100644
--- a/opends/src/messages/messages/quicksetup_zh_CN.properties
+++ b/opends/src/messages/messages/quicksetup_zh_CN.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -52,7 +52,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=\u5df2\u6ce8\u518c\u7ba1\u7406\u5458\u3002
INFO_ADS_EXCEPTION=\u5728\u7ba1\u7406\u6ce8\u518c\u4fe1\u606f\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef\u3002%n\u8be5\u9519\u8bef\u4e3a: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=\u5feb\u901f\u5b89\u88c5\u3002
INFO_BACKGROUND_ICON_TOOLTIP=\u5feb\u901f\u5b89\u88c5
INFO_BASE_DN_IS_CONFIGURATION_DN=\u63d0\u4f9b\u7684\u76ee\u5f55\u57fa DN \u7528\u4e8e\u5b58\u50a8\u670d\u52a1\u5668\u914d\u7f6e\u6570\u636e\u3002\u60a8\u5fc5\u987b\u6307\u5b9a\u4e0d\u540c\u7684 DN\u3002
@@ -431,11 +431,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=\u5c06\u6570\u636e\u5e93\u4fdd\u7559\u4e3a\u7a7a
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=\u4e0d\u8981\u4e3a\u76ee\u5f55\u57fa DN \u521b\u5efa\u4efb\u4f55\u6761\u76ee
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=\u5feb\u901f\u5b89\u88c5\u5df2\u6700\u5c0f\u5316\u3002
INFO_MINIMIZED_ICON_TOOLTIP=\u5feb\u901f\u5b89\u88c5
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=\u7f51\u7edc\u9519\u8bef
INFO_NEXT_BUTTON_LABEL=\u4e0b\u4e00\u6b65 >
INFO_NEXT_BUTTON_TOOLTIP=\u8f6c\u81f3\u4e0b\u4e00\u6b65
@@ -657,7 +657,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=\u8f93\u5165\u670d\u52a1\u5668\u7ba1\u7406\u7528\u6237\u5e10\u6237\u7684\u5bc6\u7801
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=\u5355\u51fb\u6b64\u5904\u53ef\u4f7f\u7528\u63d0\u4f9b\u7684\u9a8c\u8bc1\u4fe1\u606f\u5173\u95ed\u670d\u52a1\u5668
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=\u6b63\u5728\u542f\u52a8\u5feb\u901f\u5b89\u88c5\u3002
INFO_SPLASH_ICON_TOOLTIP=\u6b63\u5728\u542f\u52a8\u5feb\u901f\u5b89\u88c5
INFO_SSL_ACCESS_LABEL=SSL \u8bbf\u95ee:
diff --git a/opends/src/messages/messages/quicksetup_zh_TW.properties b/opends/src/messages/messages/quicksetup_zh_TW.properties
index a263d4a..7337ac7 100644
--- a/opends/src/messages/messages/quicksetup_zh_TW.properties
+++ b/opends/src/messages/messages/quicksetup_zh_TW.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2010-2011 ForgeRock AS
+# Portions Copyright 2010-2013 ForgeRock AS
@@ -53,7 +53,7 @@
INFO_ADMINISTRATOR_ALREADY_REGISTERED=\u7ba1\u7406\u54e1\u5df2\u8a3b\u518a\u3002
INFO_ADS_EXCEPTION=\u7ba1\u7406\u8a3b\u518a\u8cc7\u8a0a\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4\u3002%n\u932f\u8aa4\u70ba: %s
# Only translate if the image is specific to the local
-INFO_BACKGROUND_ICON=images/opendsbackground.png
+INFO_BACKGROUND_ICON=images/opendjbackground.png
INFO_BACKGROUND_ICON_DESCRIPTION=QuickSetup.
INFO_BACKGROUND_ICON_TOOLTIP=QuickSetup
INFO_BASE_DN_IS_CONFIGURATION_DN=\u63d0\u4f9b\u7684\u76ee\u9304\u57fa\u5e95 DN \u53ef\u7528\u4ee5\u5132\u5b58\u4f3a\u670d\u5668\u914d\u7f6e\u8cc7\u6599\u3002\u60a8\u5fc5\u9808\u6307\u5b9a\u4e0d\u540c\u7684 DN\u3002
@@ -421,11 +421,11 @@
INFO_LEAVE_DATABASE_EMPTY_LABEL=\u5c07\u8cc7\u6599\u5eab\u4fdd\u7559\u70ba\u7a7a
INFO_LEAVE_DATABASE_EMPTY_TOOLTIP=\u4e0d\u5efa\u7acb\u76ee\u9304\u57fa\u5e95 DN \u7684\u9805\u76ee
# Only translate if the image is specific to the local
-INFO_MINIMIZED_ICON=images/opendsminimized.gif
+INFO_MINIMIZED_ICON=images/opendjminimized.gif
INFO_MINIMIZED_ICON_DESCRIPTION=QuickSetup minimized.
INFO_MINIMIZED_ICON_TOOLTIP=QuickSetup
# Only translate if the image is specific to the local
-INFO_MINIMIZED_MAC_ICON=images/opendsminimizedmac.png
+INFO_MINIMIZED_MAC_ICON=images/opendjminimizedmac.png
INFO_NETWORK_ERROR_TITLE=\u7db2\u8def\u932f\u8aa4
INFO_NEXT_BUTTON_LABEL=\u4e0b\u4e00\u6b65 >
INFO_NEXT_BUTTON_TOOLTIP=\u79fb\u81f3\u4e0b\u4e00\u500b\u6b65\u9a5f
@@ -635,7 +635,7 @@
INFO_SHUTDOWN_DIRECTORY_MANAGER_PWD_TOOLTIP=Enter the password of the server Administrative User account
INFO_SHUTDOWN_DIRECTORY_MANAGER_SHUTDOWN_BUTTON_TOOLTIP=\u6309\u4e00\u4e0b\u6b64\u8655\uff0c\u4ee5\u63d0\u4f9b\u7684\u8a8d\u8b49\u95dc\u9589\u4f3a\u670d\u5668
# Only translate if the image is specific to the local
-INFO_SPLASH_ICON=images/opendssplash.png
+INFO_SPLASH_ICON=images/opendjsplash.png
INFO_SPLASH_ICON_DESCRIPTION=QuickSetup Launching.
INFO_SPLASH_ICON_TOOLTIP=QuickSetup Launching
INFO_SSL_ACCESS_LABEL=SSL \u5b58\u53d6:
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendsbackground.png b/opends/src/quicksetup/org/opends/quicksetup/images/opendjbackground.png
similarity index 100%
rename from opends/src/quicksetup/org/opends/quicksetup/images/opendsbackground.png
rename to opends/src/quicksetup/org/opends/quicksetup/images/opendjbackground.png
Binary files differ
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif b/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif
new file mode 100644
index 0000000..980e0aa
--- /dev/null
+++ b/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimized.gif
Binary files differ
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png b/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png
new file mode 100644
index 0000000..79d8eb2
--- /dev/null
+++ b/opends/src/quicksetup/org/opends/quicksetup/images/opendjminimizedmac.png
Binary files differ
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendssplash.png b/opends/src/quicksetup/org/opends/quicksetup/images/opendjsplash.png
similarity index 100%
rename from opends/src/quicksetup/org/opends/quicksetup/images/opendssplash.png
rename to opends/src/quicksetup/org/opends/quicksetup/images/opendjsplash.png
Binary files differ
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimized.gif b/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimized.gif
deleted file mode 100644
index e6a1fc0..0000000
--- a/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimized.gif
+++ /dev/null
Binary files differ
diff --git a/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimizedmac.png b/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimizedmac.png
deleted file mode 100644
index 7e8c236..0000000
--- a/opends/src/quicksetup/org/opends/quicksetup/images/opendsminimizedmac.png
+++ /dev/null
Binary files differ
diff --git a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 01c69a0..2bf218c 100644
--- a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.admin.doc;
@@ -1003,7 +1003,7 @@
" Configuration Reference</h2></td>\n");
htmlBuff.append(" <td valign=\"bottom\" width=\"10%\">" +
"<a href=\"" + OpenDJHome + "\" target=\"_parent\">" +
- "<img src=\"opends_logo_sm.png\" alt=\"OpenDJ Logo\" align=\"bottom\" " +
+ "<img src=\"opendj_logo_sm.png\" alt=\"OpenDJ Logo\" align=\"bottom\" " +
"border=\"0\" height=\"33\" width=\"114\"></a></td>\n");
htmlBuff.append("</tr>\n");
htmlBuff.append("</tbody></table>\n");
--
Gitblit v1.10.0