Attachment 6795 Details for Bug 32760

[patch] new patch text changes

32760_after_po.patch (text/plain), 118.35 KB, created by Alexander Kramer on 2015-04-01 15:14 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kramer

Created: 2015-04-01 15:14 CEST

Size: 118.35 KB

patch

obsolete

>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/clientdevices.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/clientdevices.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/clientdevices.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=clientDevicesFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=clientDevicesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/thinclient.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/thinclient.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/thinclient.py	(Arbeitskopie)
>@@ -128,7 +128,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -138,7 +138,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -148,7 +148,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=thinclientFixedAttributes,
> 			multivalue=1,
>@@ -158,7 +158,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=thinclientFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/mobileclientpackages.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/mobileclientpackages.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/mobileclientpackages.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=mobileClientPackagesFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=mobileClientPackagesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/sound.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/sound.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/sound.py	(Arbeitskopie)
>@@ -95,7 +95,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -105,7 +105,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -115,7 +115,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=soundFixedAttributes,
> 			multivalue=1,
>@@ -125,7 +125,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=soundFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/xfree.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/xfree.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/xfree.py	(Arbeitskopie)
>@@ -237,7 +237,7 @@
> 			configAttributeName='univentionXModuleChoices'
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -247,7 +247,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -257,7 +257,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=xfreeFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/managedclientpackages.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/managedclientpackages.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/managedclientpackages.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=clientPackagesFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=clientPackagesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/legacy/policies/de.po	(Arbeitskopie)
>@@ -29,10 +29,11 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2012-10-19 14:46+0200\n"
>+"POT-Creation-Date: 2015-04-01 14:22+0200\n"
> "PO-Revision-Date: 2011-10-29 22:19+0200\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>+"Language: \n"
> "MIME-Version: 1.0\n"
> "Content-Type: text/plain; charset=UTF-8\n"
> "Content-Transfer-Encoding: unicode\n"
>@@ -57,31 +58,33 @@
> 
> #: clientdevices.py:86 managedclientpackages.py:97 mobileclientpackages.py:97
> #: sound.py:98 thinclient.py:131 xfree.py:240
>-msgid "Required object classes"
>-msgstr "BenÃ¶tigte Objektklassen"
>+msgid "Required object class"
>+msgstr "BenÃ¶tigte Objektklasse"
> 
> #: clientdevices.py:96 managedclientpackages.py:107
> #: mobileclientpackages.py:107 sound.py:108 thinclient.py:141 xfree.py:250
>-msgid "Excluded object classes"
>-msgstr "Ausgeschlossene Objektklassen"
>+msgid "Excluded object class"
>+msgstr "Ausgeschlossene Objektklasse"
> 
> #: clientdevices.py:106 managedclientpackages.py:117
> #: mobileclientpackages.py:117 sound.py:118 thinclient.py:151 xfree.py:260
>-msgid "Fixed attributes"
>-msgstr "Festgelegte Attribute"
>+msgid "Fixed attribute"
>+msgstr "Festgelegtes Attribut"
> 
> #: clientdevices.py:116 managedclientpackages.py:127
> #: mobileclientpackages.py:127 sound.py:128 thinclient.py:161
>-msgid "Empty attributes"
>-msgstr "Leere Attribute"
>+msgid "Empty attribute"
>+msgstr "Leeres Attribut"
> 
>-#: clientdevices.py:128 clientdevices.py:129 managedclientpackages.py:139
>-#: managedclientpackages.py:140 mobileclientpackages.py:139
>-#: mobileclientpackages.py:140 sound.py:140 sound.py:141 thinclient.py:173
>-#: thinclient.py:174 xfree.py:393 xfree.py:394
>+#: clientdevices.py:128 managedclientpackages.py:139
>+#: mobileclientpackages.py:139 sound.py:140 thinclient.py:173 xfree.py:393
> msgid "General"
> msgstr "Allgemein"
> 
>+#: clientdevices.py:129
>+msgid "General client devices settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r die Client-Peripherie"
>+
> #: clientdevices.py:134 managedclientpackages.py:146
> #: mobileclientpackages.py:146 sound.py:147 thinclient.py:181 xfree.py:414
> msgid "Object"
>@@ -105,6 +108,10 @@
> msgid "Managed Client packages"
> msgstr "Managed Client Pakete"
> 
>+#: managedclientpackages.py:140
>+msgid "General managed client packages settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r die Managed Client Pakete"
>+
> #: mobileclientpackages.py:59
> msgid "Policy: Mobile Client packages"
> msgstr "Richtlinie: Mobile Client Pakete"
>@@ -113,6 +120,10 @@
> msgid "Mobile Client packages"
> msgstr "Mobile Client Pakete"
> 
>+#: mobileclientpackages.py:140
>+msgid "General mobile client packages settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r die Mobile Client Pakete"
>+
> #: sound.py:47 sound.py:77
> msgid "Sound enabled"
> msgstr "Sound aktivieren"
>@@ -129,6 +140,10 @@
> msgid "Sound settings"
> msgstr "Sound-Einstellungen"
> 
>+#: sound.py:141
>+msgid "General sound settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r den Sound"
>+
> #: thinclient.py:47 thinclient.py:91
> msgid "File servers"
> msgstr "File-Server"
>@@ -181,6 +196,10 @@
> msgid "Servers to use"
> msgstr "Zu nutzende Server"
> 
>+#: thinclient.py:174
>+msgid "General thin client settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r den Thin Client"
>+
> #: xfree.py:45 xfree.py:382
> msgid "Automatic detection"
> msgstr "Automatische Erkennung"
>@@ -305,6 +324,10 @@
> msgid "RAM on the graphics adapter in kB"
> msgstr "RAM auf der Grafikkarte in kB"
> 
>+#: xfree.py:394
>+msgid "General display settings"
>+msgstr "Allgemeine Einstellungen fÃ¼r den Display"
>+
> #: xfree.py:400
> msgid "Input devices"
> msgstr "EingabegerÃ¤te"
>@@ -320,21 +343,3 @@
> #: xfree.py:409
> msgid "Advanced settings of secondary display"
> msgstr "Erweiterte Einstellungen des sekundÃ¤ren Monitors"
>-
>-msgid "General client devices settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r die Client-Peripherie"
>-
>-msgid "General managed client packages settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r die Managed Client Pakete"
>-
>-msgid "General mobile client packages settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r die Mobile Client Pakete"
>-
>-msgid "General sound settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r den Sound"
>-
>-msgid "General thin client settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r den Thin Client"
>-
>-msgid "General display settings"
>-msgstr "Allgemeine Einstellungen fÃ¼r den Display"
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/nfsmounts.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/nfsmounts.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/nfsmounts.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_boot.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_boot.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_boot.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_bootFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_bootFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/memberpackages.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/memberpackages.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/memberpackages.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=memberPackagesFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=memberPackagesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/ldapserver.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/ldapserver.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/ldapserver.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/registry.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/registry.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/registry.py	(Arbeitskopie)
>@@ -84,7 +84,7 @@
> 			identifies=0,
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=registryFixedAttributes,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=registryFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/pwhistory.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/pwhistory.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/pwhistory.py	(Arbeitskopie)
>@@ -115,7 +115,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -125,7 +125,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -135,7 +135,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=pwhistoryFixedAttributes,
> 			multivalue=1,
>@@ -145,7 +145,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=pwhistoryFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/desktop.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/desktop.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/desktop.py	(Arbeitskopie)
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -134,7 +134,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=desktopFixedAttributes,
> 			multivalue=1,
>@@ -144,7 +144,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=desktopFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/share_userquota.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/share_userquota.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/share_userquota.py	(Arbeitskopie)
>@@ -128,7 +128,7 @@
> 			default="FALSE"
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -138,7 +138,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -148,7 +148,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=shareUserQuotaFixedAttributes,
> 			multivalue=1,
>@@ -158,7 +158,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=shareUserQuotaFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po	(Arbeitskopie)
>@@ -96,7 +96,7 @@
> #: registry.py:107 release.py:116 repositoryserver.py:107
> #: repositorysync.py:147 share_userquota.py:151 slavepackages.py:117
> #: umc.py:107
>-msgid "Fixed attributes"
>+msgid "Fixed attribute"
> msgstr "Festgelegte Attribute"
> 
> #: admin_container.py:120 autostart.py:116 desktop.py:147 dhcp_boot.py:127
>@@ -108,7 +108,7 @@
> #: registry.py:117 release.py:126 repositoryserver.py:117
> #: repositorysync.py:157 share_userquota.py:161 slavepackages.py:127
> #: umc.py:117
>-msgid "Empty attributes"
>+msgid "Empty attribute"
> msgstr "Leere Attribute"
> 
> #: admin_container.py:132 admin_container.py:133 autostart.py:128
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py	(Arbeitskopie)
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=releaseFixedAttributes,
> 			multivalue=1,
>@@ -123,7 +123,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=releaseFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dns.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dns.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dns.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_dnsFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_dnsFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/maintenance.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/maintenance.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/maintenance.py	(Arbeitskopie)
>@@ -164,7 +164,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -174,7 +174,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -184,7 +184,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=maintenanceFixedAttributes,
> 			multivalue=1,
>@@ -194,7 +194,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=maintenanceFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_routing.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_routing.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_routing.py	(Arbeitskopie)
>@@ -82,7 +82,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -92,7 +92,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -102,7 +102,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_routingFixedAttributes,
> 			multivalue=1,
>@@ -112,7 +112,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_routingFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dnsupdate.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dnsupdate.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_dnsupdate.py	(Arbeitskopie)
>@@ -160,7 +160,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -170,7 +170,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -180,7 +180,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_dnsupdateFixedAttributes,
> 			multivalue=1,
>@@ -190,7 +190,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_dnsupdateFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/admin_container.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/admin_container.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/admin_container.py	(Arbeitskopie)
>@@ -87,7 +87,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -97,7 +97,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -107,7 +107,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=adminFixedAttributes,
> 			multivalue=1,
>@@ -117,7 +117,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=adminFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/masterpackages.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/masterpackages.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/masterpackages.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=masterPackagesFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=masterPackagesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/mailquota.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/mailquota.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/mailquota.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=mailquotaFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=mailquotaFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_netbios.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_netbios.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_netbios.py	(Arbeitskopie)
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_netbiosFixedAttributes,
> 			multivalue=1,
>@@ -134,7 +134,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_netbiosFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/print_quota.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/print_quota.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/print_quota.py	(Arbeitskopie)
>@@ -107,7 +107,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -117,7 +117,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -127,7 +127,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=sharePrintQuotaFixedAttributes,
> 			multivalue=1,
>@@ -137,7 +137,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=sharePrintQuotaFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositoryserver.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositoryserver.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositoryserver.py	(Arbeitskopie)
>@@ -84,7 +84,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=ldapServerFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_leasetime.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_leasetime.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_leasetime.py	(Arbeitskopie)
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_leasetimeFixedAttributes,
> 			multivalue=1,
>@@ -134,7 +134,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_leasetimeFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_scope.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_scope.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_scope.py	(Arbeitskopie)
>@@ -126,7 +126,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -136,7 +136,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -146,7 +146,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_scopeFixedAttributes,
> 			multivalue=1,
>@@ -156,7 +156,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_scopeFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/slavepackages.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/slavepackages.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/slavepackages.py	(Arbeitskopie)
>@@ -94,7 +94,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -104,7 +104,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -114,7 +114,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=slavePackagesFixedAttributes,
> 			multivalue=1,
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=slavePackagesFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositorysync.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositorysync.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/repositorysync.py	(Arbeitskopie)
>@@ -124,7 +124,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -134,7 +134,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -144,7 +144,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=repositorySyncFixedAttributes,
> 			multivalue=1,
>@@ -154,7 +154,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=repositorySyncFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/printserver.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/printserver.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/printserver.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=printServerFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=printServerFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/umc.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/umc.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/umc.py	(Arbeitskopie)
>@@ -84,7 +84,7 @@
> 			identifies = False
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description = _( 'Required object classes' ),
>+			short_description = _( 'Required object class' ),
> 			long_description = '',
> 			syntax = udm_syntax.string,
> 			multivalue = True,
>@@ -94,7 +94,7 @@
> 			identifies = False
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description = _( 'Excluded object classes' ),
>+			short_description = _( 'Excluded object class' ),
> 			long_description = '',
> 			syntax = udm_syntax.string,
> 			multivalue = True,
>@@ -104,7 +104,7 @@
> 			identifies = False
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description = _( 'Fixed attributes' ),
>+			short_description = _( 'Fixed attribute' ),
> 			long_description = '',
> 			syntax = umcFixedAttributes,
> 			multivalue = True,
>@@ -114,7 +114,7 @@
> 			identifies = False
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description = _( 'Empty attributes' ),
>+			short_description = _( 'Empty attribute' ),
> 			long_description = '',
> 			syntax = umcFixedAttributes,
> 			multivalue = True,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_statements.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_statements.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/dhcp_statements.py	(Arbeitskopie)
>@@ -137,7 +137,7 @@
> 			identifies=0
> 			),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -147,7 +147,7 @@
> 			identifies=0
> 			),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -157,7 +157,7 @@
> 			identifies=0
> 			),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=dhcp_statementsFixedAttributes,
> 			multivalue=1,
>@@ -167,7 +167,7 @@
> 			identifies=0
> 			),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=dhcp_statementsFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/autostart.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/autostart.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/autostart.py	(Arbeitskopie)
>@@ -83,7 +83,7 @@
> 			identifies=0
> 		),
> 	'requiredObjectClasses': univention.admin.property(
>-			short_description=_('Required object classes'),
>+			short_description=_('Required object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -93,7 +93,7 @@
> 			identifies=0
> 		),
> 	'prohibitedObjectClasses': univention.admin.property(
>-			short_description=_('Excluded object classes'),
>+			short_description=_('Excluded object class'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -103,7 +103,7 @@
> 			identifies=0
> 		),
> 	'fixedAttributes': univention.admin.property(
>-			short_description=_('Fixed attributes'),
>+			short_description=_('Fixed attribute'),
> 			long_description='',
> 			syntax=autoStartFixedAttributes,
> 			multivalue=1,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
> 	'emptyAttributes': univention.admin.property(
>-			short_description=_('Empty attributes'),
>+			short_description=_('Empty attribute'),
> 			long_description='',
> 			syntax=autoStartFixedAttributes,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/group.py	(Arbeitskopie)
>@@ -127,7 +127,7 @@
> 			options=['samba']
> 		),
> 	'sambaPrivileges': univention.admin.property(
>-			short_description = _( 'Samba privileges' ),
>+			short_description = _( 'Samba privilege' ),
> 			long_description = _( 'Manage samba privileges' ),
> 			syntax = univention.admin.syntax.SambaPrivileges,
> 			multivalue = True,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/groups/de.po	(Arbeitskopie)
>@@ -29,7 +29,7 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2013-10-14 21:35+0200\n"
>+"POT-Creation-Date: 2015-04-01 14:16+0200\n"
> "PO-Revision-Date: 2011-10-09 19:21+0200\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>@@ -39,7 +39,7 @@
> "Content-Transfer-Encoding: unicode\n"
> "Generated-By: pygettext.py 1.3\n"
> 
>-#: group.py:53 group.py:208
>+#: group.py:53 group.py:216
> msgid "Groups"
> msgstr "Gruppen"
> 
>@@ -79,107 +79,107 @@
> msgid "Name"
> msgstr "Name"
> 
>-#: group.py:97 group.py:263
>+#: group.py:98 group.py:272
> msgid "Group ID"
> msgstr "Gruppen-ID"
> 
>-#: group.py:107
>+#: group.py:108
> msgid "Relative ID"
> msgstr "Relative ID"
> 
>-#: group.py:117
>+#: group.py:119
> msgid "NT group type"
> msgstr "NT Gruppentyp"
> 
>-#: group.py:128
>-msgid "Samba privileges"
>-msgstr "Samba-Privilegien"
>+#: group.py:130
>+msgid "Samba privilege"
>+msgstr "Samba-Privileg"
> 
>-#: group.py:129
>+#: group.py:131
> msgid "Manage samba privileges"
> msgstr "Samba-Privilegien verwalten"
> 
>-#: group.py:139
>+#: group.py:141
> msgid "AD group type"
> msgstr "AD Gruppentyp"
> 
>-#: group.py:140
>+#: group.py:142
> msgid "Active Directory group type"
> msgstr "Active Directory Gruppentyp"
> 
>-#: group.py:151
>+#: group.py:154
> msgid "Description"
> msgstr "Beschreibung"
> 
>-#: group.py:162
>+#: group.py:166
> msgid "Users"
> msgstr "Benutzer"
> 
>-#: group.py:173
>+#: group.py:178
> msgid "Hosts"
> msgstr "enthaltene Rechner"
> 
>-#: group.py:185
>+#: group.py:191
> msgid "Mail address"
> msgstr "Mail-Adresse"
> 
>-#: group.py:197 group.py:260
>+#: group.py:204 group.py:269
> msgid "Member of"
> msgstr "Mitglied von"
> 
>-#: group.py:219
>+#: group.py:228
> msgid "Users that are allowed to send e-mails to the group"
> msgstr "Benutzer, die berechtigt sind, E-Mails an diese Gruppe zu versenden"
> 
>-#: group.py:230
>+#: group.py:239
> msgid "Groups that are allowed to send e-mails to the group"
> msgstr "Gruppen, die berechtigt sind, E-Mails an diese Gruppe zu versenden"
> 
>-#: group.py:243
>+#: group.py:252
> msgid "General"
> msgstr "Allgemein"
> 
>-#: group.py:243
>+#: group.py:252
> msgid "Basic settings"
> msgstr "Grundeinstellungen"
> 
>-#: group.py:244
>+#: group.py:253
> msgid "Group account"
> msgstr "Gruppen-Konto"
> 
>-#: group.py:247
>+#: group.py:256
> msgid "Members of this group"
> msgstr "Mitglieder dieser Gruppe"
> 
>-#: group.py:252
>+#: group.py:261
> msgid "Mail"
> msgstr "Mail"
> 
>-#: group.py:252
>+#: group.py:261
> msgid "Mail settings of this group"
> msgstr "Mail-Einstellungen dieser Gruppe"
> 
>-#: group.py:257
>+#: group.py:266
> msgid "Host members"
> msgstr "enthaltene Rechner"
> 
>-#: group.py:257
>+#: group.py:266
> msgid "Host members of this group"
> msgstr "in dieser Gruppe enthaltene Rechner"
> 
>-#: group.py:260
>+#: group.py:269
> msgid "Membership in other groups"
> msgstr "Mitgliedschaft in weiteren Gruppen"
> 
>-#: group.py:263
>+#: group.py:272
> msgid "ID of this group"
> msgstr "ID dieser Gruppe"
> 
>-#: group.py:266
>+#: group.py:275
> msgid "Windows"
> msgstr "Windows"
> 
>-#: group.py:266
>+#: group.py:275
> msgid "Windows account settings"
> msgstr "Windows-Kontoeinstellungen"
> 
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py	(Arbeitskopie)
>@@ -141,7 +141,7 @@
> 			default = ( ( '3', 'hours' ), [] )
> 		),
> 	'nameserver': univention.admin.property(
>-			short_description=_('Name servers'),
>+			short_description=_('Name server'),
> 			long_description='',
> 			syntax=univention.admin.syntax.dnsName,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/reverse_zone.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/reverse_zone.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/reverse_zone.py	(Arbeitskopie)
>@@ -139,7 +139,7 @@
> 			default = ( ( '1', 'days' ), [] )
> 		),
> 	'nameserver': univention.admin.property(
>-			short_description=_('Name servers'),
>+			short_description=_('Name server'),
> 			long_description='',
> 			syntax=univention.admin.syntax.dnsName,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po	(Arbeitskopie)
>@@ -29,10 +29,11 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2011-11-18 15:47+0100\n"
>+"POT-Creation-Date: 2015-04-01 14:25+0200\n"
> "PO-Revision-Date: 2009-08-04 14:47+0200\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>+"Language: \n"
> "MIME-Version: 1.0\n"
> "Content-Type: text/plain; charset=UTF-8\n"
> "Content-Transfer-Encoding: unicode\n"
>@@ -46,31 +47,33 @@
> msgid "Alias"
> msgstr "Alias"
> 
>-#: alias.py:66 forward_zone.py:69 host_record.py:64 reverse_zone.py:66
>-#: srv_record.py:74 txt_record.py:64
>+#: alias.py:67 forward_zone.py:67 host_record.py:66 reverse_zone.py:65
>+#: srv_record.py:75 txt_record.py:65
> msgid "Zone time to live"
> msgstr "Zone Time-to-Live"
> 
>-#: alias.py:77
>+#: alias.py:78
> msgid "Canonical name"
> msgstr "Kanonischer Name"
> 
>-#: alias.py:78
>+#: alias.py:79
> msgid "Alias for this host. FQDNs must end with '.'"
> msgstr "Alias des Rechners. Der FQDN muss mit einem '.' enden"
> 
>-#: alias.py:88 alias.py:89 dns.py:84 forward_zone.py:185 forward_zone.py:186
>-#: host_record.py:104 host_record.py:105 ptr_record.py:73 ptr_record.py:74
>-#: reverse_zone.py:155 reverse_zone.py:156 reverse_zone.py:163
>-#: srv_record.py:86 srv_record.py:87 txt_record.py:86 txt_record.py:87
>+#: alias.py:90 dns.py:85 forward_zone.py:183 host_record.py:106
>+#: ptr_record.py:75 reverse_zone.py:154 srv_record.py:87 txt_record.py:87
> msgid "General"
> msgstr "Allgemein"
> 
>-#: alias.py:88 dns.py:84 forward_zone.py:185 ptr_record.py:73
>-#: reverse_zone.py:155 srv_record.py:86
>+#: alias.py:90 dns.py:85 forward_zone.py:183 ptr_record.py:75
>+#: reverse_zone.py:154 srv_record.py:87
> msgid "Basic settings"
> msgstr "Grundeinstellungen"
> 
>+#: alias.py:91
>+msgid "General alias record settings"
>+msgstr "Grundeinstellungen - Alias Record"
>+
> #: dns.py:53 dns.py:57
> msgid "DNS"
> msgstr "DNS"
>@@ -99,120 +102,129 @@
> msgid "Name"
> msgstr "Name"
> 
>-#: forward_zone.py:53
>+#: forward_zone.py:50
> msgid "DNS: Forward lookup zone"
> msgstr "DNS: Forward Lookup Zone"
> 
>-#: forward_zone.py:59
>+#: forward_zone.py:56
> msgid "Zone name"
> msgstr "Name der Zone"
> 
>-#: forward_zone.py:80 reverse_zone.py:77
>+#: forward_zone.py:78 reverse_zone.py:76
> msgid "Contact person"
> msgstr "Verantwortliche Person"
> 
>-#: forward_zone.py:91 reverse_zone.py:88
>+#: forward_zone.py:89 reverse_zone.py:87
> msgid "Serial number"
> msgstr "Seriennummer"
> 
>-#: forward_zone.py:102 reverse_zone.py:99
>+#: forward_zone.py:100 reverse_zone.py:98
> msgid "Refresh interval"
> msgstr "Aktualisierungsintervall"
> 
>-#: forward_zone.py:113 reverse_zone.py:110
>+#: forward_zone.py:111 reverse_zone.py:109
> msgid "Retry interval"
> msgstr "Intervall fÃ¼r erneute Versuche"
> 
>-#: forward_zone.py:124 reverse_zone.py:121
>+#: forward_zone.py:122 reverse_zone.py:120
> msgid "Expiry interval"
> msgstr "Ablaufintervall"
> 
>-#: forward_zone.py:135 reverse_zone.py:132
>+#: forward_zone.py:133 reverse_zone.py:131
> msgid "Minimum time to live"
> msgstr "Minimum Time-to-Live"
> 
>-#: forward_zone.py:146 reverse_zone.py:143
>-msgid "Name servers"
>+#: forward_zone.py:144 reverse_zone.py:142
>+msgid "Name server"
> msgstr "Nameserver"
> 
>-#: forward_zone.py:156
>+#: forward_zone.py:154
> msgid "Mail exchanger host"
> msgstr "Mail Exchanger Rechner"
> 
>-#: forward_zone.py:165
>+#: forward_zone.py:163
> msgid "TXT record"
> msgstr "TXT Record"
> 
>-#: forward_zone.py:174 forward_zone.py:200 host_record.py:75
>+#: forward_zone.py:172 forward_zone.py:198 host_record.py:77
> msgid "IP addresses"
> msgstr "IP-Adressen"
> 
>-#: forward_zone.py:192 forward_zone.py:193 reverse_zone.py:162
>+#: forward_zone.py:184
>+msgid "General forward lookup zone settings"
>+msgstr "Grundeinstellungen - Forward Lookup Zone"
>+
>+#: forward_zone.py:190 forward_zone.py:191 reverse_zone.py:161
>+#: reverse_zone.py:162
> msgid "Start of authority"
> msgstr "Start of Authority Eintrag"
> 
>-#: forward_zone.py:192 reverse_zone.py:162
>+#: forward_zone.py:190 reverse_zone.py:161
> msgid "Primary name server information"
> msgstr "PrimÃ¤re Nameserver Informationen"
> 
>-#: forward_zone.py:200 forward_zone.py:201
>+#: forward_zone.py:198 forward_zone.py:199
> msgid "IP addresses of the zone"
> msgstr "IP-Adressen der Zone"
> 
>-#: forward_zone.py:205 forward_zone.py:206
>+#: forward_zone.py:203 forward_zone.py:204
> msgid "MX records"
> msgstr "MX Records"
> 
>-#: forward_zone.py:205
>+#: forward_zone.py:203
> msgid "Mail exchanger records"
> msgstr "Mailserver-EintrÃ¤ge"
> 
>-#: forward_zone.py:210 forward_zone.py:211
>+#: forward_zone.py:208 forward_zone.py:209
> msgid "TXT records"
> msgstr "TXT Records"
> 
>-#: forward_zone.py:210
>+#: forward_zone.py:208
> msgid "Text records"
> msgstr "Text Records"
> 
>-#: forward_zone.py:251 host_record.py:156 ptr_record.py:100
>-#: reverse_zone.py:208 srv_record.py:142 txt_record.py:116
>+#: forward_zone.py:249 host_record.py:158 ptr_record.py:102
>+#: reverse_zone.py:228 srv_record.py:143 txt_record.py:117
> msgid "neither DN nor position present"
> msgstr "Weder ein DN noch eine Position wurde angegeben"
> 
>-#: host_record.py:54
>+#: host_record.py:55
> msgid "Hostname"
> msgstr "Rechnername"
> 
>-#: host_record.py:84
>+#: host_record.py:86
> msgid "Mail Exchanger"
> msgstr "Mail Exchanger"
> 
>-#: host_record.py:93 txt_record.py:75
>+#: host_record.py:95 txt_record.py:76
> msgid "Text Record"
> msgstr "Text Record"
> 
>-#: host_record.py:104 txt_record.py:86
>+#: host_record.py:106 txt_record.py:87
> msgid "Basic values"
> msgstr "Grundeinstellungen"
> 
>-#: host_record.py:111
>+#: host_record.py:107
>+msgid "General host record settings"
>+msgstr "Grundeinstellungen - Host Record"
>+
>+#: host_record.py:113
> msgid "Mail"
> msgstr "Mail"
> 
>-#: host_record.py:111
>+#: host_record.py:113
> msgid "Mail exchangers for this host"
> msgstr "Mail Exchanger fÃ¼r diesen Rechner"
> 
>-#: host_record.py:114
>+#: host_record.py:116
> msgid "Text"
> msgstr "Text"
> 
>-#: host_record.py:114
>+#: host_record.py:116
> msgid "Optional text"
> msgstr "Optionaler Text"
> 
>-#: host_record.py:154 ptr_record.py:98 srv_record.py:140 txt_record.py:114
>+#: host_record.py:156 ptr_record.py:100 srv_record.py:141 txt_record.py:115
> msgid "superordinate object not present"
> msgstr "Ein Ã¼bergeordnetes Objekt ist nicht vorhanden"
> 
>@@ -224,36 +236,52 @@
> msgid "Address"
> msgstr "Adresse"
> 
>-#: ptr_record.py:62
>+#: ptr_record.py:63
> msgid "Pointer record"
> msgstr "Pointer Record"
> 
>-#: ptr_record.py:63
>+#: ptr_record.py:64
> msgid "FQDNs must end with '.'"
> msgstr "Der FQDN muss mit einem '.' enden"
> 
>-#: reverse_zone.py:50
>+#: ptr_record.py:76
>+msgid "General pointer record settings"
>+msgstr "Grundeinstellungen - Pointer Record"
>+
>+#: reverse_zone.py:48
> msgid "DNS: Reverse lookup zone"
> msgstr "DNS: Reverse Lookup Zone"
> 
>-#: reverse_zone.py:56
>+#: reverse_zone.py:54
> msgid "Subnet"
> msgstr "Subnetz"
> 
>+#: reverse_zone.py:155
>+msgid "General reverse lookup zone settings"
>+msgstr "Grundeinstellungen - Reverse Lookup Zone"
>+
> #: srv_record.py:49
> msgid "DNS: Service record"
> msgstr "DNS: Service Record"
> 
>-#: srv_record.py:65
>+#: srv_record.py:66
> msgid "Location"
> msgstr "Ort"
> 
>-msgid "DNS: Host Record"
>-msgstr "DNS: Host Record"
>+#: srv_record.py:88
>+msgid "General service record settings"
>+msgstr "Grundeinstellungen - Service Record"
> 
>-msgid "DNS: TXT Record"
>-msgstr "DNS: TXT Record"
>+#: txt_record.py:88
>+msgid "General TXT record settings"
>+msgstr "Grundeinstellungen - TXT Record"
> 
>+#~ msgid "DNS: Host Record"
>+#~ msgstr "DNS: Host Record"
>+
>+#~ msgid "DNS: TXT Record"
>+#~ msgstr "DNS: TXT Record"
>+
> #~ msgid "Additional name servers"
> #~ msgstr "ZusÃ¤tzliche Nameserver"
> 
>@@ -277,24 +305,3 @@
> 
> #~ msgid "Update/Create Reverse Record"
> #~ msgstr "Reverse Record erstellen/erneuern"
>-
>-msgid "General alias record settings"
>-msgstr "Grundeinstellungen - Alias Record"
>-
>-msgid "General forward lookup zone settings"
>-msgstr "Grundeinstellungen - Forward Lookup Zone"
>-
>-msgid "General host record settings"
>-msgstr "Grundeinstellungen - Host Record"
>-
>-msgid "General pointer record settings"
>-msgstr "Grundeinstellungen - Pointer Record"
>-
>-msgid "General reverse lookup zone settings"
>-msgstr "Grundeinstellungen - Reverse Lookup Zone"
>-
>-msgid "General service record settings"
>-msgstr "Grundeinstellungen - Service Record"
>-
>-msgid "General TXT record settings"
>-msgstr "Grundeinstellungen - TXT Record"
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/share.py	(Arbeitskopie)
>@@ -199,7 +199,7 @@
> 			default='1'
> 		),
> 	'nfs_hosts': univention.admin.property(
>-			short_description=_('Only allow access for these hosts, IP addresses or networks'),
>+			short_description=_('Only allow access for this host, IP address or network'),
> 			long_description=_('May contain hostnames, ip addresses or networks (e.g. 10.1.1.1/24 or 10.1.1.1/255.255.255.0'),
> 			syntax=univention.admin.syntax.hostname_or_ipadress_or_network,
> 			multivalue=1,
>@@ -459,7 +459,7 @@
> 			default='manual'
> 		),
> 	'sambaHostsAllow': univention.admin.property(
>-			short_description=_('Allowed hosts/networks'),
>+			short_description=_('Allowed host/network'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -469,7 +469,7 @@
> 			identifies=0
> 		),
> 	'sambaHostsDeny': univention.admin.property(
>-			short_description=_('Denied hosts/networks'),
>+			short_description=_('Denied host/network'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/shares/de.po	(Arbeitskopie)
>@@ -30,7 +30,7 @@
> msgstr ""
> "Project-Id-Version: univention-admin-modules\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2014-10-29 20:36+0100\n"
>+"POT-Creation-Date: 2015-04-01 14:48+0200\n"
> "PO-Revision-Date: 2011-09-21 20:05+0200\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>@@ -72,8 +72,7 @@
> msgid "Price per print job"
> msgstr "Preis pro Druckauftrag"
> 
>-#: printergroup.py:129 printergroup.py:130 printer.py:220 printer.py:221
>-#: share.py:649 share.py:650
>+#: printergroup.py:129 printer.py:220 share.py:649
> msgid "General"
> msgstr "Allgemein"
> 
>@@ -81,6 +80,10 @@
> msgid "General settings"
> msgstr "Grundeinstellungen"
> 
>+#: printergroup.py:130
>+msgid "General printer group share settings"
>+msgstr "Grundeinstellungen - Druckergruppen-Freigabe"
>+
> #: printergroup.py:194 printer.py:338
> #, python-format
> msgid "%s is member of following quota printer groups %s"
>@@ -166,6 +169,10 @@
> msgid "For the given groups printing is explicitly allowed or denied."
> msgstr "FÃ¼r die angegebenen Gruppen wird der Zugriff erlaubt oder abgewiesen."
> 
>+#: printer.py:221
>+msgid "General printer share settings"
>+msgstr "Grundeinstellungen - Druckerfreigabe"
>+
> #: printer.py:231
> msgid "Access control for users and groups"
> msgstr "Zugriffskontrolle fÃ¼r Benutzer und Gruppen"
>@@ -337,8 +344,9 @@
> msgstr "Zugriff auf eine nicht privilegierte uid Kennung umlenken."
> 
> #: share.py:202
>-msgid "Only allow access for these hosts, IP addresses or networks"
>-msgstr "Zugriff nur fÃ¼r diese Rechner, IP-Adressen oder Netze erlauben"
>+msgid "Only allow access for this host, IP address or network"
>+msgstr ""
>+"Zugriff begrenzen auf: Rechner, IP-Adresse oder Netz"
> 
> #: share.py:203
> msgid ""
>@@ -730,12 +738,12 @@
> "Bestimmt das Verfahren, mit dem Clients Dateiinhalte lokal zwischenspeichern."
> 
> #: share.py:462
>-msgid "Allowed hosts/networks"
>-msgstr "Zugelassene Rechner/Netze"
>+msgid "Allowed host/network"
>+msgstr "Zugelassene(r/s) Rechner/Netz"
> 
> #: share.py:472
>-msgid "Denied hosts/networks"
>-msgstr "Nicht zugelassene Rechner/Netze"
>+msgid "Denied host/network"
>+msgstr "Nicht zugelassene(r/s) Rechner/Netz"
> 
> #: share.py:482
> msgid "Valid users or groups"
>@@ -917,6 +925,10 @@
> "Konfigurieren von zusÃ¤tzlichen Einstellungen fÃ¼r diese Freigabe, die der "
> "Datei /etc/exports hinzugefÃ¼gt werden."
> 
>+#: share.py:650
>+msgid "General directory share settings"
>+msgstr "Grundeinstellungen - Verzeichnisfreigabe"
>+
> #: share.py:657 share.py:658
> msgid "NFS"
> msgstr "NFS"
>@@ -1004,13 +1016,3 @@
> #, python-format
> msgid "%s (%s on %s)"
> msgstr "%s (%s auf %s)"
>-
>-msgid "General printer share settings"
>-msgstr "Grundeinstellungen - Druckerfreigabe"
>-
>-msgid "General printer group share settings"
>-msgstr "Grundeinstellungen - Druckergruppen-Freigabe"
>-
>-msgid "General directory share settings"
>-msgstr "Grundeinstellungen - Verzeichnisfreigabe"
>-
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py	(Arbeitskopie)
>@@ -49,7 +49,7 @@
> }
> property_descriptions={
> 	'name': univention.admin.property(
>-			short_description=_('Name'),
>+			short_description=_('User name'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -92,7 +92,7 @@
> 			identifies=0
> 		),
> 	'organisation': univention.admin.property(
>-			short_description=_('Organization'),
>+			short_description=_('Organisation'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -113,7 +113,7 @@
> 			identifies=0
> 		),
>  	'disabled': univention.admin.property(
>- 			short_description=_('Disabled'),
>+ 			short_description=_('Account deactivation'),
>  			long_description='',
>  			syntax=univention.admin.syntax.boolean,
>  			multivalue=0,
>@@ -124,7 +124,7 @@
>  			show_in_lists=1
>  		),
> 	'e-mail': univention.admin.property(
>-			short_description=_('E-Mail Address'),
>+			short_description=_('E-mail address'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>@@ -134,7 +134,7 @@
> 			identifies=0,
> 		),
> 	'unixhome': univention.admin.property(
>-			short_description=_('Unix Home Directory'),
>+			short_description=_('Unix home directory'),
> 			long_description='',
> 			syntax=univention.admin.syntax.absolutePath,
> 			multivalue=0,
>@@ -145,7 +145,7 @@
> 			default = '/home/<username>',
> 		),
>  	'homeShare': univention.admin.property(
>- 			short_description=_('Home Share'),
>+ 			short_description=_('Home share'),
>  			long_description=_('Share, the user\'s home directory resides on'),
>  			syntax = univention.admin.syntax.WritableShare,
>  			multivalue=0,
>@@ -155,8 +155,8 @@
>  			identifies=0,
>  		),
>  	'homeSharePath': univention.admin.property(
>- 			short_description=_('Home Share Path'),
>- 			long_description=_('Path on the home share'),
>+ 			short_description=_('Home share path'),
>+ 			long_description=_('Path to the home directory on the home share'),
>  			syntax=univention.admin.syntax.string,
>  			multivalue=0,
>  			options=[],
>@@ -166,7 +166,7 @@
>  			identifies=0,
>  		),
> 	'shell': univention.admin.property(
>-			short_description=_('Login Shell'),
>+			short_description=_('Login shell'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -177,7 +177,7 @@
> 			default = '/bin/bash'
> 		),
> 	'sambahome': univention.admin.property(
>-			short_description=_('Windows Home Path'),
>+			short_description=_('Windows home path'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -187,7 +187,7 @@
> 			identifies=0
> 		),
> 	'scriptpath': univention.admin.property(
>-			short_description=_('Windows Script Path'),
>+			short_description=_('Windows logon path'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -197,7 +197,7 @@
> 			identifies=0
> 		),
> 	'profilepath': univention.admin.property(
>-			short_description=_('Windows Profile Path'),
>+			short_description=_('Windows profile directory'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -207,7 +207,7 @@
> 			identifies=0
> 		),
> 	'homedrive': univention.admin.property(
>-			short_description=_('Windows Home Drive'),
>+			short_description=_('Windows home drive'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -227,7 +227,7 @@
> 			identifies=0
> 		),
> 	'postcode': univention.admin.property(
>-			short_description=_('Postal Code'),
>+			short_description=_('Postal code'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -247,7 +247,7 @@
> 			identifies=0
> 		),
> 	'phone': univention.admin.property(
>-			short_description=_('Telephone Number'),
>+			short_description=_('Telephone number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.phone,
> 			multivalue=1,
>@@ -257,7 +257,7 @@
> 			identifies=0
> 		),
> 	'secretary': univention.admin.property(
>-			short_description=_('Secretary'),
>+			short_description=_('Superior'),
> 			long_description='',
> 			syntax=univention.admin.syntax.UserDN,
> 			multivalue=1,
>@@ -267,7 +267,7 @@
> 			identifies=0
> 		),
> 	'departmentNumber': univention.admin.property(
>-			short_description=_('Department Number'),
>+			short_description=_('Department number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -277,7 +277,7 @@
> 			identifies=0
> 		),
> 	'employeeType': univention.admin.property(
>-			short_description=_('Employee Type'),
>+			short_description=_('Employee type'),
> 			long_description='',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
>@@ -297,7 +297,7 @@
>  			identifies=0
>  		),
>  	'primaryGroup': univention.admin.property(
>- 			short_description=_('Primary Group'),
>+ 			short_description=_('Primary group'),
>  			long_description='',
>  			syntax=univention.admin.syntax.GroupDN,
>  			one_only=1,
>@@ -310,7 +310,7 @@
>  			identifies=0
>  		),
> 	'mailPrimaryAddress': univention.admin.property(
>-			short_description=_('Primary E-Mail Address'),
>+			short_description=_('Primary e-mail address'),
> 			long_description='',
> 			syntax=univention.admin.syntax.emailAddressTemplate,
> 			multivalue=0,
>@@ -322,7 +322,7 @@
> 			identifies=0,
> 		),
> 	'mailAlternativeAddress': univention.admin.property(
>-			short_description=_('Alternative E-Mail Addresses'),
>+			short_description=_('Alternative e-mail address'),
> 			long_description='',
> 			syntax=univention.admin.syntax.emailAddressTemplate,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po	(Arbeitskopie)
>@@ -29,7 +29,7 @@
> msgstr ""
> "Project-Id-Version: univention-directory-manager-modules 6.0.100\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2013-10-30 13:14+0100\n"
>+"POT-Creation-Date: 2015-04-01 14:27+0200\n"
> "PO-Revision-Date: 2011-12-01 09:47+0100\n"
> "Last-Translator: Philipp Hahn <hahn@univention.de>\n"
> "Language-Team: German <de@li.org>\n"
>@@ -43,32 +43,27 @@
> msgid "Univention Settings"
> msgstr "Univention-Einstellungen"
> 
>-#: cn.py:52 default.py:54 directory.py:55 extended_attribute.py:374
>-#: extended_options.py:55 extended_options.py:56 license.py:66 license.py:67
>-#: lock.py:55 lock.py:56 packages.py:55 packages.py:56 printermodel.py:57
>-#: printermodel.py:58 printeruri.py:55 printeruri.py:56
>-#: prohibited_username.py:55 prohibited_username.py:56 umc_operationset.py:56
>-#: umc_operationset.py:57 usertemplate.py:52 xconfig_choices.py:56
>+#: cn.py:52 default.py:54 directory.py:55 extended_options.py:55
>+#: extended_options.py:56 license.py:66 license.py:67 lock.py:55 lock.py:56
>+#: packages.py:55 packages.py:56 printermodel.py:57 printermodel.py:58
>+#: printeruri.py:55 printeruri.py:56 prohibited_username.py:55
>+#: prohibited_username.py:56 umc_operationset.py:56 umc_operationset.py:57
>+#: xconfig_choices.py:56
> msgid "Name"
> msgstr "Name"
> 
>-#: cn.py:65 default.py:144 default.py:145 directory.py:179 directory.py:180
>-#: extended_attribute.py:373 extended_attribute.py:396 extended_options.py:152
>-#: extended_options.py:153 ldapacl.py:152 ldapacl.py:153 ldapschema.py:132
>-#: ldapschema.py:133 license.py:292 lock.py:78 lock.py:79 packages.py:79
>-#: packages.py:80 printermodel.py:82 printermodel.py:83 printeruri.py:80
>-#: printeruri.py:81 prohibited_username.py:79 prohibited_username.py:80
>-#: sambaconfig.py:183 sambaconfig.py:184 sambadomain.py:230 sambadomain.py:231
>-#: service.py:65 service.py:66 syntax.py:160 syntax.py:161 udm_hook.py:152
>-#: udm_hook.py:153 udm_module.py:181 udm_module.py:182 udm_syntax.py:152
>-#: udm_syntax.py:153 umc_operationset.py:104 umc_operationset.py:105
>-#: usertemplate.py:352 usertemplate.py:353 xconfig_choices.py:169
>-#: xconfig_choices.py:170
>+#: cn.py:65 default.py:144 directory.py:179 extended_attribute.py:373
>+#: extended_options.py:152 ldapacl.py:152 ldapschema.py:132 lock.py:78
>+#: packages.py:79 printermodel.py:82 printeruri.py:80
>+#: prohibited_username.py:79 sambaconfig.py:183 sambadomain.py:260
>+#: service.py:65 syntax.py:160 udm_hook.py:152 udm_module.py:181
>+#: udm_syntax.py:152 umc_operationset.py:104 usertemplate.py:352
>+#: xconfig_choices.py:169
> msgid "General"
> msgstr "Allgemein"
> 
> #: cn.py:65 default.py:144 directory.py:179 extended_options.py:152
>-#: ldapacl.py:152 ldapschema.py:132 sambaconfig.py:183 sambadomain.py:230
>+#: ldapacl.py:152 ldapschema.py:132 sambaconfig.py:183 sambadomain.py:260
> #: service.py:65 syntax.py:160 udm_hook.py:152 udm_module.py:181
> #: udm_syntax.py:152 usertemplate.py:352
> msgid "Basic values"
>@@ -106,6 +101,10 @@
> msgid "Default KDE Profiles"
> msgstr "Standard KDE-Profile"
> 
>+#: default.py:145
>+msgid "Default settings description"
>+msgstr "Bezeichnung - Vorgabe-Einstellungen"
>+
> #: default.py:149 default.py:150
> msgid "Primary Groups"
> msgstr "PrimÃ¤re Gruppen"
>@@ -162,6 +161,10 @@
> msgid "License Link"
> msgstr "Lizenzverweis"
> 
>+#: directory.py:180
>+msgid "Default container description"
>+msgstr "Bezeichnung - Standard-Container"
>+
> #: directory.py:183
> msgid "User Links"
> msgstr "Benutzerverweise"
>@@ -575,6 +578,10 @@
> msgid "General settings"
> msgstr "Allgemeine Einstellungen"
> 
>+#: extended_attribute.py:374
>+msgid "Extended attribute description"
>+msgstr "Bezeichnung - Erweitertes Attribut"
>+
> #: extended_attribute.py:381
> msgid "Long Description"
> msgstr "AusfÃ¼hrliche Beschreibung"
>@@ -603,6 +610,10 @@
> msgid "Settings for UMC"
> msgstr "UMC-spezifische Einstellungen"
> 
>+#: extended_attribute.py:396
>+msgid "General extended attribute settings"
>+msgstr "Grundeinstellungen - Erweiterte Optionen"
>+
> #: extended_attribute.py:400
> msgid "Attribute layout"
> msgstr "Attributdarstellung"
>@@ -693,6 +704,10 @@
> msgid "Mapping to LDAP objectClasses"
> msgstr "Abbildung auf LDAP-Objektklassen"
> 
>+#: extended_options.py:153
>+msgid "General extended options settings"
>+msgstr "Grundeinstellungen - Erweiterte Optionen"
>+
> #: ldapacl.py:52
> msgid "Settings: LDAP ACL Extension"
> msgstr "Einstellungen: LDAP ACL Erweiterung"
>@@ -737,6 +752,10 @@
> msgid "Maximal UCS version"
> msgstr "Maximale UCS-Version"
> 
>+#: ldapacl.py:153
>+msgid "General LDAP ACL extension settings"
>+msgstr "Grundeinstellungen - LDAP ACL-Erweiterung"
>+
> #: ldapacl.py:158 ldapschema.py:138 udm_hook.py:158 udm_module.py:190
> #: udm_syntax.py:158
> msgid "Metadata"
>@@ -772,6 +791,10 @@
> msgid "Schema data"
> msgstr "Schema-Daten"
> 
>+#: ldapschema.py:133
>+msgid "General LDAP schema extension settings"
>+msgstr "Grundeinstellungen - LDAP-Schemaerweiterung"
>+
> #: license.py:50
> msgid "Settings: License"
> msgstr "Einstellungen: Lizenz"
>@@ -976,6 +999,10 @@
> msgid "Licensing Information"
> msgstr "Lizenz-Informationen"
> 
>+#: license.py:292
>+msgid "General license settings"
>+msgstr "Grundeinstellungen - Lizenz"
>+
> #: license.py:300
> msgid "Version 1 license informations"
> msgstr "Lizenz-Informationen Version 1"
>@@ -1004,6 +1031,10 @@
> msgid "Lock Information"
> msgstr "Informationen Ã¼ber die Sperrung"
> 
>+#: lock.py:79
>+msgid "General lock settings"
>+msgstr "Grundeinstellungen - Sperrung"
>+
> #: packages.py:49
> msgid "Settings: Package List"
> msgstr "Einstellungen: Paketliste"
>@@ -1016,6 +1047,10 @@
> msgid "Package List"
> msgstr "Paketliste"
> 
>+#: packages.py:80
>+msgid "General package list settings"
>+msgstr "Grundeinstellungen - Paketliste"
>+
> #: printermodel.py:51
> msgid "Settings: Printer Driver List"
> msgstr "Einstellungen: Druckertreiberliste"
>@@ -1032,6 +1067,10 @@
> msgid "Printer List"
> msgstr "Druckerliste"
> 
>+#: printermodel.py:83
>+msgid "General printer driver list settings"
>+msgstr "Grundeinstellungen - Druckertreiberliste"
>+
> #: printeruri.py:49
> msgid "Settings: Printer URI List"
> msgstr "Einstellungen: Drucker-URI-Liste"
>@@ -1044,6 +1083,10 @@
> msgid "Printer URI"
> msgstr "Drucker-URI"
> 
>+#: printeruri.py:81
>+msgid "General printer URI list settings"
>+msgstr "Grundeinstellungen - Drucker-URI-Liste"
>+
> #: prohibited_username.py:49
> msgid "Settings: Prohibited user names"
> msgstr "Einstellungen: Verbotene Benutzernamen"
>@@ -1060,6 +1103,10 @@
> msgid "Prohibited user names"
> msgstr "Verbotene Benutzernamen"
> 
>+#: prohibited_username.py:80
>+msgid "General prohibited user names settings"
>+msgstr "Grundeinstellungen - Verbotene Benutzernamen"
>+
> #: sambaconfig.py:65
> msgid "Settings: Samba Configuration"
> msgstr "Einstellungen: Samba-Konfiguration"
>@@ -1108,6 +1155,10 @@
> msgid "Refuse Machine Password Change"
> msgstr "Ãnderung des Rechnerpasswortes ablehnen"
> 
>+#: sambaconfig.py:184
>+msgid "General Samba configuration settings"
>+msgstr "Grundeinstellungen - Samba-Konfiguration"
>+
> #: sambadomain.py:68
> msgid "Settings: Samba Domain"
> msgstr "Einstellungen: Samba-DomÃ¤ne"
>@@ -1172,11 +1223,52 @@
> msgid "Refuse machine password change"
> msgstr "Ãnderung des Rechnerpasswortes ablehnen"
> 
>-#: sambadomain.py:235
>+#: sambadomain.py:228
>+msgid "Passwords must meet complexity requirements"
>+msgstr "Kennwort muss KomplexitÃ¤tsvoraussetzungen entsprechen"
>+
>+#: sambadomain.py:229
>+msgid ""
>+"Is not based on the user's account name. Contains at least six characters. "
>+"Contains characters from three of the following four categories: Uppercase "
>+"alphabet characters (A-Z), Lowercase alphabet characters (a-z), Arabic "
>+"numerals (0-9), Nonalphanumeric characters (for example, !$#,%)"
>+msgstr ""
>+"Es darf weder wesentliche Teile des Kontonamens des Benutzers noch den "
>+"vollstÃ¤ndigen Kontonamen enthalten. Es muss mindestens sechs Zeichen lang "
>+"sein. Es muss Zeichen aus drei der vier folgenden Kategorien enthalten: "
>+"GroÃbuchstaben von A bis Z, Kleinbuchstaben von A bis Z, Ziffern der Basis "
>+"10 (0 bis 9), Andere als alphabetische Zeichen (z. B. !, $, #, %)"
>+
>+#: sambadomain.py:238
>+msgid "Store plaintext passwords"
>+msgstr "Kennwort mit umkehrbarer VerschlÃ¼sselung speichern"
>+
>+#: sambadomain.py:239
>+msgid ""
>+"Store plaintext passwords where account have \"store passwords with "
>+"reversible encryption\" set."
>+msgstr ""
>+"Klartext PasswÃ¶rter speichern, falls am Benutzerkonto \"Kennwort mit "
>+"umkehrbarer VerschlÃ¼sselung speichern\" gesetzt ist."
>+
>+#: sambadomain.py:248
>+msgid "Password properties"
>+msgstr "Passwort-Eigenschaften"
>+
>+#: sambadomain.py:249
>+msgid "A bitfield to indicate complexity and storage restrictions."
>+msgstr ""
>+
>+#: sambadomain.py:261
>+msgid "General Samba domain settings"
>+msgstr "Grundeinstellungen - Samba-DomÃ¤ne"
>+
>+#: sambadomain.py:265
> msgid "Password"
> msgstr "Passwort"
> 
>-#: sambadomain.py:241
>+#: sambadomain.py:272
> msgid "Connection"
> msgstr "Verbindung"
> 
>@@ -1188,6 +1280,10 @@
> msgid "Service Name"
> msgstr "Dienstname"
> 
>+#: service.py:66
>+msgid "General service settings"
>+msgstr "Grundeinstellungen - Dienst"
>+
> #: settings.py:50
> msgid "Preferences"
> msgstr "Einstellungen"
>@@ -1236,6 +1332,10 @@
> msgid "Stored LDAP Attribute"
> msgstr "Zu speicherndes LDAP-Attribut"
> 
>+#: syntax.py:161
>+msgid "General syntax definition settings"
>+msgstr "Grundeinstellungen - Syntax-Definition"
>+
> #: syntax.py:164
> msgid "Display"
> msgstr "Anzeige"
>@@ -1269,6 +1369,10 @@
> msgid "UDM hook data"
> msgstr "UDM Hook-Daten"
> 
>+#: udm_hook.py:153
>+msgid "General UDM hook settings"
>+msgstr "Grundeinstellungen - UDM-Hook"
>+
> #: udm_module.py:50
> msgid "Settings: UDM Module"
> msgstr "Einstellungen: UDM Modul"
>@@ -1297,6 +1401,10 @@
> msgid "UMC icon"
> msgstr "UMC-Icon"
> 
>+#: udm_module.py:182
>+msgid "General UDM module settings"
>+msgstr "Grundeinstellungen - UDM-Modul"
>+
> #: udm_syntax.py:52
> msgid "Settings: UDM Syntax"
> msgstr "Einstellungen: UDM Syntax"
>@@ -1313,6 +1421,10 @@
> msgid "UDM syntax data"
> msgstr "UDM Syntaxdaten"
> 
>+#: udm_syntax.py:153
>+msgid "General UDM syntax settings"
>+msgstr "Grundeinstellungen - UDM-Syntax"
>+
> #: umc_operationset.py:50
> msgid "Settings: UMC operation set"
> msgstr "Einstellungen: UMC-Operationen"
>@@ -1349,10 +1461,18 @@
> msgid "UMC Operation Set"
> msgstr "UMC-Befehlssatz"
> 
>+#: umc_operationset.py:105
>+msgid "General UMC operation set settings"
>+msgstr "Grundeinstellungen - UMC-Operationen"
>+
> #: usertemplate.py:46
> msgid "Settings: User Template"
> msgstr "Einstellungen: Benutzervorlage"
> 
>+#: usertemplate.py:52
>+msgid "User name"
>+msgstr "Benutzername"
>+
> #: usertemplate.py:63
> msgid "Title"
> msgstr "Anrede"
>@@ -1362,7 +1482,7 @@
> msgstr "Anzeigename"
> 
> #: usertemplate.py:95
>-msgid "Organization"
>+msgid "Organisation"
> msgstr "Organisation"
> 
> #: usertemplate.py:105 usertemplate.py:106
>@@ -1370,59 +1490,59 @@
> msgstr "Passwort bei der nÃ¤chsten Anmeldung Ã¤ndern"
> 
> #: usertemplate.py:116
>-msgid "Disabled"
>-msgstr "Deaktiviert"
>+msgid "Account deactivation"
>+msgstr "Kontodeaktivierung"
> 
> #: usertemplate.py:127
>-msgid "E-Mail Address"
>+msgid "E-mail address"
> msgstr "E-Mail-Adresse"
> 
> #: usertemplate.py:137
>-msgid "Unix Home Directory"
>+msgid "Unix home directory"
> msgstr "UNIX-Heimatverzeichnis"
> 
> #: usertemplate.py:148
>-msgid "Home Share"
>-msgstr "Heimatverzeichnisfreigabe"
>+msgid "Home share"
>+msgstr "Benutzerverzeichnis-Freigabe"
> 
> #: usertemplate.py:149
> msgid "Share, the user's home directory resides on"
> msgstr "Freigabe, auf der sich das Heimatverzeichnis des Benutzers befindet"
> 
> #: usertemplate.py:158
>-msgid "Home Share Path"
>-msgstr "Pfad der Heimatverzeichnisfreigabe"
>+msgid "Home share path"
>+msgstr "Pfad der Benutzerverzeichnis-Freigabe"
> 
> #: usertemplate.py:159
>-msgid "Path on the home share"
>-msgstr "Relativer Pfad des Heimatverzeichnises innerhalb der Freigabe"
>+msgid "Path to the home directory on the home share"
>+msgstr "Relativer Pfad der Benutzerverzeichnis-Freigabe"
> 
> #: usertemplate.py:169
>-msgid "Login Shell"
>+msgid "Login shell"
> msgstr "Login-Shell"
> 
> #: usertemplate.py:180
>-msgid "Windows Home Path"
>-msgstr "Windows-Heimatverzeichnis"
>+msgid "Windows home path"
>+msgstr "Windows-Hverzeichnis"
> 
> #: usertemplate.py:190
>-msgid "Windows Script Path"
>-msgstr "Anmeldeskriptpfad"
>+msgid "Windows logon path"
>+msgstr "Windows-Logon-Pfad"
> 
> #: usertemplate.py:200
>-msgid "Windows Profile Path"
>+msgid "Windows profile directory"
> msgstr "Profilverzeichnis"
> 
> #: usertemplate.py:210
>-msgid "Windows Home Drive"
>-msgstr "Laufwerk fÃ¼r Heimatverzeichnis"
>+msgid "Windows home drive"
>+msgstr "Laufwerk des Benutzerverzeichnises"
> 
> #: usertemplate.py:220
> msgid "Street"
> msgstr "StraÃe"
> 
> #: usertemplate.py:230
>-msgid "Postal Code"
>+msgid "Postal code"
> msgstr "Postleitzahl"
> 
> #: usertemplate.py:240
>@@ -1430,19 +1550,19 @@
> msgstr "Stadt"
> 
> #: usertemplate.py:250
>-msgid "Telephone Number"
>+msgid "Telephone number"
> msgstr "Telefonnummer"
> 
> #: usertemplate.py:260
>-msgid "Secretary"
>-msgstr "Vorgesetzter"
>+msgid "Superior"
>+msgstr ""
> 
> #: usertemplate.py:270
>-msgid "Department Number"
>+msgid "Department number"
> msgstr "Abteilungsnummer"
> 
> #: usertemplate.py:280
>-msgid "Employee Type"
>+msgid "Employee type"
> msgstr "Mitarbeiterkategorie"
> 
> #: usertemplate.py:290 usertemplate.py:397 usertemplate.py:398
>@@ -1450,17 +1570,21 @@
> msgstr "Gruppen"
> 
> #: usertemplate.py:300
>-msgid "Primary Group"
>+msgid "Primary group"
> msgstr "PrimÃ¤re Gruppe"
> 
> #: usertemplate.py:313
>-msgid "Primary E-Mail Address"
>+msgid "Primary e-mail address"
> msgstr "PrimÃ¤re E-Mail-Adresse"
> 
> #: usertemplate.py:325
>-msgid "Alternative E-Mail Addresses"
>-msgstr "Alternative E-Mail-Adressen"
>+msgid "Alternative e-mail address"
>+msgstr "Alternative E-Mail-Adresse"
> 
>+#: usertemplate.py:353
>+msgid "General user template settings"
>+msgstr "Grundeinstellungen - Benutzervorlage"
>+
> #: usertemplate.py:360 usertemplate.py:361
> msgid "User Account"
> msgstr "Benutzer-Konto"
>@@ -1561,6 +1685,19 @@
> msgid "X Configuration Choices"
> msgstr "X-Konfiguration Auswahl"
> 
>+#: xconfig_choices.py:170
>+msgid "General X configuration choices settings"
>+msgstr "Grundeinstellungen - X-Konfigurationsauswahl"
>+
>+#~ msgid "Disabled"
>+#~ msgstr "Deaktiviert"
>+
>+#~ msgid "Windows Script Path"
>+#~ msgstr "Anmeldeskriptpfad"
>+
>+#~ msgid "Secretary"
>+#~ msgstr "Vorgesetzter"
>+
> #~ msgid ""
> #~ "Configuration of the LDAP settings used to store the extended attribute"
> #~ msgstr ""
>@@ -1575,96 +1712,3 @@
> 
> #~ msgid "UMC layout"
> #~ msgstr "Karteikartendarstellung"
>-
>-msgid "Default settings description"
>-msgstr "Bezeichnung - Vorgabe-Einstellungen"
>-
>-msgid "Default container description"
>-msgstr "Bezeichnung - Standard-Container"
>-
>-msgid "General extended options settings"
>-msgstr "Grundeinstellungen - Erweiterte Optionen"
>-
>-msgid "General LDAP ACL extension settings"
>-msgstr "Grundeinstellungen - LDAP ACL-Erweiterung"
>-
>-msgid "General LDAP schema extension settings"
>-msgstr "Grundeinstellungen - LDAP-Schemaerweiterung"
>-
>-msgid "General license settings"
>-msgstr "Grundeinstellungen - Lizenz"
>-
>-msgid "General lock settings"
>-msgstr "Grundeinstellungen - Sperrung"
>-
>-msgid "General package list settings"
>-msgstr "Grundeinstellungen - Paketliste"
>-
>-msgid "General printer driver list settings"
>-msgstr "Grundeinstellungen - Druckertreiberliste"
>-
>-msgid "General printer URI list settings"
>-msgstr "Grundeinstellungen - Drucker-URI-Liste"
>-
>-msgid "General prohibited user names settings"
>-msgstr "Grundeinstellungen - Verbotene Benutzernamen"
>-
>-msgid "General Samba configuration settings"
>-msgstr "Grundeinstellungen - Samba-Konfiguration"
>-
>-msgid "General Samba domain settings"
>-msgstr "Grundeinstellungen - Samba-DomÃ¤ne"
>-
>-msgid "General service settings"
>-msgstr "Grundeinstellungen - Dienst"
>-
>-msgid "General syntax definition settings"
>-msgstr "Grundeinstellungen - Syntax-Definition"
>-
>-msgid "General UDM hook settings"
>-msgstr "Grundeinstellungen - UDM-Hook"
>-
>-msgid "General UDM module settings"
>-msgstr "Grundeinstellungen - UDM-Modul"
>-
>-msgid "General UDM syntax settings"
>-msgstr "Grundeinstellungen - UDM-Syntax"
>-
>-msgid "General UMC operation set settings"
>-msgstr "Grundeinstellungen - UMC-Operationen"
>-
>-msgid "General user template settings"
>-msgstr "Grundeinstellungen - Benutzervorlage"
>-
>-msgid "General X configuration choices settings"
>-msgstr "Grundeinstellungen - X-Konfigurationsauswahl"
>-
>-msgid "Extended attribute description"
>-msgstr "Bezeichnung - Erweitertes Attribut"
>-
>-msgid "Passwords must meet complexity requirements"
>-msgstr "Kennwort muss KomplexitÃ¤tsvoraussetzungen entsprechen"
>-
>-msgid ""
>-"Is not based on the user's account name. Contains at least "
>-"six characters. Contains characters from three of the following "
>-"four categories: Uppercase alphabet characters (A-Z), "
>-"Lowercase alphabet characters (a-z), Arabic numerals (0-9), "
>-"Nonalphanumeric characters (for example, !$#,%)"
>-msgstr ""
>-"Es darf weder wesentliche Teile des Kontonamens des Benutzers noch "
>-"den vollstÃ¤ndigen Kontonamen enthalten. Es muss mindestens sechs "
>-"Zeichen lang sein. Es muss Zeichen aus drei der vier folgenden "
>-"Kategorien enthalten: GroÃbuchstaben von A bis Z, Kleinbuchstaben "
>-"von A bis Z, Ziffern der Basis 10 (0 bis 9), "
>-"Andere als alphabetische Zeichen (z. B. !, $, #, %)"
>-
>-msgid "Store plaintext passwords"
>-msgstr "Kennwort mit umkehrbarer VerschlÃ¼sselung speichern"
>-
>-msgid ""
>-"Store plaintext passwords where account have \"store passwords with "
>-"reversible encryption\" set."
>-msgstr ""
>-"Klartext PasswÃ¶rter speichern, falls am Benutzerkonto \"Kennwort mit "
>-"umkehrbarer VerschlÃ¼sselung speichern\" gesetzt ist."
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po	(Arbeitskopie)
>@@ -29,7 +29,7 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2012-10-11 17:59+0200\n"
>+"POT-Creation-Date: 2015-04-01 14:08+0200\n"
> "PO-Revision-Date: 2013-02-15 18:12+0100\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: German <de@li.org>\n"
>@@ -43,11 +43,11 @@
> msgid "User: Password"
> msgstr "Benutzer: Passwort"
> 
>-#: passwd.py:57 user.py:133
>+#: passwd.py:57 user.py:127
> msgid "User name"
> msgstr "Benutzername"
> 
>-#: passwd.py:67 user.py:304
>+#: passwd.py:67 user.py:312
> msgid "Password"
> msgstr "Passwort"
> 
>@@ -55,91 +55,91 @@
> msgid "Change password"
> msgstr "Passwort Ã¤ndern"
> 
>-#: self.py:52 user.py:902 user.py:975
>+#: self.py:51 user.py:932 user.py:1005
> msgid "General"
> msgstr "Allgemein"
> 
>-#: self.py:56
>+#: self.py:55
> msgid "User: Self"
> msgstr "Benutzer: PersÃ¶nliche Einstellungen"
> 
>-#: user.py:69
>+#: user.py:68
> msgid "day"
> msgstr "Tag"
> 
>-#: user.py:71
>+#: user.py:70
> msgid "days"
> msgstr "Tagen"
> 
>-#: user.py:77
>+#: user.py:76
> msgid "Users"
> msgstr "Benutzer"
> 
>-#: user.py:78
>+#: user.py:77
> msgid "Add, edit and delete users"
> msgstr "HinzufÃ¼gen, Bearbeiten und LÃ¶schen von Benutzern"
> 
>-#: user.py:79
>+#: user.py:78
> msgid "Add"
> msgstr "HinzufÃ¼gen"
> 
>-#: user.py:79
>+#: user.py:78
> msgid "Add User"
> msgstr "Benutzer hinzufÃ¼gen"
> 
>-#: user.py:79
>+#: user.py:78
> msgid "Search"
> msgstr "Suchen"
> 
>-#: user.py:79
>+#: user.py:78
> msgid "Search for user(s)"
> msgstr "Benutzer suchen"
> 
>-#: user.py:83
>+#: user.py:82
> msgid "User"
> msgstr "Benutzer"
> 
>-#: user.py:94
>+#: user.py:88
> msgid "POSIX account"
> msgstr "POSIX-Konto"
> 
>-#: user.py:99
>+#: user.py:93
> msgid "Samba account"
> msgstr "Samba-Konto"
> 
>-#: user.py:104
>+#: user.py:98
> msgid "Kerberos principal"
> msgstr "Kerberos Prinzipal"
> 
>-#: user.py:109
>+#: user.py:103
> msgid "Mail account"
> msgstr "Mail-Konto"
> 
>-#: user.py:114
>+#: user.py:108
> msgid "Public key infrastructure account"
> msgstr "Public Key Infrastruktur-Konto"
> 
>-#: user.py:120 user.py:910
>+#: user.py:114 user.py:940
> msgid "Personal information"
> msgstr "PersÃ¶nliche Informationen"
> 
>-#: user.py:125
>+#: user.py:119
> msgid "Simple authentication account"
> msgstr "Einfaches Authentisierungskonto"
> 
>-#: user.py:143
>+#: user.py:138
> msgid "User ID"
> msgstr "Benutzer-ID"
> 
>-#: user.py:153
>+#: user.py:149
> msgid "Group ID of the primary group"
> msgstr "Gruppen-ID der primÃ¤ren Gruppe"
> 
>-#: user.py:164
>+#: user.py:162
> msgid "First name"
> msgstr "Vorname"
> 
>-#: user.py:175
>+#: user.py:174
> msgid "Last name"
> msgstr "Nachname"
> 
>@@ -147,486 +147,488 @@
> msgid "GECOS"
> msgstr "GECOS"
> 
>-#: user.py:196
>+#: user.py:197
> msgid "Display name"
> msgstr "Anzeigename"
> 
>-#: user.py:207
>+#: user.py:209
> msgid "Title"
> msgstr "Anrede"
> 
>-#: user.py:217
>-msgid "Samba privileges"
>-msgstr "Samba-Privilegien"
>+#: user.py:220
>+msgid "Samba privilege"
>+msgstr "Samba-Privileg"
> 
>-#: user.py:218
>+#: user.py:221
> msgid "Manage samba privileges"
> msgstr "Samba-Privilegien verwalten"
> 
>-#: user.py:228
>+#: user.py:232
> msgid "Description"
> msgstr "Beschreibung"
> 
>-#: user.py:238 user.py:916
>+#: user.py:243 user.py:945
> msgid "Organisation"
> msgstr "Organisation"
> 
>-#: user.py:248
>+#: user.py:254
> msgid "Account expiry date"
> msgstr "Konto-Ablaufdatum"
> 
>-#: user.py:249 user.py:260
>+#: user.py:255 user.py:266
> msgid "Enter date as day.month.year."
> msgstr "Datum als Tag.Monat.Jahr eingeben."
> 
>-#: user.py:259
>+#: user.py:265
> msgid "Password expiry date"
> msgstr "Passwort-Ablaufdatum"
> 
>-#: user.py:271 user.py:272
>+#: user.py:278 user.py:279
> msgid "Change password on next login"
> msgstr "Passwort bei der nÃ¤chsten Anmeldung Ã¤ndern"
> 
>-#: user.py:282
>+#: user.py:290
> msgid "Account deactivation"
> msgstr "Konto-Deaktivierung"
> 
>-#: user.py:293
>+#: user.py:301
> msgid "Locked login methods"
> msgstr "Gesperrte Anmeldeverfahren"
> 
>-#: user.py:315
>+#: user.py:324
> msgid "Street"
> msgstr "StraÃe"
> 
>-#: user.py:325
>-msgid "E-mail address(es)"
>-msgstr "E-Mail-Adresse(n)"
>+#: user.py:335
>+msgid "E-mail address"
>+msgstr "E-Mail-Adresse"
> 
>-#: user.py:336
>+#: user.py:346
> msgid "Postal code"
> msgstr "Postleitzahl"
> 
>-#: user.py:346
>+#: user.py:357
> msgid "City"
> msgstr "Stadt"
> 
>-#: user.py:356
>-msgid "Telephone number(s)"
>-msgstr "Telefonnummer(n)"
>+#: user.py:368
>+msgid "Telephone number"
>+msgstr "Telefonnummer"
> 
>-#: user.py:366
>+#: user.py:379
> msgid "Employee number"
> msgstr "Mitarbeiternummer"
> 
>-#: user.py:377
>+#: user.py:390
> msgid "Room number"
> msgstr "Raumnummer"
> 
>-#: user.py:387
>+#: user.py:400
> msgid "Superior"
> msgstr "Vorgesetzter"
> 
>-#: user.py:397
>+#: user.py:410
> msgid "Department number"
> msgstr "Abteilungsnummer"
> 
>-#: user.py:407
>+#: user.py:420
> msgid "Employee type"
> msgstr "Mitarbeiterkategorie"
> 
>-#: user.py:417
>+#: user.py:430
> msgid "Private postal address"
> msgstr "Private Adresse"
> 
>-#: user.py:427
>-msgid "Private telephone number(s)"
>-msgstr "Telefonnummer(n) Festnetz"
>+#: user.py:440
>+msgid "Private telephone number"
>+msgstr "Telefonnummer Festnetz"
> 
>-#: user.py:437
>-msgid "Mobile phone number(s)"
>-msgstr "Telefonnummer(n) Mobil"
>+#: user.py:451
>+msgid "Mobile phone number"
>+msgstr "Telefonnummer Mobil"
> 
>-#: user.py:447
>-msgid "Pager telephone number(s)"
>-msgstr "Rufnummer(n) Pager"
>+#: user.py:462
>+msgid "Pager telephone number"
>+msgstr "Rufnummer Pager"
> 
>-#: user.py:457
>+#: user.py:473
> msgid "Birthday"
> msgstr "Geburtsdatum"
> 
>-#: user.py:458
>+#: user.py:474
> msgid "Date of birth"
> msgstr "Geburtsdatum"
> 
>-#: user.py:467
>+#: user.py:483
> msgid "Unix home directory"
> msgstr "UNIX-Heimatverzeichnis"
> 
>-#: user.py:479
>+#: user.py:495
> msgid "Login shell"
> msgstr "Login-Shell"
> 
>-#: user.py:490
>+#: user.py:506
> msgid "Windows home path"
> msgstr "Windows-Heimatverzeichnis"
> 
>-#: user.py:500
>+#: user.py:517
> msgid "Windows logon script"
> msgstr "Anmeldeskript"
> 
>-#: user.py:510
>+#: user.py:528
> msgid "Windows profile directory"
> msgstr "Profilverzeichnis"
> 
>-#: user.py:520
>+#: user.py:539
> msgid "Windows home drive"
> msgstr "Laufwerk fÃ¼r das Windows-Heimatverzeichnis"
> 
>-#: user.py:530
>+#: user.py:550
> msgid "Relative ID"
> msgstr "Relative ID"
> 
>-#: user.py:541 user.py:921
>+#: user.py:562 user.py:951
> msgid "Groups"
> msgstr "Gruppen"
> 
>-#: user.py:552 user.py:922
>+#: user.py:574 user.py:952
> msgid "Primary group"
> msgstr "PrimÃ¤re Gruppe"
> 
>-#: user.py:563
>+#: user.py:586
> msgid "Mail home server"
> msgstr "Mail Home Server"
> 
>-#: user.py:574
>+#: user.py:598
> msgid "Primary e-mail address"
> msgstr "PrimÃ¤re E-Mail-Adresse"
> 
>-#: user.py:586
>-msgid "Alternative e-mail addresses"
>-msgstr "Alternative E-Mail-Adressen"
>+#: user.py:611
>+msgid "Alternative e-mail address"
>+msgstr "Alternative E-Mail-Adresse"
> 
>-#: user.py:597
>+#: user.py:623
> msgid "Override password history"
> msgstr "Passwort-History ignorieren"
> 
>-#: user.py:608
>+#: user.py:635
> msgid "Override password check"
> msgstr "Passwort-PrÃ¼fungen ignorieren"
> 
>-#: user.py:619
>+#: user.py:647 user.py:2379
> msgid "Home share"
> msgstr "Heimatverzeichnisfreigabe"
> 
>-#: user.py:620
>+#: user.py:648
> msgid "Share, the user's home directory resides on"
> msgstr "Freigabe, auf der das Heimatverzeichnis des Benutzers liegt."
> 
>-#: user.py:630
>+#: user.py:658 user.py:2379 user.py:2383
> msgid "Home share path"
> msgstr "Pfad zum Heimatverzeichnis"
> 
>-#: user.py:631
>+#: user.py:659
> msgid "Path to the home directory on the home share"
> msgstr "Pfad zum Heimatverzeichnis unterhalb der Freigabe."
> 
>-#: user.py:642
>-msgid "Allow the authentication only on these Microsoft Windows hosts"
>-msgstr "Anmeldung nur an diesen Microsoft Windows-Rechnern zulassen"
>+#: user.py:670
>+msgid "Allow the authentication only on this Microsoft Windows host"
>+msgstr "Anmeldung nur an diesem Microsoft Windows-Rechner zulassen"
> 
>-#: user.py:653
>+#: user.py:682
> msgid "Permitted times for Windows logins"
> msgstr "Erlaubte Zeiten fÃ¼r Windows-Anmeldungen"
> 
>-#: user.py:664
>+#: user.py:694
> msgid "Picture of the user (JPEG format)"
> msgstr "Bild des Benutzers (JPEG-Format)"
> 
>-#: user.py:665
>+#: user.py:695
> msgid "Picture for user account in JPEG format"
> msgstr "Bild des Benutzerkontos im JPEG-Format"
> 
>-#: user.py:675
>+#: user.py:705
> msgid "PKI user certificate (DER format)"
> msgstr "PKI Benutzerzertifikat (DER Format)"
> 
>-#: user.py:676
>+#: user.py:706
> msgid "Public key infrastructure - user certificate "
> msgstr "Public key infrastruktur - Benutzerzertifikat"
> 
>-#: user.py:686
>+#: user.py:716
> msgid "Issuer Country"
> msgstr "Herausgeber Land"
> 
>-#: user.py:687
>+#: user.py:717
> msgid "Certificate Issuer Country"
> msgstr "Land des Zertifikat-Herausgebers"
> 
>-#: user.py:697
>+#: user.py:727
> msgid "Issuer State"
> msgstr "Herausgeber Bundesland"
> 
>-#: user.py:698
>+#: user.py:728
> msgid "Certificate Issuer State"
> msgstr "Bundesland des Zertifikat-Herausgebers"
> 
>-#: user.py:708
>+#: user.py:738
> msgid "Issuer Location"
> msgstr "Herausgeber Ort"
> 
>-#: user.py:709
>+#: user.py:739
> msgid "Certificate Issuer Location"
> msgstr "Ort des Zertifikat-Herausgebers"
> 
>-#: user.py:719
>+#: user.py:749
> msgid "Issuer Organisation"
> msgstr "Herausgeber Organisation"
> 
>-#: user.py:720
>+#: user.py:750
> msgid "Certificate Issuer Organisation"
> msgstr "Organisation des Zertifikat-Herausgebers"
> 
>-#: user.py:730
>+#: user.py:760
> msgid "Issuer Organisational Unit"
> msgstr "Herausgeber Organisationseinheit"
> 
>-#: user.py:731
>+#: user.py:761
> msgid "Certificate Issuer Organisational Unit"
> msgstr "Organisationseinheit des Zertifikat-Herausgebers"
> 
>-#: user.py:741
>+#: user.py:771
> msgid "Issuer Common Name"
> msgstr "Herausgeber Allgemeiner Name"
> 
>-#: user.py:742
>+#: user.py:772
> msgid "Certificate Issuer Common Name"
> msgstr "Allgemeiner Name des Zertifikat-Herausgebers"
> 
>-#: user.py:752
>+#: user.py:782
> msgid "Issuer Mail"
> msgstr "Herausgeber E-Mail-Adresse"
> 
>-#: user.py:753
>+#: user.py:783
> msgid "Certificate Issuer Mail"
> msgstr "E-Mail-Adresse des Zertifikat-Herausgebers"
> 
>-#: user.py:763
>+#: user.py:793
> msgid "Subject Country"
> msgstr "Inhaber Land"
> 
>-#: user.py:764
>+#: user.py:794
> msgid "Certificate Subject Country"
> msgstr "Land des Zertifikat-Inhabers"
> 
>-#: user.py:774
>+#: user.py:804
> msgid "Subject State"
> msgstr "Inhaber Bundesland"
> 
>-#: user.py:775
>+#: user.py:805
> msgid "Certificate Subject State"
> msgstr "Bundesland des Zertifikat-Inhaber"
> 
>-#: user.py:785
>+#: user.py:815
> msgid "Subject Location"
> msgstr "Inhaber Ort"
> 
>-#: user.py:786
>+#: user.py:816
> msgid "Certificate Subject Location"
> msgstr "Ort des Zertifikat-Inhaber"
> 
>-#: user.py:796
>+#: user.py:826
> msgid "Subject Organisation"
> msgstr "Inhaber Organisation"
> 
>-#: user.py:797
>+#: user.py:827
> msgid "Certificate Subject Organisation"
> msgstr "Organisation des Zertifikat-Inhabers"
> 
>-#: user.py:807
>+#: user.py:837
> msgid "Subject Organisational Unit"
> msgstr "Inhaber Organisationseinheit"
> 
>-#: user.py:808
>+#: user.py:838
> msgid "Certificate Subject Organisational Unit"
> msgstr "Organisationseinheit des Zertifikat-Inhabers"
> 
>-#: user.py:818
>+#: user.py:848
> msgid "Subject Common Name"
> msgstr "Inhaber Allgemeiner Name"
> 
>-#: user.py:819
>+#: user.py:849
> msgid "Certificate Subject Common Name"
> msgstr "Allgemeiner Name des Zertifikat-Inhaber"
> 
>-#: user.py:823
>+#: user.py:859
> msgid "Subject Mail"
> msgstr "Inhaber E-Mail-Adresse"
> 
>-#: user.py:824
>+#: user.py:860
> msgid "Certificate Subject Mail"
> msgstr "E-Mail-Adresse des Zertifikat-Inhabers"
> 
>-#: user.py:840
>+#: user.py:870
> msgid "Valid from"
> msgstr "GÃ¼ltig ab"
> 
>-#: user.py:841
>+#: user.py:871
> msgid "Certificate valid from"
> msgstr "Das Zertifikat ist gÃ¼ltig ab dem Zeitpunkt"
> 
>-#: user.py:851
>+#: user.py:881
> msgid "Valid until"
> msgstr "GÃ¼ltig bis"
> 
>-#: user.py:852
>+#: user.py:882
> msgid "Certificate valid until"
> msgstr "Das Zertifikat ist gÃ¼ltig bis zu dem Zeitpunkt"
> 
>-#: user.py:862
>+#: user.py:892
> msgid "Version"
> msgstr "Version"
> 
>-#: user.py:863
>+#: user.py:893
> msgid "Certificate Version"
> msgstr "Zertifikatversion"
> 
>-#: user.py:873
>+#: user.py:903
> msgid "Serial"
> msgstr "Seriennummer"
> 
>-#: user.py:874
>+#: user.py:904
> msgid "Certificate Serial"
> msgstr "Zertifikatsseriennummer"
> 
>-#: user.py:884
>+#: user.py:914
> msgid "UMC user preferences"
> msgstr "UMC-Benutzer-Einstellungen"
> 
>-#: user.py:885
>+#: user.py:915
> msgid "Key value pairs storing user preferences for UMC"
> msgstr "Key-Value-Paare, die UMC-Benutzereinstellungen speichern"
> 
>-#: user.py:902
>+#: user.py:932
> msgid "Basic settings"
> msgstr "Grundeinstellungen"
> 
>-#: user.py:903
>+#: user.py:933
> msgid "User account"
> msgstr "Benutzerkonto"
> 
>-#: user.py:925
>+#: user.py:955
> msgid "Additional groups"
> msgstr "Weitere Gruppen"
> 
>-#: user.py:929
>+#: user.py:959
> msgid "Account"
> msgstr "Konto"
> 
>-#: user.py:929
>+#: user.py:959
> msgid "Account settings"
> msgstr "Konto-Einstellungen"
> 
>-#: user.py:930
>+#: user.py:960
> msgid "Locking and deactivation"
> msgstr "Konto-Deaktivierung"
> 
>-#: user.py:935
>+#: user.py:965
> msgid "Windows"
> msgstr "Windows"
> 
>-#: user.py:935
>+#: user.py:965
> msgid "Windows account settings"
> msgstr "Windows-Kontoeinstellungen"
> 
>-#: user.py:943
>+#: user.py:973
> msgid "POSIX (Linux/UNIX)"
> msgstr "POSIX (Linux/UNIX)"
> 
>-#: user.py:943
>+#: user.py:973
> msgid "POSIX (Linux/UNIX) account settings"
> msgstr "POSIX (Linux/UNIX) Kontoeinstellungen"
> 
>-#: user.py:949
>+#: user.py:979
> msgid "Contact"
> msgstr "Kontakt"
> 
>-#: user.py:949
>+#: user.py:979
> msgid "Contact information"
> msgstr "Kontaktinformationen"
> 
>-#: user.py:950
>+#: user.py:980
> msgid "Business"
> msgstr "GeschÃ¤ftlich"
> 
>-#: user.py:956
>+#: user.py:986
> msgid "Private"
> msgstr "Privat"
> 
>-#: user.py:963
>+#: user.py:993
> msgid "Mail"
> msgstr "Mail"
> 
>-#: user.py:963
>+#: user.py:993
> msgid "Mail preferences"
> msgstr "Maileinstellungen"
> 
>-#: user.py:964
>+#: user.py:994
> msgid "Advanced settings"
> msgstr "Erweiterte Einstellungen"
> 
>-#: user.py:969 user.py:970
>+#: user.py:999 user.py:1000
> msgid "UMC preferences"
> msgstr "UMC-Einstellungen"
> 
>-#: user.py:972
>+#: user.py:1004
>+msgid "Certificate"
>+msgstr "Zertifikat"
>+
>+#: user.py:1008
> msgid "Subject"
> msgstr "Inhaber"
> 
>-#: user.py:974
>-msgid "Certificate"
>-msgstr "Zertifikat"
>-
>-#: user.py:985
>+#: user.py:1014
> msgid "Issuer"
> msgstr "Aussteller"
> 
>-#: user.py:994
>+#: user.py:1020
> msgid "Validity"
> msgstr "GÃ¼ltigkeit"
> 
>-#: user.py:998
>+#: user.py:1023
> msgid "Misc"
> msgstr "Verschiedenes"
> 
>-#: user.py:1824
>+#: user.py:1768
> #, python-format
> msgid "Need one of %s, %s, %s or %s in options to create user."
> msgstr ""
> "Mindestens eine Option aus %s, %s, %s oder %s muss aktiv sein, um einen "
> "neuen Benutzer zu erstellen."
> 
>-#: user.py:2094 user.py:2100
>+#: user.py:2039 user.py:2045
> #, python-format
> msgid "The password is too short, at least %d characters needed!"
> msgstr "Das Passwort ist zu kurz, mindestens %d Zeichen erforderlich!"
> 
>-#: user.py:2432
>+#: user.py:2371
> msgid "DN given as share is not valid."
> msgstr "Der DN der Freigabe ist nicht zulÃ¤ssig."
> 
>-#: user.py:2444
>-msgid "Given DN is no share."
>-msgstr "Der angegebene DN ist keine Freigabe."
>-
>-#: user.py:2434
>+#: user.py:2379
>+#, python-format
> msgid "%(homeSharePath)s must be given if %(homeShare)s is given."
> msgstr "%(homeSharePath)s muss gesetzt sein, wenn %(homeShare)s gesetzt wurde."
> 
>-#: user.py:2438
>+#: user.py:2383
>+#, python-format
> msgid "%s: Invalid path"
> msgstr "%s: UngÃ¼ltige Pfadangabe"
> 
>+#: user.py:2389
>+msgid "Given DN is no share."
>+msgstr "Der angegebene DN ist keine Freigabe."
>+
> #~ msgid "Dates"
> #~ msgstr "Datumsangaben"
> 
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py	(Arbeitskopie)
>@@ -217,7 +217,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'sambaPrivileges': univention.admin.property(
>-			short_description = _( 'Samba privileges' ),
>+			short_description = _( 'Samba privilege' ),
> 			long_description = _( 'Manage samba privileges' ),
> 			syntax = univention.admin.syntax.SambaPrivileges,
> 			multivalue = True,
>@@ -332,7 +332,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'e-mail': univention.admin.property(
>-			short_description=_('E-mail address(es)'),
>+			short_description=_('E-mail address'),
> 			long_description='',
> 			syntax=univention.admin.syntax.emailAddress,
> 			multivalue=1,
>@@ -365,7 +365,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'phone': univention.admin.property(
>-			short_description=_('Telephone number(s)'),
>+			short_description=_('Telephone number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.phone,
> 			multivalue=1,
>@@ -437,7 +437,7 @@
> 			identifies=0,
> 		),
> 	'homeTelephoneNumber': univention.admin.property(
>-			short_description=_('Private telephone number(s)'),
>+			short_description=_('Private telephone number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.phone,
> 			multivalue=1,
>@@ -448,7 +448,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'mobileTelephoneNumber': univention.admin.property(
>-			short_description=_('Mobile phone number(s)'),
>+			short_description=_('Mobile phone number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.phone,
> 			multivalue=1,
>@@ -459,7 +459,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'pagerTelephoneNumber': univention.admin.property(
>-			short_description=_('Pager telephone number(s)'),
>+			short_description=_('Pager telephone number'),
> 			long_description='',
> 			syntax=univention.admin.syntax.phone,
> 			multivalue=1,
>@@ -608,7 +608,7 @@
> 			readonly_when_synced=1,
> 		),
> 	'mailAlternativeAddress': univention.admin.property(
>-			short_description=_('Alternative e-mail addresses'),
>+			short_description=_('Alternative e-mail address'),
> 			long_description='',
> 			syntax=univention.admin.syntax.emailAddressValidDomain,
> 			multivalue=1,
>@@ -667,7 +667,7 @@
> 			default = '<username>'
> 		),
> 	'sambaUserWorkstations': univention.admin.property(
>-			short_description=_('Allow the authentication only on these Microsoft Windows hosts'),
>+			short_description=_('Allow the authentication only on this Microsoft Windows host'),
> 			long_description=(''),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=1,
>Index: management/univention-directory-manager-modules/modules/univention/admin/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/de.po	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/de.po	(Arbeitskopie)
>@@ -29,7 +29,7 @@
> msgstr ""
> "Project-Id-Version: univention-directory-manager-modules 6.0.99\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2015-03-24 17:10+0100\n"
>+"POT-Creation-Date: 2015-04-01 14:56+0200\n"
> "PO-Revision-Date: 2015-01-29 17:54+0100\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: German <de@li.org>\n"
>@@ -187,8 +187,8 @@
> msgstr "Erweiterung"
> 
> #: nagios.py:50
>-msgid "Email addresses of Nagios contacts"
>-msgstr "Email-Adressen fÃ¼r Nagios-Benachrichtigungen"
>+msgid "Email address of Nagios contacts"
>+msgstr "Email-Adresse fÃ¼r Nagios-Benachrichtigungen"
> 
> #: nagios.py:60
> msgid "Parent hosts"
>@@ -452,8 +452,8 @@
> "This is not a valid DNS entry name. A valid name can only consist of "
> "numbers, letters, dots and hyphens."
> msgstr ""
>-"Dies ist kein gÃ¼ltiger Name fÃ¼r einen DNS-Eintrag. Ein gÃ¼ltiger Name darf nur aus Buchstaben, Zahlen, Punkten und "
>-"Bindestrichen bestehen."
>+"Dies ist kein gÃ¼ltiger Name fÃ¼r einen DNS-Eintrag. Ein gÃ¼ltiger Name darf "
>+"nur aus Buchstaben, Zahlen, Punkten und Bindestrichen bestehen."
> 
> #: syntax.py:950
> msgid "Not a valid windows hostname!"
>Index: management/univention-directory-manager-modules/modules/univention/admin/nagios.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/nagios.py	(Revision 59522)
>+++ management/univention-directory-manager-modules/modules/univention/admin/nagios.py	(Arbeitskopie)
>@@ -47,7 +47,7 @@
> 
> nagios_properties = {
> 	'nagiosContactEmail': univention.admin.property(
>-			short_description = _('Email addresses of Nagios contacts'),
>+			short_description = _('Email address of Nagios contacts'),
> 			long_description = (''),
> 			syntax=univention.admin.syntax.emailAddress,
> 			multivalue=1,
>Index: management/univention-management-console-frontend/umc/widgets/MultiInput.js
>===================================================================
>--- management/univention-management-console-frontend/umc/widgets/MultiInput.js	(Revision 59522)
>+++ management/univention-management-console-frontend/umc/widgets/MultiInput.js	(Arbeitskopie)
>@@ -390,8 +390,13 @@
> 		},
> 
> 		_renderNewEntryButton: function() {
>+			var label = _('New entry');
>+			if (this.subtypes.length === 1 && this.subtypes[0].label) {
>+				label = _('Add %s', this.subtypes[0].label);
>+//				label = _('Add %s', this.label[0]);
>+			}
> 			this._newEntryButton = new Button({
>-				label: _('New entry'),
>+				label: label,
> 				disabled: this.disabled,
> 				visible: !this.disabled,
> 				iconClass: 'umcPlusIcon',

Actions: View | Diff

Attachments on bug 32760: 5954 | 5955 | 6795 | 6826