From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 17 Sep 2014 15:12:02 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.1.0_Alpha_1~344
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50970626e74309792f1e8e3509fd26d1b02d8e96;p=GitHub%2FWoltLab%2FWCF.git

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

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

50970626e74309792f1e8e3509fd26d1b02d8e96
diff --cc wcfsetup/install/lang/de.xml
index dbe64f6aa1,cc4b3dc104..e583b3bb5e
--- a/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 e971100df0,a421751632..b3a4fc4229
--- a/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">