Merge branch '2.0'

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

diff --cc com.woltlab.wcf/userGroupOption.xml
index 48529d6d6b7ad8806d9b2b18b5b896b3ca78bc98,8a8dd7b606fe468b7fa5c5b50711a52eb6ba44f5..a9eea1a904447125a727854ed4d7b92785d0e90a
--- 1/com.woltlab.wcf/userGroupOption.xml
--- 2/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 com.woltlab.wcf/userOption.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index 0302f1df6ef7c06983d814d84dc01820b61cb23a,2d7b5d9088835503155f2204e70a18f1d4ead68e..a3bd1578ca8ff0cbba427a636171435249f20882
--- 1/wcfsetup/install/lang/en.xml
--- 2/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">