diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/de.po b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/de.po
index 251d916..4d708c6 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/de.po
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/de.po
@@ -373,7 +373,7 @@ msgid " At least posix or kerberos is required."
 msgstr " Zumindest Posix oder Kerberos wird benötigt."
 
 #: macos.py:
-msgid "Computer: Mac OS X Client"
+msgid "Computer: Mac OS X client"
 msgstr "Rechner: Mac OS X Client"
 
 #: macos.py:
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
index 5c2238e..6ced80c 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/computers/macos.py
@@ -51,7 +51,7 @@ operations=['add','edit','remove','search','move']
 usewizard=1
 docleanup=1
 childs=0
-short_description=_('Computer: Mac OS X Client')
+short_description=_('Computer: Mac OS X client')
 long_description=''
 options={
 	'posix': univention.admin.option(
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po
index b8558d4..caef60f 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/de.po
@@ -181,6 +181,10 @@ msgid "neither DN nor position present"
 msgstr "Weder ein DN noch eine Position wurde angegeben"
 
 #: host_record.py:
+msgid "DNS: Host record"
+msgstr "DNS: Host Record"
+
+#: host_record.py:
 msgid "Hostname"
 msgstr "Rechnername"
 
@@ -248,6 +252,10 @@ msgstr "DNS: Service Record"
 msgid "Location"
 msgstr "Ort"
 
+#: txt_record.py:
+msgid "DNS: TXT record"
+msgstr "DNS: TXT Record"
+
 #~ msgid "Additional name servers"
 #~ msgstr "Zusätzliche Nameserver"
 
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
index 72b76f2..5704bd3 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/host_record.py
@@ -47,7 +47,7 @@ operations=['add','edit','remove','search']
 superordinate='dns/forward_zone'
 usewizard=1
 childs=0
-short_description='DNS: Host Record'
+short_description=_('DNS: Host record')
 long_description=''
 
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
index db6f32a..9ef51e0 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
@@ -46,7 +46,7 @@ operations=['add','edit','remove','search']
 superordinate='dns/forward_zone'
 usewizard=1
 childs=0
-short_description='DNS: TXT Record'
+short_description=_('DNS: TXT record')
 long_description=''
 
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/de.po b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/de.po
index e8db80e..ca076e4 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/de.po
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/de.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: unicode\n"
 
 #: kdcentry.py:
-msgid "Kerberos: KDC Entry"
+msgid "Kerberos: KDC entry"
 msgstr "Kerberos: KDC-Eintrag"
 
 #: kdcentry.py:
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/kdcentry.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/kdcentry.py
index fecb575..cecbb41 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/kdcentry.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/kerberos/kdcentry.py
@@ -47,7 +47,7 @@ _=translation.translate
 module='kerberos/kdcentry'
 operations=['add','edit','remove','search','move']
 childs=0
-short_description=_('Kerberos: KDC Entry')
+short_description=_('Kerberos: KDC entry')
 long_description=''
 property_descriptions={
 	'name': univention.admin.property(
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/cn.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/cn.py
index 9a3bfa3..5570392 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/cn.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/cn.py
@@ -43,7 +43,7 @@ _=translation.translate
 module='settings/cn'
 operations=['search']
 childs=1
-short_description=_('Univention Settings')
+short_description=_('Univention settings')
 long_description=''
 options={
 }
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..6962658 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
@@ -40,7 +40,7 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 #: cn.py:
-msgid "Univention Settings"
+msgid "Univention settings"
 msgstr "Univention-Einstellungen"
 
 #: cn.py: default.py: directory.py: extended_attribute.py:
@@ -115,7 +115,7 @@ msgid "KDE Profiles"
 msgstr "KDE-Profile"
 
 #: directory.py:
-msgid "Preferences: Default Container"
+msgid "Preferences: Default container"
 msgstr "Einstellungen: Standard-Container"
 
 #: directory.py:
@@ -207,7 +207,7 @@ msgid "License Links"
 msgstr "Lizenzverweise"
 
 #: extended_attribute.py:
-msgid "Settings: extended attribute"
+msgid "Settings: Extended attribute"
 msgstr "Einstellungen: Erweitertes Attribut"
 
 #: extended_attribute.py: extended_options.py:
@@ -439,7 +439,7 @@ msgid "Mapping to LDAP objectClasses"
 msgstr "Abbildung auf LDAP-Objektklassen"
 
 #: ldapacl.py:
-msgid "Settings: LDAP ACL Extension"
+msgid "Settings: LDAP ACL extension"
 msgstr "Einstellungen: LDAP ACL Erweiterung"
 
 #: ldapacl.py:
@@ -502,7 +502,7 @@ msgid "packageversion: Version must not be lower than the current one."
 msgstr "packageversion: Der Wert darf nicht geringer sein als der aktuelle."
 
 #: ldapschema.py:
-msgid "Settings: LDAP Schema Extension"
+msgid "Settings: LDAP Schema extension"
 msgstr "Einstellungen: LDAP-Schemaerweiterung"
 
 #: ldapschema.py:
@@ -754,7 +754,7 @@ msgid "Lock Information"
 msgstr "Informationen über die Sperrung"
 
 #: packages.py:
-msgid "Settings: Package List"
+msgid "Settings: Package list"
 msgstr "Einstellungen: Paketliste"
 
 #: packages.py:
@@ -766,7 +766,7 @@ msgid "Package List"
 msgstr "Paketliste"
 
 #: printermodel.py:
-msgid "Settings: Printer Driver List"
+msgid "Settings: Printer driver list"
 msgstr "Einstellungen: Druckertreiberliste"
 
 #: printermodel.py:
@@ -782,7 +782,7 @@ msgid "Printer List"
 msgstr "Druckerliste"
 
 #: printeruri.py:
-msgid "Settings: Printer URI List"
+msgid "Settings: Printer URI list"
 msgstr "Einstellungen: Drucker-URI-Liste"
 
 #: printeruri.py:
@@ -810,7 +810,7 @@ msgid "Prohibited user names"
 msgstr "Verbotene Benutzernamen"
 
 #: sambaconfig.py:
-msgid "Settings: Samba Configuration"
+msgid "Settings: Samba configuration"
 msgstr "Einstellungen: Samba-Konfiguration"
 
 #: sambaconfig.py:
@@ -858,7 +858,7 @@ msgid "Refuse Machine Password Change"
 msgstr "Änderung des Rechnerpasswortes ablehnen"
 
 #: sambadomain.py:
-msgid "Settings: Samba Domain"
+msgid "Settings: Samba domain"
 msgstr "Einstellungen: Samba-Domäne"
 
 #: sambadomain.py:
@@ -942,7 +942,7 @@ msgid "Preferences"
 msgstr "Einstellungen"
 
 #: syntax.py:
-msgid "Settings: Syntax Definition"
+msgid "Settings: Syntax definition"
 msgstr "Einstellungen: Syntax-Definition"
 
 #: syntax.py:
@@ -999,7 +999,7 @@ msgstr ""
 "Ein LDAP-Attribut wird benötigt dessen Information gespeichert werden soll."
 
 #: udm_hook.py:
-msgid "Settings: UDM Hook"
+msgid "Settings: UDM hook"
 msgstr "Einstellungen: UDM Hook"
 
 #: udm_hook.py:
@@ -1015,7 +1015,7 @@ msgid "UDM hook data"
 msgstr "UDM Hook-Daten"
 
 #: udm_module.py:
-msgid "Settings: UDM Module"
+msgid "Settings: UDM module"
 msgstr "Einstellungen: UDM Modul"
 
 #: udm_module.py:
@@ -1031,7 +1031,7 @@ msgid "UDM module data"
 msgstr "UDM Moduldaten"
 
 #: udm_syntax.py:
-msgid "Settings: UDM Syntax"
+msgid "Settings: UDM syntax"
 msgstr "Einstellungen: UDM Syntax"
 
 #: udm_syntax.py:
@@ -1083,7 +1083,7 @@ msgid "UMC Operation Set"
 msgstr "UMC-Befehlssatz"
 
 #: usertemplate.py:
-msgid "Settings: User Template"
+msgid "Settings: User template"
 msgstr "Einstellungen: Benutzervorlage"
 
 #: usertemplate.py:
@@ -1247,7 +1247,7 @@ msgid "Group Memberships"
 msgstr "Gruppenmitgliedschaften"
 
 #: xconfig_choices.py:
-msgid "Preferences: X Configuration Choices"
+msgid "Preferences: X configuration choices"
 msgstr "Einstellungen: X Konfigurationsauswahl"
 
 #: xconfig_choices.py:
@@ -1291,5 +1291,5 @@ msgid "Display Size (mm)"
 msgstr "Bildschirm Grösse (mm)"
 
 #: xconfig_choices.py:
-msgid "X Configuration Choices"
+msgid "X configuration choices"
 msgstr "X Konfiguration Auswahl"
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/directory.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/directory.py
index 8e4eb55..092766c 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/directory.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/directory.py
@@ -46,7 +46,7 @@ module='settings/directory'
 superordinate='settings/cn'
 childs=0
 operations=['search', 'edit']
-short_description=_('Preferences: Default Container')
+short_description=_('Preferences: Default container')
 long_description=''
 options={
 }
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..b17e86b 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
@@ -43,7 +43,7 @@ module='settings/extended_attribute'
 operations=['add','edit','remove','search','move']
 superordinate='settings/cn'
 childs=0
-short_description=_('Settings: extended attribute')
+short_description=_('Settings: Extended attribute')
 long_description=''
 options={
 }
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapacl.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapacl.py
index 7e689a4..072ba98 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapacl.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapacl.py
@@ -48,7 +48,7 @@ OC = "univentionLDAPExtensionACL"
 module='settings/ldapacl'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: LDAP ACL Extension')
+short_description=_('Settings: LDAP ACL extension')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapschema.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapschema.py
index 3ebb2a3..9113817 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapschema.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/ldapschema.py
@@ -48,7 +48,7 @@ OC = "univentionLDAPExtensionSchema"
 module='settings/ldapschema'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: LDAP Schema Extension')
+short_description=_('Settings: LDAP schema extension')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/packages.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/packages.py
index b9ac35f..507dd2b 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/packages.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/packages.py
@@ -46,7 +46,7 @@ operations=['add','edit','remove','search','move']
 superordinate='settings/cn'
 
 childs=0
-short_description=_('Settings: Package List')
+short_description=_('Settings: Package list')
 long_description=_('List of Packages for UCS Systems')
 options={
 }
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
index 708c2ea..9171426 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printermodel.py
@@ -48,7 +48,7 @@ operations=['add','edit','remove','search','move']
 superordinate='settings/cn'
 
 childs=0
-short_description=_('Settings: Printer Driver List')
+short_description=_('Settings: Printer driver list')
 long_description=_('List of drivers for printers')
 options={
 }
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printeruri.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printeruri.py
index d6765bd..d87e05c 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printeruri.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/printeruri.py
@@ -46,7 +46,7 @@ operations=['add','edit','remove','search','move']
 superordinate='settings/cn'
 
 childs=0
-short_description=_('Settings: Printer URI List')
+short_description=_('Settings: Printer URI list')
 long_description=_('List of URIs for printers')
 options={
 }
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambaconfig.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambaconfig.py
index 17b35e8..b5a74c6 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambaconfig.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambaconfig.py
@@ -62,7 +62,7 @@ module='settings/sambaconfig'
 childs=0
 # since samba 3.0.30 and UCS 2.1 the domain configuration for samba will be stored in the samba domain object
 operations=['edit','remove','search','move']
-short_description=_('Settings: Samba Configuration')
+short_description=_('Settings: Samba configuration')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambadomain.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambadomain.py
index 28308a7..06522a6 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambadomain.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/sambadomain.py
@@ -65,7 +65,7 @@ def logonToChangePWUnmap(val):
 module='settings/sambadomain'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: Samba Domain')
+short_description=_('Settings: Samba domain')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/syntax.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/syntax.py
index b7fc3f8..8104c4d 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/syntax.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/syntax.py
@@ -44,7 +44,7 @@ module = 'settings/syntax'
 superordinate = 'settings/cn'
 childs = 0
 operations = [ 'add', 'edit', 'remove', 'search', 'move' ]
-short_description=_( 'Settings: Syntax Definition' )
+short_description=_( 'Settings: Syntax definition' )
 long_description = ''
 options = {}
 property_descriptions = {
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_hook.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_hook.py
index 9d00ccb..e1733de 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_hook.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_hook.py
@@ -48,7 +48,7 @@ OC = "univentionUDMHook"
 module='settings/udm_hook'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: UDM Hook')
+short_description=_('Settings: UDM hook')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_module.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_module.py
index 7e34aa4..b15b4a7 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_module.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_module.py
@@ -48,7 +48,7 @@ OC = "univentionUDMModule"
 module='settings/udm_module'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: UDM Module')
+short_description=_('Settings: UDM module')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_syntax.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_syntax.py
index 58c116b..143707a 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_syntax.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/udm_syntax.py
@@ -48,7 +48,7 @@ OC = "univentionUDMSyntax"
 module='settings/udm_syntax'
 childs=0
 operations=['add','edit','remove','search','move']
-short_description=_('Settings: UDM Syntax')
+short_description=_('Settings: UDM syntax')
 long_description=''
 options={}
 property_descriptions={
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py
index a222d23..04af8ec 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/usertemplate.py
@@ -43,7 +43,7 @@ module='settings/usertemplate'
 operations=['add','edit','remove','search','move']
 superordinate='settings/cn'
 childs=0
-short_description=_('Settings: User Template')
+short_description=_('Settings: User template')
 long_description=''
 options={
 }
diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/xconfig_choices.py b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/xconfig_choices.py
index 3abb988..537a670 100644
--- a/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/xconfig_choices.py
+++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-directory-manager-modules/modules/univention/admin/handlers/settings/xconfig_choices.py
@@ -47,7 +47,7 @@ superordinate='settings/cn'
 childs=0
 width="100"
 operations=['search','edit']
-short_description=_('Preferences: X Configuration Choices')
+short_description=_('Preferences: X configuration choices')
 long_description=''
 options={
 }
@@ -166,7 +166,7 @@ property_descriptions={
 }
 
 layout = [
-	Tab(_('General'),_('X Configuration Choices'), layout = [
+	Tab(_('General'),_('X configuration choices'), layout = [
 		Group( _( 'General' ), layout = [
 			'name',
 			[ 'resolution', 'colorDepth' ],