Merge branch 'master' into next

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
	wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
	wcfsetup/install/files/js/WCF.Combined.min.js
	wcfsetup/install/files/lib/system/WCF.class.php

diff --cc com.woltlab.wcf/templates/messageSidebar.tpl
index 3faf6e524cf868fd45565376cc400b53151cc9d4,90ffcc7b053b68936c8c8cc7368a3180d3d92134..c651ca19366f1214812125738c50ef42cfbc755b
--- 1/com.woltlab.wcf/templates/messageSidebar.tpl
--- 2/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@@ -42,15 -42,15 +42,15 @@@
                {else}
                        <header>
                                <h2 class="username">
-                                       <span>{@$userProfile->username}</span>
+                                       <span>{$userProfile->username}</span>
                                </h2>
                                
 -                              <div class="userTitle">
 -                                      <p class="badge">{lang}wcf.user.guest{/lang}</p>
 -                              </div>
 -                              
                                {event name='header'}
                        </header>
 +                      
 +                      <div class="userTitle">
 +                              <p class="badge">{lang}wcf.user.guest{/lang}</p>
 +                      </div>
                {/if}
                
                {event name='beforeCredits'}

diff --cc wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
Simple merge

diff --cc wcfsetup/install/files/js/3rdParty/redactor/plugins/wmonkeypatch.js
Simple merge

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/lib/data/style/StyleAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/style/StyleEditor.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/option/OptionHandler.class.php
Simple merge

diff --cc wcfsetup/install/files/style/icon.less
Simple merge

diff --cc wcfsetup/install/files/style/layout.less
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index 4d6b62da4802dd62820c4a39756f15a99be347bd,a78e11a5959adbfb97fef9791eead2868b1c3cbb..75230e1a9aaac0e53644843bb2883b8ab1a398da
--- 1/wcfsetup/install/lang/de.xml
--- 2/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -3138,18 -3093,20 +3138,18 @@@ Sollten Sie sich nicht auf der Website
                <item name="wcf.user.condition.conditionGroup.general"><![CDATA[Allgemeine Daten]]></item>
                <item name="wcf.user.condition.conditionGroup.userOptions"><![CDATA[Persönliche Daten]]></item>
                <item name="wcf.user.condition.groupIDs"><![CDATA[in Benutzergruppen]]></item>
-               <item name="wcf.user.condition.groupIDs.description"><![CDATA[Benutzer müssen in den ausgewählten Benutzergruppen Mitglied sein.]]></item>
+               <item name="wcf.user.condition.groupIDs.description"><![CDATA[Benutzer müssen in allen ausgewählten Benutzergruppen Mitglied sein.]]></item>
                <item name="wcf.user.condition.languages"><![CDATA[Sprachen]]></item>
 +              <item name="wcf.user.condition.lastActivityTime"><![CDATA[Letzte Aktivität]]></item>
                <item name="wcf.user.condition.likesReceived"><![CDATA[Erhaltene Likes]]></item>
                <item name="wcf.user.condition.mobileBrowser"><![CDATA[Mobiler Browser]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser"><![CDATA[Verwendet mobilen Browser]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser.error.conflict"><![CDATA[„Verwendet mobilen Browser“ und „Verwendet keinen mobilen Browser“ können nicht gleichzeitig ausgewählt werden.]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesNoMobileBrowser"><![CDATA[Verwendet keinen mobilen Browser]]></item>
                <item name="wcf.user.condition.notGroupIDs"><![CDATA[nicht in Benutzergruppen]]></item>
-               <item name="wcf.user.condition.notGroupIDs.description"><![CDATA[Benutzer dürfen in den ausgewählten Benutzergruppen nicht Mitglied sein.]]></item>
+               <item name="wcf.user.condition.notGroupIDs.description"><![CDATA[Benutzer dürfen in keiner der ausgewählten Benutzergruppen Mitglied sein.]]></item>
                <item name="wcf.user.condition.notGroupIDs.error.groupIDsIntersection"><![CDATA[Die ausgewählten Benutzergruppen in „in Benutzergruppen“ und „nicht in Benutzergruppen“ sind widersprüchlich.]]></item>
                <item name="wcf.user.condition.registrationDate"><![CDATA[Registrierungsdatum]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.endBeforeStart"><![CDATA[Das Enddatum ist vor dem Startdatum.]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.endNotValid"><![CDATA[Das Startdatum ist ungültig.]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.startNotValid"><![CDATA[Das Enddatum ist ungültig.]]></item>
                <item name="wcf.user.condition.registrationDateInterval"><![CDATA[Tage seit Registrierung]]></item>
                <item name="wcf.user.condition.state"><![CDATA[Zustand]]></item>
                <item name="wcf.user.condition.state.isBanned"><![CDATA[Gesperrt]]></item>

diff --cc wcfsetup/install/lang/en.xml
index 111c7e2ea62a99e32e22c104458e91b67cff3fcd,d63a6629d08c489e8c7f8412a185f241d4950571..00c469f166f99c275cefbe9e76fafbdbcb1f31d8
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -3138,9 -3095,12 +3138,9 @@@ You can safely ignore this email if yo
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser.error.conflict"><![CDATA[You may not simultaneously select “Uses mobile browser“ and “Uses no mobile browser“.]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesNoMobileBrowser"><![CDATA[Uses no mobile browser]]></item>
                <item name="wcf.user.condition.notGroupIDs"><![CDATA[not in User Groups]]></item>
-               <item name="wcf.user.condition.notGroupIDs.description"><![CDATA[Users may not be a member of the selected user groups.]]></item>
+               <item name="wcf.user.condition.notGroupIDs.description"><![CDATA[Users may not be a member of any selected user group.]]></item>
                <item name="wcf.user.condition.notGroupIDs.error.groupIDsIntersection"><![CDATA[The selected user groups in “in User Groups“ and “not in User Groups“ are conflicting.]]></item>
                <item name="wcf.user.condition.registrationDate"><![CDATA[Registration Date]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.endBeforeStart"><![CDATA[The end date is prior to the start date.]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.endNotValid"><![CDATA[The start date is not valid.]]></item>
 -              <item name="wcf.user.condition.registrationDate.error.startNotValid"><![CDATA[The end date is not valid.]]></item>
                <item name="wcf.user.condition.registrationDateInterval"><![CDATA[Days since registration]]></item>
                <item name="wcf.user.condition.state"><![CDATA[State]]></item>
                <item name="wcf.user.condition.state.isBanned"><![CDATA[Banned]]></item>