Added additional notice for WCF dir during setup

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index 4ca8e86e68195b03ebda9f781ff9fc38ceecd35a..98064c9758ce73b93527cda505be1771e6138e85 100644 (file)
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -41,6 +41,7 @@
                <item name="wcf.global.wcfDir.description"><![CDATA[In das Installationsverzeichnis werden alle Dateien von <b>WoltLab Community Framework</b> entpackt.]]></item>
                <item name="wcf.global.wcfDir.dir"><![CDATA[Installationsverzeichnis]]></item>
                <item name="wcf.global.wcfDir.dir.description"><![CDATA[Wenn Sie unsicher sind, belassen sie den vom System vorgegebenen Namen und führen die Standard-Installation durch.]]></item>
+               <item name="wcf.global.wcfDir.dir.info"><![CDATA[Dies ist <u>nicht</u> das Installationsverzeichnis von {$setupPackageName}! Es wird empfohlen den vorgeschlagenen Pfad beizubehalten.]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
                <item name="wcf.global.wcfDir.error.invalidDirectory"><![CDATA[Die Installation vermutet eine bereits vorhandene Installation von <b>WoltLab Community Framework</b> im Verzeichnis „{$wcfDir}“.<br />Bitte definieren Sie ein anderes Installationsverzeichnis um die Installation fortzusetzen.]]></item>
                <item name="wcf.global.wcfDir.url"><![CDATA[Installationsadresse (URL)]]></item>

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 1c670f1ae78669844c5e54617a35d65101ba8330..29efa4b9b0e420e09cfd7f997e7ff8045f41430b 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -41,6 +41,7 @@
                <item name="wcf.global.wcfDir.description"><![CDATA[All files of <b>WoltLab Community Framework</b> will be extracted into the installation-folder.]]></item>
                <item name="wcf.global.wcfDir.dir"><![CDATA[Installation Directory]]></item>
                <item name="wcf.global.wcfDir.dir.description"><![CDATA[If you are unsure, keep the name which the system suggests and run the standard installation.]]></item>
+               <item name="wcf.global.wcfDir.dir.info"><![CDATA[This is <u>not</u> the installation directory for {$setupPackageName}! It is recommended to keep the suggested path.]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[The given directory is not valid.]]></item>
                <item name="wcf.global.wcfDir.error.invalidDirectory"><![CDATA[The installer has found a previous installation of <b>WoltLab Community Framework</b> in the “{$wcfDir}” directory.<br />Please enter an alternative installation directory to continue installation.]]></item>
                <item name="wcf.global.wcfDir.url"><![CDATA[Installation Address (URL)]]></item>

diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl
index 266a44b704b9f57b631dd6f8f92adc9652ec0f2b..a6c46cb55fccdb1ad5386d966da4c985e940a937 100644 (file)
--- a/wcfsetup/setup/template/stepSearchWcfDir.tpl
+++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl
@@ -97,6 +97,7 @@
        <div class="container containerPadding marginTop">
                <fieldset>
                        <legend>{lang}wcf.global.wcfDir.dir{/lang}</legend>
+                       <small>{lang}wcf.global.wcfDir.dir.info{/lang}</small>
                        
                        <dl>
                                <dt><label for="wcfDir">{lang}wcf.global.wcfDir.dir{/lang}</label></dt>