Merge pull request #157 from Gravatronics/langVarFixes
authorAlexander Ebert <ebert@woltlab.com>
Fri, 9 Sep 2011 18:00:52 +0000 (11:00 -0700)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 9 Sep 2011 18:00:52 +0000 (11:00 -0700)
Fixes wrong language variable names in xml files

1  2 
wcfsetup/install/lang/de-informal.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

Simple merge
Simple merge
index fd05201909b44b2607c7c601028b98b9dfac1e23,85942d92ed3a8a01a71af83d9fbc02d8cd4dfe8d..cd0370db0e3ceb62c10243bf5bbba887803429c2
                <item name="wcf.acp.updateServer.edit"><![CDATA[Edit server]]></item>
                <item name="wcf.acp.updateServer.edit.success"><![CDATA[Your changes have been successfully saved.]]></item>
                <item name="wcf.acp.updateServer.enable"><![CDATA[Enable]]></item>
-               <item name="wcf.acp.updateServer.errorText"><![CDATA[Error messages]]></item>
-               <item name="wcf.acp.updateServer.htPassword"><![CDATA[Password]]></item>
-               <item name="wcf.acp.updateServer.htPassword.description"><![CDATA[Please enter a valid password (optional).]]></item>
-               <item name="wcf.acp.updateServer.htUsername"><![CDATA[Username]]></item>
-               <item name="wcf.acp.updateServer.htUsername.description"><![CDATA[Please enter a valid user name (optional).]]></item>
+               <item name="wcf.acp.updateServer.errorMessage"><![CDATA[Error messages]]></item>
                <item name="wcf.acp.updateServer.lastErrorText"><![CDATA[The following error occured while trying to connect:]]></item>
 -              <item name="wcf.acp.updateServer."><![CDATA[Available update-servers]]></item>
 +              <item name="wcf.acp.updateServer.list"><![CDATA[Available update-servers]]></item>
                <item name="wcf.acp.updateServer.list.count"><![CDATA[{#$items} update server{if $items != 1}s{/if} available]]></item>
                <item name="wcf.acp.updateServer.list.noneAvailable"><![CDATA[There are no update-servers available.]]></item>
+               <item name="wcf.acp.updateServer.loginPassword"><![CDATA[Password]]></item>
+               <item name="wcf.acp.updateServer.loginPassword.description"><![CDATA[Please enter a valid password (optional).]]></item>
+               <item name="wcf.acp.updateServer.loginUsername"><![CDATA[Username]]></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>