Some small changes

Started styling the installation-overlays; corrected most of the
english installation language-file; some small modifications to other
files.

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 02bfb2c997bb21e70e31d24e8cc1efcc5c4c0f6c..c6900520c351adf84b62b4e99294974573abf4db 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -578,7 +578,7 @@ fieldset {
        border: 1px solid #ccc;
        border-radius: 7px;
        background-color: rgba(0, 0, 0, .015);
-       margin: 15px 0;
+       margin: 15px 0 0;
        padding: 15px;
 }
 
@@ -1912,14 +1912,7 @@ p.error {
 /* ToDo: Installation */
 
 div#packageInstallationDialogContainer {
-       background-color: #fefefe;
-       background-image: -webkit-linear-gradient(#fefefe, #eee);
-       background-image: -moz-linear-gradient(#fefefe, #eee);
-       background-image: -ms-linear-gradient(#fefefe, #eee);
-       background-image: -o-linear-gradient(#fefefe, #eee);
-       background-image: linear-gradient(#fefefe, #eee);
-       
-       padding: 21px;
+       padding: 20px;
        height: 100%;
        max-width: 600px;
 }
@@ -1931,24 +1924,22 @@ div#ajaxExceptionStacktrace {
 }
 
 div#packageInstallationInnerContentContainer {
-       border-top: 2px solid #999 !important;
-       border-radius: 0 !important;
-       margin-top: 21px;
-       padding-top: 14px;
+       margin-top: 20px;
+       padding-top: 15px;
 }
 
 div#packageInstallationInnerContent p.error {
-       border: 3px solid #ed1c24;
+       border: 1px solid #ed1c24;
        border-radius: 5px;
        background-color: #fdd;
-       margin-bottom: 14px;
+       margin-bottom: 15px;
        padding: 7px;
 }
 
 div#ajaxExceptionStacktrace {
        font-family: monospace;
        font-size: 90%;
-       line-height: 1.2em;
+       line-height: 1.2;
        border: 1px solid #ccc;
        padding: 3px;
 }
@@ -2079,10 +2070,6 @@ div.ui-widget-overlay {
 
 /* Types */
 
-.badgeNote {
-       border: 1px solid #ccc;
-}
-
 .badgeInfo {
        color: #68b;
        border: 1px solid #9be;

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
index 94c073b92133f445fad4b31f9e57027452e50607..17088fcd0db69cd7d29c6ca01fc989942c68bfa7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl
@@ -1,6 +1,6 @@
-<div id="packageInstallationDialogContainer">
+<div id="packageInstallationDialogContainer" class="border overlay">
        <header class="mainHeading">
-               <img src="{@RELATIVE_WCF_DIR}icon/packageInstallL.png" alt="" />
+               <img src="{@RELATIVE_WCF_DIR}icon/installation1.svg" alt="" />
                <hgroup>
                        <h1>Paket &raquo;{$queue->packageName}&laquo; wird installiert &hellip;</h1>
                        <h2>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.installation.step.prepare{/lang}</span></h2>
@@ -8,7 +8,7 @@
                </hgroup>
        </header>
        
-       <div id="packageInstallationInnerContentContainer" class="border content" style="display: none;">
-               <div id="packageInstallationInnerContent" class="container-1"></div>
+       <div id="packageInstallationInnerContentContainer" class="" style="display: none;">
+               <div id="packageInstallationInnerContent" class=""></div>
        </div>
 </div>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
index 1dc0026f397a1a4d37e984869d74c87325f3076c..1bbfeb942c42469e6b5c0042e8f50b9361a78f97 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl
@@ -1,6 +1,6 @@
-<div id="packageInstallationDialogContainer">
+<div id="packageInstallationDialogContainer" class="border overlay">
        <header class="mainHeading">
-               <img src="{@RELATIVE_WCF_DIR}icon/packageUninstallL.png" alt="" />
+               <img src="{@RELATIVE_WCF_DIR}icon/installation1.svg" alt="" />
                <hgroup>
                        <h1>Paket &raquo;{$queue->packageName}&laquo; wird deinstalliert &hellip;</h1>
                        <h2>Aktueller Schritt: <span id="packageInstallationAction">{lang}wcf.package.uninstallation.step.prepare{/lang}</span></h2>
@@ -8,7 +8,7 @@
                </hgroup>
        </header>
        
-       <div id="packageInstallationInnerContentContainer" class="border content" style="display: none;">
-               <div id="packageInstallationInnerContent" class="container-1"></div>
+       <div id="packageInstallationInnerContentContainer" class="" style="display: none;">
+               <div id="packageInstallationInnerContent" class=""></div>
        </div>
 </div>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index d23a945e36b432701d4c70bc5ebcfb4ee7c1d6f0..2d6f27b4749a7f698e8aec83e7d438c8756ee556 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -77,7 +77,7 @@
                                                                {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}
                                                        </td>
                                                        <td class="columnUserID columnID"><p>{@$user->userID}</p></td>
-                                                       <td class="columnUsername columnText"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
+                                                       <td class="columnUsername columnName columnText"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
                                        
                                                        {foreach from=$columnHeads key=column item=columnLanguageVariable}
                                                                <td class="column{$column|ucfirst}"><p>{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</p></td>

diff --git a/wcfsetup/setup/lang/setup_de-informal.xml b/wcfsetup/setup/lang/setup_de-informal.xml
index 86f803299d7b00e8c83fa37a1a3fb5528531f550..2349b14566a54853a39c1e45ac31e6bf29e78700 100644 (file)
--- a/wcfsetup/setup/lang/setup_de-informal.xml
+++ b/wcfsetup/setup/lang/setup_de-informal.xml
@@ -126,7 +126,7 @@
                <item name="wcf.global.languages.error.empty"><![CDATA[Wähle mindestens eine Sprache aus!]]></item>
                <item name="wcf.global.languages.error.notAvailable"><![CDATA[Du hast Sprachen ausgewählt, die in der gleichzeitig ausgewählten Zeichencodierung nicht zur Verfügung stehen. Korrigiere deine Auswahl.]]></item>
                <item name="wcf.global.configureDB"><![CDATA[Datenbankzugang konfigurieren]]></item>
-               <item name="wcf.global.configureDB.description"><![CDATA[Die Daten der Software werden in einer MySQL Datenbank gespeichert. Gib die Zugangsdaten für diese Datenbank an!]]></item>
+               <item name="wcf.global.configureDB.description"><![CDATA[Die Daten der Software werden in einer SQL-Datenbank gespeichert. Gib die Zugangsdaten für diese Datenbank an!]]></item>
                <item name="wcf.global.configureDB.accessData"><![CDATA[Datenbankzugangsdaten]]></item>
                <item name="wcf.global.configureDB.host"><![CDATA[Hostname]]></item>
                <item name="wcf.global.configureDB.user"><![CDATA[Benutzername]]></item>

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index c3dd6f0d567264951c4b6ebbe326b9ac7e6683d9..35849125963f8203a1c4f3211abfd2c2aadda09a 100644 (file)
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -127,7 +127,7 @@
                <item name="wcf.global.languages.error.empty"><![CDATA[Bitte wählen Sie mindestens eine Sprache aus!]]></item>
                <item name="wcf.global.languages.error.notAvailable"><![CDATA[Sie haben Sprachen ausgewählt, die in der gleichzeitig ausgewählten Zeichencodierung nicht zur Verfügung stehen. Bitte korrigieren Sie Ihre Auswahl.]]></item>
                <item name="wcf.global.configureDB"><![CDATA[Datenbankzugang konfigurieren]]></item>
-               <item name="wcf.global.configureDB.description"><![CDATA[Die Daten der Software werden in einer SQL Datenbank gespeichert. Bitte geben Sie die Zugangsdaten für diese Datenbank an!]]></item>
+               <item name="wcf.global.configureDB.description"><![CDATA[Die Daten der Software werden in einer SQL-Datenbank gespeichert. Bitte geben Sie die Zugangsdaten für diese Datenbank an!]]></item>
                <item name="wcf.global.configureDB.accessData"><![CDATA[Datenbankzugangsdaten]]></item>
                <item name="wcf.global.configureDB.host"><![CDATA[Hostname]]></item>
                <item name="wcf.global.configureDB.user"><![CDATA[Benutzername]]></item>

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index d8e4f046bfff817827417942c5a9ff039261bc56..daf0077b89075ec5c149c1e63732c551920a0e44 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/language.xsd" languagecode="en">
        <category name="wcf.global">
-               <item name="wcf.global.pageTitle"><![CDATA[{$setupPackageName} Installation]]></item>
+               <item name="wcf.global.pageTitle"><![CDATA[{$setupPackageName} installation]]></item>
                <item name="wcf.global.title"><![CDATA[{$setupPackageName}]]></item>
                <item name="wcf.global.title.subtitle"><![CDATA[Installation]]></item>
                <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item> <!-- system variable; do not translate -->
@@ -17,7 +17,7 @@
                <item name="wcf.global.dateFormatToday"><![CDATA[<b>\T\o\d\a\y</b>, g:ia]]></item>
                <item name="wcf.global.dateFormatYesterday"><![CDATA[\Y\e\s\t\e\r\d\a\y, g:ia]]></item>
                <item name="wcf.global.welcome"><![CDATA[Thank you for choosing {$setupPackageName}]]></item>
-               <item name="wcf.global.welcome.description"><![CDATA[This installations-assistant will help you to setup <br /><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} and <b>{$setupPackageName}</b>{/if}.]]></item>
+               <item name="wcf.global.welcome.description"><![CDATA[This installation-assistant will help you to install <br /><b>WoltLab Community Framework</b>{if $setupPackageName != 'WoltLab Community Framework'} and <b>{$setupPackageName}</b>{/if}.]]></item>
                <item name="wcf.global.welcome.language"><![CDATA[Language]]></item>
                <item name="wcf.global.language.en"><![CDATA[English]]></item>
                <item name="wcf.global.language.de"><![CDATA[German]]></item>
@@ -50,57 +50,57 @@
                <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 ]]></item>
+               <item name="wcf.global.welcome.language.description"><![CDATA[The assistant-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>
-               <item name="wcf.global.license.accept.description"><![CDATA[Do you accept the terms and conditions of the License Agreement? You may only install this software upon acceptance of the License Agreement.]]></item>
-               <item name="wcf.global.license.missingAcception"><![CDATA[You must accept the License Agreement to continue this installation.]]></item>
-               <item name="wcf.global.systemRequirements"><![CDATA[Checking System Requirements]]></item>
-               <item name="wcf.global.systemRequirements.description"><![CDATA[These are the System Requirements:]]></item>
-               <item name="wcf.global.systemRequirements.required"><![CDATA[Required System component]]></item>
-               <item name="wcf.global.systemRequirements.recommended"><![CDATA[Recommended System component]]></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 scroll bar to view the entire document.]]></item>
+               <item name="wcf.global.license.accept.description"><![CDATA[Do you accept the terms and conditions of the license agreement? You may only install this software upon acceptance of the license agreement.]]></item>
+               <item name="wcf.global.license.missingAcception"><![CDATA[You must accept the license agreement to continue this installation.]]></item>
+               <item name="wcf.global.systemRequirements"><![CDATA[Checking system-requirements]]></item>
+               <item name="wcf.global.systemRequirements.description"><![CDATA[These are the system-requirements:]]></item>
+               <item name="wcf.global.systemRequirements.required"><![CDATA[Required system-component]]></item>
+               <item name="wcf.global.systemRequirements.recommended"><![CDATA[Recommended system component]]></item>
                <item name="wcf.global.systemRequirements.element.required"><![CDATA[Required:]]></item>
                <item name="wcf.global.systemRequirements.element.yours"><![CDATA[Found:]]></item>
                <item name="wcf.global.systemRequirements.element.recommended"><![CDATA[Recommended:]]></item>
-               <item name="wcf.global.systemRequirements.php"><![CDATA[Installed version of the Script language &quot;PHP&quot;]]></item>
-               <item name="wcf.global.systemRequirements.php.description"><![CDATA[The installed version of the Script language &quot;PHP&quot; is too old for a stable operation of this Software. To proceed with the installation, a version update is necessary.]]></item>
-               <item name="wcf.global.systemRequirements.php.description2"><![CDATA[Your PHP Version is obsolete. For a stable operation of this Software, we recommend a PHP version of 5.0.5 or greater.]]></item>
-               <item name="wcf.global.systemRequirements.mysql"><![CDATA[&quot;MySQL&quot; Database support]]></item>
-               <item name="wcf.global.systemRequirements.mysql.description"><![CDATA[&quot;MySQL&quot; Database support is required to install this Software.]]></item>
+               <item name="wcf.global.systemRequirements.php"><![CDATA[Installed version of the script-language &quot;PHP&quot;]]></item>
+               <item name="wcf.global.systemRequirements.php.description"><![CDATA[The installed version of the script-language &quot;PHP&quot; is too old for a stable operation of this software. To proceed with the installation, a version update is necessary.]]></item>
+               <item name="wcf.global.systemRequirements.php.description2"><![CDATA[Your PHP version is obsolete. For a stable operation of this software, we recommend a PHP version of 5.0.5 or greater.]]></item>
+               <item name="wcf.global.systemRequirements.mysql"><![CDATA[&quot;MySQL&quot; database support]]></item>
+               <item name="wcf.global.systemRequirements.mysql.description"><![CDATA[&quot;MySQL&quot; database support is required to install this software.]]></item>
                <item name="wcf.global.systemRequirements.uploadMaxFilesize"><![CDATA[Maximum size for file uploads]]></item>
-               <item name="wcf.global.systemRequirements.uploadMaxFilesize.description"><![CDATA[The current configuration of the installed &quot;PHP&quot; makes it impossible to upload any files. Due to this configuration, some features of this Software will be restricted.]]></item>
+               <item name="wcf.global.systemRequirements.uploadMaxFilesize.description"><![CDATA[The current configuration of the installed &quot;PHP&quot; version oes not allow for file-uploads. Due to this configuration, some features of this software will not be available.]]></item>
                <item name="wcf.global.systemRequirements.gdLib"><![CDATA[Installed version of the graphics library &quot;GDLib&quot;]]></item>
-               <item name="wcf.global.systemRequirements.gdLib.description"><![CDATA[The graphics library &quot;GDLib&quot; is needed for the Dynamic Generation of Images. Without this, some features of this Software will not be available.]]></item>
-               <item name="wcf.global.systemRequirements.mbString"><![CDATA[The multibyte character library &quot;MBString&quot;]]></item>
-               <item name="wcf.global.systemRequirements.mbString.description"><![CDATA[Without this library, the Software can only be used with Western European languages.]]></item>
-               <item name="wcf.global.systemRequirements.safeMode"><![CDATA[Security option of &quot;safe mode&quot; in the &quot;PHP&quot; Script language]]></item>
-               <item name="wcf.global.systemRequirements.safeMode.description"><![CDATA[To quarantee the operation of this Software, we recommend to disable the safe mode setting.]]></item>
-               <item name="wcf.global.systemRequirements.ftp"><![CDATA[The data transfer library for FTP]]></item>
-               <item name="wcf.global.systemRequirements.ftp.description"><![CDATA[With the security option of &quot;safe mode&quot; being enabled, the data transfer library is needed for most of the file operations within this Software. We strongly recommend to enable this library.]]></item>
+               <item name="wcf.global.systemRequirements.gdLib.description"><![CDATA[The graphics-library &quot;GDLib&quot; is needed for the dynamic image generation. Without this library, some features of this software will not be available.]]></item>
+               <item name="wcf.global.systemRequirements.mbString"><![CDATA[The multibyte-character library &quot;MBString&quot;]]></item>
+               <item name="wcf.global.systemRequirements.mbString.description"><![CDATA[Without this library, the software can only be used with Western European languages.]]></item>
+               <item name="wcf.global.systemRequirements.safeMode"><![CDATA[Security option of &quot;Safe Mode&quot; in the &quot;PHP&quot; Script language]]></item>
+               <item name="wcf.global.systemRequirements.safeMode.description"><![CDATA[To guarantee the operation of this software, we recommend to disable &quot;Safe Mode&quot; setting.]]></item>
+               <item name="wcf.global.systemRequirements.ftp"><![CDATA[Data-transfer library for FTP]]></item>
+               <item name="wcf.global.systemRequirements.ftp.description"><![CDATA[With the security option of &quot;Safe Mode&quot; being enabled, the data-transfer library is needed for most of the file-operations of this software. We strongly recommend to enable this library.]]></item>
                <item name="wcf.global.systemRequirements.active"><![CDATA[Enabled]]></item>
                <item name="wcf.global.systemRequirements.notActive"><![CDATA[Not enabled]]></item>
-               <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"><![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[Enter here the name of the installation folder for <b>WoltLab Community Framework</b>. If you are unsure, keep the name which the system suggests and run a standard-installation.]]></item>
+               <item name="wcf.global.wcfDir.dir.description"><![CDATA[Enter here the name of the installation-folder for <b>WoltLab Community Framework</b>. If you are unsure, keep the name which the system suggests and run the standard-installation.]]></item>
                <item name="wcf.global.wcfDir.error.invalid"><![CDATA[The given folder is not valid.]]></item>
                <item name="wcf.global.wcfDir.url"><![CDATA[Installation-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.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>
+               <item name="wcf.global.ftp.description"><![CDATA[With the PHP Safe Mode security option being enabled, WoltLab Community Framework can only be installed using FTP functionality. Please enter here the FTP user-name 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 user-name and password requests will be needed.]]></item>
                <item name="wcf.global.ftp.accessData"><![CDATA[FTP access information]]></item>
-               <item name="wcf.global.ftp.host"><![CDATA[Hostname]]></item>
-               <item name="wcf.global.ftp.user"><![CDATA[Username]]></item>
+               <item name="wcf.global.ftp.host"><![CDATA[Host-name]]></item>
+               <item name="wcf.global.ftp.user"><![CDATA[User-name]]></item>
                <item name="wcf.global.ftp.password"><![CDATA[Password]]></item>
-               <item name="wcf.global.ftp.error"><![CDATA[A connection to the given FTP server could not be made.]]></item>
+               <item name="wcf.global.ftp.error"><![CDATA[A connection to the given FTP-server could not be established.]]></item>
                <item name="wcf.global.next"><![CDATA[Loading next step ...]]></item>
                <item name="wcf.global.next.description"><![CDATA[The installation is currently loading the next step, please wait.]]></item>
                <item name="wcf.global.languages"><![CDATA[Choose languages to install]]></item>
-               <item name="wcf.global.languages.description"><![CDATA[This Software can support multiple languages. Please choose the languages you would like to install.]]></item>
-               <item name="wcf.global.languages.charset"><![CDATA[Character Encoding]]></item>
-               <item name="wcf.global.languages.charset.description"><![CDATA[The Character Encoding, also known as the Character Set or the Code page determines the storage type and the representation of the installed languages of this System. Please be aware that once you have set your chosen Character Encoding, this can not be changed afterwards.]]></item>
+               <item name="wcf.global.languages.description"><![CDATA[This software can support multiple languages. Please choose the languages you would like to install.]]></item>
+               <item name="wcf.global.languages.charset"><![CDATA[Character-encoding]]></item>
+               <item name="wcf.global.languages.charset.description"><![CDATA[The character-encoding, also known as the character-set or the code-page determines the storage-type and the representation of the installed languages of this system. Please be aware that once you have set your chosen character-encoding, this can not be changed afterwards.]]></item>
                
                <!--<item name="wcf.global.languages.charset.ISO-8859-1"><![CDATA[ISO-8859-1 is required if you wish to install Western European languages only.]]></item>
                <item name="wcf.global.languages.charset.UTF-8"><![CDATA[UTF-8 is required if you wish to install Western European or any Non-Western European langauges, now or at a later date.]]></item>-->
@@ -122,39 +122,39 @@
                
                <item name="wcf.global.languages.languages"><![CDATA[Languages]]></item>
                <item name="wcf.global.languages.error.empty"><![CDATA[Please choose at least one language!]]></item>
-               <item name="wcf.global.languages.error.notAvailable"><![CDATA[The languages you have chosen do not correspond to the given Character Encoding you made previously. Please amend your language choice.]]></item>
-               <item name="wcf.global.configureDB"><![CDATA[Configure Database access]]></item>
-               <item name="wcf.global.configureDB.description"><![CDATA[The Data for this Software needs to be stored in a MySQL Database. Please enter your Database access information!]]></item>
-               <item name="wcf.global.configureDB.accessData"><![CDATA[Database access information]]></item>
+               <item name="wcf.global.languages.error.notAvailable"><![CDATA[The languages you have chosen do not correspond to the given character-encoding you made previously. Please amend your language choice.]]></item>
+               <item name="wcf.global.configureDB"><![CDATA[Configure database access]]></item>
+               <item name="wcf.global.configureDB.description"><![CDATA[The data for this software needs to be stored in an SQL-database. Please enter your database-access information!]]></item>
+               <item name="wcf.global.configureDB.accessData"><![CDATA[Database-access information]]></item>
                <item name="wcf.global.configureDB.host"><![CDATA[Hostname]]></item>
                <item name="wcf.global.configureDB.user"><![CDATA[Username]]></item>
                <item name="wcf.global.configureDB.password"><![CDATA[Password]]></item>
                <item name="wcf.global.configureDB.database"><![CDATA[Database name]]></item>
-               <item name="wcf.global.configureDB.number"><![CDATA[Installations number]]></item>
-               <item name="wcf.global.configureDB.error"><![CDATA[An Error has accured while trying to connect to your Database:
+               <item name="wcf.global.configureDB.number"><![CDATA[Installation-number]]></item>
+               <item name="wcf.global.configureDB.error"><![CDATA[An error has accured while trying to connect to your database:
                <br /><b>{$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}<br />{$exception->getErrorDesc()}{/if}</b>
                <br />Additional information can be found in the WoltLab Error Reference:
                <br /><a href="http://www.woltlab.com/help/?code={@$exception->getCode()}">http://www.woltlab.com/help/?code={@$exception->getCode()}</a>]]></item>
-               <item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your &quot;{$dbName}&quot; Database:<br />{implode from=$conflictedTables item="table"}{$table}{/implode}.<br /><br />To solve this problem, please do one of the following:<br />1. Enable the &quot;Overwrite&quot; option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the &quot;Next&quot; Button or<br />2. You re-enter the Database access information, but to a different Database and continue the installation with the &quot;Next&quot; Button or<br />3. You enter a new Installations number, not forgetting to continue the installation with the &quot;Next&quot; Button.]]></item>
+               <item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your &quot;{$dbName}&quot; Database:<br />{implode from=$conflictedTables item="table"}{$table}{/implode}.<br /><br />To solve this problem, please do one of the following:<br />1. Enable the &quot;Overwrite&quot; option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the &quot;Next&quot; button or<br />2. You re-enter the database access information, but to a different database and continue the installation with the &quot;Next&quot; button or<br />3. Enter a new installation number, not forgetting to continue the installation with the &quot;Next&quot; Button.]]></item>
                <item name="wcf.global.configureDB.conflictedTables.overwrite"><![CDATA[Overwrite the above listed table{if $conflictedTables|count > 1}s{/if}?]]></item>
                <item name="wcf.global.configureDB.class"><![CDATA[Database type]]></item>
                <item name="wcf.global.configureDB.class.MSSQLDatabase"><![CDATA[Microsoft SQL Server 2008+]]></item>
                <item name="wcf.global.configureDB.class.MySQLDatabase"><![CDATA[MySQL 5.1+]]></item>
                <item name="wcf.global.configureDB.class.PostgreSQLDatabase"><![CDATA[PostgreSQL 8.2+]]></item>
                <item name="wcf.global.createUser"><![CDATA[Create an Administrator]]></item>
-               <item name="wcf.global.createUser.description"><![CDATA[The Installation will now generate an Administrator account for you. Please give a username, email address and password.]]></item>
-               <item name="wcf.global.createUser.data"><![CDATA[User information]]></item>
-               <item name="wcf.global.createUser.username"><![CDATA[Username]]></item>
-               <item name="wcf.global.createUser.email"><![CDATA[E-Mail Address]]></item>
-               <item name="wcf.global.createUser.confirmEmail"><![CDATA[Confirm E-Mail Address]]></item>
+               <item name="wcf.global.createUser.description"><![CDATA[The installation will now generate an administrator-account for you. Please give a user-name, e-mail address and password.]]></item>
+               <item name="wcf.global.createUser.data"><![CDATA[User-information]]></item>
+               <item name="wcf.global.createUser.username"><![CDATA[User-name]]></item>
+               <item name="wcf.global.createUser.email"><![CDATA[E-mail address]]></item>
+               <item name="wcf.global.createUser.confirmEmail"><![CDATA[Confirm e-mail address]]></item>
                <item name="wcf.global.createUser.password"><![CDATA[Password]]></item>
-               <item name="wcf.global.createUser.confirmPassword"><![CDATA[Confirm Password]]></item>
-               <item name="wcf.global.createUser.error"><![CDATA[Errors have accured while registering the User account, please check the marked fields for errors.]]></item>
+               <item name="wcf.global.createUser.confirmPassword"><![CDATA[Confirm password]]></item>
+               <item name="wcf.global.createUser.error"><![CDATA[Errors have accured while registering the user-account, please check the marked fields for errors.]]></item>
                <item name="wcf.global.createUser.error.empty"><![CDATA[This field can not be left empty.]]></item>
-               <item name="wcf.global.createUser.error.username.notValid"><![CDATA[The Username you have given is invalid. A valid Username must be between 3 and 20 characters long.]]></item>
-               <item name="wcf.global.createUser.error.email.notValid"><![CDATA[The E-Mail Address you have given is invalid. A valid E-Mail Address must be in the format of name@domain.tld]]></item>
-               <item name="wcf.global.createUser.error.confirmEmail.notEqual"><![CDATA[The E-Mail Addresses you have given are not identical. For security reasons, please make sure that both E-Mail Address fields have been filled in and are identical.]]></item>
-               <item name="wcf.global.createUser.error.confirmPassword.notEqual"><![CDATA[The Passwords you have given are not identical. For security reasons, please make sure that both Password fields have been filled in and are identical.]]></item>
+               <item name="wcf.global.createUser.error.username.notValid"><![CDATA[The user-name you have given is invalid. A valid user-name must be between 3 and 20 characters long.]]></item>
+               <item name="wcf.global.createUser.error.email.notValid"><![CDATA[The e-mail address you have given is invalid. A valid e-mail address must be in the format of name@domain.tld]]></item>
+               <item name="wcf.global.createUser.error.confirmEmail.notEqual"><![CDATA[The e-mail addresses you have given are not identical. For security reasons, please make sure that both e-mail address fields have been filled in and are identical.]]></item>
+               <item name="wcf.global.createUser.error.confirmPassword.notEqual"><![CDATA[The passwords you have given are not identical. For security reasons, please make sure that both password fields have been filled in and are identical.]]></item>
                <item name="wcf.global.wcfDir.error"><![CDATA[An Error has accured while extracting the required files:
                <br /><b>{$exception->getMessage()}</b><br />
                Please make sure that the destination folder exists and can be written to.