Installation-, Language and Style-Changes
authorLuzifr <szekely@woltlab.com>
Mon, 12 Sep 2011 19:31:58 +0000 (21:31 +0200)
committerLuzifr <szekely@woltlab.com>
Mon, 12 Sep 2011 19:32:05 +0000 (21:32 +0200)
Installation is now widely functional again, some pages have been
modified; New language-variables and some older modified; Style changes
to work around the missing header-link of the installation page;
CSS-code format; Proper installation icon (the former was
unintentional).

12 files changed:
wcfsetup/install/files/acp/style/testing.css
wcfsetup/install/files/icon/installation1.svg [new file with mode: 0644]
wcfsetup/install/lang/de-informal.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml
wcfsetup/setup/lang/setup_de-informal.xml
wcfsetup/setup/lang/setup_de.xml
wcfsetup/setup/lang/setup_en.xml
wcfsetup/setup/template/header.tpl
wcfsetup/setup/template/stepSearchWcfDir.tpl
wcfsetup/setup/template/stepSelectSetupLanguage.tpl
wcfsetup/setup/template/stepShowSystemRequirements.tpl

index 682ea9909b0b1c4ab3fcee8a77bbcb383bd94ad7..4c4cc73dfbf838e6744a0022c822c493cc6652f3 100644 (file)
@@ -67,6 +67,7 @@ q:after {
 body {
        font-family: 'Trebuchet MS', Arial, sans-serif;
        font-size: 80%;
+       color: #666;
        line-height: 1;
        background-color: #29374a;
 }
@@ -75,10 +76,6 @@ img {
        vertical-align: middle !important;
 }
 
-p {
-       color: #666;
-}
-
 a {
        color: #369;
        text-decoration: none;
@@ -191,7 +188,8 @@ header.pageHeader div#logo img {
        left: 0;
 }
 
-header.pageHeader div#logo a {
+header.pageHeader div#logo > a,
+header.pageHeader div#logo > div {
        text-align: right;
        display: block;
        height: 110px;
@@ -1540,7 +1538,7 @@ thead th:first-child {
 
 thead th:last-child {
        /* rounded corners for the last table header cell to the left */
-       border-top-right-radius: 5px;   
+       border-top-right-radius: 5px;
 }
 
 thead th {
@@ -1619,12 +1617,12 @@ tbody tr:last-child {
 
 tbody tr:last-child td:first-child {
        /* rounded corners for the last table cell to the left */
-       border-bottom-left-radius: 5px; 
+       border-bottom-left-radius: 5px;
 }
 
 tbody tr:last-child td:last-child {
        /* rounded corners for the last table cell to the right */
-       border-bottom-right-radius: 5px;        
+       border-bottom-right-radius: 5px;
 }
 
 tbody td {
@@ -1671,7 +1669,7 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover {
 }
 
 .menu ~ .border thead th:last-child {
-       border-top-right-radius: 0 !important;  
+       border-top-right-radius: 0 !important;
 }
 
 .menu ~ .border thead th:first-child,
@@ -1681,7 +1679,7 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover {
 
 .menu ~ .border thead th:last-child,
 .boxTitle > table thead th:last-child {
-       border-top-right-radius: 0 !important;  
+       border-top-right-radius: 0 !important;
 }
 
 
diff --git a/wcfsetup/install/files/icon/installation1.svg b/wcfsetup/install/files/icon/installation1.svg
new file mode 100644 (file)
index 0000000..6b37de7
--- /dev/null
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--<?xml-stylesheet type="text/css" href="svg.css"?>-->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" xml:space="preserve">\r
+       \r
+       <title>Options</title> \r
+       <desc>Options Icon</desc> \r
+       \r
+       <!--\r
+               @author         Harald Szekely \r
+               @copyright      2011 WoltLab GmbH \r
+               @license        GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php> \r
+       --> \r
+       \r
+       <defs>\r
+               \r
+       </defs>\r
+       \r
+       <g id="IconOptions">\r
+               <g>\r
+                       <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0 7.5 8.5" to="360 7.5 8.5" begin="0s" dur="10s"  repeatCount="indefinite" />\r
+                       \r
+                       <path class="Lower" style="fill: #fff;" d="M13.5058594,7.4238281l-1.7324219-0.2666016\r
+                               C11.6933594,6.902832,11.59375,6.659668,11.4716797,6.4267578l1.0361328-1.4125977\r
+                               c0.1630859-0.2216797,0.1367188-0.5625-0.0576172-0.7568359L11.7431641,3.550293\r
+                               c-0.1943359-0.1943359-0.5351562-0.2207031-0.7568359-0.0576172L9.5732422,4.5283203\r
+                               C9.3398438,4.40625,9.0976562,4.3066406,8.8427734,4.2265625L8.5761719,2.4941406C8.5341797,2.222168,8.2749023,2,8,2H7.0004883\r
+                               C6.7255859,2,6.4663086,2.222168,6.4243164,2.4941406L6.1582031,4.2265625\r
+                               C5.9033203,4.3066406,5.6601562,4.40625,5.4267578,4.5283203L4.0141602,3.4926758\r
+                               c-0.2216797-0.1630859-0.5625-0.1367188-0.7568359,0.0576172L2.550293,4.2573242\r
+                               C2.355957,4.4516602,2.3300781,4.7924805,2.4926758,5.0141602l1.0356445,1.4125977\r
+                               C3.4067383,6.659668,3.3071289,6.902832,3.2270508,7.1572266L1.4941406,7.4238281C1.222168,7.4658203,1,7.7250977,1,8v1\r
+                               c0,0.2753906,0.222168,0.5341797,0.4941406,0.5761719l1.7324219,0.2666016\r
+                               c0.0800781,0.2548828,0.1791992,0.4970703,0.3012695,0.7304688l-1.0356445,1.4121094\r
+                               c-0.1625977,0.2216797-0.1367188,0.5625,0.0576172,0.7568359l0.7084961,0.7080078\r
+                               c0.1943359,0.1943359,0.5351562,0.2207031,0.7568359,0.0576172l1.4121094-1.0351562\r
+                               C5.659668,12.59375,5.902832,12.6933594,6.1572266,12.7734375l0.2661133,1.7324219C6.465332,14.7773438,6.7246094,15,6.9995117,15\r
+                               h1.0014648c0.2749023,0,0.5341797-0.2226562,0.5761719-0.4941406l0.2661133-1.7324219\r
+                               c0.2543945-0.0800781,0.4975586-0.1796875,0.7299805-0.3017578l1.4121094,1.0361328\r
+                               c0.2216797,0.1630859,0.5625,0.1367188,0.7568359-0.0576172l0.7080078-0.7080078\r
+                               c0.1943359-0.1943359,0.2207031-0.5351562,0.0576172-0.7568359l-1.0351562-1.4121094\r
+                               c0.1210938-0.2333984,0.2207031-0.4755859,0.3007812-0.7304688l1.7324219-0.2666016C13.7773438,9.5341797,14,9.2753906,14,9V8\r
+                               C14,7.7250977,13.7773438,7.4658203,13.5058594,7.4238281z M7.5,11C6.1191406,11,5,9.8808594,5,8.5004883\r
+                               C5,7.1196289,6.1191406,6,7.5,6S10,7.1196289,10,8.5004883C10,9.8808594,8.8808594,11,7.5,11z M9,8.5004883\r
+                               C9,9.3291016,8.3286133,10,7.5,10C6.671875,10,6,9.3291016,6,8.5004883S6.671875,7,7.5,7C8.3286133,7,9,7.671875,9,8.5004883z"/>\r
+               </g>\r
+               <g>\r
+                       <animateTransform attributeName="transform" attributeType="XML" type="rotate" from="0 7.5 7.5" to="360 7.5 7.5" begin="0s" dur="10s"  repeatCount="indefinite" />\r
+                       \r
+                       <path class="Upper" style="fill: #666;" d="M13.5058594,6.4238281l-1.7324219-0.2666016\r
+                               C11.6933594,5.902832,11.59375,5.659668,11.4716797,5.4267578l1.0361328-1.4125977\r
+                               c0.1630859-0.2216797,0.1367188-0.5625-0.0576172-0.7568359L11.7431641,2.550293\r
+                               c-0.1943359-0.1943359-0.5351562-0.2207031-0.7568359-0.0576172L9.5732422,3.5283203\r
+                               C9.3398438,3.40625,9.0976562,3.3066406,8.8427734,3.2265625L8.5761719,1.4941406C8.5341797,1.222168,8.2749023,1,8,1H7.0004883\r
+                               C6.7255859,1,6.4663086,1.222168,6.4243164,1.4941406L6.1582031,3.2265625\r
+                               C5.9033203,3.3066406,5.6601562,3.40625,5.4267578,3.5283203L4.0141602,2.4926758\r
+                               c-0.2216797-0.1630859-0.5625-0.1367188-0.7568359,0.0576172L2.550293,3.2573242\r
+                               C2.355957,3.4516602,2.3300781,3.7924805,2.4926758,4.0141602l1.0356445,1.4125977\r
+                               C3.4067383,5.659668,3.3071289,5.902832,3.2270508,6.1572266L1.4941406,6.4238281C1.222168,6.4658203,1,6.7250977,1,7v1\r
+                               c0,0.2749023,0.222168,0.5341797,0.4941406,0.5761719l1.7324219,0.2666016\r
+                               C3.3066406,9.0976562,3.4057617,9.3398438,3.527832,9.5732422l-1.0356445,1.4121094\r
+                               c-0.1625977,0.2216797-0.1367188,0.5625,0.0576172,0.7568359l0.7084961,0.7080078\r
+                               c0.1943359,0.1943359,0.5351562,0.2207031,0.7568359,0.0576172l1.4121094-1.0351562\r
+                               C5.659668,11.59375,5.902832,11.6933594,6.1572266,11.7734375l0.2661133,1.7324219C6.465332,13.7773438,6.7246094,14,6.9995117,14\r
+                               h1.0014648c0.2749023,0,0.5341797-0.2226562,0.5761719-0.4941406l0.2661133-1.7324219\r
+                               c0.2543945-0.0800781,0.4975586-0.1796875,0.7299805-0.3017578l1.4121094,1.0361328\r
+                               c0.2216797,0.1630859,0.5625,0.1367188,0.7568359-0.0576172l0.7080078-0.7080078\r
+                               c0.1943359-0.1943359,0.2207031-0.5351562,0.0576172-0.7568359l-1.0351562-1.4121094\r
+                               c0.1210938-0.2333984,0.2207031-0.4755859,0.3007812-0.7304688l1.7324219-0.2666016C13.7773438,8.5341797,14,8.2749023,14,8V7\r
+                               C14,6.7250977,13.7773438,6.4658203,13.5058594,6.4238281z M7.5,10C6.1191406,10,5,8.8813477,5,7.5004883S6.1191406,5,7.5,5\r
+                               S10,6.1196289,10,7.5004883S8.8808594,10,7.5,10z M9,7.5004883C9,8.3286133,8.3286133,9,7.5,9C6.671875,9,6,8.3286133,6,7.5004883\r
+                               C6,6.671875,6.671875,6,7.5,6C8.3286133,6,9,6.671875,9,7.5004883z"/>\r
+               </g>\r
+       </g>\r
+</svg>\r
index 5d9c32765fd43ee779f27a03be7a91f3c696def4..d4cda1134dc54500b2c31e83d1051ef4f3f7e551 100644 (file)
                <item name="wcf.acp.option.category.general.cache.general"><![CDATA[Allgemein]]></item>
                <item name="wcf.acp.option.category.general.cache.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.cache.memcache"><![CDATA[Memcache]]></item>
-               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lies mehr über dieses Thema auf der folgenden Seite:
-<ul>
-       <li><a href="http://memcached.org/">memcached.org</a></li>
-</ul>]]></item>
+               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lies mehr über dieses Thema auf der folgenden Seite: <a href="http://memcached.org/" class="externalURL">memcached.org</a>.]]></item>
                <item name="wcf.acp.option.category.general.date"><![CDATA[Datum &amp; Zeit]]></item>
                <item name="wcf.acp.option.category.general.date.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.package.packageDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
                <item name="wcf.acp.package.packageDir.error.notWritable"><![CDATA[Das angegebene Verzeichnis ist nicht beschreibbar.]]></item>
                <item name="wcf.acp.package.packageDir.error.wcfDirLocked"><![CDATA[Das angegebene Verzeichnis wird bereits von WoltLab Community Framework beansprucht. Wähle ein anderes Verzeichnis.]]></item>
-               <item name="wcf.acp.package.packageDir.input"><![CDATA[Gib hier das Installationsverzeichnis an.]]></item>
-               <item name="wcf.acp.package.packageDir.url"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über folgende Adresse (URL) erreichbar:]]></item>
+               <item name="wcf.acp.package.packageDir.input"><![CDATA[Installationsverzeichnis]]></item>
+               <item name="wcf.acp.package.packageDir.url"><![CDATA[Installationsverzeichnis-Adresse (URL)]]></item>
+               <item name="wcf.acp.package.packageDir.url.description"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über diese Adresse (URL) erreichbar]]></item>
                <item name="wcf.acp.package.requirements"><![CDATA[Abhängigkeiten auswählen]]></item>
                <item name="wcf.acp.package.requirements.description"><![CDATA[Das aktuelle Paket benötigt Pakete, von denen mehrere Instanzen installiert sind. Bitte wähle aus, zu welcher Instanz jeweils eine Abhängigkeit hergestellt werden soll.]]></item>
                <item name="wcf.acp.package.rollback"><![CDATA[Paketinstallation zurücksetzen]]></item>
