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

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index c39ddd88319845c1242a7cbace051ca8151ba891,73a0e865f0fc4ea1e0db5cfc46d10c2dbb2792cc..6ee848dd402172d72ced75283dabdecd16452db4
--- 1/wcfsetup/install/lang/en.xml
--- 2/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.missingRequirements"><![CDATA[TODO: Die Abhängigkeiten dieses Paketes konnten nicht aufgelöst werden.]]></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[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>