From f5ecf730bc84272997eb87ec8e6185f12adf8848 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 28 Jun 2016 15:57:49 +0200
Subject: [PATCH] Added some missing language variables / unified language
 variables

---
 .../install/files/acp/templates/adAdd.tpl     |  2 +-
 .../install/files/acp/templates/boxAdd.tpl    | 77 +++++++++----------
 .../files/acp/templates/boxAddDialog.tpl      |  6 +-
 .../install/files/acp/templates/boxList.tpl   | 14 ++--
 .../install/files/acp/templates/labelAdd.tpl  |  2 +-
 .../files/acp/templates/labelGroupAdd.tpl     |  2 +-
 .../install/files/acp/templates/menuAdd.tpl   |  2 +-
 .../files/acp/templates/menuItemAdd.tpl       |  4 +-
 .../install/files/acp/templates/noticeAdd.tpl |  2 +-
 .../acp/templates/paidSubscriptionAdd.tpl     |  2 +-
 .../install/files/acp/templates/smileyAdd.tpl |  2 +-
 .../files/acp/templates/userOptionAdd.tpl     |  2 +-
 .../acp/templates/userOptionCategoryAdd.tpl   |  2 +-
 .../WCF/Acp/Ui/Box/Controller/Handler.js      | 24 +-----
 .../files/lib/acp/page/BoxListPage.class.php  |  9 +--
 wcfsetup/install/lang/de.xml                  | 40 ++++++----
 wcfsetup/install/lang/en.xml                  | 40 ++++++----
 17 files changed, 121 insertions(+), 111 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index 72fca849ed..98049900b8 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -100,7 +100,7 @@
 		</dl>
 		
 		<dl>
-			<dt><label for="showOrder">{lang}wcf.acp.ad.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
 				<small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index aeaa1087d0..2a55a88eba 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -4,18 +4,13 @@
 	<script data-relocate="true">
 		{include file='mediaJavaScript'}
 		
