Merge branch '5.2'

diff --cc com.woltlab.wcf/templates/uploadFieldComponent.tpl
index 795d6c5a16c8f81fa50b013d2c3a9148d578254e,7c8d41f40e685fe1b25e76962f6f25ad5785231e..4f56debb4e1f87844cf1ad467504a0ab0f455385
--- 1/com.woltlab.wcf/templates/uploadFieldComponent.tpl
--- 2/com.woltlab.wcf/templates/uploadFieldComponent.tpl
+++ b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
@@@ -35,8 -35,9 +35,9 @@@
  <script data-relocate="true">
        require(['WoltLabSuite/Core/Ui/File/Upload', 'Language'], function(Upload, Language) {
                Language.addObject({
 -                      'wcf.upload.error.reachedRemainingLimit': '{lang __literal=true}wcf.upload.error.reachedRemainingLimit{/lang}',
 -                      'wcf.upload.error.noImage': '{lang}wcf.upload.error.noImage{/lang}',
 +                      'wcf.upload.error.reachedRemainingLimit': '{jslang __literal=true}wcf.upload.error.reachedRemainingLimit{/jslang}',
-                       'wcf.upload.error.noImage': '{jslang}wcf.upload.error.noImage{/jslang}'
++                      'wcf.upload.error.noImage': '{jslang}wcf.upload.error.noImage{/jslang}',
+                       'wcf.upload.error.uploadFailed': '{lang}wcf.upload.error.uploadFailed{/lang}',
                });
                
                new Upload("{$uploadFieldId}UploadButtonDiv", "{$uploadFieldId}uploadFileList", {

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/File/Upload.js
Simple merge

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

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