From 31c199ebbf2578ee3986862461157bfe3df309b1 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 21 Jul 2016 00:56:14 +0200
Subject: [PATCH] Moved some language variables from wcf.global to wcf.page
 (wcf.global doesn't support template scripting)

---
 .../templates/headIncludeJavaScript.tpl       |  4 ++--
 .../templates/permissionDenied.tpl            |  6 +++---
 com.woltlab.wcf/templates/redirect.tpl        |  4 ++--
 com.woltlab.wcf/templates/userException.tpl   |  2 +-
 com.woltlab.wcf/templates/userNotice.tpl      |  2 +-
 .../install/files/acp/templates/header.tpl    |  4 ++--
 .../files/acp/templates/permissionDenied.tpl  |  2 +-
 .../files/acp/templates/userException.tpl     |  2 +-
 .../files/js/WoltLab/WCF/Ui/Page/JumpTo.js    |  4 ++--
 .../files/js/WoltLab/WCF/Ui/Pagination.js     |  2 +-
 .../install/files/lib/system/CLIWCF.class.php |  2 +-
 .../exception/IllegalLinkException.class.php  |  4 ++--
 .../PermissionDeniedException.class.php       |  2 +-
 .../PagesFunctionTemplatePlugin.class.php     |  4 ++--
 wcfsetup/install/lang/de.xml                  | 20 +++++++++----------
 wcfsetup/install/lang/en.xml                  | 20 +++++++++----------
 16 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index aff8b6dec9..f149194801 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -71,8 +71,8 @@ requirejs.config({
 			'wcf.global.language.noSelection': '{lang}wcf.global.language.noSelection{/lang}',
 			'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
 			'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}',
-			'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}',
-			'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}',
+			'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}',
+			'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}',
 			'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}',
 			'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
 			'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
diff --git a/com.woltlab.wcf/templates/permissionDenied.tpl b/com.woltlab.wcf/templates/permissionDenied.tpl
index 827bd56f28..15ef266d92 100644
--- a/com.woltlab.wcf/templates/permissionDenied.tpl
+++ b/com.woltlab.wcf/templates/permissionDenied.tpl
@@ -1,10 +1,10 @@
-{capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture}
-{capture assign='contentTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture}
+{capture assign='pageTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture}
+{capture assign='contentTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture}
 
 {include file='header' __disableAds=true}
 
 <div class="section">
-	<p>{lang}wcf.global.error.permissionDenied{/lang}</p>
+	<p>{lang}wcf.page.error.permissionDenied{/lang}</p>
 </div>
 
 {event name='content'}
diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/templates/redirect.tpl
index d9b034a939..dd2d4a4b53 100644
--- a/com.woltlab.wcf/templates/redirect.tpl
+++ b/com.woltlab.wcf/templates/redirect.tpl
@@ -1,4 +1,4 @@
-{capture assign='pageTitle'}{lang}wcf.global.redirect.title{/lang}{/capture}
+{capture assign='pageTitle'}{lang}wcf.page.redirect.title{/lang}{/capture}
 
 {capture assign='headContent'}
 	<meta http-equiv="refresh" content="{if $wait|isset}{@$wait}{else}10{/if};URL={$url}">
@@ -8,7 +8,7 @@
 
 <div class="{if !$status|empty}{@$status}{else}success{/if}">
 	<p>{@$message}</p>
-	<a href="{$url}">{lang}wcf.global.redirect.url{/lang}</a>
+	<a href="{$url}">{lang}wcf.page.redirect.url{/lang}</a>
 </div>
 
 {include file='footer' __disableAds=true}
diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index 9cbf3959f2..ded43bf579 100644
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -17,7 +17,7 @@
 <script data-relocate="true">
 	//<![CDATA[
 	if (document.referrer) {
-		$('#errorMessage').append('<br><br><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
+		$('#errorMessage').append('<br><br><a href="' + document.referrer + '">{lang}wcf.page.error.backward{/lang}</a>'); 
 	}
 	//]]>
 </script>
diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 96fb63629d..b06d1aa15a 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -7,7 +7,7 @@
 	{/if}
 	
 	{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates() && SHOW_UPDATE_NOTICE_FRONTEND}
-		<p class="info">{lang}wcf.global.availableUpdates{/lang}</p>
+		<p class="info">{lang}wcf.page.availableUpdates{/lang}</p>
 	{/if}
 	
 	{if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation'}
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index b18a63328f..af8e10da04 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -83,8 +83,8 @@
 				'wcf.global.form.error.lessThan': '{lang __literal=true}wcf.global.form.error.lessThan{/lang}',
 				'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
 				'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}',
-				'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}',
-				'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}',
+				'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}',
+				'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}',
 				'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}',
 				'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
 				'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
diff --git a/wcfsetup/install/files/acp/templates/permissionDenied.tpl b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
index 4eb787a1c3..250fb231fa 100644
--- a/wcfsetup/install/files/acp/templates/permissionDenied.tpl
+++ b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
@@ -1,6 +1,6 @@
 {include file='header' templateName='permissionDenied' templateNameApplication='wcf'}
 
-<p class="error">{lang}wcf.global.error.permissionDenied{/lang}</p>
+<p class="error">{lang}wcf.page.error.permissionDenied{/lang}</p>
 
 {if ENABLE_DEBUG_MODE}
 	<!-- 
diff --git a/wcfsetup/install/files/acp/templates/userException.tpl b/wcfsetup/install/files/acp/templates/userException.tpl
index 117b0ae469..e1f168f284 100644
--- a/wcfsetup/install/files/acp/templates/userException.tpl
+++ b/wcfsetup/install/files/acp/templates/userException.tpl
@@ -7,7 +7,7 @@
 <script data-relocate="true">
 	//<![CDATA[
 	if (document.referrer) {
-		$('#errorMessage').append('<br><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>');
+		$('#errorMessage').append('<br><a href="' + document.referrer + '">{lang}wcf.page.error.backward{/lang}</a>');
 	}
 	//]]>
 </script>
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js
index d9e27c17f2..fa61bc7f77 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/JumpTo.js
@@ -70,7 +70,7 @@ define(['Language', 'ObjectMap', 'Ui/Dialog'], function(Language, ObjectMap, UiD
 			_input.value = pages;
 			_input.setAttribute('max', pages);
 			
-			_description.textContent = Language.get('wcf.global.page.jumpTo.description').replace(/#pages#/, pages);
+			_description.textContent = Language.get('wcf.page.jumpTo.description').replace(/#pages#/, pages);
 		},
 		
 		/**
@@ -106,7 +106,7 @@ define(['Language', 'ObjectMap', 'Ui/Dialog'], function(Language, ObjectMap, UiD
 		
 		_dialogSetup: function() {
 			var source = '<dl>'
-					+ '<dt><label for="jsPaginationPageNo">' + Language.get('wcf.global.page.jumpTo') + '</label></dt>'
+					+ '<dt><label for="jsPaginationPageNo">' + Language.get('wcf.page.jumpTo') + '</label></dt>'
 					+ '<dd>'
 						+ '<input type="number" id="jsPaginationPageNo" value="1" min="1" max="1" class="tiny">'
 						+ '<small></small>'
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js
index 99e693bb5c..dca29158c7 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Pagination.js
@@ -114,7 +114,7 @@ define(['Core', 'Language', 'ObjectMap', 'StringUtil', 'WoltLab/WCF/Ui/Page/Jump
 			if (right > this._options.maxPage) right = this._options.maxPage;
 			
 			// left ... links
-			var jumpToHtml = '<a class="jsTooltip" title="' + Language.get('wcf.global.page.jumpTo') + '">&hellip;</a>';
+			var jumpToHtml = '<a class="jsTooltip" title="' + Language.get('wcf.page.jumpTo') + '">&hellip;</a>';
 			if (left > 1) {
 				if (left - 1 < 2) {
 					list.appendChild(this._createLink(2));
diff --git a/wcfsetup/install/files/lib/system/CLIWCF.class.php b/wcfsetup/install/files/lib/system/CLIWCF.class.php
index 3412ed796d..f29963ab71 100644
--- a/wcfsetup/install/files/lib/system/CLIWCF.class.php
+++ b/wcfsetup/install/files/lib/system/CLIWCF.class.php
@@ -290,7 +290,7 @@ class CLIWCF extends WCF {
 			}
 			catch (PermissionDeniedException $e) {
 				Log::error('permissionDenied');
-				self::getReader()->println(WCF::getLanguage()->getDynamicVariable('wcf.global.error.permissionDenied'));
+				self::getReader()->println(WCF::getLanguage()->getDynamicVariable('wcf.page.error.permissionDenied'));
 				
 				if (self::getArgvParser()->exitOnFail) {
 					exit(1);
diff --git a/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php b/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php
index 3824cb45b6..5cdb401141 100644
--- a/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php
+++ b/wcfsetup/install/files/lib/system/exception/IllegalLinkException.class.php
@@ -15,7 +15,7 @@ class IllegalLinkException extends NamedUserException {
 	 * Creates a new IllegalLinkException object.
 	 */
 	public function __construct() {
-		parent::__construct(WCF::getLanguage()->get('wcf.global.error.illegalLink'));
+		parent::__construct(WCF::getLanguage()->getDynamicVariable('wcf.page.error.illegalLink'));
 	}
 	
 	/**
@@ -25,7 +25,7 @@ class IllegalLinkException extends NamedUserException {
 		@header('HTTP/1.0 404 Not Found');
 		
 		WCF::getTPL()->assign([
-			'title' => WCF::getLanguage()->get('wcf.global.error.illegalLink.title')
+			'title' => WCF::getLanguage()->getDynamicVariable('wcf.page.error.illegalLink.title')
 		]);
 		
 		parent::show();
diff --git a/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php b/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php
index e5f32cb257..555b55ae94 100644
--- a/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php
+++ b/wcfsetup/install/files/lib/system/exception/PermissionDeniedException.class.php
@@ -17,7 +17,7 @@ class PermissionDeniedException extends UserException {
 	 * Creates a new PermissionDeniedException object.
 	 */
 	public function __construct() {
-		parent::__construct(WCF::getLanguage()->get('wcf.global.error.permissionDenied'));
+		parent::__construct(WCF::getLanguage()->getDynamicVariable('wcf.page.error.permissionDenied'));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
index b7a2d5d4f9..868a5df0d1 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
@@ -181,7 +181,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
 					$html .= $this->makeLink($link, 2, $tagArgs['page'], $tagArgs['pages']);
 				}
 				else {
-					$html .= '<li class="jumpTo"><a title="'.WCF::getLanguage()->getDynamicVariable('wcf.global.page.jumpTo').'" class="jsTooltip">'.StringUtil::HELLIP.'</a></li>'."\n";
+					$html .= '<li class="jumpTo"><a title="'.WCF::getLanguage()->getDynamicVariable('wcf.page.jumpTo').'" class="jsTooltip">'.StringUtil::HELLIP.'</a></li>'."\n";
 				}
 			}
 			
@@ -196,7 +196,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
 					$html .= $this->makeLink($link, $tagArgs['pages'] - 1, $tagArgs['page'], $tagArgs['pages']);
 				}
 				else {
-					$html .= '<li class="jumpTo"><a title="'.WCF::getLanguage()->getDynamicVariable('wcf.global.page.jumpTo').'" class="jsTooltip">'.StringUtil::HELLIP.'</a></li>'."\n";
+					$html .= '<li class="jumpTo"><a title="'.WCF::getLanguage()->getDynamicVariable('wcf.page.jumpTo').'" class="jsTooltip">'.StringUtil::HELLIP.'</a></li>'."\n";
 				}
 			}
 			
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 082630990e..795b3f8a59 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2310,7 +2310,6 @@ Fehler sind beispielsweise:
 	</category>
 	
 	<category name="wcf.global">
-		<item name="wcf.global.availableUpdates"><![CDATA[Es sind <a href="{link controller='PackageUpdate' isACP=true}{/link}">Aktualisierungen für installierte Pakete</a> verfügbar.]]></item>
 		<item name="wcf.global.button.add"><![CDATA[Hinzufügen]]></item>
 		<item name="wcf.global.button.back"><![CDATA[&laquo; Zurück]]></item>
 		<item name="wcf.global.button.cancel"><![CDATA[Abbrechen]]></item>
@@ -2342,8 +2341,6 @@ Fehler sind beispielsweise:
 		<item name="wcf.global.date"><![CDATA[Datum]]></item>
 		<item name="wcf.global.decimalPoint"><![CDATA[,]]></item>
 		<item name="wcf.global.description"><![CDATA[Beschreibung]]></item>
-		<item name="wcf.global.error.permissionDenied"><![CDATA[Der Zutritt zu dieser Seite ist {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} leider verwehrt. {if LANGUAGE_USE_INFORMAL_VARIANT}Du besitzt{else}Sie besitzen{/if} nicht die notwendigen Zugriffsrechte, um diese Seite aufrufen zu können.]]></item>
-		<item name="wcf.global.error.permissionDenied.title"><![CDATA[Zugriff verweigert]]></item>
 		<item name="wcf.global.error.timeout"><![CDATA[Keine Antwort vom Server erhalten, Anfrage wurde abgebrochen.]]></item>
 		<item name="wcf.global.error.title"><![CDATA[Fehlermeldung]]></item>
 		<item name="wcf.global.exception.explanation"><![CDATA[<p class="exceptionSubtitle">Was ist passiert?</p>
@@ -2371,8 +2368,6 @@ Fehler sind beispielsweise:
 		<item name="wcf.global.page.pagination"><![CDATA[Navigation]]></item>
 		<item name="wcf.global.page.previous"><![CDATA[Vorherige Seite]]></item>
 		<item name="wcf.global.pageDirection"><![CDATA[ltr]]></item> <!-- system variable; do not translate -->
-		<item name="wcf.global.redirect.title"><![CDATA[Weiterleitung]]></item>
-		<item name="wcf.global.redirect.url"><![CDATA[Falls die automatische Weiterleitung nicht funktioniert, {if LANGUAGE_USE_INFORMAL_VARIANT}klicke{else}klicken Sie{/if} bitte hier!]]></item>
 		<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>
@@ -2387,11 +2382,6 @@ Fehler sind beispielsweise:
 		<item name="wcf.global.jumpToPage"><![CDATA[Zur Seite]]></item>
 		<item name="wcf.global.preview"><![CDATA[Vorschau]]></item>
 		<item name="wcf.global.multiSelect"><![CDATA[Mehrfache Markierungen sind durch zusätzliches Drücken der Taste „Strg/Ctrl“ (Windows) oder „Befehl/Command“ (Mac OS) möglich.]]></item>
-		<item name="wcf.global.page.jumpTo"><![CDATA[Gehe zu Seite]]></item>
-		<item name="wcf.global.page.jumpTo.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Gib{else}Geben Sie{/if} einen Wert zwischen „1“ und „#pages#“ ein.]]></item>
-		<item name="wcf.global.error.illegalLink"><![CDATA[Die von {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} angeforderte Seite wurde nicht gefunden. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}überprüfe{else}überprüfen Sie{/if} die Adresse oder {if LANGUAGE_USE_INFORMAL_VARIANT}geh{else}gehen Sie{/if} zurück auf die Startseite.]]></item>
-		<item name="wcf.global.error.illegalLink.title"><![CDATA[Seite nicht gefunden]]></item>
-		<item name="wcf.global.error.backward"><![CDATA[Zurück zur vorherigen Seite]]></item>
 		<item name="wcf.global.noDeclaration"><![CDATA[Keine Angabe]]></item>
 		<item name="wcf.global.defaultValue"><![CDATA[Standard]]></item>
 		<item name="wcf.global.noSelection"><![CDATA[(Keine Auswahl)]]></item>
@@ -2695,6 +2685,16 @@ Fehler sind beispielsweise:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Article"><![CDATA[Artikel <a href="{$article->getLink()}">{$article->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.CategoryArticleList"><![CDATA[Artikel-Kategogie <a href="{$category->getLink()}">{$category->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[Benutzerprofil von <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
+		<item name="wcf.page.availableUpdates"><![CDATA[Es sind <a href="{link controller='PackageUpdate' isACP=true}{/link}">Aktualisierungen für installierte Pakete</a> verfügbar.]]></item>
+		<item name="wcf.page.error.permissionDenied"><![CDATA[Der Zutritt zu dieser Seite ist {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} leider verwehrt. {if LANGUAGE_USE_INFORMAL_VARIANT}Du besitzt{else}Sie besitzen{/if} nicht die notwendigen Zugriffsrechte, um diese Seite aufrufen zu können.]]></item>
+		<item name="wcf.page.error.permissionDenied.title"><![CDATA[Zugriff verweigert]]></item>
+		<item name="wcf.page.error.illegalLink"><![CDATA[Die von {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} angeforderte Seite wurde nicht gefunden. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}überprüfe{else}überprüfen Sie{/if} die Adresse oder {if LANGUAGE_USE_INFORMAL_VARIANT}geh{else}gehen Sie{/if} zurück auf die Startseite.]]></item>
+		<item name="wcf.page.error.illegalLink.title"><![CDATA[Seite nicht gefunden]]></item>
+		<item name="wcf.page.error.backward"><![CDATA[Zurück zur vorherigen Seite]]></item>
+		<item name="wcf.page.jumpTo"><![CDATA[Gehe zu Seite]]></item>
+		<item name="wcf.page.jumpTo.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Gib{else}Geben Sie{/if} einen Wert zwischen „1“ und „#pages#“ ein.]]></item>
+		<item name="wcf.page.redirect.title"><![CDATA[Weiterleitung]]></item>
+		<item name="wcf.page.redirect.url"><![CDATA[Falls die automatische Weiterleitung nicht funktioniert, {if LANGUAGE_USE_INFORMAL_VARIANT}klicke{else}klicken Sie{/if} bitte hier!]]></item>
 	</category>
 	
 	<category name="wcf.paidSubscription">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 02332c5bcc..a4a81e5245 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2289,7 +2289,6 @@ Errors are:
 	</category>
 	
 	<category name="wcf.global">
-		<item name="wcf.global.availableUpdates"><![CDATA[There are <a href="{link controller='PackageUpdate' isACP=true}{/link}">updates available</a> for installed packages.]]></item>
 		<item name="wcf.global.button.add"><![CDATA[Add]]></item>
 		<item name="wcf.global.button.back"><![CDATA[« Back]]></item>
 		<item name="wcf.global.button.cancel"><![CDATA[Cancel]]></item>
@@ -2321,8 +2320,6 @@ Errors are:
 		<item name="wcf.global.date"><![CDATA[Date]]></item>
 		<item name="wcf.global.decimalPoint"><![CDATA[.]]></item>
 		<item name="wcf.global.description"><![CDATA[Description]]></item>
-		<item name="wcf.global.error.permissionDenied"><![CDATA[Access denied. You’re not authorized to view this page.]]></item>
-		<item name="wcf.global.error.permissionDenied.title"><![CDATA[Access Denied]]></item>
 		<item name="wcf.global.error.timeout"><![CDATA[Did not receive a response from server, request aborted.]]></item>
 		<item name="wcf.global.error.title"><![CDATA[Error Message]]></item>
 		<item name="wcf.global.exception.explanation"><![CDATA[<p class="exceptionSubtitle">What happened?</p>
@@ -2350,8 +2347,6 @@ Errors are:
 		<item name="wcf.global.page.pagination"><![CDATA[Navigation]]></item>
 		<item name="wcf.global.page.previous"><![CDATA[Previous Page]]></item>
 		<item name="wcf.global.pageDirection"><![CDATA[ltr]]></item> <!-- system variable; do not translate -->
-		<item name="wcf.global.redirect.title"><![CDATA[Redirection]]></item>
-		<item name="wcf.global.redirect.url"><![CDATA[Please click here if the automatic redirection does not work!]]></item>
 		<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>
@@ -2366,11 +2361,6 @@ Errors are:
 		<item name="wcf.global.jumpToPage"><![CDATA[To Front Page]]></item>
 		<item name="wcf.global.preview"><![CDATA[Preview]]></item>
 		<item name="wcf.global.multiSelect"><![CDATA[Multiple items can be selected by holding the “Ctrl/Shift” key (Windows) or “Command” (Mac OS) key and clicking on the desired items.]]></item>
-		<item name="wcf.global.page.jumpTo"><![CDATA[Go to Page]]></item>
-		<item name="wcf.global.page.jumpTo.description"><![CDATA[Enter a value between “1” and “#pages#”.]]></item>
-		<item name="wcf.global.error.illegalLink"><![CDATA[Sorry, but the page you are looking for has not been found. Try checking the URL for errors, then hit the refresh button on your browser.]]></item>
-		<item name="wcf.global.error.illegalLink.title"><![CDATA[Page Not Found]]></item>
-		<item name="wcf.global.error.backward"><![CDATA[Back to previous page.]]></item>
 		<item name="wcf.global.noDeclaration"><![CDATA[Unspecified]]></item>
 		<item name="wcf.global.defaultValue"><![CDATA[Default Value]]></item>
 		<item name="wcf.global.noSelection"><![CDATA[(No Selection)]]></item>
@@ -2701,6 +2691,16 @@ Errors are:
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.Article"><![CDATA[Article <a href="{$article->getLink()}">{$article->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.CategoryArticleList"><![CDATA[Article category <a href="{$category->getLink()}">{$category->getTitle()}</a>]]></item>
 		<item name="wcf.page.onlineLocation.com.woltlab.wcf.User"><![CDATA[User profile of <a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{@$user->userID}">{$user->username}</a>]]></item>
+		<item name="wcf.page.availableUpdates"><![CDATA[There are <a href="{link controller='PackageUpdate' isACP=true}{/link}">updates available</a> for installed packages.]]></item>
+		<item name="wcf.page.error.permissionDenied"><![CDATA[Access denied. You’re not authorized to view this page.]]></item>
+		<item name="wcf.page.error.permissionDenied.title"><![CDATA[Access Denied]]></item>
+		<item name="wcf.page.error.illegalLink"><![CDATA[Sorry, but the page you are looking for has not been found. Try checking the URL for errors, then hit the refresh button on your browser.]]></item>
+		<item name="wcf.page.error.illegalLink.title"><![CDATA[Page Not Found]]></item>
+		<item name="wcf.page.error.backward"><![CDATA[Back to previous page.]]></item>
+		<item name="wcf.page.jumpTo"><![CDATA[Go to Page]]></item>
+		<item name="wcf.page.jumpTo.description"><![CDATA[Enter a value between “1” and “#pages#”.]]></item>
+		<item name="wcf.page.redirect.title"><![CDATA[Redirection]]></item>
+		<item name="wcf.page.redirect.url"><![CDATA[Please click here if the automatic redirection does not work!]]></item>
 	</category>
 	
 	<category name="wcf.acp.page">
-- 
2.20.1