Merge branch '5.3'

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

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

diff --cc com.woltlab.wcf/templates/pageHeaderUser.tpl
index ce657cdb2c40a395e78d6f2e560dd2e9e1f92146,14009f1a208dfa4f0eb91092fd2e6767bc06a0b4..d2aaabfc62d2ff2040f9d85d4771ade09f1315cf
--- 1/com.woltlab.wcf/templates/pageHeaderUser.tpl
--- 2/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@@ -71,7 -71,7 +71,7 @@@
                                                        {event name='userMenuItemsAfter'}
                                                </ul>
                                        </div>
-                                       <a class="interactiveDropdownShowAll" href="{link controller='Logout'}t={csrfToken type=url}{/link}" onclick="WCF.Dropdown.Interactive.Handler.close('userMenu'); WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a>
 -                                      <a class="interactiveDropdownShowAll" href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.Dropdown.Interactive.Handler.close('userMenu'); WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a>
++                                      <a class="interactiveDropdownShowAll" href="{link controller='Logout'}t={csrfToken type=url}{/link}" onclick="WCF.Dropdown.Interactive.Handler.close('userMenu'); WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a>
                                </div>
                                <script data-relocate="true">
                                        $(function() {

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

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

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

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

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

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

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

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

diff --cc wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 77a2073e6cacb0a0731726afdef8a22652e66959,a510b43a7c07f0de1b3a1b7a99308ff7af0f10fe..234c05b93737a5cee8404c6a6fc13592e4ab2b5d
--- 1/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
--- 2/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@@ -12,7 -12,7 +12,7 @@@
                                                {event name='userMenuItems'}
                                                
                                                <li class="dropdownDivider"></li>
-                                               <li><a href="{link controller='Logout'}t={csrfToken type=url}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
 -                                              <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
++                                              <li><a href="{link controller='Logout'}t={csrfToken type=url}{/link}" onclick="WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
                                        </ul>
                                </li>
                                

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

diff --cc wcfsetup/install/files/acp/templates/sitemapList.tpl
index 83dd09ef8d753b208ab27c6cff7cb57761036bba,67163ebc978bc5c2c9e719bec921c1f368ff75bd..6bde07ae6f0f1a5e2a54039cb54c4ed5aaf5a2e2
--- 1/wcfsetup/install/files/acp/templates/sitemapList.tpl
--- 2/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@@ -72,10 -72,10 +72,10 @@@
  
  <script data-relocate="true">
        require(['Language'], function(Language) {
-               Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+               Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
                
 -              elById('sitemapRebuildButton').addEventListener(WCF_CLICK_EVENT, function () {
 +              elById('sitemapRebuildButton').addEventListener('click', function () {
-                       new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}', {
+                       new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{jslang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/jslang}', {
                                forceRebuild: true
                        });
                });

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

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

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

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

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

diff --cc wcfsetup/install/files/lib/system/WCF.class.php
Simple merge

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