From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 11 Jun 2014 22:25:59 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~710
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a24a89e477c62f3eccfc9386006dd242d531dda2;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/userGroupOption.xml
	wcfsetup/install/lang/en.xml
---

a24a89e477c62f3eccfc9386006dd242d531dda2
diff --cc com.woltlab.wcf/userGroupOption.xml
index 48529d6d6b,8a8dd7b606..a9eea1a904
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@@ -313,7 -287,7 +313,8 @@@
  				<categoryname>user.message.attachment</categoryname>
  				<optiontype>fileSize</optiontype>
  				<defaultvalue>1000000</defaultvalue>
 +				<minvalue>10000</minvalue>
+ 				<options>module_attachment</options>
  			</option>
  			<option name="user.attachment.allowedExtensions">
  				<categoryname>user.message.attachment</categoryname>
@@@ -332,8 -307,7 +334,9 @@@ pdf]]></defaultvalue
  				<categoryname>user.message.attachment</categoryname>
  				<optiontype>integer</optiontype>
  				<defaultvalue>10</defaultvalue>
 +				<minvalue>1</minvalue>
+ 				<options>module_attachment</options>
 +				<maxvalue>100</maxvalue>
  			</option>
  			
  			<option name="admin.attachment.canManageAttachment">
diff --cc wcfsetup/install/lang/en.xml
index 0302f1df6e,2d7b5d9088..a3bd1578ca
--- 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, Google Plus User name (+Username) or the url of your Google Plus profile]]></item>
+ 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21 digits Google Plus user ID, Google Plus username (+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">