Merge branch '5.4'

diff --cc com.woltlab.wcf/mediaProvider.xml
Simple merge

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc com.woltlab.wcf/packageInstallationPlugin.xml
Simple merge

diff --cc wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/devtools/pip/TXmlGuiPackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index 3d1fb59abfee99b6bd7fb580ff4522c7a2f40acf,362c1630df84b5ab3087e2c8eec58bb678e57653..16328702f24c7f295e0ca1332f27ea33b76cae7d
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/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" languagename="Deutsch" countrycode="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" languagename="Deutsch" countrycode="de">
 +<import>
        <category name="wcf.acl">
                <item name="wcf.acl.access"><![CDATA[Zugangsbeschränkung]]></item>
                <item name="wcf.acl.access.grant"><![CDATA[Zugang gewähren]]></item>

diff --cc wcfsetup/install/lang/en.xml
index 205ee6341cd85537edfb702a4a591e0fa842f7a2,884e32807122fd729b350f92c389a2e091923b25..3b672d56f6fbe24de3564c3e04ae08db19dea471
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/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" languagename="English" countrycode="gb">
+ <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" languagename="English" countrycode="gb">
 +<import>
        <category name="wcf.acl">
                <item name="wcf.acl.access"><![CDATA[Restricted Access]]></item>
                <item name="wcf.acl.access.grant"><![CDATA[Allow Access]]></item>