Merge branch '2.0'

diff --cc com.woltlab.wcf/templates/moderationActivation.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/moderationReport.tpl
index bdb16a53d69c247446e178b709ddbfbd6bddffc3,beafea37e8527b80266eb8ca85a8e389c6ee02ba..839c291a3ce464dce82024a51d801122850dff5f
--- 1/com.woltlab.wcf/templates/moderationReport.tpl
--- 2/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@@ -9,17 -10,12 +9,17 @@@
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({
 +                              'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
 +                              'wcf.moderation.assignedUser.change': '{lang}wcf.moderation.assignedUser.change{/lang}',
 +                              'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
                                'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
                                'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
 -                              'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}'
 +                              'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}',
 +                              'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
 +                              'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}'
                        });
                        
-                       new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList'}{/link}');
+                       new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
                });
                //]]>
        </script>

diff --cc com.woltlab.wcf/templates/userPanel.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/dataImport.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/packageList.tpl
Simple merge