From b68865819297b2841bf40518ae36f7c32ab636c7 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 17 Apr 2013 16:37:16 +0200
Subject: [PATCH] Language administration overhaul (WIP)

---
 com.woltlab.wcf/acpMenu.xml                   | 24 +++---
 com.woltlab.wcf/userGroupOption.xml           | 29 +------
 .../files/acp/templates/languageAdd.tpl       | 20 ++---
 .../files/acp/templates/languageExport.tpl    | 20 ++---
 .../files/acp/templates/languageList.tpl      | 76 +++++++------------
 .../files/acp/templates/languageServerAdd.tpl | 20 ++---
 .../acp/templates/languageServerList.tpl      | 64 +++++-----------
 .../lib/acp/form/LanguageAddForm.class.php    |  2 +-
 .../lib/acp/form/LanguageExportForm.class.php |  2 +-
 .../LanguageMultilingualismForm.class.php     |  2 +-
 .../acp/form/LanguageServerAddForm.class.php  |  2 +-
 .../acp/form/LanguageServerEditForm.class.php |  2 +-
 .../lib/acp/page/LanguageListPage.class.php   |  2 +-
 .../acp/page/LanguageServerListPage.class.php |  2 +-
 .../data/language/LanguageAction.class.php    |  6 +-
 .../category/LanguageCategoryAction.class.php |  6 +-
 .../item/LanguageItemAction.class.php         |  6 +-
 .../server/LanguageServerAction.class.php     |  6 +-
 wcfsetup/install/lang/de.xml                  | 14 ++--
 wcfsetup/install/lang/en.xml                  | 12 +--
 20 files changed, 110 insertions(+), 207 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 918faa9cf0..17f19a824d 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -296,19 +296,25 @@
 		<acpmenuitem name="wcf.acp.menu.link.language.list">
 			<parent>wcf.acp.menu.link.language</parent>
 			<controller><![CDATA[wcf\acp\page\LanguageListPage]]></controller>
-			<permissions>admin.language.canEditLanguage,admin.language.canDeleteLanguage</permissions>
+			<permissions>admin.language.canManageLanguage</permissions>
 		</acpmenuitem>
 		
-		<acpmenuitem name="wcf.acp.menu.link.language.add">
+		<acpmenuitem name="wcf.acp.menu.link.language.import">
 			<parent>wcf.acp.menu.link.language</parent>
-			<controller><![CDATA[wcf\acp\form\LanguageAddForm]]></controller>
-			<permissions>admin.language.canAddLanguage</permissions>
+			<controller><![CDATA[wcf\acp\form\LanguageImportForm]]></controller>
+			<permissions>admin.language.canManageLanguage</permissions>
+		</acpmenuitem>
+		
+		<acpmenuitem name="wcf.acp.menu.link.language.item.list">
+			<parent>wcf.acp.menu.link.language</parent>
+			<controller><![CDATA[wcf\acp\form\LanguageItemList]]></controller>
+			<permissions>admin.language.canManageLanguage</permissions>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.language.multilingualism">
 			<parent>wcf.acp.menu.link.language</parent>
 			<controller><![CDATA[wcf\acp\form\LanguageMultilingualismForm]]></controller>
-			<permissions>admin.language.canEditLanguage</permissions>
+			<permissions>admin.language.canManageLanguage</permissions>
 		</acpmenuitem>
 		
 		<acpmenuitem name="wcf.acp.menu.link.language.server">
@@ -318,13 +324,7 @@
 		<acpmenuitem name="wcf.acp.menu.link.language.server.list">
 			<controller><![CDATA[wcf\acp\page\LanguageServerListPage]]></controller>
 			<parent>wcf.acp.menu.link.language.server</parent>
-			<permissions>admin.language.canEditServer,admin.language.canDeleteServer</permissions>
-		</acpmenuitem>
-		
-		<acpmenuitem name="wcf.acp.menu.link.language.server.add">
-			<controller><![CDATA[wcf\acp\form\LanguageServerAddForm]]></controller>
-			<parent>wcf.acp.menu.link.language.server</parent>
-			<permissions>admin.language.canAddServer</permissions>
+			<permissions>admin.language.canManageServer</permissions>
 		</acpmenuitem>
 		<!-- /language -->
 		
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 70782701b0..b3b11e2078 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -172,42 +172,19 @@
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
 			
