Merge branch '5.4'

diff --cc language/de.xml
index 583bd2903d4521ccc5e2b50bd1cefd3a2c2b3990,c798069b334dc71a40ad9e61075c1cd2f6325d0f..8fa7d73c5503462d364767966fbde7c1a56794c0
--- 1/language/de.xml
--- 2/language/de.xml
+++ b/language/de.xml
@@@ -1,6 -1,5 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/2019/language.xsd" languagecode="de">
+ <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="de">
 +<import>
        <category name="wcf.acp.option">
                <item name="wcf.acp.option.category.legalNotice"><![CDATA[Impressum]]></item>
                <item name="wcf.acp.option.legal_notice_additional_text"><![CDATA[Weitere Informationen]]></item>

diff --cc language/en.xml
index 1f176bb2fd8c94017d49a6b3246bbf350cdb7071,d595d663e62f24699d345d31f16d5cf8c2d7d098..f2e7bc3565ba57b9a7e28716b305fb75fbea2547
--- 1/language/en.xml
--- 2/language/en.xml
+++ b/language/en.xml
@@@ -1,6 -1,5 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/2019/language.xsd" languagecode="en">
+ <language xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/5.4/language.xsd" languagecode="en">
 +<import>
        <category name="wcf.acp.option">
                <item name="wcf.acp.option.category.legalNotice"><![CDATA[Legal Notice]]></item>
                <item name="wcf.acp.option.legal_notice_additional_text"><![CDATA[Additional Information]]></item>