From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 16 Jun 2013 15:52:45 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_4~32
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6209e92f512332044b782aeac1729c4a2eb3f07e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF
---

6209e92f512332044b782aeac1729c4a2eb3f07e
diff --cc wcfsetup/install/lang/en.xml
index c39ddd8831,73a0e865f0..6ee848dd40
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -821,11 -821,6 +821,11 @@@ Examples for medium ID detection
  		<item name="wcf.acp.package.installation.step.update"><![CDATA[Updating “{$packageName}” …]]></item>
  		<item name="wcf.acp.package.installation.step.update.success"><![CDATA[Updated completed]]></item>
  		<item name="wcf.acp.package.installedVersion"><![CDATA[Installed Version]]></item>
 +		<item name="wcf.acp.package.install.error.excludedPackages"><![CDATA[This package can't be installed because of the following already installed packages:]]></item>
 +		<item name="wcf.acp.package.install.error.excludedPackages.excludedPackage"><![CDATA[“{$excludedPackage}” ({$excludedPackage->package}){if $excludedPackage->excludedPackageVersion} (excluded version: {$excludedPackage->excludedPackageVersion}, installed version: {$excludedPackage->packageVersion}){/if}]]></item>
 +		<item name="wcf.acp.package.install.error.excludingPackages"><![CDATA[The following, already installed packages prohibit installing this package:]]></item>
 +		<item name="wcf.acp.package.install.error.excludingPackages.excludingPackage"><![CDATA[“{$excludingPackage}” ({$excludingPackage->package}){if $excludingPackage->excludedPackageVersion} (excluded version: {$excludingPackage->excludedPackageVersion}){/if}]]></item>
- 		<item name="wcf.acp.package.install.error.missingRequirements"><![CDATA[TODO: Die Abhängigkeiten dieses Paketes konnten nicht aufgelöst werden.]]></item>
++		<item name="wcf.acp.package.install.error.missingRequirements"><![CDATA[Unable to resolve requirements of this package.]]></item>
  		<item name="wcf.acp.package.install.step.prepare"><![CDATA[Preparing Installation …]]></item>
  		<item name="wcf.acp.package.install.title"><![CDATA[Installation]]></item>
  		<item name="wcf.acp.package.installation.requiredVersion"><![CDATA[Required Version]]></item>
@@@ -879,7 -874,8 +879,7 @@@
  		<item name="wcf.acp.package.upload"><![CDATA[Upload package]]></item>
  		<item name="wcf.acp.package.optionalPackages"><![CDATA[Optional packages]]></item>
  		<item name="wcf.acp.package.optionalPackages.description"><![CDATA[The following optional packages are available for installation:]]></item>
- 		<item name="wcf.acp.package.search.error.noMatches"><![CDATA[TODO: Es wurden keine Pakete gefunden.]]></item>
+ 		<item name="wcf.acp.package.search.error.noMatches"><![CDATA[No packages matched your criteria.]]></item>
 -		<item name="wcf.acp.package.install.error.missingRequirements"><![CDATA[Unable to resolve requirements of this package.]]></item>
  	</category>
  	
  	<category name="wcf.acp.pageMenu">
@@@ -1752,7 -1748,6 +1752,7 @@@ Allowed extensions: {', '|implode:$atta
  		<item name="wcf.poll.button.showVote"><![CDATA[Vote]]></item>
  		<item name="wcf.poll.button.vote"><![CDATA[Vote]]></item>
  		<item name="wcf.poll.endTime"><![CDATA[Poll Ends (optional)]]></item>
- 		<item name="wcf.poll.endTime.error.notValid"><![CDATA[You entered an invalid date.]]></item>
++		<item name="wcf.poll.endTime.error.notValid"><![CDATA[You have entered an invalid date.]]></item>
  		<item name="wcf.poll.isChangeable"><![CDATA[Votes can be changed]]></item>
  		<item name="wcf.poll.isPublic"><![CDATA[Publicize participants]]></item>
  		<item name="wcf.poll.management"><![CDATA[Poll]]></item>