Merge branch 'master' into next

diff --cc files/lib/system/exporter/XF2xExporter.class.php
Simple merge

diff --cc language/de.xml
index 5faaadf4dc6a02de23875273e2e21d56e298c9f6,2220159ad1988566af2b298206ed6032523ba257..c81581e74b3bee4f90041fdf2cc7a2b01a489d78
--- 1/language/de.xml
--- 2/language/de.xml
+++ b/language/de.xml
@@@ -15,8 -15,7 +15,8 @@@
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.ipb3x"><![CDATA[IP.Board 3.4.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.ipb4x"><![CDATA[IP.Board 4.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf12x"><![CDATA[XenForo 1.2.x - 1.4.x]]></item>
-               <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf2x"><![CDATA[XenForo 2.x (experimentell)]]></item>
+               <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf2x"><![CDATA[XenForo 2.0.x, 2.1.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.nodeBB0xRedis"><![CDATA[NodeBB 0.6+ (Redis, experimentell)]]></item>
 +              <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xobor"><![CDATA[Xobor]]></item>
        </category>
  </language>

diff --cc language/en.xml
index c89bf369d277de88bffc2f5aeba69f7eaa3d950e,847669fae4e57541a492797bfc42ed50adcabab4..5ee96a59fdf929ef9a12dfef15128a0c37fd1239
--- 1/language/en.xml
--- 2/language/en.xml
+++ b/language/en.xml
@@@ -15,8 -15,7 +15,8 @@@
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.ipb3x"><![CDATA[IP.Board 3.4.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.ipb4x"><![CDATA[IP.Board 4.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf12x"><![CDATA[XenForo 1.2.x - 1.4.x]]></item>
-               <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf2x"><![CDATA[XenForo 2.x (experimental)]]></item>
+               <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xf2x"><![CDATA[XenForo 2.0.x, 2.1.x]]></item>
                <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.nodeBB0xRedis"><![CDATA[NodeBB 0.6+ (Redis, experimental)]]></item>
 +              <item name="wcf.acp.dataImport.exporter.com.woltlab.wcf.exporter.xobor"><![CDATA[Xobor]]></item>
        </category>
  </language>