From 6668706129d3f55d670aecd010e307b591487cc1 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 2 Mar 2012 12:59:12 +0100
Subject: [PATCH] Updates and adds permission lang vars

---
 com.woltlab.wcf/userGroupOption.xml | 12 ++++++------
 wcfsetup/install/lang/de.xml        | 25 ++++++++++++++++---------
 wcfsetup/install/lang/en.xml        | 25 ++++++++++++++++---------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 2f58d33c3f..ad82e40c95 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -177,37 +177,37 @@
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canAddServer">
+			<option name="admin.language.canAddLanguage">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canDeleteServer">
+			<option name="admin.language.canEditLanguage">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canEditServer">
+			<option name="admin.language.canDeleteLanguage">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canAddLanguage">
+			<option name="admin.language.canAddServer">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canEditLanguage">
+			<option name="admin.language.canDeleteServer">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
-			<option name="admin.language.canDeleteLanguage">
+			<option name="admin.language.canEditServer">
 				<categoryname>admin.language</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>0</defaultvalue>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 122f7da86b..f6a0b7abc6 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -64,7 +64,14 @@
 		<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.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>
 		<item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob"><![CDATA[Kann neue zeitgesteuerte Aufgaben anlegen]]></item>
 		<item name="wcf.acp.group.option.admin.system.cronjob.canDeleteCronjob"><![CDATA[Kann zeitgesteuerte Aufgaben löschen]]></item>
@@ -89,18 +96,18 @@
 		<item name="wcf.acp.group.option.admin.user.canMailUser"><![CDATA[Kann E-Mails an Benutzer senden]]></item>
 		<item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Kann Benutzer suchen]]></item>
 		<item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative Rechte]]></item>
-		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[Allgemeine administrative Rechte]]></item>
-		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System-Funktionen]]></item>
+		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Darstellung]]></item>
+		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[Allgemeine Rechte]]></item>
+		<item name="wcf.acp.group.option.category.admin.language"><![CDATA[Sprachen]]></item>
+		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Stile]]></item>
+		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.cronjob"><![CDATA[Cronjobs]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Paketverwaltung]]></item>
-		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[Benutzer-Funktionen]]></item>
-		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[Gruppenverwaltung]]></item>
-		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[Benutzerverwaltung]]></item>
+		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Pakete]]></item>
+		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[Benutzer]]></item>
+		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[Benutzergruppen]]></item>
+		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.group.option.category.mod"><![CDATA[Moderative Rechte]]></item>
 		<item name="wcf.acp.group.option.category.user"><![CDATA[Allgemeine Rechte]]></item>
-		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Darstellung]]></item>
-		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Kann deaktivierte Stile benutzen]]></item>
-		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Stil-Verwaltung]]></item>
 	</category>
 	
 	<category name="wcf.acp.cache">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 29048abe71..fa2559018a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -64,6 +64,13 @@
 		<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[Allows members of this user group to enter the Administration Control Panel and, dependent upon their permissions, run certain actions.]]></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 new languages]]></item>
+		<item name="wcf.acp.group.option.admin.language.canAddServer"><![CDATA[Can add new 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.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
 		<item name="wcf.acp.group.option.admin.system.canEditOption"><![CDATA[Can change the system options]]></item>
 		<item name="wcf.acp.group.option.admin.system.canViewLog"><![CDATA[Can view logs]]></item>
 		<item name="wcf.acp.group.option.admin.system.cronjob.canAddCronjob"><![CDATA[Can add new cron jobs]]></item>
@@ -89,18 +96,18 @@
 		<item name="wcf.acp.group.option.admin.user.canMailUser"><![CDATA[Can send e-mails to users]]></item>
 		<item name="wcf.acp.group.option.admin.user.canSearchUser"><![CDATA[Can search users]]></item>
 		<item name="wcf.acp.group.option.category.admin"><![CDATA[Administrative permissions]]></item>
-		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[General administrative permissions]]></item>
-		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System functions]]></item>
+		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Design]]></item>
+		<item name="wcf.acp.group.option.category.admin.general"><![CDATA[General permissions]]></item>
+		<item name="wcf.acp.group.option.category.admin.language"><![CDATA[Languages]]></item>
+		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Styles]]></item>
+		<item name="wcf.acp.group.option.category.admin.system"><![CDATA[System]]></item>
 		<item name="wcf.acp.group.option.category.admin.system.cronjob"><![CDATA[Cron jobs]]></item>
-		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Package management]]></item>
-		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[User functions]]></item>
-		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[Group management]]></item>
-		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[User management]]></item>
+		<item name="wcf.acp.group.option.category.admin.system.package"><![CDATA[Packages]]></item>
+		<item name="wcf.acp.group.option.category.admin.user"><![CDATA[Users]]></item>
+		<item name="wcf.acp.group.option.category.admin.user.group"><![CDATA[User groups]]></item>
+		<item name="wcf.acp.group.option.category.admin.user.user"><![CDATA[Users]]></item>
 		<item name="wcf.acp.group.option.category.mod"><![CDATA[Moderative permissions]]></item>
 		<item name="wcf.acp.group.option.category.user"><![CDATA[General permissions]]></item>
-		<item name="wcf.acp.group.option.category.admin.display"><![CDATA[Design]]></item>
-		<item name="wcf.acp.group.option.admin.style.canUseDisabledStyle"><![CDATA[Can view disabled styles]]></item>
-		<item name="wcf.acp.group.option.category.admin.style"><![CDATA[Style management]]></item>
 	</category>
 	
 	<category name="wcf.acp.cache">
-- 
2.20.1