-		require(['WoltLab/WCF/Acp/Ui/Box/Controller/Handler', 'WoltLab/WCF/Media/Manager/Select'], function(AcpUiBoxControllerHandler, MediaManagerSelect) {
-			AcpUiBoxControllerHandler.init({if $boxController}{@$boxController->objectTypeID}{/if});
-			
-			new MediaManagerSelect({
-				dialogTitle: '{lang}wcf.acp.box.image.dialog.title{/lang}',
-				fileTypeFilters: {
-					isImage: 1
-				}
+		{if $boxType == 'system'}
+			require(['WoltLab/WCF/Acp/Ui/Box/Controller/Handler'], function(AcpUiBoxControllerHandler) {
+				AcpUiBoxControllerHandler.init({if $boxController}{@$boxController->objectTypeID}{/if});
 			});
-		});
+		{/if}
 		
-		require(['Dictionary', 'Language', 'WoltLab/WCF/Acp/Ui/Box/Handler'], function(Dictionary, Language, AcpUiBoxHandler) {
+		require(['Dictionary', 'Language', 'WoltLab/WCF/Acp/Ui/Box/Handler', 'WoltLab/WCF/Media/Manager/Select'], function(Dictionary, Language, AcpUiBoxHandler, MediaManagerSelect) {
 			Language.addObject({
 				'wcf.page.pageObjectID.search.noResults': '{lang}wcf.page.pageObjectID.search.noResults{/lang}',
 				'wcf.page.pageObjectID.search.results': '{lang}wcf.page.pageObjectID.search.results{/lang}',
@@ -30,6 +25,13 @@
 			{/foreach}
 			
 			AcpUiBoxHandler.init(handlers);
+			
+			new MediaManagerSelect({
+				dialogTitle: '{lang}wcf.acp.box.image.dialog.title{/lang}',
+				fileTypeFilters: {
+					isImage: 1
+				}
+			});
 		});
 	</script>
 {/if}
@@ -60,8 +62,8 @@
 			<ul>
 				<li><a href="{@$__wcf->getAnchor('general')}">{lang}wcf.global.form.data{/lang}</a></li>
 				<li><a href="{@$__wcf->getAnchor('contents')}">{lang}wcf.acp.box.contents{/lang}</a></li>
-				<li><a href="{@$__wcf->getAnchor('pages')}">{lang}wcf.acp.box.pages{/lang}</a></li>
-				<li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acp.box.acl{/lang}</a></li>
+				<li><a href="{@$__wcf->getAnchor('pages')}">{lang}wcf.acp.page.list{/lang}</a></li>
+				<li><a href="{@$__wcf->getAnchor('acl')}">{lang}wcf.acl.access{/lang}</a></li>
 				
 				{event name='tabMenuTabs'}
 			</ul>
@@ -85,27 +87,6 @@
 					</dd>
 				</dl>
 				
-				<dl{if $errorField == 'boxType'} class="formError"{/if}>
-					<dt><label for="boxType">{lang}wcf.acp.box.boxType{/lang}</label></dt>
-					<dd>
-						<select name="boxType" id="boxType" readonly>
-							{foreach from=$availableBoxTypes item=availableBoxType}
-								<option value="{@$availableBoxType}"{if $availableBoxType == $boxType} selected{/if}>{lang}wcf.acp.box.boxType.{@$availableBoxType}{/lang}</option>
-							{/foreach}
-						</select>
-						
-						{if $errorField == 'boxType'}
-							<small class="innerError">
-								{if $errorType == 'empty'}
-									{lang}wcf.global.form.error.empty{/lang}
-								{else}
-									{lang}wcf.acp.box.boxType.error.{@$errorType}{/lang}
-								{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
-				
 				<dl id="boxControllerContainer"{if $errorField == 'boxControllerID'} class="formError"{/if}{if !$boxController} style="display: none;"{/if}>
 					<dt><label for="boxControllerID">{lang}wcf.acp.box.boxController{/lang}</label></dt>
 					<dd>
@@ -132,7 +113,7 @@
 					<dd>
 						<select name="position" id="position">
 							{foreach from=$availablePositions item=availablePosition}
-								<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{lang}wcf.acp.box.position.{@$availablePosition}{/lang}</option>
+								<option value="{@$availablePosition}"{if $availablePosition == $position} selected{/if}>{@$availablePosition}</option>
 							{/foreach}
 						</select>
 						
@@ -149,7 +130,7 @@
 				</dl>
 				
 				<dl>
-					<dt><label for="showOrder">{lang}wcf.acp.box.showOrder{/lang}</label></dt>
+					<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 					<dd>
 						<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0">
 					</dd>
@@ -192,7 +173,7 @@
 				</dl>
 				
 				<dl id="linkPageIDContainer"{if $errorField == 'linkPageID'} class="formError"{/if}{if $linkType != 'internal'} style="display: none;"{/if}>
-					<dt><label for="linkPageID">{lang}wcf.acp.box.linkPageID{/lang}</label></dt>
+					<dt><label for="linkPageID">{lang}wcf.acp.page.page{/lang}</label></dt>
 					<dd>
 						<select name="linkPageID" id="linkPageID">
 							<option value="0">{lang}wcf.global.noSelection{/lang}</option>
@@ -214,7 +195,7 @@
 				</dl>
 				
 				<dl id="linkPageObjectIDContainer"{if $errorField == 'linkPageObjectID'} class="formError"{/if}{if !$linkPageID || !$pageHandler[$linkPageID]|isset} style="display: none;"{/if}>
-					<dt><label for="linkPageObjectID">{lang}wcf.acp.box.linkPageObjectID{/lang}</label></dt>
+					<dt><label for="linkPageObjectID">{lang}wcf.acp.page.objectID{/lang}</label></dt>
 					<dd>
 						<div class="inputAddon">
 							<input type="text" id="linkPageObjectID" name="linkPageObjectID" value="{$linkPageObjectID}" class="short">
@@ -235,7 +216,7 @@
 				<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $linkType != 'external'} style="display: none;"{/if}>
 					<dt><label for="externalURL">{lang}wcf.acp.box.link.externalURL{/lang}</label></dt>
 					<dd>
-						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255">
+						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255" placeholder="http://">
 						{if $errorField == 'externalURL'}
 							<small class="innerError">
 								{if $errorType == 'empty'}
@@ -287,7 +268,7 @@
 					{/if}
 					
 					<dl{if $errorField == 'title'} class="formError"{/if}>
-						<dt><label for="title0">{lang}wcf.acp.box.title{/lang}</label></dt>
+						<dt><label for="title0">{lang}wcf.global.title{/lang}</label></dt>
 						<dd>
 							<input type="text" id="title0" name="title[0]" value="{if !$title[0]|empty}{$title[0]}{/if}" class="long" maxlength="255">
 							{if $errorField == 'title'}
@@ -407,11 +388,26 @@
 					<dt></dt>
 					<dd>
 						<label><input type="checkbox" id="visibleEverywhere" name="visibleEverywhere" value="1"{if $visibleEverywhere} checked{/if}> {lang}wcf.acp.box.visibleEverywhere{/lang}</label>
+						<script data-relocate="true">
+							elById('visibleEverywhere').addEventListener('change', function() {
+								if (this.checked) {
+									elShow(elById('visibilityExceptionHidden'));
+									elHide(elById('visibilityExceptionVisible'));
+								}
+								else {
+									elHide(elById('visibilityExceptionHidden'));
+									elShow(elById('visibilityExceptionVisible'));
+								} 
+							});
+						</script>
 					</dd>
 				</dl>
 				
 				<dl>
-					<dt>{lang}wcf.acp.box.pageIDs{/lang}</dt>
+					<dt>
+						<span id="visibilityExceptionVisible"{if $visibleEverywhere} style="display: none"{/if}>{lang}wcf.acp.box.visibilityException.visible{/lang}</span>
+						<span id="visibilityExceptionHidden"{if !$visibleEverywhere} style="display: none"{/if}>{lang}wcf.acp.box.visibilityException.hidden{/lang}</span>
+					</dt>
 					<dd>
 						<ul class="scrollableCheckboxList">
 							{foreach from=$pageNodeList item=pageNode}
@@ -433,6 +429,7 @@
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		<input type="hidden" name="isMultilingual" value="{@$isMultilingual}">
+		<input type="hidden" name="boxType" value="{$boxType}">
 		{@SECURITY_TOKEN_INPUT_TAG}
 	</div>
 </form>
diff --git a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
index 09306be160..11dc7243f5 100644
--- a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
@@ -30,7 +30,11 @@
 	</div>
 </div>
 <script data-relocate="true">
-	require(['WoltLab/WCF/Acp/Ui/Box/Add'], function(AcpUiBoxAdd) {
+	require(['Language', 'WoltLab/WCF/Acp/Ui/Box/Add'], function(Language, AcpUiBoxAdd) {
+		Language.addObject({
+			'wcf.acp.box.add': '{lang}wcf.acp.box.add{/lang}'
+		});
+		
 		AcpUiBoxAdd.init('{link controller='BoxAdd' encode=false}{literal}boxType={$boxType}&isMultilingual={$isMultilingual}{/literal}{/link}');
 		
 		{if $showBoxAddDialog}
diff --git a/wcfsetup/install/files/acp/templates/boxList.tpl b/wcfsetup/install/files/acp/templates/boxList.tpl
index fdcd354f6a..6fcdf39076 100644
--- a/wcfsetup/install/files/acp/templates/boxList.tpl
+++ b/wcfsetup/install/files/acp/templates/boxList.tpl
@@ -37,7 +37,7 @@
 			<dl class="col-xs-12 col-md-4">
 				<dt></dt>
 				<dd>
-					<input type="text" id="boxTitle" name="title" value="{$title}" placeholder="{lang}wcf.acp.box.title{/lang}" class="long">
+					<input type="text" id="boxTitle" name="title" value="{$title}" placeholder="{lang}wcf.global.title{/lang}" class="long">
 				</dd>
 			</dl>
 			
@@ -67,9 +67,11 @@
 				<dd>
 					<label class="selectDropdown">
 						<select name="boxType" id="boxType">
-							<option value="">{lang}wcf.acp.box.boxType{/lang}</option>
-							<option value="static"{if $boxType == 'static'} selected{/if}>{lang}wcf.acp.box.boxType.static{/lang}</option>
-							<option value="system"{if $boxType == 'system'} selected{/if}>{lang}wcf.acp.box.boxType.system{/lang}</option>
+							<option value="">{lang}wcf.acp.box.type{/lang}</option>
+							<option value="text"{if $boxType == 'text'} selected{/if}>{lang}wcf.acp.box.type.text{/lang}</option>
+							<option value="html"{if $boxType == 'html'} selected{/if}>{lang}wcf.acp.box.type.html{/lang}</option>
+							<option value="tpl"{if $boxType == 'tpl'} selected{/if}>{lang}wcf.acp.box.type.tpl{/lang}</option>
+							<option value="system"{if $boxType == 'system'} selected{/if}>{lang}wcf.acp.box.type.system{/lang}</option>
 						</select>
 					</label>
 				</dd>
@@ -107,7 +109,7 @@
 				<tr>
 					<th class="columnPageID{if $sortField == 'boxID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='BoxList'}pageNo={@$pageNo}&sortField=boxID&sortOrder={if $sortField == 'boxID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnName{if $sortField == 'name'} active {@$sortOrder}{/if}"><a href="{link controller='BoxList'}pageNo={@$pageNo}&sortField=name&sortOrder={if $sortField == 'name' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.global.name{/lang}</a></th>
-					<th class="columnText columnBoxType{if $sortField == 'boxType'} active {@$sortOrder}{/if}"><a href="{link controller='BoxList'}pageNo={@$pageNo}&sortField=boxType&sortOrder={if $sortField == 'boxType' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.acp.box.boxType{/lang}</a></th>
+					<th class="columnText columnBoxType{if $sortField == 'boxType'} active {@$sortOrder}{/if}"><a href="{link controller='BoxList'}pageNo={@$pageNo}&sortField=boxType&sortOrder={if $sortField == 'boxType' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.acp.box.type{/lang}</a></th>
 					<th class="columnText columnPosition{if $sortField == 'position'} active {@$sortOrder}{/if}"><a href="{link controller='BoxList'}pageNo={@$pageNo}&sortField=position&sortOrder={if $sortField == 'position' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@$linkParameters}{/link}">{lang}wcf.acp.box.position{/lang}</a></th>
 					
 					{event name='columnHeads'}
@@ -120,7 +122,7 @@
 						<td class="columnIcon">
 							<a href="{link controller='BoxEdit' id=$box->boxID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 							{if $box->canDelete()}
-								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$box->boxID}" data-confirm-message="{lang}wcf.acp.box.delete.confirmMessage{/lang}"></span>
+								<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$box->boxID}" data-confirm-message-html="{lang __encode=true}wcf.acp.box.delete.confirmMessage{/lang}"></span>
 							{else}
 								<span class="icon icon16 fa-times disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index cee8f37740..9f92474bdc 100644
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -81,7 +81,7 @@
 			{include file='multipleLanguageInputJavascript' elementIdentifier='label' forceSelection=false}
 			
 			<dl>
-				<dt><label for="showOrder">{lang}wcf.acp.label.showOrder{/lang}</label></dt>
+				<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 				<dd>
 					<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}">
 					<small>{lang}wcf.acp.label.showOrder.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index a70515a623..07db3c77a6 100644
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -78,7 +78,7 @@
 				</dl>
 				
 				<dl>
-					<dt><label for="showOrder">{lang}wcf.acp.label.group.showOrder{/lang}</label></dt>
+					<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 					<dd>
 						<input type="number" min="0" id="showOrder" name="showOrder" class="tiny" value="{if $showOrder}{@$showOrder}{/if}">
 					</dd>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 864c4d0140..c157dfd380 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -66,7 +66,7 @@
 			</dl>
 			
 			<dl>
-				<dt><label for="showOrder">{lang}wcf.acp.box.showOrder{/lang}</label></dt>
+				<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 				<dd>
 					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="tiny" min="0">
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 4b3f25eef9..e946f90e3f 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -139,7 +139,7 @@
 		<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $isInternalLink} style="display: none;"{/if}>
 			<dt><label for="externalURL">{lang}wcf.acp.menu.item.externalURL{/lang}</label></dt>
 			<dd>
-				<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long">
+				<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255" placeholder="http://">
 				{if $errorField == 'externalURL'}
 					<small class="innerError">
 						{if $errorType == 'empty'}
@@ -161,7 +161,7 @@
 		<h2 class="sectionTitle">{lang}wcf.acp.menu.item.advanced{/lang}</h2>
 		
 		<dl>
-			<dt><label for="showOrder">{lang}wcf.acp.menu.item.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0">
 			</dd>
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 8d41d71b00..0e6e9c9528 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -87,7 +87,7 @@
 		</dl>
 		
 		<dl>
-			<dt><label for="showOrder">{lang}wcf.acp.notice.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
 				<small>{lang}wcf.acp.notice.showOrder.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
index ac76524bae..12d2563f13 100644
--- a/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/paidSubscriptionAdd.tpl
@@ -76,7 +76,7 @@
 		</dl>
 		
 		<dl>
-			<dt><label for="showOrder">{lang}wcf.acp.paidSubscription.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" id="showOrder" name="showOrder" value="{if $showOrder}{@$showOrder}{/if}" class="tiny" min="0">
 				<small>{lang}wcf.acp.paidSubscription.showOrder.description{/lang}</small>
diff --git a/wcfsetup/install/files/acp/templates/smileyAdd.tpl b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
index 571ca95866..e77787827e 100644
--- a/wcfsetup/install/files/acp/templates/smileyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyAdd.tpl
@@ -91,7 +91,7 @@
 		</dl>
 		
 		<dl{if $errorField == 'showOrder'} class="formError"{/if}>
-			<dt><label for="showOrder">{lang}wcf.acp.smiley.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" min="0" class="short">
 				
diff --git a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
index cd180d3a72..88fd8b2997 100644
--- a/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionAdd.tpl
@@ -84,7 +84,7 @@
 			</dl>
 			
 			<dl>
-				<dt><label for="showOrder">{lang}wcf.acp.user.option.showOrder{/lang}</label></dt>
+				<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 				<dd>
 					<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short">
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
index 64345b297e..b2f81558c3 100644
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryAdd.tpl
@@ -41,7 +41,7 @@
 		{include file='multipleLanguageInputJavascript' elementIdentifier='categoryName' forceSelection=true}
 		
 		<dl>
-			<dt><label for="showOrder">{lang}wcf.acp.user.option.category.showOrder{/lang}</label></dt>
+			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
 			<dd>
 				<input type="number" id="showOrder" name="showOrder" value="{@$showOrder}" class="short">
 			</dd>
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Box/Controller/Handler.js b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Box/Controller/Handler.js
index 860ef59157..d62bbc6cd0 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Box/Controller/Handler.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Acp/Ui/Box/Controller/Handler.js
@@ -9,7 +9,6 @@
 define(['Ajax', 'Dictionary'], function(Ajax, Dictionary) {
 	"use strict";
 	
-	var _boxType = elById('boxType');
 	var _boxControllerContainer = elById('boxControllerContainer');
 	var _boxController = elById('boxControllerID');
 	var _boxConditions = elById('boxConditions');
@@ -20,14 +19,15 @@ define(['Ajax', 'Dictionary'], function(Ajax, Dictionary) {
 	 */
 	return {
 		init: function(initialObjectTypeId) {
-			_boxType.addEventListener('change', this._updateControllers.bind(this));
 			_boxController.addEventListener('change', this._updateConditions.bind(this));
 			
 			if (initialObjectTypeId) {
 				_templates.set(~~initialObjectTypeId, _boxConditions.innerHTML);
 			}
 			
-			this._updateControllers();
+			elShow(_boxControllerContainer);
+			
+			this._updateConditions();
 		},
 		
 		/**
@@ -77,24 +77,6 @@ define(['Ajax', 'Dictionary'], function(Ajax, Dictionary) {
 					}
 				});
 			}
-		},
-		
-		/**
-		 * Shows or hides the list of dynamic box controllers based on the selected box type.
-		 * 
-		 * @protected
-		 */
-		_updateControllers: function() {
-			if (_boxType.value === 'system') {
-				elShow(_boxControllerContainer);
-				
-				this._updateConditions();
-			}
-			else {
-				elHide(_boxControllerContainer);
-				
-				_boxConditions.innerHTML = '';
-			}
 		}
 	};
 });
diff --git a/wcfsetup/install/files/lib/acp/page/BoxListPage.class.php b/wcfsetup/install/files/lib/acp/page/BoxListPage.class.php
index fa38cfb0fc..9b83c9d8fd 100644
--- a/wcfsetup/install/files/lib/acp/page/BoxListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/BoxListPage.class.php
@@ -65,7 +65,7 @@ class BoxListPage extends SortablePage {
 	 * box type
 	 * @var string
 	 */
-	public $boxType = 'static';
+	public $boxType = '';
 	
 	/**
 	 * box position
@@ -114,11 +114,8 @@ class BoxListPage extends SortablePage {
 		if (!empty($this->position)) {
 			$this->objectList->getConditionBuilder()->add('box.position = ?', [$this->position]);
 		}
-		if ($this->boxType == 'static') {
-			$this->objectList->getConditionBuilder()->add('box.boxType IN (?, ?, ?)', ['text', 'html', 'tpl']);
-		}
-		else if ($this->boxType == 'system') {
-			$this->objectList->getConditionBuilder()->add('box.boxType IN (?)', ['system']);
+		if (!empty($this->boxType)) {
+			$this->objectList->getConditionBuilder()->add('box.boxType = ?', [$this->boxType]);
 		}
 	}
 	
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3444537bfc..5ad054ec10 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -44,7 +44,6 @@
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.top"><![CDATA[Sidebar (oben)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.bottom"><![CDATA[Sidebar (unten)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.footer.bottom"><![CDATA[Seitenende]]></item>
-		<item name="wcf.acp.ad.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.ad.showOrder.description"><![CDATA[Legt die Reihenfolge fest, in der die Werbung angezeigt werden.]]></item>
 	</category>
 	
@@ -142,7 +141,32 @@
 	</category>
 	
 	<category name="wcf.acp.box">
+		<item name="wcf.acp.box.add"><![CDATA[Box hinzufügen]]></item>
+		<item name="wcf.acp.box.content"><![CDATA[Inhalt]]></item>
+		<item name="wcf.acp.box.contents"><![CDATA[Inhalte]]></item>
+		<item name="wcf.acp.box.cssClassName"><![CDATA[CSS-Klassen]]></item>
+		<item name="wcf.acp.box.delete.confirmMessage"><![CDATA[Wollen Sie die Box <span class="confirmationObject">{$box->name}</span> wirklich löschen?]]></item>
+		<item name="wcf.acp.box.edit"><![CDATA[Box bearbeiten]]></item>
+		<item name="wcf.acp.box.image"><![CDATA[Box-Bild]]></item>
+		<item name="wcf.acp.box.i18n"><![CDATA[Mehrsprachigkeit]]></item>
+		<item name="wcf.acp.box.i18n.i18n"><![CDATA[Mehrsprachige Box]]></item>
+		<item name="wcf.acp.box.i18n.none"><![CDATA[Einsprachige Box]]></item>
+		<item name="wcf.acp.box.link"><![CDATA[Verlinkung]]></item>
+		<item name="wcf.acp.box.linkType.none"><![CDATA[Keine]]></item>
+		<item name="wcf.acp.box.linkType.internal"><![CDATA[Interner Link]]></item>
+		<item name="wcf.acp.box.linkType.external"><![CDATA[Externer Link]]></item>
+		<item name="wcf.acp.box.link.externalURL"><![CDATA[Externe URL]]></item>
 		<item name="wcf.acp.box.list"><![CDATA[Boxen]]></item>
+		<item name="wcf.acp.box.position"><![CDATA[Position]]></item>
+		<item name="wcf.acp.box.showHeader"><![CDATA[Box-Titel anzeigen]]></item>
+		<item name="wcf.acp.box.type"><![CDATA[Box-Typ]]></item>
+		<item name="wcf.acp.box.type.html"><![CDATA[HTML]]></item>
+		<item name="wcf.acp.box.type.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.box.type.text"><![CDATA[Text]]></item>
+		<item name="wcf.acp.box.type.tpl"><![CDATA[Template]]></item>
+		<item name="wcf.acp.box.visibleEverywhere"><![CDATA[Box überall sichtbar]]></item>
+		<item name="wcf.acp.box.visibilityException.visible"><![CDATA[Box auf ausgewählten Seiten <strong>explizit anzeigen</strong>]]></item>
+		<item name="wcf.acp.box.visibilityException.hidden"><![CDATA[Box auf ausgewählten Seiten <strong>nicht anzeigen</strong>]]></item>
 	</category>
 	
 	<category name="wcf.acp.cache">
@@ -509,12 +533,10 @@
 		<item name="wcf.acp.label.group.error.notValid"><![CDATA[Die gewählte Labelgruppe ist ungültig.]]></item>
 		<item name="wcf.acp.label.group.forceSelection"><![CDATA[Label aus dieser Gruppe muss zwingend ausgewählt werden]]></item>
 		<item name="wcf.acp.label.group.list"><![CDATA[Labelgruppen]]></item>
-		<item name="wcf.acp.label.group.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.label.label"><![CDATA[Label]]></item>
 		<item name="wcf.acp.label.list"><![CDATA[Labels]]></item>
 		<item name="wcf.acp.label.group.groupName.description"><![CDATA[Der Titel ist für alle Benutzer sichtbar, die Zugriff auf diese Labelgruppe haben.]]></item>
 		<item name="wcf.acp.label.group.groupDescription.description"><![CDATA[Die optionale Beschreibung wird nur in der Administrationsoberfläche angezeigt.]]></item>
-		<item name="wcf.acp.label.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.label.showOrder.description"><![CDATA[Reihenfolge des Labels innerhalb seiner Labelgruppe. Wenn Sie das Feld leer lassen, wird das Label an letzter Position einsortiert.]]></item>
 		<item name="wcf.acp.label.sortAfterGroupFiltering"><![CDATA[Wenn Sie die Label-Liste nur nach einer bestimmten Labelgruppe filtern, können Sie die Labels innerhalb dieser Gruppe durch Ziehen und Loslassen sortieren.]]></item>
 		<item name="wcf.acp.label.filter"><![CDATA[Filter]]></item>
@@ -715,7 +737,6 @@
 		<item name="wcf.acp.notice.noticeUseHtml"><![CDATA[HTML im Hinweis verwenden]]></item>
 		<item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Ausgeblendete Hinweise erneut anzeigen]]></item>
 		<item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[Der Hinweis wird jenen Benutzern wieder angezeigt, die die ursprüngliche Version bereits ausgeblendet haben. Gästen, die den Hinweis bereits ausgeblendet haben, wird dieser nur in einer neuen Session erneut angezeigt.]]></item>
-		<item name="wcf.acp.notice.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.acp.notice.showOrder.description"><![CDATA[Legt die Reihenfolge fest, in der die Hinweise angezeigt werden.]]></item>
 	</category>
 	
@@ -1261,6 +1282,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
 		<item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
 		<item name="wcf.acp.page.name.error.notUnique"><![CDATA[Dieser Name wird bereits von einer anderen Seite verwendet.]]></item>
+		<item name="wcf.acp.page.page"><![CDATA[Seite]]></item>
 		<item name="wcf.acp.page.parentPage"><![CDATA[Übergeordnete Seite]]></item>
 		<item name="wcf.acp.page.parentPage.none"><![CDATA[Keine]]></item>
 		<item name="wcf.acp.page.type"><![CDATA[Seiten-Typ]]></item>
@@ -1284,7 +1306,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLengthUnit.M"><![CDATA[Monat(e)]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLengthUnit.Y"><![CDATA[Jahr(e)]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLength.error.invalid"><![CDATA[Sie haben eine ungültige Laufzeit eingegeben. Für die Auswahl „Tage“ liegt der zulässige Maximalwert bei 90, für „Monate“ bei 24 und für „Jahre“ bei fünf.]]></item>
-		<item name="wcf.acp.paidSubscription.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.paidSubscription.showOrder.description"><![CDATA[Legt die Reihenfolge fest, in der die bezahlten Mitgliedschaften angezeigt werden.]]></item>
 		<item name="wcf.acp.paidSubscription.isDisabled"><![CDATA[Mitgliedschaft deaktivieren]]></item>
 		<item name="wcf.acp.paidSubscription.isDisabled.description"><![CDATA[Entfernt diese bezahlte Mitgliedschaft aus dem Angebot.]]></item>
@@ -1451,7 +1472,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.smiley.smileyPath"><![CDATA[Smiley-Pfad]]></item>
 		<item name="wcf.acp.smiley.smileyPath.description"><![CDATA[Der Smiley-Pfad wird relativ zu „{$__wcf->getPath()}“ interpretiert.]]></item>
 		<item name="wcf.acp.smiley.smileyPath.error.notFound"><![CDATA[Es wurde keine Datei unter dem angegebenen Pfad gefunden]]></item>
-		<item name="wcf.acp.smiley.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.acp.smiley.smileyFile"><![CDATA[Smiley-Datei]]></item>
 		<item name="wcf.acp.smiley.fileUpload"><![CDATA[Smiley hochladen]]></item>
 		<item name="wcf.acp.smiley.fileUpload.description"><![CDATA[Laden Sie hier die Bilddatei des Smileys hoch.]]></item>
@@ -1675,7 +1695,6 @@ Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alle
 		<item name="wcf.acp.user.option.category.add"><![CDATA[Benutzerprofilfeld-Kategorie hinzufügen]]></item>
 		<item name="wcf.acp.user.option.category.delete.sure"><![CDATA[Wollen Sie die Benutzerprofilfeld-Kategorie <span class="confirmationObject">{lang}wcf.user.option.category.{$category->categoryName}{/lang}</span> wirklich löschen?]]></item>
 		<item name="wcf.acp.user.option.category.edit"><![CDATA[Benutzerprofilfeld-Kategorie bearbeiten]]></item>
-		<item name="wcf.acp.user.option.category.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.user.option.category.options"><![CDATA[Felder]]></item>
 		<item name="wcf.acp.user.option.category.list"><![CDATA[Benutzerprofilfeld-Kategorien]]></item>
 		<item name="wcf.acp.user.option.categoryName"><![CDATA[Kategorie]]></item>
@@ -1699,7 +1718,6 @@ Wenn Sie unter <em>System -&gt; Optionen -&gt; Allgemein -&gt; E-Mails</em> alle
 		<item name="wcf.acp.user.option.setDefaults"><![CDATA[Benutzerprofil-Einstellungen verwalten]]></item>
 		<item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers"><![CDATA[Änderungen auch auf bestehende Benutzerkonten anwenden]]></item>
 		<item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description"><![CDATA[Die hier eingestellten Änderungen der Vorgabewerte für Benutzerprofil-Einstellungen werden auch in bestehende Benutzerkonten übernommen. Die entsprechenden Einstellungen der Benutzer werden dabei überschrieben.]]></item>
-		<item name="wcf.acp.user.option.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.acp.user.option.validationPattern"><![CDATA[Regulärer Ausdruck zur Validierung]]></item>
 		<item name="wcf.acp.user.option.validationPattern.description"><![CDATA[Tragen Sie hier den regulären Ausdruck ein, um die Eingabe der Benutzer zu validieren.]]></item>
 		<item name="wcf.acp.user.option.list"><![CDATA[Benutzerprofilfelder]]></item>
@@ -1912,7 +1930,6 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.category.parentCategoryID"><![CDATA[Übergeordnete Kategorie]]></item>
 		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[Die ausgewählte Kategorie existiert nicht.]]></item>
 		<item name="wcf.category.position"><![CDATA[Position]]></item>
-		<item name="wcf.category.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.category.description"><![CDATA[Beschreibung]]></item>
 		<item name="wcf.category.title"><![CDATA[Titel]]></item>
 		<item name="wcf.category.button.choose"><![CDATA[Kategorien wählen]]></item>
@@ -2334,10 +2351,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.global.scrollDown"><![CDATA[Zum Seitenende]]></item>
 		<item name="wcf.global.scrollUp"><![CDATA[Zum Seitenanfang]]></item>
 		<item name="wcf.global.search.enterSearchTerm"><![CDATA[Suchbegriff eingeben]]></item>
-		<item name="wcf.global.sidebar.showLeftSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.showRightSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.hideLeftSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.hideRightSidebar"><![CDATA[]]></item>
+		<item name="wcf.global.showOrder"><![CDATA[Reihenfolge]]></item>
 		<item name="wcf.global.sortOrder.ascending"><![CDATA[aufsteigend]]></item>
 		<item name="wcf.global.sortOrder.descending"><![CDATA[absteigend]]></item>
 		<item name="wcf.global.state.closed"><![CDATA[Geschlossen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 3676669a74..71d4daa3da 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -44,7 +44,6 @@
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.top"><![CDATA[Sidebar (top)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.sidebar.bottom"><![CDATA[Sidebar (bottom)]]></item>
 		<item name="wcf.acp.ad.location.com.woltlab.wcf.footer.bottom"><![CDATA[End of Page]]></item>
-		<item name="wcf.acp.ad.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.ad.showOrder.description"><![CDATA[Sets the order in which the ads are displayed.]]></item>
 	</category>
 	
@@ -141,7 +140,32 @@ Examples for medium ID detection:
 	</category>
 	
 	<category name="wcf.acp.box">
+		<item name="wcf.acp.box.add"><![CDATA[Add Box]]></item>
+		<item name="wcf.acp.box.content"><![CDATA[Content]]></item>
+		<item name="wcf.acp.box.contents"><![CDATA[Contents]]></item>
+		<item name="wcf.acp.box.cssClassName"><![CDATA[CSS Class Name]]></item>
+		<item name="wcf.acp.box.delete.confirmMessage"><![CDATA[Do you really want to delete the box <span class="confirmationObject">{$box->name}</span>?]]></item>
+		<item name="wcf.acp.box.edit"><![CDATA[Edit Box]]></item>
+		<item name="wcf.acp.box.image"><![CDATA[Box Image]]></item>
+		<item name="wcf.acp.box.i18n"><![CDATA[Multilingualism]]></item>
+		<item name="wcf.acp.box.i18n.i18n"><![CDATA[Monolingual box]]></item>
+		<item name="wcf.acp.box.i18n.none"><![CDATA[Multilingual box]]></item>
+		<item name="wcf.acp.box.link"><![CDATA[Link]]></item>
+		<item name="wcf.acp.box.linkType.none"><![CDATA[None]]></item>
+		<item name="wcf.acp.box.linkType.internal"><![CDATA[Internal link]]></item>
+		<item name="wcf.acp.box.linkType.external"><![CDATA[External link]]></item>
+		<item name="wcf.acp.box.link.externalURL"><![CDATA[External URL]]></item>
 		<item name="wcf.acp.box.list"><![CDATA[Boxes]]></item>
+		<item name="wcf.acp.box.position"><![CDATA[Position]]></item>
+		<item name="wcf.acp.box.showHeader"><![CDATA[Show box title]]></item>
+		<item name="wcf.acp.box.type"><![CDATA[Page Type]]></item>
+		<item name="wcf.acp.box.type.html"><![CDATA[HTML]]></item>
+		<item name="wcf.acp.box.type.system"><![CDATA[System]]></item>
+		<item name="wcf.acp.box.type.text"><![CDATA[Text]]></item>
+		<item name="wcf.acp.box.type.tpl"><![CDATA[Template]]></item>
+		<item name="wcf.acp.box.visibleEverywhere"><![CDATA[Visible everywhere]]></item>
+		<item name="wcf.acp.box.visibilityException.visible"><![CDATA[Choose Where Box Will be Explicitly <strong>Visible</strong>]]></item>
+		<item name="wcf.acp.box.visibilityException.hidden"><![CDATA[Choose Where Box Will be Explicitly <strong>Hidden</strong>]]></item>
 	</category>
 	
 	<category name="wcf.acp.cache">
@@ -508,12 +532,10 @@ Examples for medium ID detection:
 		<item name="wcf.acp.label.group.error.notValid"><![CDATA[Chosen label group is invalid.]]></item>
 		<item name="wcf.acp.label.group.forceSelection"><![CDATA[Force selection of a label]]></item>
 		<item name="wcf.acp.label.group.list"><![CDATA[Label Groups]]></item>
-		<item name="wcf.acp.label.group.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.label.label"><![CDATA[Label]]></item>
 		<item name="wcf.acp.label.list"><![CDATA[Labels]]></item>
 		<item name="wcf.acp.label.group.groupName.description"><![CDATA[The title is visible for every user who can interact with the label group.]]></item>
 		<item name="wcf.acp.label.group.groupDescription.description"><![CDATA[This description is optional and only visible in the Administration Control Panel. It’s intended to help differentiate groups with the same title.]]></item>
-		<item name="wcf.acp.label.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.label.showOrder.description"><![CDATA[Display order of the label in its label group. If you leave this field empty, the label will be placed at the last position.]]></item>
 		<item name="wcf.acp.label.sortAfterGroupFiltering"><![CDATA[If you only filter the label list by a certain label group, you can sort the labels in this group using drag and drop.]]></item>
 		<item name="wcf.acp.label.filter"><![CDATA[Filter]]></item>
@@ -714,7 +736,6 @@ Examples for medium ID detection:
 		<item name="wcf.acp.notice.noticeUseHtml.description"><![CDATA[]]></item>
 		<item name="wcf.acp.notice.resetIsDismissed"><![CDATA[Dismissed notices will be displayed again.]]></item>
 		<item name="wcf.acp.notice.resetIsDismissed.description"><![CDATA[The notice will be displayed again to users who dismissed the previous version. Guests who dismissed the notice will only see it in a new session.]]></item>
-		<item name="wcf.acp.notice.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.notice.showOrder.description"><![CDATA[Sets the order in which the notices are displayed.]]></item>
 	</category>
 	
@@ -1265,7 +1286,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLengthUnit.M"><![CDATA[Month(s)]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLengthUnit.Y"><![CDATA[Year(s)]]></item>
 		<item name="wcf.acp.paidSubscription.subscriptionLength.error.invalid"><![CDATA[You have entered an invalid length. You may set a maximum of 90 for “Day(s)”, 24 for “Month(s)” or 5 for “Year(s)”.]]></item>
-		<item name="wcf.acp.paidSubscription.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.paidSubscription.showOrder.description"><![CDATA[Sets the display order for paid subscriptions.]]></item>
 		<item name="wcf.acp.paidSubscription.isDisabled"><![CDATA[Disable subscription]]></item>
 		<item name="wcf.acp.paidSubscription.isDisabled.description"><![CDATA[Disabling a subscription will make it unpurchasable.]]></item>
@@ -1432,7 +1452,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.smiley.smileyPath"><![CDATA[Smiley Path]]></item>
 		<item name="wcf.acp.smiley.smileyPath.description"><![CDATA[Smiley path is relative to “{$__wcf->getPath()}”.]]></item>
 		<item name="wcf.acp.smiley.smileyPath.error.notFound"><![CDATA[Unable to find a file on given path.]]></item>
-		<item name="wcf.acp.smiley.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.smiley.smileyFile"><![CDATA[Smiley File]]></item>
 		<item name="wcf.acp.smiley.fileUpload"><![CDATA[Upload Smiley]]></item>
 		<item name="wcf.acp.smiley.fileUpload.description"><![CDATA[Upload the image file for the smiley.]]></item>
@@ -1656,7 +1675,6 @@ You can define the default sender in <em>System -&gt; Options -&gt; General -&gt
 		<item name="wcf.acp.user.option.category.add"><![CDATA[Add Custom User Field Category]]></item>
 		<item name="wcf.acp.user.option.category.delete.sure"><![CDATA[Do you really want to delete the category <span class="confirmationObject">{lang}wcf.user.option.category.{$category->categoryName}{/lang}</span>?]]></item>
 		<item name="wcf.acp.user.option.category.edit"><![CDATA[Edit Custom User Field Category]]></item>
-		<item name="wcf.acp.user.option.category.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.user.option.category.options"><![CDATA[Fields]]></item>
 		<item name="wcf.acp.user.option.category.list"><![CDATA[Custom User Field Categories]]></item>
 		<item name="wcf.acp.user.option.categoryName"><![CDATA[Category]]></item>
@@ -1680,7 +1698,6 @@ You can define the default sender in <em>System -&gt; Options -&gt; General -&gt
 		<item name="wcf.acp.user.option.setDefaults"><![CDATA[Manage User Field Settings]]></item>
 		<item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers"><![CDATA[Apply changes for existing users too]]></item>
 		<item name="wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description"><![CDATA[Any changes to default user profile settings will be applied to existing users. This will override any settings changed by the users themselves.]]></item>
-		<item name="wcf.acp.user.option.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.acp.user.option.validationPattern"><![CDATA[Regular Expression for Validation]]></item>
 		<item name="wcf.acp.user.option.validationPattern.description"><![CDATA[Provide a regular expression to validate user input.]]></item>
 		<item name="wcf.acp.user.option.list"><![CDATA[Custom User Fields]]></item>
@@ -1893,7 +1910,6 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.category.parentCategoryID"><![CDATA[Parent Category]]></item>
 		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[Chosen category does not exist.]]></item>
 		<item name="wcf.category.position"><![CDATA[Position]]></item>
-		<item name="wcf.category.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.category.description"><![CDATA[Description]]></item>
 		<item name="wcf.category.title"><![CDATA[Title]]></item>
 		<item name="wcf.category.button.choose"><![CDATA[Choose Category]]></item>
@@ -2318,10 +2334,7 @@ Errors are:
 		<item name="wcf.global.scrollDown"><![CDATA[Go to Page Bottom]]></item>
 		<item name="wcf.global.scrollUp"><![CDATA[Go to Page Top]]></item>
 		<item name="wcf.global.search.enterSearchTerm"><![CDATA[Search …]]></item>
-		<item name="wcf.global.sidebar.showLeftSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.showRightSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.hideLeftSidebar"><![CDATA[]]></item>
-		<item name="wcf.global.sidebar.hideRightSidebar"><![CDATA[]]></item>
+		<item name="wcf.global.showOrder"><![CDATA[Display Order]]></item>
 		<item name="wcf.global.sortOrder.ascending"><![CDATA[Ascending]]></item>
 		<item name="wcf.global.sortOrder.descending"><![CDATA[Descending]]></item>
 		<item name="wcf.global.state.closed"><![CDATA[Closed]]></item>
@@ -2693,6 +2706,7 @@ Errors are:
 		<item name="wcf.acp.page.metaDescription"><![CDATA[Meta Description]]></item>
 		<item name="wcf.acp.page.metaKeywords"><![CDATA[Meta Keywords]]></item>
 		<item name="wcf.acp.page.name.error.notUnique"><![CDATA[Name is already in use.]]></item>
+		<item name="wcf.acp.page.page"><![CDATA[Page]]></item>
 		<item name="wcf.acp.page.parentPage"><![CDATA[Parent Page]]></item>
 		<item name="wcf.acp.page.parentPage.none"><![CDATA[None]]></item>
 		<item name="wcf.acp.page.type"><![CDATA[Page Type]]></item>
-- 
2.20.1