-			<option name="admin.language.canAddLanguage">
+			<option name="admin.language.canManageLanguage">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canEditLanguage">
-				<categoryname>admin.language</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.language.canDeleteLanguage">
-				<categoryname>admin.language</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.language.canAddServer">
-				<categoryname>admin.language</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.language.canDeleteServer">
-				<categoryname>admin.language</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="admin.language.canEditServer">
+			<option name="admin.language.canManageServer">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			
 			<option name="admin.style.canAddStyle">
 				<categoryname>admin.style</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/wcfsetup/install/files/acp/templates/languageAdd.tpl b/wcfsetup/install/files/acp/templates/languageAdd.tpl
index 8cf1720577..b9d8875052 100644
--- a/wcfsetup/install/files/acp/templates/languageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageAdd.tpl
@@ -24,19 +24,13 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.language.canDeleteLanguage') || $__wcf->session->getPermission('admin.language.canEditLanguage')}
-						<li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageAdd'}{/link}">
diff --git a/wcfsetup/install/files/acp/templates/languageExport.tpl b/wcfsetup/install/files/acp/templates/languageExport.tpl
index 3cb0b50b87..405063cd31 100644
--- a/wcfsetup/install/files/acp/templates/languageExport.tpl
+++ b/wcfsetup/install/files/acp/templates/languageExport.tpl
@@ -15,19 +15,13 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.language.canDeleteLanguage') || $__wcf->session->getPermission('admin.language.canEditLanguage')}
-						<li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='LanguageList'}{/link}" title="{lang}wcf.acp.menu.link.language.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.list{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form enctype="multipart/form-data" method="post" action="{link controller='LanguageExport' id=$languageID}{/link}">
diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 3abb04ecec..3aa206bc87 100644
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -37,19 +37,13 @@
 <div class="contentNavigation">
 	{pages print=true assign=pagesLinks controller='LanguageList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 	
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->getSession()->getPermission('admin.language.canAddLanguage')}
-						<li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtonsTop'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+			
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
 </div>
 
 {if $objects|count}
@@ -75,42 +69,30 @@
 				{foreach from=$objects item=language}
 					<tr class="jsLanguageRow">
 						<td class="columnIcon">
-							{if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-								<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip"><span class="icon icon16 icon-download-alt"></span></a>
-							{/if}
+							<a href="{link controller='LanguageExport' id=$language->languageID}{/link}" title="{lang}wcf.acp.language.export{/lang}" class="jsTooltip"><span class="icon icon16 icon-download-alt"></span></a>
 							
-							{if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-								{if !$language->isDefault}
-									<span class="icon icon16 icon-check jsSetAsDefaultButton jsTooltip pointer" title="{lang}wcf.acp.language.setAsDefault{/lang}" title="{lang}wcf.acp.language.setAsDefault{/lang}" data-object-id="{@$language->languageID}"></span>
-								{else}
-									<span class="icon icon16 icon-check disabled" title="{lang}wcf.acp.language.setAsDefault{/lang}"></span>
-								{/if}
+							{if !$language->isDefault}
+								<span class="icon icon16 icon-check jsSetAsDefaultButton jsTooltip pointer" title="{lang}wcf.acp.language.setAsDefault{/lang}" title="{lang}wcf.acp.language.setAsDefault{/lang}" data-object-id="{@$language->languageID}"></span>
+							{else}
+								<span class="icon icon16 icon-check disabled" title="{lang}wcf.acp.language.setAsDefault{/lang}"></span>
 							{/if}
 							
-							{if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-								<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
-							{/if}
-							{if $__wcf->getSession()->getPermission('admin.language.canDeleteLanguage')}
-								{if !$language->isDefault}
-									<span class="icon icon16 icon-remove jsTooltip jsDeleteButton pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$language->languageID}" data-confirm-message="{lang}wcf.acp.language.delete.sure{/lang}"></span>
-								{else}
-									<span class="icon icon16 icon-remove disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
-								{/if}
+							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
+							{if !$language->isDefault}
+								<span class="icon icon16 icon-remove jsTooltip jsDeleteButton pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$language->languageID}" data-confirm-message="{lang}wcf.acp.language.delete.sure{/lang}"></span>
+							{else}
+								<span class="icon icon16 icon-remove disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
 							
 							{event name='rowButtons'}
 						</td>
 						<td class="columnID columnLanguageID">{@$language->languageID}</td>
 						<td class="columnTitle columnLanguageName">
-							{if $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}
-								<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}">{$language->languageName} ({@$language->languageCode})</a>
-							{else}
-								{$language->languageName} ({@$language->languageCode})
-							{/if}
+							<a href="{link controller='LanguageEdit' id=$language->languageID}{/link}">{$language->languageName} ({@$language->languageCode})</a>
 						</td>
 						<td class="columnDigits columnUsers">{#$language->users}</td>
 						<td class="columnDigits columnVariables">{#$language->variables}</td>
-						<td class="columnDigits columnCustomVariables">{if $language->customVariables > 0 && $__wcf->getSession()->getPermission('admin.language.canEditLanguage')}<a href="{link controller='LanguageEdit' id=$language->languageID}customVariables=1{/link}">{#$language->customVariables}</a>{else}{#$language->customVariables}{/if}</td>
+						<td class="columnDigits columnCustomVariables">{if $language->customVariables > 0}<a href="{link controller='LanguageEdit' id=$language->languageID}customVariables=1{/link}">{#$language->customVariables}</a>{else}{#$language->customVariables}{/if}</td>
 
 						{event name='columns'}
 					</tr>
@@ -122,19 +104,13 @@
 	<div class="contentNavigation">
 		{@$pagesLinks}
 		
-		{hascontent}
-			<nav>
-				<ul>
-					{content}
-						{if $__wcf->getSession()->getPermission('admin.language.canAddLanguage')}
-							<li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
-						{/if}
-						
-						{event name='contentNavigationButtonsBottom'}
-					{/content}
-				</ul>
-			</nav>
-		{/hascontent}
+		<nav>
+			<ul>
+				<li><a href="{link controller='LanguageAdd'}{/link}" title="{lang}wcf.acp.language.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.language.add{/lang}</span></a></li>
+					
+				{event name='contentNavigationButtonsBottom'}
+			</ul>
+		</nav>
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
index 940867fdba..b633447be9 100644
--- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl
@@ -15,19 +15,13 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.language.canDeleteServer') || $__wcf->session->getPermission('admin.language.canEditServer')}
-						<li><a href="{link controller='LanguageServerList'}{/link}" title="{lang}wcf.acp.menu.link.language.server.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.server.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='LanguageServerList'}{/link}" title="{lang}wcf.acp.menu.link.language.server.list{/lang}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.language.server.list{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='LanguageServerAdd'}{/link}{else}{link controller='LanguageServerEdit' id=$languageServerID}{/link}{/if}">
diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl
index c17cfc5c7e..159a71f7b5 100644
--- a/wcfsetup/install/files/acp/templates/languageServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl
@@ -3,12 +3,8 @@
 <script type="text/javascript">
 	//<![CDATA[
 	$(function() {
-		{if $__wcf->getSession()->getPermission('admin.language.canDeleteServer')}
-			new WCF.Action.Delete('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');
-		{/if}
-		{if $__wcf->getSession()->getPermission('admin.language.canEditServer')}
-			new WCF.Action.Toggle('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');
-		{/if}
+		new WCF.Action.Delete('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');
+		new WCF.Action.Toggle('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');
 	});
 	//]]>
 </script>
@@ -22,19 +18,13 @@
 <div class="contentNavigation">
 	{pages print=true assign=pagesLinks controller='LanguageServerList' link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 	
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->getSession()->getPermission('admin.language.canAddServer')}
-						<li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtonsTop'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtonsTop'}
+		</ul>
+	</nav>
 </div>
 
 {if !$languageServers|count}
@@ -58,24 +48,16 @@
 				{foreach from=$languageServers item=languageServer}
 					<tr class="jsLanguageServerRow">
 						<td class="columnIcon">
-							{if $__wcf->getSession()->getPermission('admin.language.canEditServer')}
-								<span class="icon icon16 icon-{if !$languageServer->isDisabled}circle-blank{else}off{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if !$languageServer->isDisabled}disable{else}enable{/if}{/lang}" data-object-id="{@$languageServer->languageServerID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
-								<a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
-							{/if}
+							<span class="icon icon16 icon-{if !$languageServer->isDisabled}circle-blank{else}off{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if !$languageServer->isDisabled}disable{else}enable{/if}{/lang}" data-object-id="{@$languageServer->languageServerID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}"></span>
+							<a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
 							
-							{if $__wcf->getSession()->getPermission('admin.language.canDeleteServer')}
-								<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$languageServer->languageServerID}" data-confirm-message="{lang}wcf.acp.languageServer.delete.sure{/lang}"></span>
-							{/if}
+							<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$languageServer->languageServerID}" data-confirm-message="{lang}wcf.acp.languageServer.delete.sure{/lang}"></span>
 							
 							{event name='rowButtons'}
 						</td>
 						<td class="columnID columnLanguageServerID">{@$languageServer->languageServerID}</td>
 						<td class="columnTitle columnServerURL">
-							{if $__wcf->getSession()->getPermission('admin.language.canEditServer')}
-								<a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}">{@$languageServer->serverURL}</a>
-							{else}
-								{@$languageServer->serverURL}
-							{/if}
+							<a href="{link controller='LanguageServerEdit' id=$languageServer->languageServerID}{/link}">{$languageServer->serverURL}</a>
 						</td>
 						
 						{event name='columns'}
@@ -88,19 +70,13 @@
 	<div class="contentNavigation">
 		{@$pagesLinks}
 		
-		{hascontent}
-			<nav>
-				<ul>
-					{content}
-						{if $__wcf->getSession()->getPermission('admin.language.canAddServer')}
-							<li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
-						{/if}
-						
-						{event name='contentNavigationButtonsBottom'}
-					{/content}
-				</ul>
-			</nav>
-		{/hascontent}
+		<nav>
+			<ul>
+				<li><a href="{link controller='LanguageServerAdd'}{/link}" title="{lang}wcf.acp.languageServer.add{/lang}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.languageServer.add{/lang}</span></a></li>
+					
+				{event name='contentNavigationButtonsBottom'}
+			</ul>
+		</nav>
 	</div>
 {/if}
 
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
index af033abb94..23e422b4ab 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageAddForm.class.php
@@ -71,7 +71,7 @@ class LanguageAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canAddLanguage');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * source language object
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
index e05b861dd1..7a441997e0 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageExportForm.class.php
@@ -28,7 +28,7 @@ class LanguageExportForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canEditLanguage');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * language id
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
index 78af10098c..80fcfada0b 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageMultilingualismForm.class.php
@@ -28,7 +28,7 @@ class LanguageMultilingualismForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canEditLanguage');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	// data
 	// todo: comment
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
index 1117c16e36..a6f9df90ab 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerAddForm.class.php
@@ -27,7 +27,7 @@ class LanguageServerAddForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canAddServer');
+	public $neededPermissions = array('admin.language.canManageServer');
 	
 	/**
 	 * server url
diff --git a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
index 2d34d060c7..45533aa202 100644
--- a/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LanguageServerEditForm.class.php
@@ -25,7 +25,7 @@ class LanguageServerEditForm extends LanguageServerAddForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canAddServer');
+	public $neededPermissions = array('admin.language.canManageServer');
 	
 	/**
 	 * language server id
diff --git a/wcfsetup/install/files/lib/acp/page/LanguageListPage.class.php b/wcfsetup/install/files/lib/acp/page/LanguageListPage.class.php
index 63d9739b9d..b70eddb257 100644
--- a/wcfsetup/install/files/lib/acp/page/LanguageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/LanguageListPage.class.php
@@ -27,7 +27,7 @@ class LanguageListPage extends SortablePage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canEditLanguage', 'admin.language.canDeleteLanguage');
+	public $neededPermissions = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
index df44962b1c..aee4adb10f 100644
--- a/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/LanguageServerListPage.class.php
@@ -27,7 +27,7 @@ class LanguageServerListPage extends SortablePage {
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
-	public $neededPermissions = array('admin.language.canEditServer', 'admin.language.canDeleteServer');
+	public $neededPermissions = array('admin.language.canManageServer');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
diff --git a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
index 9e19afdaf7..4318d7f1c8 100644
--- a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
@@ -23,17 +23,17 @@ class LanguageAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.language.canAddLanguage');
+	protected $permissionsCreate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.language.canDeleteLanguage');
+	protected $permissionsDelete = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.language.canEditLanguage');
+	protected $permissionsUpdate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * language editor object
diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
index 639acbbd14..eba0b1f4f7 100644
--- a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
@@ -21,15 +21,15 @@ class LanguageCategoryAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.language.canAddLanguage');
+	protected $permissionsCreate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.language.canDeleteLanguage');
+	protected $permissionsDelete = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.language.canEditLanguage');
+	protected $permissionsUpdate = array('admin.language.canManageLanguage');
 }
diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
index 14ee39627d..3c258dadca 100644
--- a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
@@ -21,15 +21,15 @@ class LanguageItemAction extends AbstractDatabaseObjectAction {
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.language.canAddLanguage');
+	protected $permissionsCreate = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.language.canDeleteLanguage');
+	protected $permissionsDelete = array('admin.language.canManageLanguage');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.language.canEditLanguage');
+	protected $permissionsUpdate = array('admin.language.canManageLanguage');
 }
diff --git a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
index c7557f940d..ddd66aa40c 100644
--- a/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/server/LanguageServerAction.class.php
@@ -22,17 +22,17 @@ class LanguageServerAction extends AbstractDatabaseObjectAction implements ITogg
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
 	 */
-	protected $permissionsCreate = array('admin.language.canAddServer');
+	protected $permissionsCreate = array('admin.language.canManageServer');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
 	 */
-	protected $permissionsDelete = array('admin.language.canDeleteServer');
+	protected $permissionsDelete = array('admin.language.canManageServer');
 	
 	/**
 	 * @see	wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
 	 */
-	protected $permissionsUpdate = array('admin.language.canEditServer');
+	protected $permissionsUpdate = array('admin.language.canManageServer');
 	
 	/**
 	 * @see	wcf\data\IToggleAction::toggle()
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 1b5e838318..e2a2a340f4 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -109,12 +109,8 @@
 		<item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Kann Administrationsoberfläche betreten]]></item>
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Mitglieder dieser Benutzergruppe können die Administrationsoberfläche betreten und dort abhängig von den weiteren Zugriffsrechten verschiedene Aktionen durchführen. Diese Option muss aktiviert sein, wenn diesen Benutzern andere administrative Funktionen erlaubt werden sollen.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Kann versteckte Profilinformationen sehen]]></item>
-		<item name="wcf.acp.group.option.admin.language.canAddLanguage"><![CDATA[Kann neue Sprachen hinzufügen]]></item>
-		<item name="wcf.acp.group.option.admin.language.canAddServer"><![CDATA[Kann neue Sprach-Server hinzufügen]]></item>
-		<item name="wcf.acp.group.option.admin.language.canDeleteLanguage"><![CDATA[Kann Sprachen löschen]]></item>
-		<item name="wcf.acp.group.option.admin.language.canDeleteServer"><![CDATA[Kann Sprach-Server löschen]]></item>
-		<item name="wcf.acp.group.option.admin.language.canEditLanguage"><![CDATA[Kann Sprachen bearbeiten]]></item>
-		<item name="wcf.acp.group.option.admin.language.canEditServer"><![CDATA[Kann Sprach-Server bearbeiten]]></item>
+		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Kann Sprachen verwalten]]></item>
+		<item name="wcf.acp.group.option.admin.language.canManageServer"><![CDATA[Kann Sprach-Update-Server verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Kann allgemeine Einstellungen vornehmen]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Kann deaktivierte Stile benutzen]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Kann Protokolle abrufen]]></item>
@@ -212,11 +208,11 @@
 		<item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Aufgabe hinzufügen]]></item>
 		<item name="wcf.acp.menu.link.cronjob.list"><![CDATA[Aufgaben auflisten]]></item>
 		<item name="wcf.acp.menu.link.language"><![CDATA[Sprachen]]></item>
-		<item name="wcf.acp.menu.link.language.add"><![CDATA[Sprache hinzufügen]]></item>
+		<item name="wcf.acp.menu.link.language.import"><![CDATA[Sprache importieren]]></item>
+		<item name="wcf.acp.menu.link.language.item.list"><![CDATA[Texte verwalten]]></item>
 		<item name="wcf.acp.menu.link.language.list"><![CDATA[Sprachen auflisten]]></item>
 		<item name="wcf.acp.menu.link.language.multilingualism"><![CDATA[Mehrsprachigkeit verwalten]]></item>
-		<item name="wcf.acp.menu.link.language.server.add"><![CDATA[Server hinzufügen]]></item>
-		<item name="wcf.acp.menu.link.language.server.list"><![CDATA[Server auflisten]]></item>
+		<item name="wcf.acp.menu.link.language.server.list"><![CDATA[Sprach-Update-Server auflisten]]></item>
 		<item name="wcf.acp.menu.link.log"><![CDATA[Protokoll]]></item>
 		<item name="wcf.acp.menu.link.log.session"><![CDATA[Sitzungen]]></item>
 		<item name="wcf.acp.menu.link.log.cronjob"><![CDATA[Cronjobs]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 7c34fd1cd9..0db4b7fb4a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -109,12 +109,8 @@
 		<item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Can enter Administration Control Panel]]></item>
 		<item name="wcf.acp.group.option.admin.general.canUseAcp.description"><![CDATA[Users of this group may access the Administration Control Panel based upon their granted permissions. This option must be enabled if you wish to grant access to any administrative option.]]></item>
 		<item name="wcf.acp.group.option.admin.general.canViewPrivateUserOptions"><![CDATA[Can view private user options]]></item>
-		<item name="wcf.acp.group.option.admin.language.canAddLanguage"><![CDATA[Can add languages]]></item>
-		<item name="wcf.acp.group.option.admin.language.canAddServer"><![CDATA[Can add language servers]]></item>
-		<item name="wcf.acp.group.option.admin.language.canDeleteLanguage"><![CDATA[Can delete languages]]></item>
-		<item name="wcf.acp.group.option.admin.language.canDeleteServer"><![CDATA[Can delete language servers]]></item>
-		<item name="wcf.acp.group.option.admin.language.canEditLanguage"><![CDATA[Can edit languages]]></item>
-		<item name="wcf.acp.group.option.admin.language.canEditServer"><![CDATA[Can edit language servers]]></item>
+		<item name="wcf.acp.group.option.admin.language.canManageLanguage"><![CDATA[Can manage languages]]></item>
+		<item name="wcf.acp.group.option.admin.language.canManageServer"><![CDATA[Can manage language servers]]></item>
 		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Can edit system options]]></item>
 		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view log files]]></item>
@@ -212,10 +208,10 @@
 		<item name="wcf.acp.menu.link.cronjob.add"><![CDATA[Add Cronjob]]></item>
 		<item name="wcf.acp.menu.link.cronjob.list"><![CDATA[List Cronjobs]]></item>
 		<item name="wcf.acp.menu.link.language"><![CDATA[Languages]]></item>
-		<item name="wcf.acp.menu.link.language.add"><![CDATA[Add Language]]></item>
+		<item name="wcf.acp.menu.link.language.import"><![CDATA[Import Language]]></item>
+		<item name="wcf.acp.menu.link.language.item.list"><![CDATA[Manage Phrases]]></item>
 		<item name="wcf.acp.menu.link.language.list"><![CDATA[List Languages]]></item>
 		<item name="wcf.acp.menu.link.language.multilingualism"><![CDATA[Multilingualism]]></item>
-		<item name="wcf.acp.menu.link.language.server.add"><![CDATA[Add Language Server]]></item>
 		<item name="wcf.acp.menu.link.language.server.list"><![CDATA[List Language Server]]></item>
 		<item name="wcf.acp.menu.link.log"><![CDATA[Logs]]></item>
 		<item name="wcf.acp.menu.link.log.session"><![CDATA[Sessions]]></item>
-- 
2.20.1