From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 9 Sep 2011 18:00:52 +0000 (-0700)
Subject: Merge pull request #157 from Gravatronics/langVarFixes
X-Git-Tag: 2.0.0_Beta_1~1765^2~33
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54602acc44db9c5018229c53f2799f592e08ef28;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #157 from Gravatronics/langVarFixes

Fixes wrong language variable names in xml files
---

54602acc44db9c5018229c53f2799f592e08ef28
diff --cc wcfsetup/install/lang/en.xml
index fd05201909,85942d92ed..cd0370db0e
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -637,15 -635,15 +637,15 @@@
  		<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>