index 5eab2fb0c9de6e45d4ec7cc15c22b7a3d43e5af8..e98e67b19b9ded2ccba4d6c4ae160b157802b240 100644 (file)
                <item name="wcf.acp.option.category.general.cache.general"><![CDATA[Allgemein]]></item>
                <item name="wcf.acp.option.category.general.cache.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.cache.memcache"><![CDATA[Memcache]]></item>
-               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lesen Sie mehr über dieses Thema auf der folgenden Seite:
-<ul>
-       <li><a href="http://memcached.org/">memcached.org</a></li>
-</ul>]]></item>
+               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache speichert häufig benötige Daten im Arbeitsspeicher zwischen. Dies kann die Last auf die Datenbank und das Dateisystem drastisch reduzieren. Lesen Sie mehr über dieses Thema auf der folgenden Seite: <a href="http://memcached.org/" class="externalURL">memcached.org</a>.]]></item>
                <item name="wcf.acp.option.category.general.date"><![CDATA[Datum &amp; Zeit]]></item>
                <item name="wcf.acp.option.category.general.date.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.package.packageDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
                <item name="wcf.acp.package.packageDir.error.notWritable"><![CDATA[Das angegebene Verzeichnis ist nicht beschreibbar.]]></item>
                <item name="wcf.acp.package.packageDir.error.wcfDirLocked"><![CDATA[Das angegebene Verzeichnis wird bereits von WoltLab Community Framework beansprucht. Bitte wählen Sie ein anderes Verzeichnis.]]></item>
