Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	wcfsetup/install/lang/de.xml
	wcfsetup/install/lang/en.xml

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

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

diff --cc wcfsetup/install/lang/de.xml
index dbe64f6aa1bf08d9d55e1d05a06c418d221c210e,cc4b3dc104ff372f4d5a2394008fa818f397a989..e583b3bb5ee8e14dd6763a2f78adf9a53bc157a0
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -1034,14 -1029,9 +1034,17 @@@ GmbH=Gesellschaft mit beschränkter Haf
                <item name="wcf.acp.option.gravatar_default_type.wavatar"><![CDATA[Wavatar]]></item>
                <item name="wcf.acp.option.gravatar_default_type.monsterid"><![CDATA[Monster-ID]]></item>
                <item name="wcf.acp.option.gravatar_default_type.retro"><![CDATA[Retro]]></item>
+               <item name="wcf.acp.option.search_engine"><![CDATA[Suche]]></item>
+               <item name="wcf.acp.option.search_engine.mysql"><![CDATA[MySQL FULLTEXT (Standard)]]></item>
+               <item name="wcf.acp.option.enable_pluginstore_widget"><![CDATA[Empfohlene Produkte aus dem WoltLab® Plugin-Store auf der Startseite der Administrationsoberfläche anzeigen]]></item>
 +              <item name="wcf.acp.option.category.general.payment"><![CDATA[Zahlungsoptionen]]></item>
 +              <item name="wcf.acp.option.category.general.payment.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.available_payment_methods"><![CDATA[Unterstützte Zahlungsmethoden]]></item>
 +              <item name="wcf.acp.option.available_payment_methods.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.paypal_email_address"><![CDATA[Paypal-E-Mail-Adresse]]></item>
 +              <item name="wcf.acp.option.paypal_email_address.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.module_paid_subscription"><![CDATA[Bezahlte Mitgliedschaften aktivieren]]></item>
 +              <item name="wcf.acp.option.module_paid_subscription.description"><![CDATA[TODO]]></item>
        </category>
        
        <category name="wcf.acp.package">

diff --cc wcfsetup/install/lang/en.xml
index e971100df0e4789644b153a89e6f17162931f24d,a421751632e21f74d7ea2572fa8e91d4fa12098c..b3a4fc4229fee1f0fa9413275b056c931d5b47cf
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -1033,14 -1028,9 +1033,17 @@@ GmbH=Gesellschaft mit beschränkter Haf
                <item name="wcf.acp.option.gravatar_default_type.wavatar"><![CDATA[Wavatar]]></item>
                <item name="wcf.acp.option.gravatar_default_type.monsterid"><![CDATA[Monster id]]></item>
                <item name="wcf.acp.option.gravatar_default_type.retro"><![CDATA[Retro]]></item>
+               <item name="wcf.acp.option.search_engine"><![CDATA[Search Engine]]></item>
+               <item name="wcf.acp.option.search_engine.mysql"><![CDATA[MySQL FULLTEXT (default)]]></item>
+               <item name="wcf.acp.option.enable_pluginstore_widget"><![CDATA[Show recommended products from the WoltLab® Plugin-Store on the administration control panel’s start page]]></item>
 +              <item name="wcf.acp.option.category.general.payment"><![CDATA[TODO: Zahlungsoptionen]]></item>
 +              <item name="wcf.acp.option.category.general.payment.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.available_payment_methods"><![CDATA[TODO: Unterstützte Zahlungsmethoden]]></item>
 +              <item name="wcf.acp.option.available_payment_methods.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.paypal_email_address"><![CDATA[TODO: Paypal-E-Mail-Adresse]]></item>
 +              <item name="wcf.acp.option.paypal_email_address.description"><![CDATA[TODO]]></item>
 +              <item name="wcf.acp.option.module_paid_subscription"><![CDATA[TODO: Bezahlte Mitgliedschaften aktivieren]]></item>
 +              <item name="wcf.acp.option.module_paid_subscription.description"><![CDATA[TODO]]></item>
        </category>
        
        <category name="wcf.acp.package">