From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 11 Jun 2014 22:11:47 +0000 (+0200)
Subject: Merge pull request #1742 from SoftCreatR/patch-4
X-Git-Tag: 2.1.0_Alpha_1~712
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=67ecde7248d94a54f677c090286f368ea545e512;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #1742 from SoftCreatR/patch-4

Apply small optimizations
---

67ecde7248d94a54f677c090286f368ea545e512
diff --cc wcfsetup/install/lang/de.xml
index 72d677c8b7,9580ea421e..03529f681a
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -2907,11 -2505,8 +2907,11 @@@ Möchten Sie diese E-Mail-Benachrichtig
  		<item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
  		<item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
  		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
- 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21-stellige Google-Plus-ID]]></item>
+ 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21-stellige Google-Plus-ID, Google-Plus Benutzername (+Benutzername) oder URL zum Google-Plus-Profil]]></item>
  		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Kann Pinnwand-Kommentare schreiben]]></item>
 +		
 +		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[Auswahl des Benutzers bei „{lang}wcf.user.option.{$option->optionName}{/lang}“:]]></item>
 +		<item name="wcf.user.option.searchTextOption"><![CDATA[„{lang}wcf.user.option.{$option->optionName}{/lang}“ enthält:]]></item>
  	</category>
  	
  	<category name="wcf.user.mail">
diff --cc wcfsetup/install/lang/en.xml
index 184844b571,64af943a0d..0302f1df6e
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -2762,11 -2503,8 +2762,11 @@@ If you do not want to receive further e
  		<item name="wcf.user.option.facebook"><![CDATA[Facebook]]></item>
  		<item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
  		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
- 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21 digits Google Plus user ID]]></item>
+ 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21 digits Google Plus user ID, Google Plus User name (+Username) or the url of your Google Plus profile]]></item>
  		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Can Write Comments on My Wall]]></item>
 +		
 +		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[User's selection for “{lang}wcf.user.option.{$option->optionName}{/lang}”:]]></item>
 +		<item name="wcf.user.option.searchTextOption"><![CDATA[“{lang}wcf.user.option.{$option->optionName}{/lang}” contains:]]></item>
  	</category>
  	
  	<category name="wcf.user.mail">