-               <item name="wcf.acp.package.packageDir.input"><![CDATA[Bitte geben Sie hier das Installationsverzeichnis an.]]></item>
-               <item name="wcf.acp.package.packageDir.url"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über folgende Adresse (URL) erreichbar:]]></item>
+               <item name="wcf.acp.package.packageDir.input"><![CDATA[Installationsverzeichnis]]></item>
+               <item name="wcf.acp.package.packageDir.url"><![CDATA[Installationsverzeichnis-Adresse (URL)]]></item>
+               <item name="wcf.acp.package.packageDir.url.description"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist die Anwendung über diese Adresse (URL) erreichbar:]]></item>
                <item name="wcf.acp.package.requirements"><![CDATA[Abhängigkeiten auswählen]]></item>
                <item name="wcf.acp.package.requirements.description"><![CDATA[Das aktuelle Paket benötigt Pakete, von denen mehrere Instanzen installiert sind. Bitte wählen Sie aus, zu welcher Instanz jeweils eine Abhängigkeit hergestellt werden soll.]]></item>
                <item name="wcf.acp.package.rollback"><![CDATA[Paketinstallation zurücksetzen]]></item>
index cd0370db0e3ceb62c10243bf5bbba887803429c2..3a79090ae968e753a5d05407e7ce0acf5d6660a3 100644 (file)
                <item name="wcf.acp.option.category.general.cache.general"><![CDATA[General]]></item>
                <item name="wcf.acp.option.category.general.cache.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.cache.memcache"><![CDATA[Memcache]]></item>
-               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache stores data in the memory that is often accessed. This may reduce the database load dramatically. Read more about the memcache on the following site:
-<ul>
-       <li><a href="http://memcached.org/">memcached.org</a></li>
-</ul>]]></item>
+               <item name="wcf.acp.option.category.general.cache.memcache.description"><![CDATA[Memcache stores data in the memory that is often accessed. This may reduce the database load dramatically. Read more about the memcache on the following site: <a href="http://memcached.org/" class="externalURL">memcached.org</a>.]]></item>
                <item name="wcf.acp.option.category.general.date"><![CDATA[Date and time]]></item>
                <item name="wcf.acp.option.category.general.date.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.category.general.description"><![CDATA[]]></item>
                <item name="wcf.acp.option.mail_use_formatted_address"><![CDATA[Use formatted e-mail addresses]]></item>
                <item name="wcf.acp.option.mail_use_formatted_address.description"><![CDATA[Sender's and receiver's addresses are formatted in &quot;Name &lt;email@domain.tld&gt;&quot;. This option is not supported by all mail servers and should be turned off in case of any problems.]]></item>
                <item name="wcf.acp.option.module_master_password"><![CDATA[Enable master password]]></item>
