Merge commit 'd9ff0c' into next

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

diff --cc wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
index 3503cc83bf12e713771c80e56413ecab96513ae8,be2e775cdd04d0652282bf3314b8998604a5f8cd..dac09beca7b06a158a3e087c54d97dc9d4da5862
--- 1/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
--- 2/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
@@@ -243,11 -246,13 +247,13 @@@ class UserOptionHandler extends OptionH
                }
                
                if ($this->editMode) {
 -                      return $option->isEditable();
 +                      return $option->isEditable($this->inRegistration);
                }
-               else {
+               else if (!$this->conditionMode) {
                        return $option->isVisible();
                }
+               
+               return true;
        }
        
        /**

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
index 3d9bb85b4459fdf266c35778846671a96bcfdfc7,ed8db8a1cb202eec844a5f55dbc148095ab99fc3..2fb80718566ef99b1179ea883884ea587741dbf6
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -667,10 -665,10 +667,10 @@@ Examples for medium ID detection
                <item name="wcf.acp.notice.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the notice to be shown.]]></item>
                <item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Time]]></item>
                <item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the notice is shown.]]></item>
 -              <item name="wcf.acp.notice.conditions.user"><![CDATA[Active user]]></item>
 +              <item name="wcf.acp.notice.conditions.user"><![CDATA[Active User]]></item>
                <item name="wcf.acp.notice.conditions.user.description"><![CDATA[The active user has to fulfill the following conditions to see the notice.]]></item>
                <item name="wcf.acp.notice.delete.confirmMessage"><![CDATA[Do you really want to delete the notice “{$notice->noticeName}”?]]></item>
-               <item name="wcf.acp.notice.edit"><![CDATA[Edit Notices]]></item>
+               <item name="wcf.acp.notice.edit"><![CDATA[Edit Notice]]></item>
                <item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
                <item name="wcf.acp.notice.isDisabled"><![CDATA[Disable Notice]]></item>
                <item name="wcf.acp.notice.isDismissible"><![CDATA[User can dismiss notice]]></item>
@@@ -1928,16 -1884,14 +1928,16 @@@ Errors are
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.ban"><![CDATA[Ban ({#$count})]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.delete"><![CDATA[Delete ({#$count})]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.delete.confirmMessage"><![CDATA[Do you really want to delete {#$count} user{if $count != 1}s{/if}?]]></item>
-               <item name="wcf.clipboard.item.com.woltlab.wcf.user.exportMailAddress"><![CDATA[Export Email addresses]]></item>
 +              <item name="wcf.clipboard.item.com.woltlab.wcf.user.enable"><![CDATA[Approve]]></item>
+               <item name="wcf.clipboard.item.com.woltlab.wcf.user.exportMailAddress"><![CDATA[Export Email Addresses]]></item>
 +              <item name="wcf.clipboard.item.com.woltlab.wcf.user.merge"><![CDATA[Merge]]></item>
 +              <item name="wcf.clipboard.item.com.woltlab.wcf.user.revertContentChanges"><![CDATA[Revert Changes To Contents]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.sendMail"><![CDATA[Send Email]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword"><![CDATA[Send New Password ({#$count})]]></item>
                <item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to {#$count} user{if $count != 1}s{/if}?]]></item>
-               <item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{#$count} Tag{if $count != 1}s{/if} marked]]></item>
-               <item name="wcf.clipboard.label.com.woltlab.wcf.user.marked"><![CDATA[{#$count} User{if $count != 1}s{/if} marked]]></item>
 +              
 -              <item name="wcf.clipboard.item.com.woltlab.wcf.user.merge"><![CDATA[Merge]]></item>
 -              <item name="wcf.clipboard.item.com.woltlab.wcf.user.revertContentChanges"><![CDATA[Revert Changes To Contents]]></item>
 -              <item name="wcf.clipboard.item.com.woltlab.wcf.user.enable"><![CDATA[Approve]]></item>
++              <item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{if $count == 1}One Tag{else}{#$count} Tags{/if} marked]]></item>
+               <item name="wcf.clipboard.label.com.woltlab.wcf.user.marked"><![CDATA[{if $count == 1}One User{else}{#$count} Users{/if} marked]]></item>
        </category>
        
        <category name="wcf.comment">