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

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index c0354093f931da79e9a2b7c19945f8a9ba996a80,cdfe03f490c6d8e150b8681ffc4ace3dbe9b6c50..ec55753d359b202096483351f8c5cb90ccc57327
--- 1/wcfsetup/install/lang/en.xml
--- 2/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>