From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 21 Feb 2012 16:31:36 +0000 (+0100)
Subject: Fixed language variables in package management
X-Git-Tag: 2.0.0_Beta_1~1325
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48b51dcae83201446e2a64be8b1f16440c2b4825;p=GitHub%2FWoltLab%2FWCF.git

Fixed language variables in package management
---

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index c309f41a27..cbb3aa3cce 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -4,10 +4,10 @@
 	//<![CDATA[
 	$(function() {
 		WCF.TabMenu.init();
-
+		
 		WCF.Language.add('wcf.acp.package.view.button.uninstall.sure', 'wcf.acp.package.view.button.uninstall.sure');
 		new WCF.ACP.Package.Uninstallation($('.package .uninstallButton'));
-
+		
 		{if $pluginsCount > 1}
 			WCF.Icon.addObject({
 				'wcf.icon.arrow.down': '{@RELATIVE_WCF_DIR}icon/dropdown1.svg',
@@ -32,14 +32,14 @@
 <div class="wcf-tabMenuContainer">
 	<nav class="wcf-tabMenu">
 		<ul>
-			<li><a href="#applications" title="applications">applications</a></li>
-			{if $plugins|count}<li><a href="#plugins" title="plugins">plugins</a></li>{/if}
+			<li><a href="#applications" title="applications">{lang}wcf.acp.package.application.title{/lang}</a></li>
+			{if $plugins|count}<li><a href="#plugins" title="plugins">{lang}wcf.acp.package.plugin.title{/lang}</a></li>{/if}
 		</ul>
 	</nav>
 	
 	<div id="applications" class="wcf-border wcf-tabMenuContent hidden">
 		<hgroup class="wcf-subHeading">
-			<h1>Installed Applications</h1>
+			<h1>{lang}wcf.acp.package.application.installed{/lang}</h1>
 		</hgroup>
 		
 		<ol class="wcf-applicationList">
@@ -52,27 +52,27 @@
 						
 						<div>
 							<dl>
-								<dt>package</dt>
+								<dt>{lang}wcf.acp.package.identifier{/lang}</dt>
 								<dd>{$package->package}</dd>
 							</dl>
 							<dl>
-								<dt>installed version</dt>
+								<dt>{lang}wcf.acp.package.installedVersion{/lang}</dt>
 								<dd>{$package->packageVersion}</dd>
 							</dl>
 							<dl>
-								<dt>create date</dt>
+								<dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
 								<dd>{$package->packageDate|date}</dd>
 							</dl>
 							<dl>
-								<dt>install date</dt>
+								<dt>{lang}wcf.acp.package.installDate{/lang}</dt>
 								<dd>{@$package->installDate|time}</dd>
 							</dl>
 							<dl>
-								<dt>update date</dt>
+								<dt>{lang}wcf.acp.package.updateDate{/lang}</dt>
 								<dd>{@$package->updateDate|time}</dd>
 							</dl>
 							<dl>
-								<dt>creator</dt>
+								<dt>{lang}wcf.acp.package.author{/lang}</dt>
 								<dd>{if $package->authorURL}<a href="dereferrer.php?url={$package->authorURL|rawurlencode}">{/if}{$package->author}{if $package->authorURL}</a>{/if}</dd>
 							</dl>
 						</div>
@@ -80,8 +80,8 @@
 						<footer>
 							<nav>
 								<ul class="wcf-smallButtons">
-									<li><a href="{link controller='PackageView' id=$packageID}{/link}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/info1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /> <span>Details</span></a></li>
-									<li><a href="{link controller='PackageStartInstall' id=$packageID}action=update{/link}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" /> <span>Update</span></a></li>
+									<li><a href="{link controller='PackageView' id=$packageID}{/link}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/info1.svg" alt="" title="{lang}wcf.acp.package.button.info{/lang}" /> <span>{lang}wcf.acp.package.button.info{/lang}</span></a></li>
+									<li><a href="{link controller='PackageStartInstall' id=$packageID}action=update{/link}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
 								</ul>
 							</nav>
 						</footer>
@@ -94,7 +94,7 @@
 	{hascontent}
 		<div id="plugins" class="wcf-border wcf-tabMenuContent hidden">
 			<hgroup class="wcf-subHeading">
-				<h1>Installed Plugins</h1>
+				<h1>{lang}wcf.acp.package.plugin.installed{/lang}</h1>
 			</hgroup>
 			
 			<div class="wcf-contentHeader jsPluginListPagination">
@@ -119,7 +119,7 @@
 <div class="wcf-contentFooter">
 	<nav>
 		<ul class="wcf-largeButtons">
-			<li><a href="{link controller='PackageListDetailed'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /> <span>detailed package list</span></a></li>
+			<li><a href="{link controller='PackageListDetailed'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" /> <span>{lang}wcf.acp.package.list.detailed{/lang}</span></a></li>
 		</ul>
 	</nav>
 </div>
diff --git a/wcfsetup/install/files/acp/templates/packageListPlugins.tpl b/wcfsetup/install/files/acp/templates/packageListPlugins.tpl
index 3f32146773..097c745354 100644
--- a/wcfsetup/install/files/acp/templates/packageListPlugins.tpl
+++ b/wcfsetup/install/files/acp/templates/packageListPlugins.tpl
@@ -10,9 +10,9 @@
 		<footer>
 			<nav>
 				<ul class="wcf-smallButtonBar">
-					<li><a href="{link controller='PackageView' id=$packageID}{/link}" title="{$package->getName()}" class="jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/info1.svg" alt="" /> <span>Update</span></a></li>
-					<li><a href="{link controller='PackageStartInstall' id=$packageID}action=update{/link}" title="{lang}wcf.acp.package.view.button.update{/lang}" class="jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>Update</span></a></li>
-					<li title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="separator jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" class="uninstallButton" data-object-id="{@$package->packageID}" /> <span>Delete</span></li>
+					<li><a href="{link controller='PackageView' id=$packageID}{/link}" title="{$package->getName()}" class="jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/info1.svg" alt="" /> <span>{lang}wcf.acp.package.button.info{/lang}</span></a></li>
+					<li><a href="{link controller='PackageStartInstall' id=$packageID}action=update{/link}" title="{lang}wcf.acp.package.button.update{/lang}" class="jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
+					<li title="{lang}wcf.acp.package.button.uninstall{/lang}" class="separator jsTooltip"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" class="uninstallButton" data-object-id="{@$package->packageID}" /> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></li>
 				</ul>
 			</nav>
 		</footer>
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index d9d4fa6610..3742e209c7 100644
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -19,51 +19,40 @@
 <div class="wcf-tabMenuContainer">
 	<nav class="wcf-tabMenu">
 		<ul>
-			<li><a href="#overview">overview</a></li>
-			{if $requiredPackages|count || $dependentPackages|count}<li><a href="#dependencies">dependencies</a></li>{/if}
+			<li><a href="#information">{lang}wcf.acp.package.information.title{/lang}</a></li>
+			{if $requiredPackages|count || $dependentPackages|count}<li><a href="#dependencies">{lang}wcf.acp.package.dependencies{/lang}</a></li>{/if}
 		</ul>
 	</nav>
 
-	<div id="overview" class="wcf-border wcf-tabMenuContent hidden">
+	<div id="information" class="wcf-border wcf-tabMenuContent hidden">
 		<hgroup class="wcf-subHeading">
-			<h1>information</h1>
+			<h1>{lang}wcf.acp.package.information.title{/lang}</h1>
 		</hgroup>
 
 		<fieldset>
-			<legend>{lang}wcf.acp.package.view.properties{/lang}</legend>
+			<legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
 	
 			<dl>
-				<dt>{lang}wcf.acp.package.view.identifier{/lang}</dt>
+				<dt>{lang}wcf.acp.package.identifier{/lang}</dt>
 				<dd>{$package->package}</dd>
 			</dl>
 			<dl>
-				<dt>{lang}wcf.acp.package.view.version{/lang}</dt>
+				<dt>{lang}wcf.acp.package.version{/lang}</dt>
 				<dd>{$package->packageVersion}</dd>
 			</dl>
 			{if $package->instanceNo > 1}
 				<dl>
-					<dt>{lang}wcf.acp.package.view.instanceNo{/lang}</dt>
+					<dt>{lang}wcf.acp.package.instanceNo{/lang}</dt>
 					<dd>{#$package->instanceNo}</dd>
 				</dl>
 			{elseif $package->package == 'com.woltlab.wcf' && WCF_N != 1}
 				<dl>
-					<dt>{lang}wcf.acp.package.view.instanceNo{/lang}</dt>
+					<dt>{lang}wcf.acp.package.instanceNo{/lang}</dt>
 					<dd>{#WCF_N}</dd>
 				</dl>
 			{/if}
-			{if $package->packageDir != ''}
-				<dl>
-					<dt>{lang}wcf.acp.package.view.dir{/lang}</dt>
-					<dd><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}">{$package->packageDir}</a></dd>
-				</dl>
-			{elseif $package->package == 'com.woltlab.wcf'}
-				<dl>
-					<dt>{lang}wcf.acp.package.view.dir{/lang}</dt>
-					<dd>{WCF_DIR}</dd>
-				</dl>
-			{/if}
 			<dl>
-				<dt>{lang}wcf.acp.package.view.date{/lang}</dt>
+				<dt>{lang}wcf.acp.package.packageDate{/lang}</dt>
 				<dd>{@$package->packageDate|date}</dd>
 			</dl>
 			<dl>
@@ -76,18 +65,18 @@
 			</dl>
 			{if $package->packageURL != ''}
 				<dl>
-					<dt>{lang}wcf.acp.package.view.url{/lang}</dt>
-					<dd><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->packageURL|rawurlencode}" class="wcf-externalURL">{$package->packageURL}</a></dd>
+					<dt>{lang}wcf.acp.package.url{/lang}</dt>
+					<dd><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$package->packageURL|rawurlencode}" class="wcf-externalURL">{$package->packageURL}</a></dd>
 				</dl>
 			{/if}
 			{if $package->parentPackageID}
 				<dl>
-					<dt>{lang}wcf.acp.package.view.parent{/lang}</dt>
+					<dt>{lang}wcf.acp.package.parentPackage{/lang}</dt>
 					<dd><a href="{link controller='PackageView' id=$package->parentPackageID}{/link}">{$package->getParentPackage()->getName()}</a></dd>
 				</dl>
 			{/if}
 			<dl>
-				<dt>{lang}wcf.acp.package.view.author{/lang}</dt>
+				<dt>{lang}wcf.acp.package.author{/lang}</dt>
 				<dd>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="wcf-externalURL">{$package->author}</a>{else}{$package->author}{/if}</dd>
 			</dl>
 	
@@ -96,7 +85,7 @@
 
 		{if $package->packageDescription}
 			<hgroup class="wcf-subHeading">
-				<h1>description</h1>
+				<h1>{lang}wcf.acp.package.description{/lang}</h1>
 			</hgroup>
 
 			<p>{$package->packageDescription}</p>
@@ -107,26 +96,26 @@
 		<div id="dependencies" class="wcf-border wcf-tabMenuContainer wcf-tabMenuContent">
 			<nav class="wcf-menu">
 				<ul>
-					{if $requiredPackages|count}<li><a href="#dependencies-required">required</a></li>{/if}
-					{if $dependentPackages|count}<li><a href="#dependencies-dependent">dependent</a></li>{/if}
+					{if $requiredPackages|count}<li><a href="#dependencies-required">{lang}wcf.acp.package.dependencies.required{/lang}</a></li>{/if}
+					{if $dependentPackages|count}<li><a href="#dependencies-dependent">{lang}wcf.acp.package.dependencies.dependent{/lang}</a></li>{/if}
 				</ul>
 			</nav>
 
 			{hascontent}
 				<div id="dependencies-required" class="wcf-hidden">
 					<hgroup class="wcf-subHeading">
-						<h1>{lang}wcf.acp.package.view.requiredPackages{/lang}</h1>
-						<h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>
+						<h1>{lang}wcf.acp.package.dependencies.required{/lang}</h1>
+						<h2>{lang}wcf.acp.package.dependencies.required.description{/lang}</h2>
 					</hgroup>
 		
 					<table class="wcf-table wcf-border wcf-boxTitle">
 						<thead>
 							<tr>
-								<th colspan="2" class="columnID">{lang}wcf.acp.package.list.id{/lang}</th>
-								<th colspan="2" class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
-								<th class="columnText">{lang}wcf.acp.package.list.author{/lang}</th>
-								<th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
-								<th class="columnDigits">{lang}wcf.acp.package.list.date{/lang}</th>
+								<th colspan="2" class="columnID">{lang}wcf.global.objectID{/lang}</th>
+								<th colspan="2" class="columnTitle">{lang}wcf.acp.package.name{/lang}</th>
+								<th class="columnText">{lang}wcf.acp.package.author{/lang}</th>
+								<th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
+								<th class="columnDigits">{lang}wcf.acp.package.packageDate{/lang}</th>
 								
 								{event name='requirementHeadColumns'}
 							</tr>
@@ -138,28 +127,28 @@
 									<tr>
 										<td class="columnIcon">
 											{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-												<a href="{link controller='PackageStartInstall' id=$requiredPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="jsTooltip" /></a>
+												<a href="{link controller='PackageStartInstall' id=$requiredPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="jsTooltip" /></a>
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
+												<img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" />
 											{/if}
 											{if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $requiredPackage.package != 'com.woltlab.wcf' && $requiredPackage.packageID != PACKAGE_ID}
-												<a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="{link controller='Package'}action=startUninstall&packageID={@$requiredPackage.packageID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="jsTooltip" /></a>
+												<a onclick="return confirm('{lang}wcf.acp.package.button.uninstall.sure{/lang}')" href="{link controller='Package'}action=startUninstall&packageID={@$requiredPackage.packageID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="jsTooltip" /></a>
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
+												<img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" />
 											{/if}
 										</td>
 										<td class="columnID"><p>{@$requiredPackage.packageID}</p></td>
 										<td class="columnIcon">
 											{if $requiredPackage.isApplication}
-												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.type.application{/lang}" class="jsTooltip" />
 											{elseif $requiredPackage.parentPackageID}
-												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.type.plugin{/lang}" class="jsTooltip" />
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.type.other{/lang}" class="jsTooltip" />
 											{/if}
 										</td>
 										<td class="columnTitle" title="{$requiredPackage.packageDescription}"><p><a href="{link controller='PackageView' id=$requiredPackage.packageID}{/link}">{$requiredPackage.packageName}{if $requiredPackage.instanceNo > 1 && $requiredPackage.instanceName == ''} (#{#$requiredPackage.instanceNo}){/if}</a></p></td>
-										<td class="columnText">{if $requiredPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$requiredPackage.authorURL|rawurlencode}" class="wcf-externalURL">{$requiredPackage.author}</a>{else}{$requiredPackage.author}</p>{/if}</td>
+										<td class="columnText">{if $requiredPackage.authorURL}<p><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$requiredPackage.authorURL|rawurlencode}" class="wcf-externalURL">{$requiredPackage.author}</a>{else}{$requiredPackage.author}</p>{/if}</td>
 										<td class="columnText"><p>{$requiredPackage.packageVersion}</p></td>
 										<td class="columnDate"><p>{@$requiredPackage.packageDate|date}</p></td>
 										
@@ -175,18 +164,18 @@
 			{hascontent}
 				<div id="dependencies-dependent" class="hidden">
 					<hgroup class="wcf-subHeading">
-						<h1>{lang}wcf.acp.package.view.dependentPackages{/lang}</h1>
-						<h2>{lang}wcf.acp.package.view.dependentPackages.description{/lang}</h2>
+						<h1>{lang}wcf.acp.package.dependencies.dependent{/lang}</h1>
+						<h2>{lang}wcf.acp.package.dependencies.dependent.description{/lang}</h2>
 					</hgroup>
 		
 					<table class="wcf-table wcf-border wcf-boxTitle">
 						<thead>
 							<tr>
-								<th colspan="2" class="columnID">{lang}wcf.acp.package.list.id{/lang}</th>
-								<th colspan="2" class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
-								<th class="columnText">{lang}wcf.acp.package.list.author{/lang}</th>
-								<th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
-								<th class="columnDigits">{lang}wcf.acp.package.list.date{/lang}</th>
+								<th colspan="2" class="columnID">{lang}wcf.global.objectID{/lang}</th>
+								<th colspan="2" class="columnTitle">{lang}wcf.acp.package.name{/lang}</th>
+								<th class="columnText">{lang}wcf.acp.package.author{/lang}</th>
+								<th class="columnText">{lang}wcf.acp.package.version{/lang}</th>
+								<th class="columnDigits">{lang}wcf.acp.package.packageDate{/lang}</th>
 								
 								{event name='dependencyHeadColumns'}
 							</tr>
@@ -198,28 +187,28 @@
 									<tr>
 										<td class="columnIcon">
 											{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-												<a href="{link controller='PackageStartInstall' id=$dependentPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="jsTooltip" /></a>
+												<a href="{link controller='PackageStartInstall' id=$dependentPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" class="jsTooltip" /></a>
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
+												<img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.button.update{/lang}" />
 											{/if}
 											{if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $dependentPackage.package != 'com.woltlab.wcf' && $dependentPackage.packageID != PACKAGE_ID}
-												<a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="{link controller='Package'}action=startUninstall&packageID={@$dependentPackage.packageID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="jsTooltip" /></a>
+												<a onclick="return confirm('{lang}wcf.acp.package.button.uninstall.sure{/lang}')" href="{link controller='Package'}action=startUninstall&packageID={@$dependentPackage.packageID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="jsTooltip" /></a>
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
+												<img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.package.button.uninstall{/lang}" />
 											{/if}
 										</td>
 										<td class="columnID"><p>{@$dependentPackage.packageID}</p></td>
 										<td class="columnIcon">
 											{if $dependentPackage.isApplication}
-												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.list.isApplication{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/packageApplication1.svg" alt="" title="{lang}wcf.acp.package.type.application{/lang}" class="jsTooltip" />
 											{elseif $dependentPackage.parentPackageID}
-												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.type.plugin{/lang}" class="jsTooltip" />
 											{else}
-												<img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="jsTooltip" />
+												<img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.type.other{/lang}" class="jsTooltip" />
 											{/if}
 										</td>
 										<td class="columnTitle" title="{$dependentPackage.packageDescription}"><p><a href="{link controller='PackageView' id=$dependentPackage.packageID}{/link}">{$dependentPackage.packageName}{if $dependentPackage.instanceNo > 1 && $dependentPackage.instanceName == ''} (#{#$dependentPackage.instanceNo}){/if}</a></p></td>
-										<td class="columnText">{if $dependentPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$dependentPackage.authorURL|rawurlencode}" class="wcf-externalURL">{$dependentPackage.author}</a>{else}{$dependentPackage.author}</p>{/if}</td>
+										<td class="columnText">{if $dependentPackage.authorURL}<p><a href="{@$__wcf->getPath()}acp/dereferrer.php?url={$dependentPackage.authorURL|rawurlencode}" class="wcf-externalURL">{$dependentPackage.author}</a>{else}{$dependentPackage.author}</p>{/if}</td>
 										<td class="columnText"><p>{$dependentPackage.packageVersion}</p></td>
 										<td class="columnDate"><p>{@$dependentPackage.packageDate|date}</p></td>
 										
@@ -250,14 +239,14 @@
 				{content}
 					{if PACKAGE_ID != $package->packageID}
 						{if $package->isApplication && $package->package != 'com.woltlab.wcf'}
-							<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>
+							<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.button.switch{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.button.switch{/lang}</span></a></li>
 						{/if}
 						{if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}
-							<li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>
+							<li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.button.uninstall{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.button.uninstall{/lang}</span></a></li>
 						{/if}
 					{/if}
 					{if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-						<li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.view.button.update{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>
+						<li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.button.update{/lang}" class="wcf-button"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.button.update{/lang}</span></a></li>
 					{/if}
 					
 					{event name='largeButtons'}