Merge branch '5.2' into 5.3

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

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

diff --cc com.woltlab.wcf/templates/registerActivation.tpl
index b7c87f54e2b3c51f2099b3cd76be651df55f1745,c49aed9a96713d9bea0aac8c8bd6b474a9314833..f135cf460799bbdd3b590b88de277eb52a30cef5
--- 1/com.woltlab.wcf/templates/registerActivation.tpl
--- 2/com.woltlab.wcf/templates/registerActivation.tpl
+++ b/com.woltlab.wcf/templates/registerActivation.tpl
@@@ -21,10 -25,14 +25,14 @@@
                <dl{if $errorField == 'activationCode'} class="formError"{/if}>
                        <dt><label for="activationCode">{lang}wcf.user.activationCode{/lang}</label></dt>
                        <dd>
 -                              <input type="text" id="activationCode" maxlength="9" name="activationCode" value="{@$activationCode}" required class="medium">
 +                              <input type="text" id="activationCode" maxlength="40" name="activationCode" value="{@$activationCode}" required class="medium">
                                {if $errorField == 'activationCode'}
                                        <small class="innerError">
-                                               {if $errorType == 'invalid'}{lang}wcf.user.activationCode.error.invalid{/lang}{/if}
+                                               {if $errorType == 'empty'}
+                                                       {lang}wcf.global.form.error.empty{/lang}
+                                               {else}
+                                                       {lang}wcf.user.activationCode.error.{@$errorType}{/lang}
+                                               {/if}
                                        </small>
                                {/if}
                                <small><a href="{link controller='RegisterNewActivationCode'}{/link}">{lang}wcf.user.newActivationCode{/lang}</a></small>