From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 23 Jun 2021 07:34:14 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~612
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c1490c3e3889a186e16620a0ccbef5c19f61e882;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

c1490c3e3889a186e16620a0ccbef5c19f61e882
diff --cc wcfsetup/install/lang/de.xml
index 3d1fb59abf,362c1630df..16328702f2
--- a/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 205ee6341c,884e328071..3b672d56f6
--- a/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>