Attachment 5490 Details for Bug 32785

[patch] EA improvements

32785_udm-ea-usability.diff (text/plain), 34.29 KB, created by Philipp Hahn on 2013-10-01 22:30 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2013-10-01 22:30 CEST

Size: 34.29 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po
>index 9313b32..3d9d373 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po
>+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/de.po
>@@ -29,7 +29,7 @@ msgid ""
> msgstr ""
> "Project-Id-Version: univention-directory-manager-modules 6.0.100\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2013-09-06 16:04+0200\n"
>+"POT-Creation-Date: 2013-10-01 21:28+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"
>@@ -210,144 +210,381 @@ msgstr "Lizenzverweise"
> msgid "Settings: extended attribute"
> msgstr "Einstellungen: Erweitertes Attribut"
> 
>+#: extended_attribute.py:
>+msgid "Unique Name"
>+msgstr "Eindeutiger Name"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"The name for the extended attribute, which is used by default for the "
>+"command line client and internally to name the attribute."
>+msgstr ""
>+"Der names der Erweiterten Attributs, der standardmÃ¤Ãig fÃ¼r das "
>+"Kommandozeilenprogramm und intern fÃ¼r die Benennung des Attributs verwendet "
>+"wird."
>+
> #: extended_attribute.py: extended_options.py:
> msgid "Default short description"
> msgstr "Standard-Kurzbeschreibung"
> 
>+#: extended_attribute.py:
>+msgid "A default descriptive text, which is used as the label in the UMC."
>+msgstr ""
>+"Ein standard Beschreibungstext, der als Beschriftung in UMC verwendet wird."
>+
> #: extended_attribute.py: extended_options.py:
> msgid "Default long description"
> msgstr "AusfÃ¼hrliche Standardbeschreibung"
> 
>+#: extended_attribute.py:
>+msgid ""
>+"A default longer descriptive text, which is shown as a bubble-help in the "
>+"UMC."
>+msgstr ""
>+"Eine lÃ¤ngerer Beschreibungstext, der als Standard dienst und als Popup-"
>+"Hilfstext in UMC angezeigt wird."
>+
> #: extended_attribute.py: extended_options.py:
>-msgid "Translation of short description "
>-msgstr "Ãbersetzung der Kurzbeschreibung"
>+msgid "Translations of short description"
>+msgstr "Ãbersetzungen der Kurzbeschreibung"
>+
>+#: extended_attribute.py:
>+msgid "Translations of the label text for other languages."
>+msgstr "Ãbersetzungen des Beschreibungstextes in andere Sprachen."
> 
> #: extended_attribute.py: extended_options.py:
>-msgid "Translation of long description "
>-msgstr "Ãbersetzung der ausfÃ¼hrlichen Beschreibung"
>+msgid "Translations of long description"
>+msgstr "Ãbersetzungen der ausfÃ¼hrlichen Beschreibung"
>+
>+#: extended_attribute.py:
>+msgid "Translations of the descriptive text for other languages."
>+msgstr "Ãbersetzungen der ausfÃ¼hrlichen Beschreibung in andere Sprachen."
> 
> #: extended_attribute.py:
>-msgid "Translation of tab name"
>-msgstr "Ãbersetzung des Karteikartennamens"
>+msgid "Translations of tab name"
>+msgstr "Ãbersetzungen des Karteikartennamens"
> 
> #: extended_attribute.py:
>-msgid "Translation of group name"
>-msgstr "Ãbersetzung des Gruppennames"
>+msgid "Translations of the name of the tab."
>+msgstr "Ãbersetzungen des Namens der Karteikarte"
> 
> #: extended_attribute.py:
>-msgid "Syntax"
>-msgstr "Syntax"
>+msgid "Translations of group name"
>+msgstr "Ãbersetzungen des Gruppennames"
> 
> #: extended_attribute.py:
>-msgid "Hook"
>-msgstr "Hook"
>+msgid "Translations of the name of the group on the tab."
>+msgstr "Ãbersetzungen des Namens der Gruppe einer Karteikarte."
>+
>+#: extended_attribute.py:
>+msgid "Syntax class"
>+msgstr "Syntaxklasse"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"The name of a syntax class implementing the Python univention.admin.syntax "
>+"interface. 'string' by default."
>+msgstr ""
>+"Der Name einer Syntaxklasse, die die Python-Schnittstelle univention.admin."
>+"sytax implementiert. StandardmÃ¤Ãig 'string'."
>+
>+#: extended_attribute.py:
>+msgid "Hook class"
>+msgstr "Hook-Klasse"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"The name of a Python class implementing the Python univention.admin.hook "
>+"interface, which can be used to trigger additional actions when objects are "
>+"created, modified or deleted."
>+msgstr ""
>+"Der Name einer Python-Klasse, die die Python-Schnittstelle univention.admin."
>+"hook implementiert. Die kann genutzt werden, um zusÃ¤tzliche Aktionen beim "
>+"Anlegen, Bearbeiten und LÃ¶schen von Objekten auszufÃ¼hren."
> 
> #: extended_attribute.py:
> msgid "Multi value"
> msgstr "Mehrfachwert"
> 
> #: extended_attribute.py:
>+msgid ""
>+"If this option is enabled, the attribute stores multiple values instead of a "
>+"single value."
>+msgstr ""
>+"Ist diese Option aktiviert, speichert das Attribut mehrere Werte anstatt nur "
>+"eines Wertes."
>+
>+#: extended_attribute.py:
> msgid "Default value"
> msgstr "Vorgabewert"
> 
> #: extended_attribute.py:
>-msgid "Do not show in UMC"
>-msgstr "In UMC nicht anzeigen"
>+msgid "The default value, which is used when an object is newly created."
>+msgstr "Der Standardwert, der beim Anlegen eines neuen Objekts benutzt wird."
>+
>+#: extended_attribute.py:
>+msgid "Don't show this extended attribute in the UMC"
>+msgstr "Dieses Erweitertes Attribut nicht in der UMC anzeigen"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"If this option is enabled, no widget is shown in the UMC to represent this "
>+"extended attribute. It can then only by used from the command line program "
>+"or the Python interface."
>+msgstr ""
>+"Ist diese Option aktiviert, wird kein Widget in der UMC angezeigt, um dieser "
>+"Erweiterte Attribut darzustellen. Es kann dann nur Ã¼ber die Kommandozeile "
>+"oder Ã¼ber die Python-Schnittstelle benutzt werden."
> 
> #: extended_attribute.py:
> msgid "Tab name"
> msgstr "Name der Karteikarte"
> 
> #: extended_attribute.py:
>-msgid "Position number on tab"
>-msgstr "Positionsnummer auf der Karteikarte"
>+msgid ""
>+"The name of tab in the UMC, on which this extended attribute is placed. A "
>+"new tab is created automatically if no tab with the name exists."
>+msgstr ""
>+"Der Name der Karteikarte in der UMC, auf der das Erweiterte Attribut "
>+"plaziert wird. Eine neue Karteikarte wird automatisch angelegt, fall noch "
>+"keine Karteikarte mit dem Namen existiert."
>+
>+#: extended_attribute.py:
>+msgid "Ordering number"
>+msgstr "Ordnungsnummer"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"This option specifies the order, in which multiple extended attributes are "
>+"added to the group or tab."
>+msgstr ""
>+"Diese Option dient der Sortierung, wenn mehrere Erweiterte Attribute zu "
>+"einer Gruppe oder Karteikarte hinzugefÃ¼gt werden."
> 
> #: extended_attribute.py:
> msgid "Group name"
> msgstr "Gruppenname"
> 
> #: extended_attribute.py:
>+msgid ""
>+"Related properties can be grouped. This option specifies the name of the "
>+"group, where this extended attribute is put in."
>+msgstr ""
>+"ZusammengehÃ¶rige Eigenschaften kÃ¶nnen gruppiert werden. Diese Option benennt "
>+"die Gruppe, in die das Erweiterte Attribute plaziert werden soll."
>+
>+#: extended_attribute.py:
> msgid "Position number of group"
> msgstr "Positionsnummer der Gruppe"
> 
> #: extended_attribute.py:
>+msgid ""
>+"On each tab the groups are numbered starting with 1. This option specifies "
>+"the position, before which group a newly created group is inserted."
>+msgstr ""
>+"Auf jeder Karteikarte sind die Gruppen von 1 an numeriert. Diese Option gibt "
>+"die Position der Gruppe an, vor der eine eine neue Gruppe plaziert wird."
>+
>+#: extended_attribute.py:
> msgid "Tab with advanced settings"
> msgstr "Karteikarte mit erweiterten Einstellungen"
> 
> #: extended_attribute.py:
>+msgid ""
>+"If enabled, the tab is put under \"Advanced settings\" instead of creating a "
>+"new top-level tab."
>+msgstr ""
>+"Ist diese Option aktiviert, wird die Karteikarte unter \"Erweiterte "
>+"Einstellungen\" anstatt einer selbstÃ¤ndigen Karteikarte angelegt."
>+
>+#: extended_attribute.py:
> msgid "Overwrite existing tab"
> msgstr "Existierende Karteikarte Ã¼berschreiben"
> 
> #: extended_attribute.py:
>-msgid "Overwrite existing widget"
>-msgstr "Existierendes Eingabefeld Ã¼berschreiben"
>+msgid ""
>+"If a tab with the given name already exists, is it replaced by a new tab "
>+"only containg extended attributes."
>+msgstr ""
>+"Wenn eine Karteikarte mit dem angegebenen Namen bereits existiert, wird "
>+"diese durch eine neue ersetzt, die ausschlieÃlich durch Erweiterte Attribute "
>+"gefÃ¼llt wird."
>+
>+#: extended_attribute.py:
>+msgid "Overwrite existing property"
>+msgstr "Existierende Eigenschaft Ã¼berschreiben"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"The pre-defined property with the name given here is removed and replaced by "
>+"this extended attribute."
>+msgstr ""
>+"Die Standardeigenschaft mit dem hier angegebenen Namen wird entfernt und "
>+"durch dieses Erweiterte Attribute ersetzt."
> 
> #: extended_attribute.py:
> msgid "Span both columns"
> msgstr "Beide Spalten umfassen"
> 
>-#: extended_attribute.py: extended_attribute.py:
>-msgid "LDAP mapping"
>-msgstr "LDAP-Abbildung"
>+#: extended_attribute.py:
>+msgid ""
>+"The widget used to represent this extended attribute spans both columns in "
>+"the UMC."
>+msgstr ""
>+"Das Dialogelement, welches dieses Erweiterte Attribute reprÃ¤sentiert, "
>+"erstreckt sich Ã¼ber beide Spalten in der UMC."
>+
>+#: extended_attribute.py:
>+msgid "LDAP attribute"
>+msgstr "LDAP-Attribut"
>+
>+#: extended_attribute.py:
>+msgid ""
>+"This specifies the name of the LDAP attribute, which is used to store this "
>+"property."
>+msgstr ""
>+"Der Name des LDAP-Attributs, der zum Speichern dieser Eigenschaft verwendet "
>+"wird."
> 
> #: extended_attribute.py:
> msgid "Editable after creation"
> msgstr "NachtrÃ¤glich modifizierbar"
> 
> #: extended_attribute.py:
>+msgid ""
>+"This extended attribute can be modified. Otherwise the data can only be "
>+"entered when the object is initially created."
>+msgstr ""
>+"Das Erweiterte Attributs kann verÃ¤ndert werden. Andernfalls kÃ¶nnen die Daten "
>+"nur beim erstmaligen Anlegen eingegeben werden."
>+
>+#: extended_attribute.py:
> msgid "Value not editable"
> msgstr "Wert ist nicht Ã¤nderbar"
> 
> #: extended_attribute.py:
>-msgid "Disabling this option will only allow hooks to change the value"
>+msgid ""
>+"If this option is enabled, the property can't be changed through UMC or CLI, "
>+"but only through the Python API or by hooks."
> msgstr ""
>-"Das Deaktivieren dieser Option fÃ¼hrt dazu, dass der Wert nur noch Ã¼ber Hooks "
>-"Ã¤nderbar ist."
>+"Ist diese Option aktiv, kann die Eigenschaft nicht durch die UMC oder die "
>+"Kommandozeile geÃ¤ndert werden.Dies ist dann nur noch direkt Ã¼ber die Python-"
>+"API oder Hooks mÃ¶glich."
> 
> #: extended_attribute.py:
> msgid "Value required"
> msgstr "Wert wird benÃ¶tigt"
> 
>-#: extended_attribute.py: extended_options.py:
>-msgid "Object class"
>+#: extended_attribute.py:
>+msgid "A value is required and must be entered."
>+msgstr "Ein Eingabewert ist erforderlich und muÃ angegeben werden."
>+
>+#: extended_attribute.py:
>+msgid "LDAP Object class"
> msgstr "Objektklasse"
> 
>+#: extended_attribute.py:
>+msgid ""
>+"This specifies the name of the LDAP object class, which is used to store "
>+"this property."
>+msgstr ""
>+"Gibt den Namen der LDAP-Objektklasse an, die zum Speichern dieser "
>+"Eigenschaft verwendet wird."
>+
> # customattribute.py:06
> #: extended_attribute.py:
> msgid "Delete object class"
> msgstr "Objektklasse lÃ¶schen"
> 
>+#: extended_attribute.py:
>+msgid ""
>+"If this option is enabled, the LDAP object class is removed (if possible) "
>+"when the property is unset."
>+msgstr ""
>+"Ist diese Option aktiv, wird die LDAP-Objektklasse (sofern mÃ¶glich) "
>+"entfernt, wenn die Eigenschaft nicht lÃ¤nger gesetzt ist."
>+
> #: extended_attribute.py: extended_options.py:
> msgid "Needed module"
> msgstr "BenÃ¶tigtes Modul"
> 
> #: extended_attribute.py:
>-msgid "\"users/user\" or \"computer/thinclient\""
>-msgstr "\"users/user\" oder \"computer/thinclient\""
>+msgid ""
>+"The modules, where this extended attribute is added to, e.g. \"users/user\" "
>+"or \"computers/windows\"."
>+msgstr ""
>+"Die Module, bei denen dieses Erweiterte Attributs angewendet wird, z.B. "
>+"\"users/user\" oder \"computers/windows\"."
> 
> #: extended_attribute.py:
> msgid "Version of extended attribute"
> msgstr "Version des erweiterten Attributs"
> 
> #: extended_attribute.py:
>+msgid "The ABI number used by this extended attribute."
>+msgstr "Die ABI-Nummer, die diesem Erweiterte Attributs verwendet."
>+
>+#: extended_attribute.py:
> msgid "UDM CLI name of extended attribute"
> msgstr "UDM-CLI Attributname"
> 
>-#: extended_attribute.py: syntax.py: usertemplate.py:
>-msgid "Options"
>-msgstr "Optionen"
>+#: extended_attribute.py:
>+msgid "The name for the extended attribute as used by the command line client."
>+msgstr ""
>+"Der Name des Erweiterten Attributes, wie es auf der Kommandozeile verwendet "
>+"wird."
> 
> #: extended_attribute.py:
>-msgid "Unsearchable"
>-msgstr "Nicht durchsuchbar"
>+msgid "Enabling options"
>+msgstr "Aktivierende Optionen"
> 
> #: extended_attribute.py:
>-msgid "UMC"
>-msgstr "UMC"
>+msgid ""
>+"This extended attribute is only used, when one of the given options is "
>+"enabled for the object, e.g. \"posix\" or \"samba\"."
>+msgstr ""
>+"Dieses Erweiterte Attribut wird dann genutzt, wenn eine der angegebenen "
>+"Optionen fÃ¼r das Objekt aktiviert ist, z.B. \"posix\" oder \"samba\"."
>+
>+#: extended_attribute.py:
>+msgid "Hide from search"
>+msgstr "FÃ¼r die Suche ausblenden"
>+
>+#: extended_attribute.py:
>+msgid "The attribute is not available for searching."
>+msgstr "Bei der Suche kann nicht nach diesem Attribut gesucht werden."
>+
>+#: extended_attribute.py:
>+msgid "Short descriptions"
>+msgstr "Kurzbeschreibungen"
>+
>+#: extended_attribute.py:
>+msgid "Long descriptions"
>+msgstr "AusfÃ¼hrliche Beschreibung"
>+
>+#: extended_attribute.py: license.py:
>+msgid "Module"
>+msgstr "Modul"
>+
>+#: extended_attribute.py:
>+msgid "Module related settings"
>+msgstr "Modul-relevante Einstellungen"
>+
>+#: extended_attribute.py:
>+msgid "LDAP maping"
>+msgstr "LDAP-Abbildung"
> 
> #: extended_attribute.py:
>-msgid "Settings for UMC"
>-msgstr "UMC-spezifische Einstellungen"
>+msgid "Mapping to LDAP object class and attribute"
>+msgstr "Abbildung auf LDAP-Objektklasse und -Attribut"
>+
>+#: extended_attribute.py:
>+msgid "UMC layout"
>+msgstr "UMC-Darstellung"
>+
>+#: extended_attribute.py:
>+msgid "Settings for UMC web layout"
>+msgstr "Einstellungen fÃ¼r die UMC-Web-Darstellung"
> 
> #: extended_attribute.py:
> msgid "Tab layout"
>@@ -358,18 +595,10 @@ msgid "Group layout"
> msgstr "Gruppendarstellung"
> 
> #: extended_attribute.py:
>-msgid "Extended settings"
>-msgstr "Erweiterte Einstellungen"
>-
>-#: extended_attribute.py: extended_attribute.py:
>-msgid "UDM General"
>-msgstr "UDM Allgemein"
>+msgid "Attribute layout"
>+msgstr "Attributdarstellung"
> 
> #: extended_attribute.py:
>-msgid "UDM related settings"
>-msgstr "UDM-spezifische Einstellungen"
>-
>-#: extended_attribute.py: extended_attribute.py:
> msgid "Data type"
> msgstr "Datentyp"
> 
>@@ -377,10 +606,6 @@ msgstr "Datentyp"
> msgid "Data type definition"
> msgstr "Datentyp-Definition"
> 
>-#: extended_attribute.py: extended_attribute.py:
>-msgid "LDAP"
>-msgstr "LDAP"
>-
> #: extended_options.py:
> msgid "Settings: Extended options"
> msgstr "Einstellungen: Erweiterte Optionen"
>@@ -401,17 +626,18 @@ msgstr ""
> 
> #: extended_options.py:
> msgid ""
>-"Translation of the short description for the option as shown on the Option "
>+"Translations of the short description for the option as shown on the Option "
> "tab"
> msgstr ""
>-"Ãbersetzung der kurzen Beschreibung, wie sie im Optionen-Reiter angezeigt "
>+"Ãbersetzungen der kurzen Beschreibung, wie sie im Optionen-Reiter angezeigt "
> "wird."
> 
> #: extended_options.py:
> msgid ""
>-"Translation of the long description for the option as shown on the Option tab"
>+"Translations of the long description for the option as shown on the Option "
>+"tab"
> msgstr ""
>-"Ãbersetzung der langen Beschreibung, wie sie im Optionen-Reiter angezeigt "
>+"Ãbersetzungen der langen Beschreibung, wie sie im Optionen-Reiter angezeigt "
> "wird."
> 
> #: extended_options.py:
>@@ -435,8 +661,12 @@ msgid "List of modules this option applies to."
> msgstr "Liste der Module, auf die diese Option angewandt wird."
> 
> #: extended_options.py:
>+msgid "LDAP object class"
>+msgstr "LDAP-Objektklasse"
>+
>+#: extended_options.py:
> msgid "Mapping to LDAP objectClasses"
>-msgstr "Abbildung auf LDAP-Objektklassen"
>+msgstr "Abbildung auf die LDAP-objectClass"
> 
> #: ldapacl.py:
> msgid "Settings: LDAP ACL Extension"
>@@ -542,10 +772,6 @@ msgid "License Expiration Date"
> msgstr "Lizenz-Ablaufdatum"
> 
> #: license.py:
>-msgid "Module"
>-msgstr "Modul"
>-
>-#: license.py:
> msgid "Module the license is valid for"
> msgstr "FÃ¼r dieses Modul ist die Lizenz gÃ¼ltig."
> 
>@@ -993,6 +1219,10 @@ msgstr "Anzeige"
> msgid "Storage"
> msgstr "Speicherung"
> 
>+#: syntax.py: usertemplate.py:
>+msgid "Options"
>+msgstr "Optionen"
>+
> #: syntax.py:
> msgid "An LDAP attribute is required of which the information will be stored."
> msgstr ""
>diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py
>index b98edc6..34de679 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py
>+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_attribute.py
>@@ -49,8 +49,8 @@ options={
> }
> property_descriptions={
> 	'name': univention.admin.property(
>-			short_description=_('Name'),
>-			long_description='',
>+			short_description=_('Unique Name'),
>+			long_description=_('The name for the extended attribute, which is used by default for the command line client and internally to name the attribute.'),
> 			syntax=univention.admin.syntax.string_numbers_letters_dots,
> 			multivalue=0,
> 			include_in_default_search=1,
>@@ -61,7 +61,7 @@ property_descriptions={
> 		),
> 	'shortDescription': univention.admin.property(
> 			short_description=_('Default short description'),
>-			long_description='',
>+			long_description=_('A default descriptive text, which is used as the label in the UMC.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			include_in_default_search=1,
>@@ -72,7 +72,7 @@ property_descriptions={
> 		),
> 	'longDescription': univention.admin.property(
> 			short_description=_('Default long description'),
>-			long_description='',
>+			long_description=_('A default longer descriptive text, which is shown as a bubble-help in the UMC.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			include_in_default_search=1,
>@@ -82,8 +82,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'translationShortDescription': univention.admin.property(
>-			short_description=_('Translation of short description '),
>-			long_description='',
>+			short_description=_('Translations of short description'),
>+			long_description=_('Translations of the label text for other languages.'),
> 			syntax=univention.admin.syntax.translationTupleShortDescription,
> 			multivalue=1,
> 			include_in_default_search=1,
>@@ -93,8 +93,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'translationLongDescription': univention.admin.property(
>-			short_description=_('Translation of long description '),
>-			long_description='',
>+			short_description=_('Translations of long description'),
>+			long_description=_('Translations of the descriptive text for other languages.'),
> 			syntax=univention.admin.syntax.translationTupleLongDescription,
> 			multivalue=1,
> 			include_in_default_search=1,
>@@ -104,8 +104,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'translationTabName': univention.admin.property(
>-			short_description=_('Translation of tab name'),
>-			long_description='',
>+			short_description=_('Translations of tab name'),
>+			long_description=_('Translations of the name of the tab.'),
> 			syntax=univention.admin.syntax.translationTupleTabName,
> 			multivalue=1,
> 			options=[],
>@@ -114,8 +114,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'translationGroupName': univention.admin.property(
>-			short_description = _( 'Translation of group name' ),
>-			long_description = '',
>+			short_description = _('Translations of group name'),
>+			long_description=_('Translations of the name of the group on the tab.'),
> 			syntax = univention.admin.syntax.I18N_GroupName,
> 			multivalue = True,
> 			options = [],
>@@ -124,8 +124,8 @@ property_descriptions={
> 			identifies = False
> 		),
> 	'syntax': univention.admin.property(
>-			short_description=_('Syntax'),
>-			long_description='',
>+			short_description=_('Syntax class'),
>+			long_description=_("The name of a syntax class implementing the Python univention.admin.syntax interface. 'string' by default."),
> 			syntax=univention.admin.syntax.string_numbers_letters_dots,
> 			multivalue=0,
> 			options=[],
>@@ -134,8 +134,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'hook': univention.admin.property(
>-			short_description=_('Hook'),
>-			long_description='',
>+			short_description=_('Hook class'),
>+			long_description=_('The name of a Python class implementing the Python univention.admin.hook interface, which can be used to trigger additional actions when objects are created, modified or deleted.'),
> 			syntax=univention.admin.syntax.string_numbers_letters_dots,
> 			multivalue=0,
> 			options=[],
>@@ -145,7 +145,7 @@ property_descriptions={
> 		),
> 	'multivalue': univention.admin.property(
> 			short_description=_('Multi value'),
>-			long_description='',
>+			long_description=_('If this option is enabled, the attribute stores multiple values instead of a single value.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -156,7 +156,7 @@ property_descriptions={
> 		),
> 	'default': univention.admin.property(
> 			short_description=_('Default value'),
>-			long_description='',
>+			long_description=_('The default value, which is used when an object is newly created.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -165,8 +165,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'disableUDMWeb': univention.admin.property(
>-			short_description=_('Do not show in UMC'),
>-			long_description='',
>+			short_description=_("Don't show this extended attribute in the UMC"),
>+			long_description=_('If this option is enabled, no widget is shown in the UMC to represent this extended attribute. It can then only by used from the command line program or the Python interface.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -176,7 +176,7 @@ property_descriptions={
> 		),
> 	'tabName': univention.admin.property(
> 			short_description=_('Tab name'),
>-			long_description='',
>+			long_description=_('The name of tab in the UMC, on which this extended attribute is placed. A new tab is created automatically if no tab with the name exists.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -185,8 +185,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'tabPosition': univention.admin.property(
>-			short_description=_('Position number on tab'),
>-			long_description='',
>+			short_description=_('Ordering number'),
>+			long_description=_('This option specifies the order, in which multiple extended attributes are added to the group or tab.'),
> 			syntax=univention.admin.syntax.integer,
> 			multivalue=0,
> 			options=[],
>@@ -196,7 +196,7 @@ property_descriptions={
> 		),
> 	'groupName': univention.admin.property(
> 			short_description = _( 'Group name' ),
>-			long_description = '',
>+			long_description=_('Related properties can be grouped. This option specifies the name of the group, where this extended attribute is put in.'),
> 			syntax = univention.admin.syntax.string,
> 			multivalue = False,
> 			options = [],
>@@ -206,7 +206,7 @@ property_descriptions={
> 		),
> 	'groupPosition': univention.admin.property(
> 			short_description = _( 'Position number of group' ),
>-			long_description = '',
>+			long_description=_('On each tab the groups are numbered starting with 1. This option specifies the position, before which group a newly created group is inserted.'),
> 			syntax = univention.admin.syntax.integer,
> 			multivalue = False,
> 			options = [],
>@@ -216,7 +216,7 @@ property_descriptions={
> 		),
> 	'tabAdvanced': univention.admin.property(
> 			short_description=_('Tab with advanced settings'),
>-			long_description='',
>+			long_description=_('If enabled, the tab is put under "Advanced settings" instead of creating a new top-level tab.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -226,7 +226,7 @@ property_descriptions={
> 		),
> 	'overwriteTab': univention.admin.property(
> 			short_description=_('Overwrite existing tab'),
>-			long_description='',
>+			long_description=_('If a tab with the given name already exists, is it replaced by a new tab only containg extended attributes.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -235,8 +235,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'overwritePosition': univention.admin.property(
>-			short_description=_('Overwrite existing widget'),
>-			long_description='',
>+			short_description=_('Overwrite existing property'),
>+			long_description=_('The pre-defined property with the name given here is removed and replaced by this extended attribute.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -246,7 +246,7 @@ property_descriptions={
> 		),
> 	'fullWidth': univention.admin.property(
> 			short_description=_('Span both columns'),
>-			long_description='',
>+			long_description=_('The widget used to represent this extended attribute spans both columns in the UMC.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -255,8 +255,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'ldapMapping': univention.admin.property(
>-			short_description=_('LDAP mapping'),
>-			long_description='',
>+			short_description=_('LDAP attribute'),
>+			long_description=_('This specifies the name of the LDAP attribute, which is used to store this property.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -266,7 +266,7 @@ property_descriptions={
> 		),
> 	'mayChange': univention.admin.property(
> 			short_description=_('Editable after creation'),
>-			long_description='',
>+			long_description=_('This extended attribute can be modified. Otherwise the data can only be entered when the object is initially created.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -276,7 +276,7 @@ property_descriptions={
> 		),
> 	'notEditable': univention.admin.property(
> 			short_description=_('Value not editable'),
>-			long_description=_('Disabling this option will only allow hooks to change the value'),
>+			long_description=_("If this option is enabled, the property can't be changed through UMC or CLI, but only through the Python API or by hooks."),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=False,
> 			options=[],
>@@ -287,7 +287,7 @@ property_descriptions={
> 		),
> 	'valueRequired': univention.admin.property(
> 			short_description=_('Value required'),
>-			long_description='',
>+			long_description=_('A value is required and must be entered.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -296,8 +296,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'objectClass': univention.admin.property(
>-			short_description=_('Object class'),
>-			long_description='',
>+			short_description=_('LDAP Object class'),
>+			long_description=_('This specifies the name of the LDAP object class, which is used to store this property.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -307,7 +307,7 @@ property_descriptions={
> 		),
> 	'deleteObjectClass': univention.admin.property(
> 			short_description=_('Delete object class'),
>-			long_description='',
>+			long_description=_('If this option is enabled, the LDAP object class is removed (if possible) when the property is unset.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -317,7 +317,7 @@ property_descriptions={
> 		),
> 	'module': univention.admin.property(
> 			short_description=_( 'Needed module' ),
>-			long_description = _( '"users/user" or "computer/thinclient"' ),
>+			long_description=_('The modules, where this extended attribute is added to, e.g. "users/user" or "computers/windows".'),
> 			syntax = univention.admin.syntax.univentionAdminModules,
> 			multivalue = True,
> 			options = [],
>@@ -327,7 +327,7 @@ property_descriptions={
> 		),
> 	'version': univention.admin.property(
> 			short_description = _('Version of extended attribute'),
>-			long_description = '',
>+			long_description=_('The ABI number used by this extended attribute.'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -338,7 +338,7 @@ property_descriptions={
> 		),
> 	'CLIName': univention.admin.property(
> 			short_description = _('UDM CLI name of extended attribute'),
>-			long_description = '',
>+			long_description=_('The name for the extended attribute as used by the command line client.'),
> 			syntax=univention.admin.syntax.string_numbers_letters_dots,
> 			multivalue=0,
> 			options=[],
>@@ -348,8 +348,8 @@ property_descriptions={
> 			default='<name>',
> 		),
> 	'options': univention.admin.property(
>-			short_description=_('Options'),
>-			long_description='',
>+			short_description=_('Enabling options'),
>+			long_description=_('This extended attribute is only used, when one of the given options is enabled for the object, e.g. "posix" or "samba".'),
> 			syntax=univention.admin.syntax.string_numbers_letters_dots,
> 			multivalue=1,
> 			options=[],
>@@ -358,8 +358,8 @@ property_descriptions={
> 			identifies=0
> 		),
> 	'doNotSearch': univention.admin.property(
>-			short_description=_('Unsearchable'),
>-			long_description='',
>+			short_description=_('Hide from search'),
>+			long_description=_('The attribute is not available for searching.'),
> 			syntax=univention.admin.syntax.boolean,
> 			multivalue=0,
> 			options=[],
>@@ -370,48 +370,52 @@ property_descriptions={
> }
> 
> layout = [
>-	Tab(_('General'),_('Basic values'), layout = [
>-		Group( _( 'General' ), layout = [
>-			"name",
>-			[ "shortDescription", "longDescription" ],
>-			[ "translationShortDescription", "translationLongDescription" ]
>-		] ),
>-	] ),
>-	Tab(_('UMC'),_('Settings for UMC'), layout = [
>-		Group( _( 'Tab layout' ), layout = [
>-			[ "tabName", "tabPosition" ],
>-			"translationTabName",
>-			] ),
>-		Group( _( 'Group layout' ), layout = [
>-			[ 'groupName', 'groupPosition' ],
>-			'translationGroupName',
>-			] ),
>-		Group( _( 'Extended settings' ), layout = [
>-			[ "overwritePosition", "fullWidth" ],
>-			[ "overwriteTab", "tabAdvanced" ],
>-			[ "disableUDMWeb" ],
>-			] ),
>-	] ),
>-	Tab(_('UDM General'),_('UDM related settings'), layout = [
>-		Group( _( 'UDM General' ), layout = [
>-			[ "CLIName", "hook" ],
>-			[ "options", "module" ]
>-		] ),
>-	] ),
>-	Tab(_('Data type'),_('Data type definition'), layout = [
>-		Group( _( 'Data type' ), layout = [
>-			[ "syntax", "default" ],
>-			[ "multivalue", "valueRequired" ],
>-			[ "mayChange",  "doNotSearch" ],
>-			"notEditable"
>-		] ),
>-	] ),
>-	Tab(_('LDAP'),_('LDAP mapping'), layout = [
>-		Group( _( 'LDAP' ), layout = [
>-			[ "objectClass", "ldapMapping" ],
>-			[ "deleteObjectClass" ]
>-		] ),
>+	Tab(_('General'), _('Basic values'), layout=[
>+		"name",
>+		Group(_('Short descriptions'), layout=[
>+			["shortDescription"],
>+			["translationShortDescription"],
>+		]),
>+		Group(_('Long descriptions'), layout=[
>+			["longDescription"],
>+			["translationLongDescription"]
>+		]),
> 	] ),
>+	Tab(_('Module'), _('Module related settings'), layout=[
>+		["module", "options"],
>+		["CLIName", "hook"],
>+	]),
>+	Tab(_('LDAP maping'), _('Mapping to LDAP object class and attribute'), layout=[
>+		["objectClass"],
>+		["ldapMapping"],
>+		["deleteObjectClass"]
>+	]),
>+	Tab(_('UMC layout'),_('Settings for UMC web layout'), layout=[
>+		["disableUDMWeb"],
>+		Group(_( 'Tab layout'), layout=[
>+			["tabName"],
>+			["translationTabName"],
>+			["overwriteTab", "tabAdvanced"],
>+		]),
>+		Group(_('Group layout'), layout=[
>+			['groupName'],
>+			['translationGroupName'],
>+			['groupPosition'],
>+		]),
>+		Group(_('Attribute layout'), layout=[
>+			["tabPosition", "overwritePosition"],
>+			["fullWidth"],
>+		]),
>+	]),
>+	Tab(_('Data type'), _('Data type definition'), layout=[
>+		["syntax"],
>+		["default" ],
>+		["multivalue"],
>+		["valueRequired"],
>+		["mayChange"],
>+		["notEditable"],
>+		["doNotSearch"],
>+	]),
> ]
> 
> mapping=univention.admin.mapping.mapping()
>diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_options.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_options.py
>index bc6462d..8a82e8d 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_options.py
>+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/extended_options.py
>@@ -85,8 +85,8 @@ property_descriptions = {
> 			identifies=False
> 		),
> 		'translationShortDescription': univention.admin.property(
>-			short_description=_('Translation of short description '),
>-			long_description=_('Translation of the short description for the option as shown on the Option tab'),
>+			short_description=_('Translations of short description'),
>+			long_description=_('Translations of the short description for the option as shown on the Option tab'),
> 			syntax=univention.admin.syntax.translationTupleShortDescription,
> 			multivalue=True,
> 			include_in_default_search=1,
>@@ -96,8 +96,8 @@ property_descriptions = {
> 			identifies=False
> 		),
> 		'translationLongDescription': univention.admin.property(
>-			short_description=_('Translation of long description '),
>-			long_description=_('Translation of the long description for the option as shown on the Option tab'),
>+			short_description=_('Translations of long description'),
>+			long_description=_('Translations of the long description for the option as shown on the Option tab'),
> 			syntax=univention.admin.syntax.translationTupleLongDescription,
> 			multivalue=True,
> 			include_in_default_search=1,
>@@ -137,7 +137,7 @@ property_descriptions = {
> 			identifies=False
> 		),
> 		'objectClass': univention.admin.property(
>-			short_description=_('Object class'),
>+			short_description=_('LDAP object class'),
> 			long_description=_('Mapping to LDAP objectClasses'),
> 			syntax=univention.admin.syntax.string,
> 			multivalue=True,

Actions: View | Diff

Attachments on bug 32785: 5490 | 5491