From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 29 Aug 2017 12:12:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.0_Alpha_2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c881260c780bd2f1828e9be78b85de7a2bab972;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'
---

3c881260c780bd2f1828e9be78b85de7a2bab972
diff --cc wcfsetup/install/lang/en.xml
index c0354093f9,cdfe03f490..ec55753d35
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -2220,8 -1965,8 +2220,9 @@@ full extend.]]></item
  		
  		<item name="wcf.attachment.upload.error.reachedRemainingLimit"><![CDATA[You have selected too many attachments, remaining: #remaining#.]]></item>
  		<item name="wcf.attachment.upload.error.uploadFailed"><![CDATA[An unknown error occurred during the upload.]]></item>
 +		<item name="wcf.attachment.upload.error.uploadPhpLimit"><![CDATA[The file exceeds the PHP limit “upload_max_filesize” and/or “post_max_size”.]]></item>
  		<item name="wcf.attachment.upload.limits"><![CDATA[The maximum number of attachments: {#$attachmentHandler->getMaxCount()}<br>
+ Maximum File Size: {@$attachmentHandler->getMaxSize()|filesize}<br>
  Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensions()}]]></item>
  		<item name="wcf.attachment.insert"><![CDATA[Insert into message]]></item>
  		<item name="wcf.attachment.insertAll"><![CDATA[Insert All]]></item>