-               <item name="wcf.acp.option.module_master_password.description"><![CDATA[Pages and forms within the admin panel that are relevant to security can be protected with an additional master password.]]></item>
+               <item name="wcf.acp.option.module_master_password.description"><![CDATA[Pages and forms in the admin control panel that are relevant to security can be protected with an additional master password.]]></item>
                <item name="wcf.acp.option.proxy_server_http"><![CDATA[Proxy-Server (HTTP)]]></item>
                <item name="wcf.acp.option.proxy_server_http.description"><![CDATA[Proxy-Server for HTTP connections]]></item>
                <item name="wcf.acp.option.session_timeout"><![CDATA[Session timeout]]></item>
                <item name="wcf.acp.package.install.error.excludingPackages.excludingPackage"><![CDATA[{$excludingPackage.packageName}{if $excludingPackage.instanceNo > 1} (#{@$excludingPackage.instanceNo}){/if} in version {$excludingPackage.packageVersion}]]></item>
                <item name="wcf.acp.package.install.error.excludingPackages.warning"><![CDATA[{if $excludingPackages|count == 1}Following package is{else}Following packages are{/if} incompatible with package &quot;{$packageName}&quot; in version {$packageVersion}. If you proceed installation the {if $excludingPackages|count == 1}package{else}packages{/if} probably won't work anymore.]]></item>
 
-               <item name="wcf.acp.package.install.packageName"><![CDATA[<span{if $package.open == 0} style="color: green"{else}{if !$package.file|isset} style="color: red"{/if}{/if}>{$package.name} ({if $package.open == 0}Installed{else}{if $package.file|isset}is located within this Package{else}Not available{/if}{/if})</span>]]></item>
+               <item name="wcf.acp.package.install.packageName"><![CDATA[<span{if $package.open == 0} style="color: green"{else}{if !$package.file|isset} style="color: red"{/if}{/if}>{$package.name} ({if $package.open == 0}Installed{else}{if $package.file|isset}is located in this package{else}Not available{/if}{/if})</span>]]></item>
                <item name="wcf.acp.package.install.rollback.sure"><![CDATA[Are you sure you would like to cancel the installation of this package?]]></item>
                <item name="wcf.acp.package.install.updatableInstances"><![CDATA[The following packages can be updated with this package]]></item>
                <item name="wcf.acp.package.install.updatableInstances.description"><![CDATA[Select one of the following packages, in order to update its version. If you would like to install the package again, please click on &quot;{lang}wcf.global.button.next{/lang}&quot;.]]></item>
                <item name="wcf.acp.package.installation.file.error.unknown"><![CDATA[While unpacking the files of this package the following error occured:]]></item>
                <item name="wcf.acp.package.installation.file.error.untarFailed"><![CDATA[The following files could not be unpacked successfully. Please check if the destination folder is writable.]]></item>
                <item name="wcf.acp.package.installation.tables.conflict"><![CDATA[Conflicting Tables]]></item>
-               <item name="wcf.acp.package.installation.tables.dontAskAgainKeep"><![CDATA[Do not overwrite these tables and do not ask me again for this installation.]]></item>
-               <item name="wcf.acp.package.installation.tables.dontAskAgainOverride"><![CDATA[Overwrite the existing tables and do not ask me again for this installation.]]></item>
+               <item name="wcf.acp.package.installation.tables.dontAskAgainKeep"><![CDATA[Do not overwrite these tables and do not ask me again during this installation.]]></item>
+               <item name="wcf.acp.package.installation.tables.dontAskAgainOverride"><![CDATA[Overwrite the existing tables and do not ask me again during this installation.]]></item>
                <item name="wcf.acp.package.installation.tables.solution"><![CDATA[Required changes]]></item>
                <item name="wcf.acp.package.installation.tables.tableName"><![CDATA[Tables affected]]></item>
                <item name="wcf.acp.package.installation.tables.warning"><![CDATA[Existing database tables conflict with the tables required to be installed by this package. Please choose whether to overwrite these tables.]]></item>
                <item name="wcf.acp.package.list.version"><![CDATA[Version]]></item>
                <item name="wcf.acp.package.optionals"><![CDATA[Install optional packages]]></item>
                <item name="wcf.acp.package.optionals.description"><![CDATA[The selected package brings the following options. Please select those you would like to install.]]></item>
-               <item name="wcf.acp.package.optionals.installed"><![CDATA[ (This Package is already installed.)]]></item>
-               <item name="wcf.acp.package.optionals.openRequirements"><![CDATA[ (The requirements of this Package have not been fulfilled.)]]></item>
+               <item name="wcf.acp.package.optionals.installed"><![CDATA[ (This package is already installed.)]]></item>
+               <item name="wcf.acp.package.optionals.openRequirements"><![CDATA[ (The requirements of this package have not been fulfilled.)]]></item>
                <item name="wcf.acp.package.packageDir"><![CDATA[Installation folder]]></item>
                <item name="wcf.acp.package.packageDir.description"><![CDATA[]]></item>
                <item name="wcf.acp.package.packageDir.error.alreadyInstalled"><![CDATA[Another application is already installed in this folder.]]></item>
                <item name="wcf.acp.package.packageDir.error.invalid"><![CDATA[This folder is not valid.]]></item>
                <item name="wcf.acp.package.packageDir.error.notWritable"><![CDATA[This folder is not writable.]]></item>
                <item name="wcf.acp.package.packageDir.error.wcfDirLocked"><![CDATA[This folder is already in use by the WoltLab Community Framework. Please choose a different location.]]></item>
-               <item name="wcf.acp.package.packageDir.input"><![CDATA[Please enter the installation folder name here.]]></item>
-               <item name="wcf.acp.package.packageDir.url"><![CDATA[This application is accessible through the following URL after installation in this folder:]]></item>
+               <item name="wcf.acp.package.packageDir.input"><![CDATA[Installation folder]]></item>
+               <item name="wcf.acp.package.packageDir.url"><![CDATA[Installation folder adress (URL)]]></item>
+               <item name="wcf.acp.package.packageDir.url"><![CDATA[After installation into the given installation folder, the application will be accessible through this adress (URL).]]></item>
                <item name="wcf.acp.package.requirements"><![CDATA[Select dependencies]]></item>
                <item name="wcf.acp.package.requirements.description"><![CDATA[The current package requires another package that is already installed several times. Please choose the instance that is required.]]></item>
                <item name="wcf.acp.package.rollback"><![CDATA[Rollback package installation]]></item>
                <item name="wcf.acp.package.startInstall.error.noValidInstall"><![CDATA[The chosen package has no valid installation routine.]]></item>
                <item name="wcf.acp.package.startInstall.error.noValidPackage"><![CDATA[The archive you have given is not a valid package.]]></item>
                <item name="wcf.acp.package.startInstall.error.noValidUpdate"><![CDATA[The package &quot;{$package->getName()}&quot; could not be updated with the supplied archive.]]></item>
-               <item name="wcf.acp.package.startInstall.error.notFound"><![CDATA[No files were found within the specified directory.]]></item>
+               <item name="wcf.acp.package.startInstall.error.notFound"><![CDATA[No files were found in the specified directory.]]></item>
                <item name="wcf.acp.package.startInstall.error.uniqueAlreadyInstalled"><![CDATA[The chosen package is already installed. Packages can not be installed more than one time.]]></item>
                <item name="wcf.acp.package.startInstall.error.uploadFailed"><![CDATA[The upload of the chosen archive has failed.]]></item>
                <item name="wcf.acp.package.startInstall.source"><![CDATA[Select package source]]></item>
                <item name="wcf.acp.package.step.update.packageInstallationPlugins"><![CDATA[Updating package plugins ...]]></item>
                <item name="wcf.acp.package.step.update.parent"><![CDATA[Parent package allocation is being done ...]]></item>
                <item name="wcf.acp.package.step.update.requirements"><![CDATA[Checking dependencies ...]]></item>
-               <item name="wcf.acp.package.templatePatch.install.failed"><![CDATA[The patch that this package is trying to apply has failed because this patch is not compliant to its target file. Therefore this package cannot be installed. Please click the &quot;{lang}wcf.acp.package.install.cancel{/lang}&quot; button.]]></item>
+               <item name="wcf.acp.package.templatePatch.install.failed"><![CDATA[The patch that this package is trying to apply has failed, because this patch is not compliant to its target file. Therefore this package cannot be installed. Please click the &quot;{lang}wcf.acp.package.install.cancel{/lang}&quot; button.]]></item>
                <item name="wcf.acp.package.templatePatch.repatch.failed"><![CDATA[Re-patching of the following templates has failed:<br />{foreach from=$failures item=$failure}{$failure.templateName} (Originally patched by: {$failure.packageName})<br />{/foreach}The original patch package that was previously applied may no longer function. You should still continue with this update by clicking on the &quot;{lang}wcf.global.button.next{/lang}&quot; button.]]></item>
-               <item name="wcf.acp.package.templatePatch.uninstall.failed"><![CDATA[The patch that this package is trying to remove has failed because its target file has been externally amended. Therefore this package cannot be removed. Please click the &quot;{lang}wcf.acp.package.uninstall.cancel{/lang}&quot; button.]]></item>
-               <item name="wcf.acp.package.uninstall"><![CDATA[Package removal]]></item>
+               <item name="wcf.acp.package.templatePatch.uninstall.failed"><![CDATA[The patch that this package is trying to remove has failed, because its target file has been externally amended. Therefore this package cannot be removed. Please click the &quot;{lang}wcf.acp.package.uninstall.cancel{/lang}&quot; button.]]></item>
+               <item name="wcf.acp.package.uninstall"><![CDATA[Package-removal]]></item>
                <item name="wcf.acp.package.uninstall.cancel"><![CDATA[Cancel package-removal]]></item>
-               <item name="wcf.acp.package.uninstall.dependentPackages.error"><![CDATA[It is not possible to uninstall these packages, because there is at least one dependent package, that cannot be uninstalled.]]></item>
+               <item name="wcf.acp.package.uninstall.dependentPackages.error"><![CDATA[It's not possible to uninstall these packages, because there is at least one dependent package, that cannot be uninstalled.]]></item>
                <item name="wcf.acp.package.uninstall.dependentPackages.warning"><![CDATA[Upon final confirmation {if $dependentPackages|count == 1}this package{else}these packages{/if} will be removed without any further promting.]]></item>
                <item name="wcf.acp.package.update"><![CDATA[Package update]]></item>
                <item name="wcf.acp.package.updateDate"><![CDATA[Date of update]]></item>
        <category name="wcf.acp.updateServer">
                <item name="wcf.acp.updateServer.add"><![CDATA[Add server]]></item>
                <item name="wcf.acp.updateServer.add.success"><![CDATA[The server has been successfully added.]]></item>
-               <item name="wcf.acp.updateServer.data"><![CDATA[Server data]]></item>
+               <item name="wcf.acp.updateServer.data"><![CDATA[Server-data]]></item>
                <item name="wcf.acp.updateServer.delete"><![CDATA[Delete server]]></item>
                <item name="wcf.acp.updateServer.delete.success"><![CDATA[The server has been successfully deleted.]]></item>
                <item name="wcf.acp.updateServer.delete.sure"><![CDATA[Do you really want to delete this server?]]></item>
                <item name="wcf.acp.updateServer.loginUsername.description"><![CDATA[Please enter a valid user name (optional).]]></item>
                <item name="wcf.acp.updateServer.packageUpdateServerID"><![CDATA[Server ID]]></item>
                <item name="wcf.acp.updateServer.packages"><![CDATA[Packages]]></item>
-               <item name="wcf.acp.updateServer.serverURL"><![CDATA[Address]]></item>
-               <item name="wcf.acp.updateServer.serverURL.description"><![CDATA[Please enter the URL to a package server.]]></item>
+               <item name="wcf.acp.updateServer.serverURL"><![CDATA[Address (URL)]]></item>
+               <item name="wcf.acp.updateServer.serverURL.description"><![CDATA[Please enter a package-server adress (URL).]]></item>
                <item name="wcf.acp.updateServer.serverURL.error.notValid"><![CDATA[The entered address is invalid.]]></item>
                <item name="wcf.acp.updateServer.status"><![CDATA[Status]]></item>
                <item name="wcf.acp.updateServer.lastUpdateTime"><![CDATA[Last access]]></item>
                <item name="wcf.acp.user.massProcessing.action"><![CDATA[Action]]></item>
                <item name="wcf.acp.user.massProcessing.conditions"><![CDATA[Conditions]]></item>
                <item name="wcf.acp.user.massProcessing.success"><![CDATA[The chosen action has been executed successfully on {#$affectedUsers} users.]]></item>
-               <item name="wcf.acp.user.massProcessing.warning"><![CDATA[The bulk processor will perform the following tasks <strong>without additional security notification</strong>, on all users matching the set conditions. Bulk processing can be very performance intensive, so it should only be executed when the forum is offline. To have a correct display of your content you should update the counters. The processing can not be reversed, so please be attentive when using this function.]]></item>
+               <item name="wcf.acp.user.massProcessing.warning"><![CDATA[The bulk processor will perform the following tasks <strong>without additional security notification</strong>, on all users matching the set conditions. Bulk processing can be very performance intensive, so it should only be executed while the forum is set offline. To have a correct display of your content you should update the counters. The processing can not be reversed, so please be attentive when using this function.]]></item>
                <item name="wcf.acp.user.search"><![CDATA[Search for users]]></item>
                <item name="wcf.acp.user.search.conditions"><![CDATA[Search criteria]]></item>
                <item name="wcf.acp.user.search.conditions.general"><![CDATA[General search criteria]]></item>
                <item name="wcf.page.pageNo"><![CDATA[Page {#$pageNo}]]></item>
        </category>
        <category name="wcf.user">
-               <item name="wcf.user.confirmEmail"><![CDATA[Confirm E-mail Address]]></item>
+               <item name="wcf.user.confirmEmail"><![CDATA[Confirm e-mail address]]></item>
                <item name="wcf.user.confirmPassword"><![CDATA[Confirm password]]></item>
-               <item name="wcf.user.email"><![CDATA[E-mail Address]]></item>
+               <item name="wcf.user.email"><![CDATA[E-mail address]]></item>
                <item name="wcf.user.error.confirmEmail.notEqual"><![CDATA[The given e-mail address and confirmation e-mail address are not identical.]]></item>
                <item name="wcf.user.error.confirmPassword.notEqual"><![CDATA[The given password and confirmation password are not identical.]]></item>
                <item name="wcf.user.error.email.notUnique"><![CDATA[The e-mail address you have entered has already been used by another user.]]></item>
                <item name="wcf.user.error.username.notUnique"><![CDATA[The user name you have entered is already in use.]]></item>
                <item name="wcf.user.error.username.notValid"><![CDATA[The username you have entered is not valid.]]></item>
                <item name="wcf.user.language"><![CDATA[Language]]></item>
-               <item name="wcf.user.language.description"><![CDATA[Please select the user interface language to be shown in!]]></item>
+               <item name="wcf.user.language.description"><![CDATA[Please select the user interface-language to be used.]]></item>
                <item name="wcf.user.logout"><![CDATA[Logout]]></item>
                <item name="wcf.user.password"><![CDATA[Password]]></item>
                <item name="wcf.user.registrationDate"><![CDATA[Date of registration]]></item>
                <item name="wcf.user.userID"><![CDATA[User ID]]></item>
                <item name="wcf.user.username"><![CDATA[Username]]></item>
                <item name="wcf.user.visibleLanguages"><![CDATA[Show content in the following languages]]></item>
-               <item name="wcf.user.visibleLanguages.description"><![CDATA[Select the content languages that should be shown here.]]></item>
+               <item name="wcf.user.visibleLanguages.description"><![CDATA[Select the content-languages that should be used.]]></item>
        </category>
        <category name="wcf.user.option">
                <item name="wcf.user.option.error.validationFailed"><![CDATA[The information you have entered is not valid.]]></item>
index c44f3bbaba19af607d463ae754a0bb510d7548a1..bec79f553c783d08666219bc1ff9dfc057a0b670 100644 (file)
@@ -52,7 +52,7 @@
                <item name="wcf.global.language.sr"><![CDATA[Serbisch]]></item>
                <item name="wcf.global.language.sk"><![CDATA[Slowakisch]]></item>
                <item name="wcf.global.language.el"><![CDATA[Griechisch]]></item>
-               <item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zur Zeit Deutsch.]]></item>
+               <item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zur Zeit ]]></item>
                <item name="wcf.global.welcome.language.change"><![CDATA[Sprache wechseln]]></item>
                <item name="wcf.global.license"><![CDATA[Lizenzbestimmungen]]></item>
                <item name="wcf.global.license.description"><![CDATA[Bitte lies die folgenden Lizenzbestimmungen. Verwende die Bildlaufleiste, um das gesamte Dokument anzuzeigen.]]></item>
@@ -87,7 +87,7 @@
                <item name="wcf.global.wcfDir.foundDirectory"><![CDATA[Die Installation vermutet eine bereits vorhandene Installation von <strong>WoltLab Community Framework</strong> im Ordner "{$foundDirectory}".<br />Überprüfe diese Angabe bzw. definiere ein anderes Installationsverzeichnis, wenn du eine neue Kopie von <strong>WoltLab Community Framework</strong> installieren möchtest.]]></item>
                <item name="wcf.global.wcfDir.dir"><![CDATA[Installationsverzeichnis]]></item>
                <item name="wcf.global.wcfDir.dir.description"><![CDATA[Gib hier das Installationsverzeichnis für <strong>WoltLab Community Framework</strong> an.]]></item>
-               <item name="wcf.global.wcfDir.url.description"><![CDATA[Nach einer Installation in das angegebene Installationsverzeichnis ist <strong>WoltLab Community Framework</strong> über folgende Adresse (URL) erreichbar:]]></item>
+               <item name="wcf.global.wcfDir.url.description"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist <strong>WoltLab Community Framework</strong> über diese Adresse (URL) erreichbar.]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
                <item name="wcf.global.ftp"><![CDATA[Eingabe der Zugangsdaten für FTP]]></item>
                <item name="wcf.global.ftp.description"><![CDATA[Da auf deinem Server der PHP-SafeMode aktiviert ist, muss WoltLab Community Framework über die FTP-Funktionen installiert werden. Gib Benutzernamen und Kennwort für den FTP-Zugang zu diesem Server an. Die Daten werden nicht gespeichert oder weitergeleitet, sondern lediglich zur Installation dieses Paketes verwendet. Aus diesem Grunde musst du die FTP-Zugangsdaten evtl. auch mehrfach während dieser Installation angeben.]]></item>
index 1afda825bd58640b365689a95f6cc015075dcaa1..ed185c9d412bc63cb32476a27e26ff28694c3764 100644 (file)
@@ -52,7 +52,7 @@
                <item name="wcf.global.language.sr"><![CDATA[Serbisch]]></item>
                <item name="wcf.global.language.sk"><![CDATA[Slowakisch]]></item>
                <item name="wcf.global.language.el"><![CDATA[Griechisch]]></item>
-               <item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zur Zeit Deutsch.]]></item>
+               <item name="wcf.global.welcome.language.description"><![CDATA[Die Sprache dieses Assistenten ist zur Zeit ]]></item>
                <item name="wcf.global.welcome.language.change"><![CDATA[Sprache wechseln]]></item>
                <item name="wcf.global.license"><![CDATA[Lizenzbestimmungen]]></item>
                <item name="wcf.global.license.description"><![CDATA[Bitte lesen Sie die folgenden Lizenzbestimmungen. Verwenden Sie die Bildlaufleiste, um das gesamte Dokument anzuzeigen.]]></item>
@@ -88,7 +88,7 @@
                <item name="wcf.global.wcfDir.foundDirectory"><![CDATA[Die Installation vermutet eine bereits vorhandene Installation von <b>WoltLab Community Framework</b> im Ordner "{$foundDirectory}".<br />Bitte überprüfen Sie diese Angabe bzw. definieren Sie ein anderes Installationsverzeichnis, wenn Sie eine neue Kopie von <b>WoltLab Community Framework</b> installieren möchten.]]></item>
                <item name="wcf.global.wcfDir.dir"><![CDATA[Installationsverzeichnis]]></item>
                <item name="wcf.global.wcfDir.dir.description"><![CDATA[Bitte geben Sie hier das Installationsverzeichnis für <b>WoltLab Community Framework</b> an.]]></item>
-               <item name="wcf.global.wcfDir.url.description"><![CDATA[Nach einer Installation in das angegebene Installationsverzeichnis ist <b>WoltLab Community Framework</b> über folgende Adresse (URL) erreichbar:]]></item>
+               <item name="wcf.global.wcfDir.url.description"><![CDATA[Nach der Installation in das angegebene Installationsverzeichnis ist <b>WoltLab Community Framework</b> über diese Adresse (URL) erreichbar.]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[Das eingegebene Verzeichnis ist ungültig.]]></item>
                <item name="wcf.global.ftp"><![CDATA[Eingabe der Zugangsdaten für FTP]]></item>
                <item name="wcf.global.ftp.description"><![CDATA[Da auf Ihrem Server der PHP-SafeMode aktiviert ist, muss WoltLab Community Framework über die FTP-Funktionen installiert werden. Bitte geben Sie Benutzernamen und Kennwort für den FTP-Zugang zu diesem Server an. Die Daten werden nicht gespeichert oder weitergeleitet, sondern lediglich zur Installation dieses Paketes verwendet. Möglicherweise müssen Sie diese FTP-Zugangsdaten während dieser Installation mehrfach angeben.]]></item>
index 903e6ff12a2ffa499c8dd202fd3c8f51aa2c0a9d..87dad7ffed18ad32913a82a123d1b4e87f8c2765 100644 (file)
@@ -50,7 +50,7 @@
                <item name="wcf.global.language.sr"><![CDATA[Serbian]]></item>
                <item name="wcf.global.language.sk"><![CDATA[Slovak]]></item>
                <item name="wcf.global.language.el"><![CDATA[Greek]]></item>
-               <item name="wcf.global.welcome.language.description"><![CDATA[The assistants language is currently set to English.]]></item>
+               <item name="wcf.global.welcome.language.description"><![CDATA[The assistants language is currently set to ]]></item>
                <item name="wcf.global.welcome.language.change"><![CDATA[Change language]]></item>
                <item name="wcf.global.license"><![CDATA[License Agreement]]></item>
                <item name="wcf.global.license.description"><![CDATA[Please read the following License Agreement. Use the scrollbar to view the whole document.]]></item>
@@ -83,9 +83,9 @@
                <item name="wcf.global.wcfDir"><![CDATA[Choose the installation folder]]></item>
                <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.foundDirectory"><![CDATA[The installation assistant has found a previous installation of <b>WoltLab Community Framework</b> in the "{$foundDirectory}" folder.<br />If you would like to install a new copy of the <b>WoltLab Community Framework</b>, then please enter an alternative installation folder.]]></item>
-               <item name="wcf.global.wcfDir.dir"><![CDATA[Installation folder]]></item>
-               <item name="wcf.global.wcfDir.dir.description"><![CDATA[Please enter the installation folder for <b>WoltLab Community Framework</b>.]]></item>
-               <item name="wcf.global.wcfDir.url.description"><![CDATA[After installation into the given folder you can access <b>WoltLab Community Framework</b> through the following URL:]]></item>
+               <item name="wcf.global.wcfDir.dir"><![CDATA[Installation-folder]]></item>
+               <item name="wcf.global.wcfDir.dir.description"><![CDATA[Installation-folder adress (URL)]]></item>
+               <item name="wcf.global.wcfDir.url.description"><![CDATA[After the installation into the given folder you will be able to access <b>WoltLab Community Framework</b> through this adress (URL).]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[The given folder is not valid.]]></item>
                <item name="wcf.global.ftp"><![CDATA[FTP access information]]></item>
                <item name="wcf.global.ftp.description"><![CDATA[With the PHP-SafeMode security option being enabled, WoltLab Community Framework can only be installed using FTP functionality. Please enter here the FTP Username and Password for this Server. The information given will not be saved and is only required for the installation of this Package. For this reason alone, further FTP Username and Password requests will be needed.]]></item>
index 11470b7fa58e72c87abad2b10f06c0c8e8d51b99..2f348e079ec49a511c91e628d0f28a1fd0228d44 100644 (file)
                        
                        <!-- logo -->
                        <div id="logo" class="logo">
-                               <h1>Installation</h1>
-                               <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage=wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="Installation" />
+                               <div><!-- ToDo: This is just a little trick to compensate the missing link here, find a better solution -->
+                                       <h1>Installation</h1><!-- ToDo: Use a proper text and language variable -->
+                                       <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage=wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="Installation" />
+                               </div>
                                
                                <!-- no search area -->
                        </div>
@@ -47,9 +49,7 @@
                        <section id="content" class="content">
                                
                                <header class="mainHeading setup">
-                                       {* ToDo: Installation Icon *}
-                                       <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon=cache1.svg" alt="" />
-                                       {* /Installation Icon *}
+                                       <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon=installation1.svg" alt="" />
                                        <hgroup>
                                                <h1>{lang}wcf.global.title{/lang}</h1>
                                                <h2>{lang}wcf.global.title.subtitle{/lang}</h2>
@@ -57,3 +57,4 @@
                                                <p><progress id="packageInstallationProgress" value="0" max="100" style="width: 300px;">0%</progress></p>
                                        </hgroup>
                                </header>
+                               
\ No newline at end of file
index 690aa2f060a165aeed2eaab419ff09b6f1f388b6..1bf30e0f3fc7fd164b5f5a4d550b9ac4364a5b2c 100644 (file)
@@ -22,8 +22,9 @@
                        <dd><input type="text" id="wcfDir" name="wcfDir" value="{$wcfDir}" class="long" /></dd>
                </dl>
                <dl>
-                       <dt><label for="wcfUrl">{lang}wcf.global.wcfDir.url.description{/lang}</label></dt>
+                       <dt>{lang}wcf.global.wcfDir.url.description{/lang}</dt>
                        <dd><input type="text" id="wcfUrl" name="wcfUrl" value="" readonly="readonly" class="long" /></dd>
+                       <small>{lang}wcf.global.wcfDir.url.description{/lang}</small>
                </dl>
                
        </fieldset>
index f822801a9f15a10527bad3046b9a8a98f78dc45c..2614e8fafa5ebeb467e2a654068a8582b723532a 100644 (file)
@@ -11,7 +11,7 @@
                
                <label for="languageCode">{lang}wcf.global.welcome.language.description{/lang}</label>
                {htmlOptions name="languageCode" id="languageCode" options=$availableLanguages selected=$languageCode disableEncoding=true}
-               <input type="submit" value="{lang}wcf.global.welcome.language.change{/lang}" />
+               <button type="submit" value="{lang}wcf.global.welcome.language.change{/lang}" class="badge badgeButton" />{lang}wcf.global.welcome.language.change{/lang}</button>
                <input type="hidden" name="step" value="selectSetupLanguage" />
                <input type="hidden" name="tmpFilePrefix" value="{@$tmpFilePrefix}" />
        </fieldset>
index ee43016cae07b3fc88608e077046d094571f26f8..c7c369338438a282acf2e009ba6a8df00555e576 100644 (file)
@@ -13,7 +13,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} 5.3.0</dt>
                                <dd>
-                                       <span class="badge {if !$system.phpVersion.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} {$system.phpVersion.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.phpVersion.result}badgeWarning{else}badgeSuccess{/if}">{$system.phpVersion.value}</span>
                                        {if !$system.phpVersion.result}<small>{lang}wcf.global.systemRequirements.php.description{/lang}</small>{/if}
                                </dd>
                        </dl>
@@ -24,7 +24,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
                                <dd>
-                                       <span class="badge {if !$system.sql.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} 
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.sql.result}badgeWarning{else}badgeSuccess{/if}">
                                        {if !$system.sql.result}{lang}wcf.global.systemRequirements.sql.notFound{/lang}{else}
                                                {implode from=$system.sql.value item=$sqlType glue=', '}{lang}wcf.global.configureDB.class.{@$sqlType}{/lang}{/implode}
                                        {/if}</span>
@@ -38,7 +38,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
                                <dd>
-                                       <span class="badge {if !$system.mbString.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.mbString.result}badgeWarning{else}badgeSuccess{/if}">{if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
                                </dd>
                        </dl>
                        
@@ -49,7 +49,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.notActive{/lang}</dt>
                                <dd>
-                                       <span class="badge {if !$system.safeMode.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.safeMode.result}{lang}wcf.global.systemRequirements.active{/lang}{else}{lang}wcf.global.systemRequirements.notActive{/lang}{/if}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.safeMode.result}badgeWarning{else}badgeSuccess{/if}">{if !$system.safeMode.result}{lang}wcf.global.systemRequirements.active{/lang}{else}{lang}wcf.global.systemRequirements.notActive{/lang}{/if}</span>
                                        {if !$system.safeMode.result}<small>{lang}wcf.global.systemRequirements.safeMode.description{/lang}</small>{/if}
                                </dd>
                        </dl>
@@ -65,7 +65,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} > 0</dt>
                                <dd>
-                                       <span class="badge {if !$system.uploadMaxFilesize.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} {$system.uploadMaxFilesize.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.uploadMaxFilesize.result}badgeWarning{else}badgeSuccess{/if}">{$system.uploadMaxFilesize.value}</span>
                                        {if !$system.uploadMaxFilesize.result}<small>{lang}wcf.global.systemRequirements.uploadMaxFilesize.description{/lang}</small>{/if}
                                </dd>
                        </dl>
@@ -76,7 +76,7 @@
                        <dl>
                                <dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} 2.0.0</dt>
                                <dd>
-                                       <span class="badge {if !$system.gdLib.result}badgeWarning{else}badgeSuccess{/if}">{lang}wcf.global.systemRequirements.element.yours{/lang} {$system.gdLib.value}</span>
+                                       {lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.gdLib.result}badgeWarning{else}badgeSuccess{/if}">{$system.gdLib.value}</span>
                                        {if !$system.gdLib.result}<small>{lang}wcf.global.systemRequirements.gdLib.description{/lang}</small>{/if}
                                </dd>
                        </dl>