Merge branch 'next' into next-lantia

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc wcfsetup/install/files/acp/templates/userOptionAdd.tpl
Simple merge

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

diff --cc wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
index c08478b9fb9b19fc9a55fd43645cee2733a3577d,e35b09a547179ca3ce4cc464b206765abb1f3184..6bb237ce4a533c2406dfcd04413a3ff618328a36
--- 1/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
--- 2/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
@@@ -199,19 -196,14 +199,19 @@@ define(['Dictionary', 'Dom/Traverse', '
                                }
                        }
                        
 -                      name = name || elAttr(tab, 'data-name');
 +                      name = name || elData(tab, 'name');
                        
                        // unmark active tab
-                       var oldTab = elBySel('#' + this._container.id + ' > nav > ul > li.active');
+                       var oldTab = this.getActiveTab();
                        var oldContent = null;
                        if (oldTab) {
 +                              if (elData(oldTab, 'name') === name) {
 +                                      // same tab
 +                                      return;
 +                              }
 +                              
                                oldTab.classList.remove('active');
 -                              oldContent = this._containers.get(elAttr(oldTab, 'data-name'));
 +                              oldContent = this._containers.get(elData(oldTab, 'name'));
                                oldContent.classList.remove('active');
                                oldContent.classList.add('hidden');
                                

diff --cc wcfsetup/install/files/lib/data/user/UserAction.class.php
index e2c4b1e2ec6092e7c8008be09c9aca90a7457c25,c04935cb9c72dcfdf3c52265f5fbf21487ca69a6..42c49bd970b5c99e68152bde60220a743432faf2
--- 1/wcfsetup/install/files/lib/data/user/UserAction.class.php
--- 2/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@@ -302,10 -302,10 +302,10 @@@ class UserAction extends AbstractDataba
        }
        
        /**
 -       * @see \wcf\data\AbstractDatabaseObjectAction::update()
 +       * @inheritDoc
         */
        public function update() {
-               if (isset($this->parameters['data'])) {
+               if (isset($this->parameters['data']) || isset($this->parameters['counters'])) { 
                        parent::update();
                        
                        if (isset($this->parameters['data']['languageID'])) {

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

diff --cc wcfsetup/install/lang/en.xml
index 7db8a801c4fd7dcb0bfc4588aa0270887ba1791d,2fb80718566ef99b1179ea883884ea587741dbf6..d825ff28f698c53ff28df8a0bcb9a9bb6e6cf648
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -633,13 -637,13 +633,13 @@@ Examples for medium ID detection
                <item name="wcf.acp.menu.link.group.assignment"><![CDATA[Automatic Assignments]]></item>
                <item name="wcf.acp.menu.link.notice"><![CDATA[Notices]]></item>
                <item name="wcf.acp.menu.link.notice.add"><![CDATA[Add Notice]]></item>
 -              <item name="wcf.acp.menu.link.notice.list"><![CDATA[List Notices]]></item>
 +              <item name="wcf.acp.menu.link.notice.list"><![CDATA[Notices]]></item>
-               <item name="wcf.acp.menu.link.ad"><![CDATA[Ad]]></item>
+               <item name="wcf.acp.menu.link.ad"><![CDATA[Ads]]></item>
                <item name="wcf.acp.menu.link.ad.add"><![CDATA[Add Ad]]></item>
 -              <item name="wcf.acp.menu.link.ad.list"><![CDATA[List Ads]]></item>
 +              <item name="wcf.acp.menu.link.ad.list"><![CDATA[Ads]]></item>
                <item name="wcf.acp.menu.link.captcha"><![CDATA[Captchas]]></item>
                <item name="wcf.acp.menu.link.captcha.question.add"><![CDATA[Add Question]]></item>
 -              <item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[List Questions]]></item>
 +              <item name="wcf.acp.menu.link.captcha.question.list"><![CDATA[Questions]]></item>
                <item name="wcf.acp.menu.link.log.authentication.failure"><![CDATA[Failed Login Attempts]]></item>
                <item name="wcf.acp.menu.link.paidSubscription"><![CDATA[Paid Subscriptions]]></item>
                <item name="wcf.acp.menu.link.paidSubscription.list"><![CDATA[List Paid Subscriptions]]></item>
@@@ -1935,9 -1936,8 +1936,9 @@@ Errors are
                <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.media.marked"><![CDATA[{#$count} File{if $count != 1}s{/if} marked]]></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.label.com.woltlab.wcf.media.marked"><![CDATA[{if $count == 1}One File{else}{#$count} Files{/if} marked]]></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">