Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/messageSidebar.tpl
Simple merge

diff --cc com.woltlab.wcf/templates/register.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/comment/CommentAction.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/data/user/UserProfile.class.php
index 1e2d9fc868a05e3397c2943d8c1d377c28be3553,405e7c7fc6fe0ddddb95bb426624ebd06f777a36..f89088afb787a3762bd661edfd9be9b6f77eca72
--- 1/wcfsetup/install/files/lib/data/user/UserProfile.class.php
--- 2/wcfsetup/install/files/lib/data/user/UserProfile.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserProfile.class.php
@@@ -709,9 -709,9 +709,10 @@@ class UserProfile extends DatabaseObjec
         * @return      boolean
         */
        public function showSignature() {
+               if (!MODULE_USER_SIGNATURE) return false;
                if (!$this->signature) return false;
                if ($this->disableSignature) return false;
 +              if ($this->banned) return false;
                if (WCF::getUser()->userID && !WCF::getUser()->showSignature) return false;
                
                return true;

diff --cc wcfsetup/install/lang/en.xml
index d43fbba8ba2ecf5c7b19f7cf3e0bf76aa50b57b8,da8ddc24234383c619272e8555b7701bd07233e9..6352472ed564e9572f514f9d6eb3a9c4db18cee7
--- 1/wcfsetup/install/lang/en.xml
--- 2/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -2076,13 -2035,9 +2076,13 @@@ Allowed extensions: {', '|implode:$atta
                <item name="wcf.captcha.recaptchaV2.error.recaptchaString.false"><![CDATA[Please confirm that you are not a robot.]]></item>
        </category>
        
 +      <category name="wcf.captcha.recaptchaInvisible">
 +              <item name="wcf.captcha.recaptchaInvisible.error.recaptchaString.false"><![CDATA[The check failed, please re-submit the form.]]></item>
 +      </category>
 +      
        <category name="wcf.category">
                <item name="wcf.category.add"><![CDATA[Add Category]]></item>
-               <item name="wcf.category.button.list"><![CDATA[List Categories]]></item>
+               <item name="wcf.category.button.list"><![CDATA[Categories]]></item>
                <item name="wcf.category.delete.sure"><![CDATA[Do you really want to delete this category?]]></item>
                <item name="wcf.category.edit"><![CDATA[Edit Category]]></item>
                <item name="wcf.category.isDisabled"><![CDATA[Disable Category]]></item>