Merge branch 'refs/heads/master' into enhancement/categoryLangVar

Conflicts:
	wcfsetup/install/files/acp/templates/categoryAdd.tpl

diff --cc wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 417ca25c69995bf5a57ecfcb728ecadadc5f832f,ebfa4e4fc32ae895dc62c905ffe432abeb942b19..3c6d35943a5a3d8b2efc1733ed6d4719228f3adf
--- 1/wcfsetup/install/files/acp/templates/categoryAdd.tpl
--- 2/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@@ -54,7 -59,7 +54,7 @@@
  <form method="post" action="{if $action == 'add'}{link controller=$addController}{/link}{else}{link controller=$editController id=$category->categoryID title=$category->getTitle()}{/link}{/if}">
        <div class="container containerPadding marginTop shadow">
                <fieldset>
-                       <legend>{@$objectType->getProcessor()->getLanguageVariable('data')}</legend>
 -                      <legend>{hascontent}{content}{lang __optional=true}{@$objectType->getProcessor()->getLangVarPrefix()}.data{/lang}{/content}{hascontentelse}{lang}wcf.global.form.data{/lang}{/hascontent}</legend>
++                      <legend>{lang}wcf.global.form.data{/lang}</legend>
                        
                        {if $categoryNodeList|count}
                                <dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>