diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo
index b3f05bcb..457a87a2 100644
Binary files a/lam/locale/de_DE/LC_MESSAGES/messages.mo and b/lam/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.po b/lam/locale/de_DE/LC_MESSAGES/messages.po
index 339b96de..1a6f2b5b 100644
--- a/lam/locale/de_DE/LC_MESSAGES/messages.po
+++ b/lam/locale/de_DE/LC_MESSAGES/messages.po
@@ -3,14 +3,14 @@
 #
 #
 # LDAP Account Manager
-# Roland Gruber <post@rolandgruber.de>, 2004, 2005.
+# Roland Gruber <post@rolandgruber.de>, 2004, 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2005-12-05 15:47+0100\n"
+"PO-Revision-Date: 2006-01-07 12:14+0100\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team: Deutsch <lam-i18n@lists.sourceforge.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,23 +23,32 @@ msgstr ""
 msgid "$user and $group are replaced with user name or primary group name."
 msgstr "$user und $group werden durch Benutzer- und Gruppenname ersetzt."
 
-#: ../templates/lists/listdomains.php:145
-#: ../templates/lists/listdomains.php:195
+#: ../lib/types/mailAlias.inc:106
 #, php-format
-msgid "%s Samba domain(s) found"
-msgstr "%s Samba-Domäne(n) gefunden"
+msgid "%s alias(es) found"
+msgstr "%s Alias(e) gefunden"
 
-#: ../templates/lists/listgroups.php:148 ../templates/lists/listgroups.php:225
+#: ../lib/types/smbDomain.inc:106
+#, php-format
+msgid "%s domain(s) found"
+msgstr "%s Domäne(n) gefunden"
+
+#: ../lib/types/group.inc:108
 #, php-format
 msgid "%s group(s) found"
 msgstr "%s Gruppe(n) gefunden"
 
-#: ../templates/lists/listhosts.php:148 ../templates/lists/listhosts.php:209
+#: ../lib/types/host.inc:110
 #, php-format
 msgid "%s host(s) found"
 msgstr "%s Host(s) gefunden"
 
-#: ../templates/lists/listusers.php:179 ../templates/lists/listusers.php:255
+#: ../lib/lists.inc:94
+#, php-format
+msgid "%s object(s) found"
+msgstr "%s Objekt(e) gefunden"
+
+#: ../lib/types/user.inc:120
 #, php-format
 msgid "%s user(s) found"
 msgstr "%s Benutzer gefunden"
@@ -76,14 +85,13 @@ msgstr ""
 "Benutzer können erlauben, dass andere in ihrem Namen handeln. Diese Option "
 "wird geprüft wenn über Kolab emails versendet werden."
 
-#: ../templates/ou_edit.php:103 ../templates/ou_edit.php:168
-#: ../templates/ou_edit.php:233 ../templates/ou_edit.php:298
-#: ../templates/config/confmodules.php:104
-#: ../templates/config/confmain.php:485 ../templates/pdfedit/pdfdelete.php:82
-#: ../templates/pdfedit/pdfpage.php:772 ../templates/pdfedit/pdfmain.php:153
-#: ../templates/profedit/profiledelete.php:85
+#: ../templates/ou_edit.php:106 ../templates/config/confmodules.php:110
+#: ../templates/config/confmain.php:404 ../templates/config/conftypes.php:208
+#: ../templates/pdfedit/pdfdelete.php:91 ../templates/pdfedit/pdfpage.php:772
+#: ../templates/pdfedit/pdfmain.php:153
+#: ../templates/profedit/profiledelete.php:82
 #: ../templates/profedit/profilepage.php:251
-#: ../templates/profedit/profilemain.php:158
+#: ../templates/profedit/profilemain.php:165
 #: ../lib/modules/sambaSamAccount.inc:990
 msgid "Abort"
 msgstr "Abbrechen"
@@ -93,8 +101,8 @@ msgid "Account"
 msgstr "Account"
 
 #: ../templates/massBuildAccounts.php:166 ../lib/modules/account.inc:111
-#: ../lib/modules/ieee802device.inc:84 ../lib/modules/posixGroup.inc:477
-#: ../lib/modules/posixGroup.inc:481 ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/ieee802device.inc:84 ../lib/modules/posixGroup.inc:484
+#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:489
 #: ../lib/modules/quota.inc:46 ../lib/modules/quota.inc:48
 #: ../lib/modules/quota.inc:50 ../lib/modules/quota.inc:52
 #: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:56
@@ -133,6 +141,9 @@ msgstr "Account"
 #: ../lib/modules/shadowAccount.inc:46 ../lib/modules/shadowAccount.inc:48
 #: ../lib/modules/shadowAccount.inc:50 ../lib/modules/shadowAccount.inc:52
 #: ../lib/modules/shadowAccount.inc:54 ../lib/modules/shadowAccount.inc:55
+#: ../lib/modules/sambaDomain.inc:137 ../lib/modules/sambaDomain.inc:139
+#: ../lib/modules/sambaDomain.inc:141 ../lib/modules/sambaDomain.inc:143
+#: ../lib/modules/sambaDomain.inc:145 ../lib/modules/sambaDomain.inc:147
 #: ../lib/modules/inetOrgPerson.inc:45 ../lib/modules/inetOrgPerson.inc:47
 #: ../lib/modules/inetOrgPerson.inc:49 ../lib/modules/inetOrgPerson.inc:51
 #: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:55
@@ -150,11 +161,11 @@ msgstr "Account"
 msgid "Account %s:"
 msgstr "Account %s:"
 
-#: ../templates/masscreate.php:78
+#: ../templates/masscreate.php:82
 msgid "Account creation via file upload"
 msgstr "Erstellung von Accounts mittels Dateiupload"
 
-#: ../lib/modules/posixAccount.inc:365
+#: ../lib/modules/posixGroup.inc:428 ../lib/modules/posixAccount.inc:365
 msgid "Account deactivated"
 msgstr "Account deaktiviert"
 
@@ -185,7 +196,7 @@ msgstr "Account deaktiviert"
 msgid "Account lists - Filters"
 msgstr "Accountlisten - Filter"
 
-#: ../templates/config/confmain.php:252 ../help/help.inc:111
+#: ../help/help.inc:111
 msgid "Account modules"
 msgstr "Accountmodule"
 
@@ -193,11 +204,23 @@ msgstr "Accountmodule"
 msgid "Account name:"
 msgstr "Accountname:"
 
-#: ../lib/modules.inc:992
+#: ../templates/pdfedit/pdfdelete.php:81
+msgid "Account type"
+msgstr "Accounttyp"
+
+#: ../templates/config/conftypes.php:152
+msgid "Account type selection"
+msgstr "Auswahl der Accounttypen"
+
+#: ../templates/config/confmain.php:206
+msgid "Account types and modules"
+msgstr "Accounttypen und ~module"
+
+#: ../lib/modules.inc:987
 msgid "Account was created successfully."
 msgstr "Account wurde erfolgreich erstellt."
 
-#: ../lib/modules.inc:995
+#: ../lib/modules.inc:990
 msgid "Account was modified successfully."
 msgstr "Account wurde erfolgreich geändert."
 
@@ -207,14 +230,19 @@ msgstr ""
 "Wenn Sie dieses Kästchen aktivieren, dann wird das Heimatverzeichnis des "
 "Benutzers gelöscht."
 
+#: ../templates/config/conftypes.php:170
+msgid "Active account types"
+msgstr "Aktive Accounttypen"
+
 #: ../templates/tree/add_value_form.php:156
 #: ../templates/tree/add_value_form.php:181
 #: ../templates/tree/add_oclass_form.php:140
 #: ../templates/tree/add_attr_form.php:129
 #: ../templates/tree/add_attr_form.php:161
-#: ../templates/pdfedit/pdfpage.php:724 ../lib/modules/ieee802device.inc:146
-#: ../lib/modules/kolabUser.inc:367 ../lib/modules/kolabUser.inc:384
-#: ../lib/modules/kolabUser.inc:410 ../lib/modules/ldapPublicKey.inc:137
+#: ../templates/config/conftypes.php:161 ../templates/pdfedit/pdfpage.php:724
+#: ../lib/modules/ieee802device.inc:146 ../lib/modules/kolabUser.inc:367
+#: ../lib/modules/kolabUser.inc:384 ../lib/modules/kolabUser.inc:410
+#: ../lib/modules/ldapPublicKey.inc:137
 #: ../lib/modules/inetLocalMailRecipient.inc:208
 #: ../lib/modules/nisMailAlias.inc:180
 msgid "Add"
@@ -263,16 +291,13 @@ msgstr "Zusätzliche Aufgaben des Moduls:"
 msgid "Administrators group"
 msgstr "Administratoren"
 
-#: ../templates/domain.php:171 ../help/help.inc:169
-msgid "Algorithmic RID Base"
-msgstr "RID-Basisnummer"
-
-#: ../templates/domain.php:287
+#: ../lib/modules/sambaDomain.inc:146 ../lib/modules/sambaDomain.inc:147
 msgid "Algorithmic RID base is not a number!"
 msgstr "RID-Basisnummer ist keine Zahl!"
 
-#: ../lib/modules/nisMailAlias.inc:62 ../lib/modules/nisMailAlias.inc:77
-#: ../lib/modules/nisMailAlias.inc:165 ../lib/modules/nisMailAlias.inc:323
+#: ../lib/types/mailAlias.inc:80 ../lib/modules/nisMailAlias.inc:62
+#: ../lib/modules/nisMailAlias.inc:77 ../lib/modules/nisMailAlias.inc:165
+#: ../lib/modules/nisMailAlias.inc:323
 msgid "Alias name"
 msgstr "Alias"
 
@@ -284,7 +309,7 @@ msgstr "Aliase"
 msgid "All changes were successful."
 msgstr "Alle Änderungen waren erfolgreich."
 
-#: ../lib/lists.inc:306
+#: ../lib/types/user.inc:84
 msgid "Allowed hosts"
 msgstr "Erlaubte PCs"
 
@@ -311,7 +336,7 @@ msgstr "Ein Attribut (%s) wurde geändert und ist nun hervorgehoben."
 msgid "Anyone"
 msgstr "Jeder"
 
-#: ../templates/lists/listusers.php:275
+#: ../lib/types/user.inc:237
 msgid "Apply"
 msgstr "Ok"
 
@@ -327,27 +352,19 @@ msgstr "Attribut"
 msgid "Attribute types"
 msgstr "Attributtypen"
 
-#: ../templates/config/confmain.php:323 ../lib/config.inc:365
-msgid "Attributes in Group List"
-msgstr "Attributnamen in der Gruppenliste"
-
-#: ../templates/config/confmain.php:333 ../lib/config.inc:366
-msgid "Attributes in Host List"
-msgstr "Attributnamen in der Hostliste"
-
-#: ../templates/config/confmain.php:313 ../lib/config.inc:364
-msgid "Attributes in User List"
-msgstr "Attributnamen in der Benutzerliste"
-
 #: ../templates/pdfedit/pdfpage.php:602
 msgid "Available PDF fields"
 msgstr "Verfügbare PDF-Felder"
 
+#: ../templates/config/conftypes.php:155
+msgid "Available account types"
+msgstr "Verfügbare Accounttypen"
+
 #: ../lib/modules/posixAccount.inc:983
 msgid "Available groups"
 msgstr "Verfügbare Gruppen"
 
-#: ../templates/config/confmodules.php:197
+#: ../templates/config/confmodules.php:204
 msgid "Available modules"
 msgstr "Verfügbare Module"
 
@@ -367,28 +384,23 @@ msgstr "Verfügbare PCs"
 msgid "Back"
 msgstr "Zurück"
 
-#: ../templates/config/confsave.php:254 ../templates/config/conflogin.php:162
+#: ../templates/config/confsave.php:192 ../templates/config/conflogin.php:150
 #: ../templates/logout.php:73
 msgid "Back to Login"
 msgstr "Zurück zum Login"
 
-#: ../templates/ou_edit.php:317 ../templates/ou_edit.php:321
+#: ../templates/ou_edit.php:127 ../templates/ou_edit.php:131
 msgid "Back to OU-Editor"
 msgstr "Zurück zum OU-Editor"
 
 #: ../templates/pdfedit/pdfdelete.php:61 ../templates/pdfedit/pdfdelete.php:69
-#: ../templates/pdfedit/pdfdelete.php:90
 msgid "Back to PDF Editor"
 msgstr "Zurück zum PDF-Editor"
 
-#: ../lib/modules.inc:1004
+#: ../lib/modules.inc:999
 msgid "Back to account list"
 msgstr "Zurück zur Accountliste"
 
-#: ../templates/domain.php:325 ../templates/domain.php:352
-msgid "Back to domain list"
-msgstr "Zurück zur Domänenliste"
-
 #: ../templates/lists/userlink.php:65
 msgid "Back to group list"
 msgstr "Zurück zur Gruppenliste"
@@ -397,23 +409,17 @@ msgstr "Zurück zur Gruppenliste"
 msgid "Back to list"
 msgstr "Zurück zur Liste"
 
+#: ../templates/config/confsave.php:83 ../templates/config/confsave.php:88
 #: ../templates/config/confsave.php:93 ../templates/config/confsave.php:98
-#: ../templates/config/confsave.php:103 ../templates/config/confsave.php:108
-#: ../templates/config/confsave.php:113 ../templates/config/confsave.php:118
-#: ../templates/config/confsave.php:123 ../templates/config/confsave.php:128
-#: ../templates/config/confsave.php:133 ../templates/config/confsave.php:138
-#: ../templates/config/confsave.php:143 ../templates/config/confsave.php:148
-#: ../templates/config/confsave.php:154 ../templates/config/confsave.php:160
-#: ../templates/config/confsave.php:166 ../templates/config/confsave.php:172
-#: ../templates/config/confsave.php:178 ../templates/config/confsave.php:184
-#: ../templates/config/confsave.php:231
+#: ../templates/config/confsave.php:103 ../templates/config/confsave.php:109
+#: ../templates/config/confsave.php:115 ../templates/config/confsave.php:121
+#: ../templates/config/confsave.php:171
 msgid "Back to preferences..."
 msgstr "Zurück zu den Einstellungen"
 
 #: ../templates/profedit/profiledelete.php:63
 #: ../templates/profedit/profiledelete.php:71
-#: ../templates/profedit/profiledelete.php:93
-#: ../templates/profedit/profilepage.php:120
+#: ../templates/profedit/profilepage.php:121
 msgid "Back to profile editor"
 msgstr "Zurück zum Profileditor"
 
@@ -429,7 +435,7 @@ msgstr "Basis (nur Basis-DN)"
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: ../templates/config/confmodules.php:108 ../help/help.inc:127
+#: ../templates/config/confmodules.php:114 ../help/help.inc:127
 msgid "Base module"
 msgstr "Basismodul"
 
@@ -477,23 +483,21 @@ msgstr "Weiches Block-Quota muss kleiner sein als hartes Block-Quota."
 msgid "Builtin Group"
 msgstr "Vordefinierte Gruppe"
 
-#: ../templates/masscreate.php:127
+#: ../templates/masscreate.php:128
 msgid "CSV file:"
 msgstr "CSV-Datei:"
 
-#: ../templates/config/confmain.php:231 ../lib/config.inc:358
-#: ../help/help.inc:107
+#: ../templates/config/confmain.php:185 ../help/help.inc:107
 msgid "Cache timeout"
 msgstr "Cache Zeitbegrenzung"
 
-#: ../templates/config/confsave.php:97
+#: ../templates/config/confsave.php:87
 msgid "Cache timeout is invalid!"
 msgstr "Cache Zeitbegrenzung ist ungültig!"
 
-#: ../lib/modules/posixGroup.inc:413 ../lib/modules/sambaAccount.inc:374
-#: ../lib/modules/sambaAccount.inc:377 ../lib/modules/sambaAccount.inc:380
-#: ../lib/modules/sambaAccount.inc:386 ../lib/modules/sambaAccount.inc:398
-#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaAccount.inc:377
+#: ../lib/modules/sambaAccount.inc:380 ../lib/modules/sambaAccount.inc:386
+#: ../lib/modules/sambaAccount.inc:398 ../lib/modules/sambaSamAccount.inc:215
 #: ../lib/modules/sambaSamAccount.inc:218
 #: ../lib/modules/sambaSamAccount.inc:221
 #: ../lib/modules/sambaSamAccount.inc:227 ../lib/modules/posixAccount.inc:378
@@ -505,7 +509,6 @@ msgstr "Kann leer bleiben."
 
 #: ../templates/tree/update_confirm.php:237
 #: ../templates/tree/delete_form.php:118 ../templates/tree/delete_form.php:167
-#: ../templates/domain.php:223 ../templates/domain.php:254
 #: ../templates/delete.php:111 ../templates/initsuff.php:188
 #: ../lib/modules/kolabUser.inc:596
 msgid "Cancel"
@@ -513,9 +516,10 @@ msgstr "Abbrechen"
 
 #: ../templates/login.php:372 ../templates/login.php:377
 msgid "Cannot connect to specified LDAP server. Please try again."
-msgstr "Kann keine Verbindung zum LDAP-Server aufbauen. Bitte erneut versuchen."
+msgstr ""
+"Kann keine Verbindung zum LDAP-Server aufbauen. Bitte erneut versuchen."
 
-#: ../lib/config.inc:349 ../lib/config.inc:884
+#: ../lib/config.inc:338 ../lib/config.inc:793
 msgid "Cannot open config file!"
 msgstr "Kann Konfigurationsdatei nicht öffnen!"
 
@@ -544,7 +548,7 @@ msgstr "Passwort ändern"
 msgid "Change profile"
 msgstr "Profil ändern"
 
-#: ../lib/lists.inc:356
+#: ../lib/lists.inc:474
 msgid "Change suffix"
 msgstr "Suffix wechseln"
 
@@ -561,7 +565,7 @@ msgstr "Wert wurde geändert da nur ASCII-Zeichen erlaubt sind."
 msgid "Choose a template"
 msgstr "Wählen Sie eine Vorlage"
 
-#: ../templates/tree/create.php:165 ../lib/config.inc:109
+#: ../templates/tree/create.php:165 ../lib/config.inc:111
 msgid "Click here if you are not directed to the next page."
 msgstr "Hier klicken wenn Sie nicht zur nächsten Seite weitergeleitet werden."
 
@@ -569,7 +573,7 @@ msgstr "Hier klicken wenn Sie nicht zur nächsten Seite weitergeleitet werden."
 msgid "Collective"
 msgstr "Gemeinsam"
 
-#: ../templates/masscreate.php:135
+#: ../templates/masscreate.php:136
 msgid "Columns:"
 msgstr "Spalten:"
 
@@ -609,7 +613,7 @@ msgstr "Einstellungsprofil"
 msgid "Configuration wizard"
 msgstr "Einstellungsassistent"
 
-#: ../templates/config/confmodules.php:238
+#: ../templates/config/confmodules.php:245
 msgid "Conflicting module:"
 msgstr "Modulkonflikt:"
 
@@ -650,7 +654,7 @@ msgstr "Ländername ist ungültig!"
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../lib/modules.inc:1054
+#: ../lib/modules.inc:1049
 msgid "Create Account"
 msgstr "Account erstellen"
 
@@ -659,31 +663,55 @@ msgstr "Account erstellen"
 msgid "Create Object"
 msgstr "Objekt erstellen"
 
-#: ../lib/modules.inc:1011 ../help/help.inc:146
+#: ../lib/modules.inc:1006 ../help/help.inc:146
 msgid "Create PDF file"
 msgstr "PDF-Datei erstellen"
 
-#: ../templates/lists/listgroups.php:250
+#: ../lib/types/mailAlias.inc:111
+msgid "Create PDF for all aliases"
+msgstr "PDF-Datei für alle Aliase erstellen"
+
+#: ../lib/types/smbDomain.inc:111
+msgid "Create PDF for all domains"
+msgstr "PDF-Datei für alle Domänen erstellen"
+
+#: ../lib/types/group.inc:113
 msgid "Create PDF for all groups"
 msgstr "PDF-Datei für alle Gruppen erstellen"
 
-#: ../templates/lists/listhosts.php:235
+#: ../lib/types/host.inc:115
 msgid "Create PDF for all hosts"
 msgstr "PDF-Datei für alle Hosts erstellen"
 
-#: ../templates/lists/listusers.php:295
+#: ../lib/lists.inc:99
+msgid "Create PDF for all objects"
+msgstr "PDF-Datei für alle Objekte erstellen"
+
+#: ../lib/types/user.inc:125
 msgid "Create PDF for all users"
 msgstr "PDF-Datei für alle Benutzer erstellen"
 
-#: ../templates/lists/listgroups.php:248
+#: ../lib/types/mailAlias.inc:110
+msgid "Create PDF for selected alias(es)"
+msgstr "PDF-Datei für ausgewählte(n) Alias(e) erstellen"
+
+#: ../lib/types/smbDomain.inc:110
+msgid "Create PDF for selected domain(s)"
+msgstr "PDF-Datei für ausgewählte Domäne(n) erstellen"
+
+#: ../lib/types/group.inc:112
 msgid "Create PDF for selected group(s)"
 msgstr "PDF-Datei für ausgewählte Gruppe(n) erstellen"
 
-#: ../templates/lists/listhosts.php:233
+#: ../lib/types/host.inc:114
 msgid "Create PDF for selected host(s)"
 msgstr "PDF-Datei für ausgewählte(n) Host(s) erstellen"
 
-#: ../templates/lists/listusers.php:293
+#: ../lib/lists.inc:98
+msgid "Create PDF for selected object(s)"
+msgstr "PDF-Datei für ausgewählte(s) Objekt(e) erstellen"
+
+#: ../lib/types/user.inc:124
 msgid "Create PDF for selected user(s)"
 msgstr "PDF-Datei für ausgewählte(n) Benutzer erstellen"
 
@@ -691,27 +719,19 @@ msgstr "PDF-Datei für ausgewählte(n) Benutzer erstellen"
 msgid "Create a new PDF structure for scope: "
 msgstr "Neue PDF-Struktur erstellen für Typ:"
 
-#: ../templates/profedit/profilemain.php:120
+#: ../templates/profedit/profilemain.php:127
 msgid "Create a new profile"
 msgstr "Neues Profil erstellen"
 
-#: ../lib/modules.inc:1003
+#: ../lib/modules.inc:998
 msgid "Create another account"
 msgstr "Weiteren Account anlegen"
 
-#: ../templates/masscreate.php:99
-msgid "Create group accounts"
-msgstr "Gruppen-Accounts anlegen"
-
 #: ../lib/modules/posixAccount.inc:896
 msgid "Create home directory"
 msgstr "Heimatverzeichnis anlegen"
 
-#: ../templates/masscreate.php:102
-msgid "Create host accounts"
-msgstr "Host-Accounts anlegen"
-
-#: ../lib/modules.inc:900
+#: ../lib/modules.inc:894
 msgid "Create new Account"
 msgstr "Neuen Account anlegen"
 
@@ -722,15 +742,11 @@ msgstr "Neuen Account anlegen"
 msgid "Create new entry"
 msgstr "Neues Objekt anlegen"
 
-#: ../templates/masscreate.php:96
-msgid "Create user accounts"
-msgstr "Benutzer-Accounts anlegen"
-
 #: ../templates/config/profmanage.php:84
 msgid "Created new profile."
 msgstr "Neues Profil wurde erstellt."
 
-#: ../templates/tools.php:70
+#: ../templates/tools.php:62
 msgid "Creates accounts by uploading a CSV formated file."
 msgstr "Erstellt Accounts durch das Hochladen einer CSV formatierten Datei."
 
@@ -747,15 +763,15 @@ msgstr "Individuell"
 #: ../templates/tree/update_confirm.php:75
 #: ../templates/tree/add_attr_form.php:72 ../templates/tree/delete_form.php:76
 #: ../templates/tree/delete_form.php:150 ../templates/delete.php:89
-#: ../lib/modules.inc:1620
+#: ../lib/modules.inc:1616
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:138
+#: ../templates/masscreate.php:139
 msgid "DN settings"
 msgstr "DN-Einstellungen"
 
-#: ../templates/masscreate.php:142 ../help/help.inc:138
+#: ../templates/masscreate.php:143 ../help/help.inc:138
 msgid "DN suffix"
 msgstr "DN-Suffix"
 
@@ -770,11 +786,13 @@ msgstr "Datenfeld für RDN ist leer!"
 
 #: ../lib/modules/sambaAccount.inc:366 ../lib/modules/sambaSamAccount.inc:207
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
-msgstr "Datum, nach dem der Benutzer sein Passwort ändern kann. Format: TT-MM-JJJJ"
+msgstr ""
+"Datum, nach dem der Benutzer sein Passwort ändern kann. Format: TT-MM-JJJJ"
 
 #: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:209
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
-msgstr "Datum, nach dem der Benutzer sein Passwort ändern muss. Format: TT-MM-JJJJ"
+msgstr ""
+"Datum, nach dem der Benutzer sein Passwort ändern muss. Format: TT-MM-JJJJ"
 
 #: ../lib/modules/shadowAccount.inc:150
 msgid ""
@@ -784,12 +802,11 @@ msgstr ""
 "Anzahl Tage, die der Benutzer gewarnt wird bevor sein Passwort abläuft. Wert "
 "muss größer 0 sein."
 
-#: ../templates/config/confmain.php:371 ../lib/config.inc:368
-#: ../help/help.inc:93
+#: ../templates/config/confmain.php:290 ../help/help.inc:93
 msgid "Default language"
 msgstr "Standardsprache"
 
-#: ../templates/masscreate.php:151 ../templates/masscreate.php:310
+#: ../templates/masscreate.php:152 ../templates/masscreate.php:310
 msgid "Default value"
 msgstr "Standardwert"
 
@@ -804,8 +821,7 @@ msgid "Delegates has invalid format!"
 msgstr "Vollmachten haben ungültiges Format!"
 
 #: ../templates/tree/edit.php:113 ../templates/tree/delete_form.php:158
-#: ../templates/domain.php:253 ../templates/delete.php:110
-#: ../lib/tree.inc:1162
+#: ../templates/delete.php:110 ../lib/tree.inc:1164
 msgid "Delete"
 msgstr "Löschen"
 
@@ -818,18 +834,6 @@ msgstr "%s löschen"
 msgid "Delete Account"
 msgstr "Lösche Account"
 
-#: ../templates/lists/listdomains.php:209
-msgid "Delete Domain(s)"
-msgstr "Lösche Domain(s)"
-
-#: ../templates/lists/listgroups.php:239
-msgid "Delete Group(s)"
-msgstr "Lösche Gruppe(n)"
-
-#: ../templates/lists/listhosts.php:224
-msgid "Delete Host(s)"
-msgstr "Lösche Host(s)"
-
 #: ../lib/modules/kolabUser.inc:422
 msgid "Delete Kolab account"
 msgstr "Lösche Kolab-Account"
@@ -838,27 +842,41 @@ msgstr "Lösche Kolab-Account"
 msgid "Delete PDF structure"
 msgstr "PDF-Struktur löschen"
 
+#: ../lib/types/mailAlias.inc:109
+msgid "Delete alias"
+msgstr "Alias löschen"
+
 #: ../templates/tree/delete_form.php:110
 #, php-format
 msgid "Delete all %s objects"
 msgstr "Alle %s-Objekte löschen"
 
-#: ../templates/domain.php:244
-msgid "Delete domain(s)"
-msgstr "Lösche Domäne(n)"
+#: ../lib/types/smbDomain.inc:109
+msgid "Delete domain"
+msgstr "Lösche Domäne"
+
+#: ../lib/types/group.inc:111
+msgid "Delete group"
+msgstr "Lösche Gruppe"
 
 #: ../lib/modules/posixAccount.inc:942
 msgid "Delete home directory"
 msgstr "Heimatverzeichnis löschen"
 
+#: ../lib/types/host.inc:113
+msgid "Delete host"
+msgstr "Host löschen"
+
+#: ../lib/lists.inc:97
+msgid "Delete object"
+msgstr "Objekt löschen"
+
 #: ../templates/pdfedit/pdfdelete.php:68
 #: ../templates/profedit/profiledelete.php:70
 msgid "Delete operation canceled."
 msgstr "Löschoperation abgebrochen."
 
-#: ../templates/ou_edit.php:362 ../templates/ou_edit.php:399
-#: ../templates/ou_edit.php:436 ../templates/ou_edit.php:473
-#: ../help/help.inc:155
+#: ../templates/ou_edit.php:177 ../help/help.inc:155
 msgid "Delete organizational unit"
 msgstr "Organizational Unit löschen"
 
@@ -868,12 +886,12 @@ msgstr "Foto löschen"
 
 #: ../templates/config/profmanage.php:258
 #: ../templates/profedit/profiledelete.php:52
-#: ../templates/profedit/profilemain.php:146 ../help/help.inc:117
+#: ../templates/profedit/profilemain.php:153 ../help/help.inc:117
 msgid "Delete profile"
 msgstr "Lösche Profil"
 
-#: ../templates/lists/listusers.php:284
-msgid "Delete user(s)"
+#: ../lib/types/user.inc:123
+msgid "Delete user"
 msgstr "Lösche Benutzer"
 
 #: ../lib/modules/sambaGroupMapping.inc:71
@@ -905,16 +923,16 @@ msgstr "Lösche. Bitte haben Sie ein wenig Geduld..."
 
 #: ../templates/tree/add_value_form.php:185 ../templates/schema/schema.php:93
 #: ../templates/schema/schema.php:147 ../templates/schema/schema.php:350
-#: ../lib/modules/account.inc:73 ../lib/modules/account.inc:97
-#: ../lib/modules/account.inc:211 ../lib/modules/account.inc:225
-#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixGroup.inc:408
-#: ../lib/modules/posixGroup.inc:452 ../lib/modules/sambaAccount.inc:854
-#: ../lib/modules/sambaSamAccount.inc:1196 ../lib/modules/posixAccount.inc:287
-#: ../lib/modules/posixAccount.inc:399
+#: ../lib/types/user.inc:90 ../lib/modules/account.inc:73
+#: ../lib/modules/account.inc:97 ../lib/modules/account.inc:211
+#: ../lib/modules/account.inc:225 ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/posixGroup.inc:408 ../lib/modules/posixGroup.inc:459
+#: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:1196
+#: ../lib/modules/posixAccount.inc:287 ../lib/modules/posixAccount.inc:399
 #: ../lib/modules/sambaGroupMapping.inc:318
 #: ../lib/modules/shadowAccount.inc:311 ../lib/modules/inetOrgPerson.inc:141
 #: ../lib/modules/inetOrgPerson.inc:271 ../lib/modules/inetOrgPerson.inc:546
-#: ../lib/modules/inetOrgPerson.inc:764 ../lib/lists.inc:312
+#: ../lib/modules/inetOrgPerson.inc:764
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -931,7 +949,7 @@ msgstr "Beschreibung"
 msgid "Display name"
 msgstr "Anzeigename"
 
-#: ../lib/modules.inc:475
+#: ../lib/modules.inc:471
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -939,20 +957,15 @@ msgstr ""
 "Die angezeigten Accountnummern beginnen mit \"0\". Addieren Sie 2 um die "
 "Reihennummer in Ihrer Tabellenkalkulation zu erhalten."
 
-#: ../templates/domain.php:245
-msgid "Do you really want to delete domain(s):"
-msgstr "Soll(en) diese Domäne(n) wirklich gelöscht werden?"
-
-#: ../templates/ou_edit.php:95 ../templates/ou_edit.php:160
-#: ../templates/ou_edit.php:225 ../templates/ou_edit.php:290
+#: ../templates/ou_edit.php:98
 msgid "Do you really want to delete this OU?"
 msgstr "Soll diese OU gelöscht werden?"
 
-#: ../templates/pdfedit/pdfdelete.php:77
+#: ../templates/pdfedit/pdfdelete.php:76
 msgid "Do you really want to delete this PDF structure?"
 msgstr "Soll diese PDF-Struktur gelöscht werden?"
 
-#: ../templates/profedit/profiledelete.php:80
+#: ../templates/profedit/profiledelete.php:77
 msgid "Do you really want to delete this profile?"
 msgstr "Soll dieses Profil gelöscht werden?"
 
@@ -1029,8 +1042,9 @@ msgstr "Domänengäste"
 msgid "Domain Policy Admins"
 msgstr "Domänen-Policy-Administratoren"
 
-#: ../templates/lists/listdomains.php:100 ../templates/domain.php:109
-#: ../help/help.inc:161
+#: ../lib/types/smbDomain.inc:80 ../lib/modules/sambaDomain.inc:63
+#: ../lib/modules/sambaDomain.inc:93 ../lib/modules/sambaDomain.inc:217
+#: ../lib/modules/sambaDomain.inc:223 ../lib/modules/sambaDomain.inc:408
 msgid "Domain SID"
 msgstr "Domänen-SID"
 
@@ -1039,10 +1053,6 @@ msgstr "Domänen-SID"
 msgid "Domain Schema Admins"
 msgstr "Domänen-Schema-Administratoren"
 
-#: ../templates/domain.php:83
-msgid "Domain Settings"
-msgstr "Domäneneinstellungen"
-
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
 #: ../lib/modules/sambaSamAccount.inc:1452
 #: ../lib/modules/sambaGroupMapping.inc:56
@@ -1053,16 +1063,10 @@ msgstr "Domänenbenutzer"
 msgid "Domain administrators"
 msgstr "Domänenadministratoren"
 
-#: ../templates/domain.php:348
-msgid "Domain deleted successfully."
-msgstr "Domäne erfolgreich gelöscht."
-
-#: ../templates/domain.php:304
-msgid "Domain has been modified."
-msgstr "Domäne wurde geändert."
-
-#: ../templates/lists/listdomains.php:99 ../templates/domain.php:88
-#: ../lib/modules/sambaAccount.inc:72 ../help/help.inc:157
+#: ../lib/types/smbDomain.inc:81 ../lib/modules/sambaAccount.inc:72
+#: ../lib/modules/sambaDomain.inc:59 ../lib/modules/sambaDomain.inc:86
+#: ../lib/modules/sambaDomain.inc:204 ../lib/modules/sambaDomain.inc:210
+#: ../lib/modules/sambaDomain.inc:405
 msgid "Domain name"
 msgstr "Domänenname"
 
@@ -1074,23 +1078,11 @@ msgstr ""
 "Domänenname enthält ungültige Zeichen. Gültige Zeichen sind: a-z, A-Z, 0-9 "
 "und -."
 
-#: ../templates/domain.php:277
+#: ../lib/modules/sambaDomain.inc:136 ../lib/modules/sambaDomain.inc:137
 msgid "Domain name is invalid!"
 msgstr "Domänenname ist ungültig!"
 
-#: ../templates/config/confmain.php:207 ../lib/config.inc:362
-msgid "DomainSuffix"
-msgstr "DomänenSuffix"
-
-#: ../templates/config/confsave.php:122
-msgid "DomainSuffix is invalid!"
-msgstr "Domänensuffix ist ungültig!"
-
-#: ../templates/ou_edit.php:455
-msgid "Domains"
-msgstr "Domänen"
-
-#: ../templates/main_header.php:59
+#: ../templates/main_header.php:57
 msgid "Donate"
 msgstr "Spenden"
 
@@ -1106,7 +1098,7 @@ msgstr "Beispiel-CSV-Datei runterladen"
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr "Laufwerksbuchstabe, der als Heimatverzeichnis zugewiesen wird."
 
-#: ../lib/lists.inc:311
+#: ../lib/types/user.inc:89
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -1135,8 +1127,7 @@ msgstr "EMail-Aliasliste hat ungültiges Format!"
 msgid "EMail aliases"
 msgstr "EMail-Aliase"
 
-#: ../templates/lists/listhosts.php:175 ../templates/lists/listgroups.php:175
-#: ../templates/lists/listdomains.php:175 ../templates/lists/listusers.php:221
+#: ../lib/types/group.inc:140 ../lib/types/user.inc:191 ../lib/lists.inc:370
 msgid "Edit"
 msgstr "Editieren"
 
@@ -1144,6 +1135,10 @@ msgstr "Editieren"
 msgid "Edit PDF structure"
 msgstr "PDF-Struktur ändern"
 
+#: ../templates/config/confmain.php:214
+msgid "Edit account types"
+msgstr "Accounttypen ändern"
+
 #: ../lib/modules/posixAccount.inc:888
 msgid "Edit groups"
 msgstr "Gruppen ändern"
@@ -1156,11 +1151,11 @@ msgstr "Anmeldezeiten ändern"
 msgid "Edit members"
 msgstr "Mitglieder ändern"
 
-#: ../templates/config/confmain.php:260
+#: ../templates/config/confmain.php:216
 msgid "Edit modules"
 msgstr "Module ändern"
 
-#: ../templates/profedit/profilemain.php:133
+#: ../templates/profedit/profilemain.php:140
 msgid "Edit profile"
 msgstr "Profil ändern"
 
@@ -1225,8 +1220,7 @@ msgstr ""
 msgid "Example"
 msgstr "Beispiel"
 
-#: ../templates/masscreate.php:150 ../templates/masscreate.php:164
-#: ../templates/masscreate.php:306
+#: ../templates/masscreate.php:151 ../templates/masscreate.php:306
 msgid "Example value"
 msgstr "Beispielwert"
 
@@ -1243,10 +1237,6 @@ msgstr "Export"
 msgid "Export format"
 msgstr "Exportformat"
 
-#: ../templates/domain.php:322
-msgid "Failed to add domain!"
-msgstr "Konnte Domäne nicht erstellen!"
-
 #: ../templates/tree/add_attr.php:128
 msgid "Failed to add the attribute."
 msgstr "Konnte das Attribut nicht hinzufügen."
@@ -1261,10 +1251,6 @@ msgstr "Konnte Eintrag nicht erstellen!"
 msgid "Failed to delete entry %s"
 msgstr "Konnte Eintrag %s nicht löschen"
 
-#: ../templates/domain.php:305
-msgid "Failed to modify domain!"
-msgstr "Konnte Domäne nicht ändern!"
-
 #: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:201
 #: ../lib/modules/inetOrgPerson.inc:319 ../lib/modules/inetOrgPerson.inc:320
 #: ../lib/modules/inetOrgPerson.inc:600 ../lib/modules/inetOrgPerson.inc:777
@@ -1289,7 +1275,7 @@ msgstr ""
 "Login ausgeführt wird. $user und $group werden mit Benutzer- und Gruppenname "
 "ersetzt."
 
-#: ../templates/tools.php:69
+#: ../templates/tools.php:61
 msgid "File upload"
 msgstr "Dateiupload"
 
@@ -1297,13 +1283,13 @@ msgstr "Dateiupload"
 msgid "File upload failed!"
 msgstr "Dateiupload ist fehlgeschlagen!"
 
-#: ../lib/lists.inc:217
+#: ../lib/lists.inc:331
 msgid "Filter"
 msgstr "Filtern"
 
-#: ../lib/modules/inetOrgPerson.inc:46 ../lib/modules/inetOrgPerson.inc:128
-#: ../lib/modules/inetOrgPerson.inc:279 ../lib/modules/inetOrgPerson.inc:532
-#: ../lib/modules/inetOrgPerson.inc:767 ../lib/lists.inc:307
+#: ../lib/types/user.inc:85 ../lib/modules/inetOrgPerson.inc:46
+#: ../lib/modules/inetOrgPerson.inc:128 ../lib/modules/inetOrgPerson.inc:279
+#: ../lib/modules/inetOrgPerson.inc:532 ../lib/modules/inetOrgPerson.inc:767
 msgid "First name"
 msgstr "Vorname"
 
@@ -1313,7 +1299,8 @@ msgstr "Vorname enthält ungültige Zeichen!"
 
 #: ../lib/modules/inetOrgPerson.inc:280
 msgid "First name of user. Only letters, - and spaces are allowed."
-msgstr "Vorname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
+msgstr ""
+"Vorname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
 
 #: ../lib/modules/kolabUser.inc:123
 msgid "For automatic invitation handling."
@@ -1333,16 +1320,16 @@ msgstr "Frei/Besetzt-Intervall muss eine Nummer sein!"
 msgid "Friday"
 msgstr "Freitag"
 
+#: ../lib/types/host.inc:85 ../lib/types/group.inc:81 ../lib/types/user.inc:82
 #: ../lib/modules/posixGroup.inc:169 ../lib/modules/posixGroup.inc:374
-#: ../lib/modules/posixGroup.inc:404 ../lib/modules/posixGroup.inc:429
-#: ../lib/modules/posixGroup.inc:450 ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:404 ../lib/modules/posixGroup.inc:436
+#: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:477
 #: ../lib/modules/posixAccount.inc:48 ../lib/modules/posixAccount.inc:1110
-#: ../lib/modules/sambaGroupMapping.inc:314 ../lib/lists.inc:304
-#: ../lib/lists.inc:318 ../lib/lists.inc:331
+#: ../lib/modules/sambaGroupMapping.inc:314
 msgid "GID number"
 msgstr "GID Nummer"
 
-#: ../lib/modules/posixGroup.inc:470
+#: ../lib/modules/posixGroup.inc:477
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -1360,7 +1347,7 @@ msgstr ""
 "ausführen, um die Dateirechte zu ändern: 'find / -gid %s -uid %s -exec chgrp "
 "%s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:477
+#: ../lib/modules/posixGroup.inc:484
 msgid "GID number has to be a numeric value!"
 msgstr "GID-Nummer muss eine Zahl sein!"
 
@@ -1392,20 +1379,27 @@ msgid "Grace block period"
 msgstr "Block-Frist"
 
 #: ../lib/modules/quota.inc:103
-msgid "Grace block period. Most filesystems use a fixed maximum value of 7 days."
-msgstr "Block-Frist. Viele Dateisysteme verwenden ein festes Maximum von 7 Tagen."
+msgid ""
+"Grace block period. Most filesystems use a fixed maximum value of 7 days."
+msgstr ""
+"Block-Frist. Viele Dateisysteme verwenden ein festes Maximum von 7 Tagen."
 
 #: ../lib/modules/quota.inc:119
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
-msgstr "Inode-Frist. Viele Dateisysteme verwenden ein festes Maximum von 7 Tagen."
+msgstr ""
+"Inode-Frist. Viele Dateisysteme verwenden ein festes Maximum von 7 Tagen."
 
 #: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:310
 msgid "Grace inode period"
 msgstr "Inode-Frist"
 
-#: ../lib/modules/posixGroup.inc:380 ../lib/lists.inc:321
+#: ../lib/types/group.inc:51
+msgid "Group accounts (e.g. Unix and Samba)"
+msgstr "Gruppenaccounts (z.B. Unix und Samba)"
+
+#: ../lib/types/group.inc:84 ../lib/modules/posixGroup.inc:380
 msgid "Group description"
 msgstr "Gruppenbeschreibung"
 
@@ -1413,34 +1407,25 @@ msgstr "Gruppenbeschreibung"
 msgid "Group description. If left empty group name will be used."
 msgstr "Gruppenbeschreibung. Falls leer wird der Gruppename verwendet."
 
-#: ../templates/config/confsave.php:137
-msgid "Group list attributes are invalid!"
-msgstr "Attribute der Gruppenliste sind ungültig!"
-
-#: ../lib/lists.inc:320
+#: ../lib/types/group.inc:83
 msgid "Group member DNs"
 msgstr "DNs der Gruppenmitglieder"
 
-#: ../lib/modules/posixGroup.inc:177 ../lib/modules/posixGroup.inc:242
-#: ../lib/modules/posixGroup.inc:386 ../lib/modules/posixGroup.inc:412
-#: ../lib/modules/posixGroup.inc:416 ../lib/modules/posixGroup.inc:451
-#: ../lib/lists.inc:319
+#: ../lib/types/group.inc:82 ../lib/modules/posixGroup.inc:177
+#: ../lib/modules/posixGroup.inc:242 ../lib/modules/posixGroup.inc:386
+#: ../lib/modules/posixGroup.inc:412 ../lib/modules/posixGroup.inc:416
+#: ../lib/modules/posixGroup.inc:458
 msgid "Group members"
 msgstr "Gruppenmitglieder"
 
-#: ../templates/config/confmodules.php:80 ../templates/config/confmain.php:257
-#: ../lib/config.inc:373
-msgid "Group modules"
-msgstr "Gruppenmodule"
-
-#: ../lib/modules/posixGroup.inc:165 ../lib/modules/posixGroup.inc:366
-#: ../lib/modules/posixGroup.inc:400 ../lib/modules/posixGroup.inc:449
-#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixGroup.inc:479
-#: ../lib/modules/posixGroup.inc:480 ../lib/lists.inc:317
+#: ../lib/types/group.inc:80 ../lib/modules/posixGroup.inc:165
+#: ../lib/modules/posixGroup.inc:366 ../lib/modules/posixGroup.inc:400
+#: ../lib/modules/posixGroup.inc:456 ../lib/modules/posixGroup.inc:485
+#: ../lib/modules/posixGroup.inc:486 ../lib/modules/posixGroup.inc:487
 msgid "Group name"
 msgstr "Gruppenname"
 
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:481
+#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixGroup.inc:488
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -1448,7 +1433,7 @@ msgstr ""
 "Gruppenname enthält ungültige Zeichen. Gültige Zeichen sind: a-z, A-Z, 0-"
 "9, ., - und _!"
 
-#: ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:486
 msgid "Group name in use. Selected next free group name."
 msgstr ""
 "Gruppenname wird bereits verwendet. Nächster freier Gruppenname wurde "
@@ -1472,24 +1457,11 @@ msgstr ""
 msgid "Group password"
 msgstr "Gruppenpasswort"
 
-#: ../templates/profedit/profilemain.php:46
-msgid "Group profiles"
-msgstr "Gruppenprofile"
-
 #: ../lib/modules/sambaGroupMapping.inc:212
 msgid "Group type"
 msgstr "Gruppentyp"
 
-#: ../templates/config/confmain.php:187 ../lib/config.inc:360
-msgid "GroupSuffix"
-msgstr "Gruppensuffix"
-
-#: ../templates/config/confsave.php:112
-msgid "GroupSuffix is invalid!"
-msgstr "GruppenSuffix ist ungültig!"
-
-#: ../templates/ou_edit.php:381 ../templates/main_header.php:86
-#: ../help/help.inc:81
+#: ../lib/types/group.inc:42 ../help/help.inc:81
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -1519,45 +1491,34 @@ msgstr "hartes Inode-Limit"
 msgid "Headline"
 msgstr "Überschrift"
 
-#: ../templates/ou_edit.php:357 ../templates/ou_edit.php:370
-#: ../templates/ou_edit.php:394 ../templates/ou_edit.php:407
-#: ../templates/ou_edit.php:431 ../templates/ou_edit.php:444
-#: ../templates/ou_edit.php:468 ../templates/ou_edit.php:481
-#: ../templates/domain.php:99 ../templates/domain.php:120
-#: ../templates/domain.php:136 ../templates/domain.php:149
-#: ../templates/domain.php:162 ../templates/domain.php:179
-#: ../templates/domain.php:202 ../templates/masscreate.php:145
-#: ../templates/masscreate.php:158 ../templates/masscreate.php:293
-#: ../templates/config/profmanage.php:183
+#: ../templates/ou_edit.php:172 ../templates/ou_edit.php:185
+#: ../templates/masscreate.php:146 ../templates/masscreate.php:159
+#: ../templates/masscreate.php:293 ../templates/config/profmanage.php:183
 #: ../templates/config/profmanage.php:235
 #: ../templates/config/profmanage.php:265
 #: ../templates/config/profmanage.php:299
 #: ../templates/config/profmanage.php:347
 #: ../templates/config/profmanage.php:375
 #: ../templates/config/profmanage.php:408
-#: ../templates/config/confmodules.php:111
-#: ../templates/config/confmain.php:167 ../templates/config/confmain.php:181
-#: ../templates/config/confmain.php:191 ../templates/config/confmain.php:201
-#: ../templates/config/confmain.php:211 ../templates/config/confmain.php:221
-#: ../templates/config/confmain.php:243 ../templates/config/confmain.php:262
-#: ../templates/config/confmain.php:317 ../templates/config/confmain.php:327
-#: ../templates/config/confmain.php:337 ../templates/config/confmain.php:358
-#: ../templates/config/confmain.php:403 ../templates/config/confmain.php:422
-#: ../templates/config/confmain.php:431 ../templates/config/confmain.php:449
-#: ../templates/config/confmain.php:463 ../templates/config/conflogin.php:138
-#: ../templates/pdfedit/pdfpage.php:749
+#: ../templates/config/confmodules.php:117
+#: ../templates/config/confmain.php:161 ../templates/config/confmain.php:175
+#: ../templates/config/confmain.php:197 ../templates/config/confmain.php:218
+#: ../templates/config/confmain.php:277 ../templates/config/confmain.php:322
+#: ../templates/config/confmain.php:341 ../templates/config/confmain.php:350
+#: ../templates/config/confmain.php:368 ../templates/config/confmain.php:382
+#: ../templates/config/conflogin.php:126 ../templates/pdfedit/pdfpage.php:749
 #: ../templates/profedit/profilepage.php:193
 #: ../templates/profedit/profilepage.php:213
-#: ../templates/profedit/profilepage.php:244 ../lib/lists.inc:213
-#: ../lib/modules.inc:659
+#: ../templates/profedit/profilepage.php:244 ../lib/lists.inc:327
+#: ../lib/modules.inc:655
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../templates/tools.php:91
+#: ../templates/tools.php:83
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "Hier können Sie LDAP-Objektklassen und Attribute betrachten."
 
-#: ../templates/masscreate.php:83
+#: ../templates/masscreate.php:87
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr ""
 "Hier können Sie mehrere Accounts mittels einer CSV-formatierten Datei "
@@ -1587,18 +1548,20 @@ msgstr ""
 "Damit können Sie Account-Profile laden und Standardwerte setzen. Das Profil "
 "\"default\" wird bei neuen Accounts automatisch geladen."
 
-#: ../templates/tools.php:54
+#: ../templates/tools.php:55
 msgid "Here you can manage your account profiles."
 msgstr "Hier können Sie Ihre Accountprofile verwalten."
 
 #: ../help/help.inc:147
-msgid "Here you can select a PDF structure and export the account to a PDF file."
+msgid ""
+"Here you can select a PDF structure and export the account to a PDF file."
 msgstr ""
 "Die Account-Daten können als PDF-Datei exportiert werden. Wählen Sie hierfür "
 "das gewünschte PDF-Profil."
 
 #: ../help/help.inc:112
-msgid "Here you can select which plugins you want to use for account management."
+msgid ""
+"Here you can select which plugins you want to use for account management."
 msgstr ""
 "Hier können Sie die Plugins wählen, die Sie zur Accountverwaltung verwenden "
 "möchten."
@@ -1617,12 +1580,12 @@ msgstr ""
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "Halten Sie Strg gedrückt um mehrere Gruppen zu markieren."
 
-#: ../lib/modules/posixAccount.inc:43 ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:214
-#: ../lib/modules/posixAccount.inc:332 ../lib/modules/posixAccount.inc:336
-#: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:712
-#: ../lib/modules/posixAccount.inc:891 ../lib/modules/posixAccount.inc:1038
-#: ../lib/modules/posixAccount.inc:1114 ../lib/lists.inc:309
+#: ../lib/types/user.inc:87 ../lib/modules/posixAccount.inc:43
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:214 ../lib/modules/posixAccount.inc:332
+#: ../lib/modules/posixAccount.inc:336 ../lib/modules/posixAccount.inc:353
+#: ../lib/modules/posixAccount.inc:712 ../lib/modules/posixAccount.inc:891
+#: ../lib/modules/posixAccount.inc:1038 ../lib/modules/posixAccount.inc:1114
 msgid "Home directory"
 msgstr "Heimatverzeichnis"
 
@@ -1667,7 +1630,11 @@ msgstr "Heimatverzeichnis ist ungültig."
 msgid "Homedirectory contains invalid characters."
 msgstr "Heimatverzeichnis enthält ungültige Zeichen."
 
-#: ../lib/lists.inc:329
+#: ../lib/types/host.inc:51
+msgid "Host accounts (e.g. Samba)"
+msgstr "Hostaccounts (z.B. Samba)"
+
+#: ../lib/types/host.inc:83
 msgid "Host description"
 msgstr "Hostbeschreibung"
 
@@ -1680,19 +1647,10 @@ msgstr "Hostbeschreibung. Falls leer wird der Hostname verwendet."
 msgid "Host list"
 msgstr "Hostliste"
 
-#: ../templates/config/confsave.php:142
-msgid "Host list attributes are invalid!"
-msgstr "Attribute der Hostliste sind ungültig!"
-
-#: ../templates/config/confmodules.php:81 ../templates/config/confmain.php:258
-#: ../lib/config.inc:374
-msgid "Host modules"
-msgstr "Hostmodule"
-
+#: ../lib/types/host.inc:80 ../lib/types/host.inc:81
 #: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:86
 #: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:254
-#: ../lib/modules/posixAccount.inc:387 ../lib/lists.inc:326
-#: ../lib/lists.inc:327
+#: ../lib/modules/posixAccount.inc:387
 msgid "Host name"
 msgstr "Hostname"
 
@@ -1718,7 +1676,8 @@ msgstr ""
 
 #: ../lib/modules/posixAccount.inc:88
 msgid "Host name in use. Selected next free host name."
-msgstr "Hostname wird bereits verwendet. Nächster freier Hostname wurde ausgewählt."
+msgstr ""
+"Hostname wird bereits verwendet. Nächster freier Hostname wurde ausgewählt."
 
 #: ../lib/modules/posixAccount.inc:388
 msgid ""
@@ -1735,47 +1694,36 @@ msgstr ""
 "ebenfalls nicht erlaubt. Sollte der Hostname schon in Verwendung sein wird "
 "eine Zahl angehängt."
 
-#: ../templates/profedit/profilemain.php:47
-msgid "Host profiles"
-msgstr "Hostprofile"
-
-#: ../templates/config/confmain.php:197 ../lib/config.inc:361
-msgid "HostSuffix"
-msgstr "HostSuffix"
-
-#: ../templates/config/confsave.php:117
-msgid "HostSuffix is invalid!"
-msgstr "Hostsuffix ist ungültig!"
-
-#: ../templates/main_header.php:89 ../lib/modules/posixAccount.inc:66
+#: ../lib/types/host.inc:42 ../lib/modules/posixAccount.inc:66
 #: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:69
 #: ../lib/modules/posixAccount.inc:146 ../help/help.inc:84
 msgid "Hosts"
 msgstr "Hosts"
 
-#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixGroup.inc:601
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:608
 #: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:659
 msgid "ID is already in use"
 msgstr "ID wird bereits verwendet"
 
-#: ../lib/modules/posixGroup.inc:471 ../lib/modules/posixGroup.inc:472
-#: ../lib/modules/posixGroup.inc:473 ../lib/modules/posixGroup.inc:597
-#: ../lib/modules/posixGroup.inc:601 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixGroup.inc:479
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:604
+#: ../lib/modules/posixGroup.inc:608 ../lib/modules/posixAccount.inc:74
 #: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
 #: ../lib/modules/posixAccount.inc:655 ../lib/modules/posixAccount.inc:659
 msgid "ID-Number"
 msgstr "ID-Nummer"
 
-#: ../templates/masscreate.php:149 ../templates/masscreate.php:162
+#: ../templates/masscreate.php:150 ../templates/masscreate.php:163
 #: ../templates/masscreate.php:298
 msgid "Identifier"
 msgstr "Bezeichner"
 
 #: ../lib/modules/sambaAccount.inc:342 ../lib/modules/sambaSamAccount.inc:183
 msgid "If checked Unix password will also be used as Samba password."
-msgstr "Falls aktiviert wird das Unix-Passwort auch als Samba-Passwort verwendet."
+msgstr ""
+"Falls aktiviert wird das Unix-Passwort auch als Samba-Passwort verwendet."
 
-#: ../lib/modules/posixAccount.inc:366
+#: ../lib/modules/posixGroup.inc:429 ../lib/modules/posixAccount.inc:366
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -1831,20 +1779,24 @@ msgstr ""
 "gesetzt)"
 
 #: ../lib/modules/sambaSamAccount.inc:240
-msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
+msgid ""
+"If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "Wenn Sie das Feld leer lassen wird LAM folgenden Wert einfügen: uidNumber*2 "
 "+ sambaAlgorithmicRidBase."
 
 #: ../help/help.inc:106
-msgid "If you want to change the current preferences password, please enter it here."
-msgstr "Wenn Sie das aktuelle Profilpasswort ändern wollen, geben Sie es hier ein."
+msgid ""
+"If you want to change the current preferences password, please enter it here."
+msgstr ""
+"Wenn Sie das aktuelle Profilpasswort ändern wollen, geben Sie es hier ein."
 
 #: ../help/help.inc:124
 msgid ""
 "If you want to change your master configuration password, please enter it "
 "here."
-msgstr "Wenn Sie das aktuelle Hauptpasswort ändern wollen, geben Sie es hier ein."
+msgstr ""
+"Wenn Sie das aktuelle Hauptpasswort ändern wollen, geben Sie es hier ein."
 
 #: ../lib/modules/sambaAccount.inc:395
 msgid ""
@@ -1927,8 +1879,8 @@ msgstr "Ungültiger Account"
 msgid "Invalid RDN attribute!"
 msgstr "Ungültiges RDN-Attribut!"
 
-#: ../lib/modules/posixGroup.inc:200 ../lib/modules/posixAccount.inc:369
-#: ../lib/modules/posixAccount.inc:920
+#: ../lib/modules/posixGroup.inc:200 ../lib/modules/posixGroup.inc:432
+#: ../lib/modules/posixAccount.inc:369 ../lib/modules/posixAccount.inc:920
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
@@ -1945,7 +1897,7 @@ msgstr "Einladungsregeln"
 msgid "Invitation policy list"
 msgstr "Liste der Einladungsregeln"
 
-#: ../lib/modules/posixGroup.inc:471 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixGroup.inc:478 ../lib/modules/posixAccount.inc:75
 msgid ""
 "It is possible that this ID-number is reused. This can cause several "
 "problems because files with old permissions might still exist. To avoid this "
@@ -1983,10 +1935,6 @@ msgstr "Wechseln der Objektklasse"
 msgid "Kolab"
 msgstr "Kolab"
 
-#: ../lib/status.inc:64
-msgid "LAM Internal Error"
-msgstr "LAM interner Fehler"
-
 #: ../templates/tree/delete_form.php:99
 #, php-format
 msgid ""
@@ -2001,7 +1949,7 @@ msgstr ""
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "LAM hat Ihre Eingaben überprüft und kann die Accounts nun erstellen."
 
-#: ../lib/modules/posixGroup.inc:434 ../lib/modules/posixAccount.inc:317
+#: ../lib/modules/posixGroup.inc:441 ../lib/modules/posixAccount.inc:317
 msgid ""
 "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of "
 "passwords. SSHA and CRYPT are the most common but CRYPT does not support "
@@ -2039,25 +1987,24 @@ msgstr "LAM konnte die Gruppenzugehörigkeiten für Gruppe %s nicht ändern."
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../templates/config/confmodules.php:67 ../templates/config/confsave.php:75
-#: ../templates/config/confmain.php:148
+#: ../templates/config/confmodules.php:71 ../templates/config/confsave.php:68
+#: ../templates/config/confmain.php:142 ../templates/config/conftypes.php:138
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP Account Manager Einstellungen"
 
-#: ../templates/config/confmain.php:308
-msgid "LDAP List settings"
-msgstr "LDAP Listeneinstellungen"
-
-#: ../templates/lists/listhosts.php:119 ../templates/lists/listgroups.php:119
-#: ../templates/lists/listdomains.php:132 ../templates/lists/listusers.php:147
+#: ../lib/lists.inc:639
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP Suche fehlgeschlagen! Bitte überprüfen Sie die Einstellungen."
 
+#: ../templates/config/conftypes.php:80
+msgid "LDAP Suffix is invalid!"
+msgstr "LDAP-Suffix ist ungültig!"
+
 #: ../templates/login.php:387
 msgid "LDAP error, server says:"
 msgstr "LDAP-Fehler, der Server meldet:"
 
-#: ../lib/modules.inc:998
+#: ../lib/modules.inc:993
 msgid "LDAP operation successful."
 msgstr "LDAP-Operation war erfolgreich."
 
@@ -2065,13 +2012,13 @@ msgstr "LDAP-Operation war erfolgreich."
 msgid "LDAP server"
 msgstr "LDAP-Server"
 
-#: ../templates/lists/listhosts.php:104 ../templates/lists/listgroups.php:104
-#: ../templates/lists/listdomains.php:121 ../templates/lists/listusers.php:131
+#: ../lib/lists.inc:625
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr ""
 "LDAP Größenbeschränkung überschritten, es werden nicht alle Einträge "
 "angezeigt."
 
+#: ../templates/config/conftypes.php:178
 #: ../templates/profedit/profilepage.php:178
 msgid "LDAP suffix"
 msgstr "LDAP-Suffix"
@@ -2093,17 +2040,17 @@ msgstr "LDIF-Export für: %s"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../templates/config/confsave.php:153
+#: ../templates/config/confsave.php:108
 msgid "Language is not defined!"
 msgstr "Sprache ist nicht definiert!"
 
-#: ../templates/config/confmain.php:366
+#: ../templates/config/confmain.php:285
 msgid "Language settings"
 msgstr "Spacheinstellungen"
 
-#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:134
-#: ../lib/modules/inetOrgPerson.inc:283 ../lib/modules/inetOrgPerson.inc:536
-#: ../lib/modules/inetOrgPerson.inc:768 ../lib/lists.inc:308
+#: ../lib/types/user.inc:86 ../lib/modules/inetOrgPerson.inc:48
+#: ../lib/modules/inetOrgPerson.inc:134 ../lib/modules/inetOrgPerson.inc:283
+#: ../lib/modules/inetOrgPerson.inc:536 ../lib/modules/inetOrgPerson.inc:768
 msgid "Last name"
 msgstr "Nachname"
 
@@ -2113,7 +2060,8 @@ msgstr "Nachname enthält ungültige Zeichen!"
 
 #: ../lib/modules/inetOrgPerson.inc:284
 msgid "Last name of user. Only letters, - and spaces are allowed."
-msgstr "Nachname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
+msgstr ""
+"Nachname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
 
 #: ../lib/modules/shadowAccount.inc:307
 msgid "Last password change"
@@ -2123,10 +2071,14 @@ msgstr "Letzte Passwortänderung"
 msgid "Line ends"
 msgstr "Zeilenenden"
 
-#: ../help/help.inc:71
+#: ../templates/config/conftypes.php:189 ../help/help.inc:71
 msgid "List attributes"
 msgstr "Attribute der Listen"
 
+#: ../templates/config/conftypes.php:87
+msgid "List attributes are invalid!"
+msgstr "Attribute der Liste sind ungültig!"
+
 #: ../lib/modules/sambaAccount.inc:383 ../lib/modules/sambaSamAccount.inc:224
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
@@ -2135,7 +2087,7 @@ msgstr ""
 "Liste der Samba-Arbeitsstationen, auf welchen sich der Benutzer anmelden "
 "darf. Leer heißt jede Arbeitsstation."
 
-#: ../templates/config/confsave.php:102
+#: ../templates/config/confsave.php:92
 msgid "List of admin users is empty or invalid!"
 msgstr "Liste der berechtigten Benutzer ist ungültig!"
 
@@ -2143,11 +2095,15 @@ msgstr "Liste der berechtigten Benutzer ist ungültig!"
 msgid "List of entries to be deleted:"
 msgstr "Liste der zu löschenden Einträge:"
 
-#: ../templates/config/confmain.php:445 ../lib/config.inc:371
+#: ../templates/config/confmain.php:364
 msgid "List of valid users"
 msgstr "Liste der berechtigten Benutzer"
 
-#: ../lib/modules.inc:1044 ../lib/modules.inc:1047 ../help/help.inc:142
+#: ../templates/config/confmain.php:260
+msgid "List settings"
+msgstr "Listeneinstellungen"
+
+#: ../lib/modules.inc:1039 ../lib/modules.inc:1042 ../help/help.inc:142
 msgid "Load profile"
 msgstr "Profil laden"
 
@@ -2171,14 +2127,14 @@ msgstr "Liste von lokalen Adressen"
 msgid "Lock password"
 msgstr "Passwort deaktivieren"
 
-#: ../templates/login.php:257 ../templates/config/conflogin.php:68
+#: ../templates/login.php:257 ../templates/config/conflogin.php:56
 #: ../help/help.inc:45
 msgid "Login"
 msgstr "Login"
 
-#: ../lib/modules/posixAccount.inc:221 ../lib/modules/posixAccount.inc:373
-#: ../lib/modules/posixAccount.inc:931 ../lib/modules/posixAccount.inc:1042
-#: ../lib/modules/posixAccount.inc:1116 ../lib/lists.inc:310
+#: ../lib/types/user.inc:88 ../lib/modules/posixAccount.inc:221
+#: ../lib/modules/posixAccount.inc:373 ../lib/modules/posixAccount.inc:931
+#: ../lib/modules/posixAccount.inc:1042 ../lib/modules/posixAccount.inc:1116
 msgid "Login shell"
 msgstr "Login Shell"
 
@@ -2213,7 +2169,7 @@ msgstr "Anmeldeskript"
 msgid "Logon script is invalid!"
 msgstr "Anmeldeskript ist ungültig!"
 
-#: ../templates/main_header.php:68 ../templates/logout.php:62
+#: ../templates/main_header.php:66 ../templates/logout.php:62
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -2230,7 +2186,7 @@ msgstr "Liste von MAC-Adressen"
 msgid "MAC address(es)"
 msgstr "MAC-Adresse(n)"
 
-#: ../lib/modules/nisMailAlias.inc:54
+#: ../lib/types/mailAlias.inc:42 ../lib/modules/nisMailAlias.inc:54
 msgid "Mail aliases"
 msgstr "Mail-Aliase"
 
@@ -2271,16 +2227,20 @@ msgstr "Mailservername ist leer!"
 msgid "Mailbox home server name is invalid!"
 msgstr "Mailservername ist ungültig!"
 
+#: ../lib/types/mailAlias.inc:51
+msgid "Mailing aliases (e.g. NIS mail aliases)"
+msgstr "Mailaliase (z.B. NIS-Mail-Aliase)"
+
 #: ../lib/modules/nisMailAlias.inc:63
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "Mails an diesen Namen werden an die Empfänger weitergeleitet."
 
-#: ../templates/pdfedit/pdfpage.php:616 ../lib/modules.inc:950
-#: ../lib/modules.inc:978
+#: ../templates/pdfedit/pdfpage.php:616 ../lib/modules.inc:945
+#: ../lib/modules.inc:973
 msgid "Main"
 msgstr "Allgemein"
 
-#: ../templates/config/conflogin.php:149
+#: ../templates/config/conflogin.php:137
 msgid "Manage profiles"
 msgstr "Profile verwalten"
 
@@ -2289,14 +2249,10 @@ msgstr "Profile verwalten"
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: ../templates/tools.php:77
+#: ../templates/tools.php:69
 msgid "Manages OU objects in your LDAP tree."
 msgstr "Verwaltet OU-Objekte im LDAP-Baum."
 
-#: ../templates/tools.php:62
-msgid "Manages Samba 3 domain accounts."
-msgstr "Verwaltet Samba 3 Domänen."
-
 #: ../lib/modules/kolabUser.inc:53
 msgid "Manual"
 msgstr "Manuell"
@@ -2337,12 +2293,12 @@ msgstr "Matching-Regel OID"
 msgid "Matching rules"
 msgstr "Matching-Regeln"
 
-#: ../templates/config/confsave.php:147
+#: ../templates/config/confsave.php:102
 msgid "Max list entries is invalid!"
 msgstr "Maximale Listeneinträge ist ungültig!"
 
-#: ../lib/modules/posixGroup.inc:316 ../lib/modules/posixGroup.inc:475
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:316 ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:483
 msgid "Maximum GID number"
 msgstr "Maximale GID-Nummer"
 
@@ -2350,11 +2306,11 @@ msgstr "Maximale GID-Nummer"
 msgid "Maximum GID number for Unix groups"
 msgstr "Maximale GID-Nummer für Unix-Gruppen"
 
-#: ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:482
 msgid "Maximum GID number is invalid or empty!"
 msgstr "Maximale GID-Nummer ist ungültig oder leer!"
 
-#: ../lib/modules/posixGroup.inc:476
+#: ../lib/modules/posixGroup.inc:483
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "Die maximale GID-Nummer muss größer sein als die minimale GID-Nummer!"
 
@@ -2389,8 +2345,7 @@ msgstr "Maximale Dateigröße: %s"
 msgid "Maximum length"
 msgstr "Maximale Länge"
 
-#: ../templates/config/confmain.php:346 ../lib/config.inc:367
-#: ../help/help.inc:91
+#: ../templates/config/confmain.php:265 ../help/help.inc:91
 msgid "Maximum list entries"
 msgstr "Maximale Listeneinträge"
 
@@ -2403,7 +2358,7 @@ msgstr "Maximales Passwortalter"
 msgid "Miller"
 msgstr "Müller"
 
-#: ../lib/modules/posixGroup.inc:313 ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:313 ../lib/modules/posixGroup.inc:481
 msgid "Minimum GID number"
 msgstr "Minimale GID-Nummer"
 
@@ -2411,7 +2366,7 @@ msgstr "Minimale GID-Nummer"
 msgid "Minimum GID number for Unix groups"
 msgstr "Minimale GID-Nummer für Unix-Gruppen"
 
-#: ../lib/modules/posixGroup.inc:474
+#: ../lib/modules/posixGroup.inc:481
 msgid "Minimum GID number is invalid or empty!"
 msgstr "Minimale GID-Nummer ist ungültig oder leer!"
 
@@ -2443,18 +2398,14 @@ msgstr "Minimales Passwortalter"
 msgid "Mobile number"
 msgstr "Mobil"
 
-#: ../lib/modules.inc:899 ../lib/modules.inc:1053
+#: ../lib/modules.inc:893 ../lib/modules.inc:1048
 msgid "Modify Account"
 msgstr "Account ändern"
 
-#: ../templates/config/confmodules.php:75
+#: ../templates/config/confmodules.php:82
 msgid "Module selection"
 msgstr "Modulauswahl"
 
-#: ../lib/config.inc:375
-msgid "Module settings"
-msgstr "Moduleinstellungen"
-
 #: ../lib/modules/sambaSamAccount.inc:949
 msgid "Monday"
 msgstr "Montag"
@@ -2479,7 +2430,7 @@ msgstr "Musterstraße 42"
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
 #: ../templates/schema/schema.php:272 ../templates/pdfedit/pdfdelete.php:56
-#: ../templates/pdfedit/pdfdelete.php:59 ../templates/pdfedit/pdfdelete.php:78
+#: ../templates/pdfedit/pdfdelete.php:59 ../templates/pdfedit/pdfdelete.php:84
 #: ../templates/pdfedit/pdfpage.php:668
 msgid "Name"
 msgstr "Name"
@@ -2492,28 +2443,15 @@ msgstr ""
 "Name, unter dem das Profil gespeichert wird. Falls ein Profil mit diesem "
 "Namen existiert wird es überschrieben."
 
-#: ../templates/lists/listdomains.php:208
-msgid "New Domain"
-msgstr "Neue Domäne"
-
-#: ../templates/lists/listgroups.php:237
-msgid "New Group"
-msgstr "Neue Gruppe"
-
-#: ../templates/lists/listhosts.php:222
-msgid "New Host"
-msgstr "Neuer Host"
-
 #: ../lib/modules/ieee802device.inc:144
 msgid "New MAC address"
 msgstr "Neue MAC-Adresse"
 
-#: ../templates/ou_edit.php:60 ../templates/ou_edit.php:125
-#: ../templates/ou_edit.php:190 ../templates/ou_edit.php:255
+#: ../templates/ou_edit.php:63
 msgid "New OU created successfully."
 msgstr "Neue OU erfolgreich erstellt."
 
-#: ../templates/config/confmain.php:458
+#: ../templates/config/confmain.php:377
 msgid "New Password"
 msgstr "Neues Passwort"
 
@@ -2521,10 +2459,26 @@ msgstr "Neues Passwort"
 msgid "New SSH public key"
 msgstr "Neuer öffentlicher SSH-Schlüssel"
 
+#: ../lib/types/mailAlias.inc:108
+msgid "New alias"
+msgstr "Neuer Alias"
+
 #: ../templates/config/profmanage.php:135
 msgid "New default profile set successfully."
 msgstr "Neues Standardprofil wurde erfolgreich gesetzt."
 
+#: ../lib/types/smbDomain.inc:108
+msgid "New domain"
+msgstr "Neue Domäne"
+
+#: ../lib/types/group.inc:110
+msgid "New group"
+msgstr "Neue Gruppe"
+
+#: ../lib/types/host.inc:112
+msgid "New host"
+msgstr "Neuer Host"
+
 #: ../lib/modules/inetLocalMailRecipient.inc:206
 msgid "New local address"
 msgstr "Neue lokale Adresse"
@@ -2537,10 +2491,12 @@ msgstr "Neues Hauptpasswort"
 msgid "New master password set successfully."
 msgstr "Neues Hauptpasswort wurde erfolgreich gesetzt."
 
+#: ../lib/lists.inc:96
+msgid "New object"
+msgstr "Neues Objekt"
+
 #: ../templates/tree/templates/creation/new_ou_template.php:47
-#: ../templates/ou_edit.php:349 ../templates/ou_edit.php:386
-#: ../templates/ou_edit.php:423 ../templates/ou_edit.php:460
-#: ../help/help.inc:153
+#: ../templates/ou_edit.php:164 ../help/help.inc:153
 msgid "New organizational unit"
 msgstr "Neue Organizational Unit"
 
@@ -2556,7 +2512,7 @@ msgstr "Neuer Empfänger"
 msgid "New required attributes:"
 msgstr "Neue erforderliche Attribute:"
 
-#: ../templates/lists/listusers.php:282
+#: ../lib/types/user.inc:122
 msgid "New user"
 msgstr "Neuer Benutzer"
 
@@ -2570,39 +2526,42 @@ msgstr "Neuer Wert"
 msgid "Next"
 msgstr "Weiter"
 
-#: ../templates/domain.php:155 ../help/help.inc:167
-msgid "Next Group RID"
-msgstr "Nächste Gruppen-RID"
-
-#: ../templates/domain.php:129 ../help/help.inc:163
+#: ../lib/modules/sambaDomain.inc:67 ../lib/modules/sambaDomain.inc:107
+#: ../lib/modules/sambaDomain.inc:229 ../lib/modules/sambaDomain.inc:411
 msgid "Next RID"
 msgstr "Nächste RID"
 
-#: ../templates/domain.php:284
+#: ../lib/modules/sambaDomain.inc:140 ../lib/modules/sambaDomain.inc:141
 msgid "Next RID is not a number!"
 msgstr "Nächste RID ist keine Zahl!"
 
-#: ../help/help.inc:164
-msgid "Next RID to use when creating accounts."
-msgstr "Nächste RID für neue Accounts."
+#: ../lib/modules/sambaDomain.inc:68
+msgid "Next RID to use when creating accounts (only used by Winbind)."
+msgstr "Nächste RID für neue Accounts (wird nur von Winbind verwendet)."
 
-#: ../help/help.inc:168
-msgid "Next RID to use when creating groups."
-msgstr "Nächste RID für neue Gruppen."
+#: ../lib/modules/sambaDomain.inc:76
+msgid "Next RID to use when creating group accounts (only used by Winbind)."
+msgstr "Nächste RID für neue Gruppen (wird nur von Winbind verwendet)."
 
-#: ../help/help.inc:166
-msgid "Next RID to use when creating user accounts."
-msgstr "Nächste RID für neue Benutzer."
+#: ../lib/modules/sambaDomain.inc:72
+msgid "Next RID to use when creating user accounts (only used by Winbind)."
+msgstr "Nächste RID für neue Benutzer (wird nur von Winbind verwendet)."
 
-#: ../templates/domain.php:142 ../help/help.inc:165
-msgid "Next User RID"
-msgstr "Nächste Benutzer-RID"
+#: ../lib/modules/sambaDomain.inc:75 ../lib/modules/sambaDomain.inc:119
+#: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:417
+msgid "Next group RID"
+msgstr "Nächste Gruppen-RID"
 
-#: ../templates/domain.php:286
+#: ../lib/modules/sambaDomain.inc:144 ../lib/modules/sambaDomain.inc:145
 msgid "Next group RID is not a number!"
 msgstr "Nächste Gruppen-RID ist keine Zahl!"
 
-#: ../templates/domain.php:285
+#: ../lib/modules/sambaDomain.inc:71 ../lib/modules/sambaDomain.inc:113
+#: ../lib/modules/sambaDomain.inc:234 ../lib/modules/sambaDomain.inc:414
+msgid "Next user RID"
+msgstr "Nächste Benutzer-RID"
+
+#: ../lib/modules/sambaDomain.inc:142 ../lib/modules/sambaDomain.inc:143
 msgid "Next user RID is not a number!"
 msgstr "Nächste Benutzer-RID ist keine Zahl!"
 
@@ -2620,22 +2579,20 @@ msgstr "Nein"
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Keine Samba 3 Domänen gefunden, bitte erstellen Sie eine."
 
-#: ../templates/lists/listdomains.php:126
-#: ../templates/lists/listdomains.php:132
-#: ../templates/lists/listdomains.php:136
-msgid "No Samba domains found!"
-msgstr "Keine Samba-Domänen gefunden!"
-
 #: ../lib/modules/posixAccount.inc:417 ../lib/modules/posixAccount.inc:579
 #: ../lib/modules/posixAccount.inc:859
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "Keine Unix-Gruppen gefunden, bitte erstellen Sie eine."
 
+#: ../lib/types/mailAlias.inc:107
+msgid "No aliases found!"
+msgstr "Keine Aliase gefunden!"
+
 #: ../templates/initsuff.php:161
 msgid "No changes were made."
 msgstr "Keine Änderungen vorgenommen."
 
-#: ../templates/config/conflogin.php:104
+#: ../templates/config/conflogin.php:92
 msgid "No configuration profiles found. Please create one."
 msgstr "Keine Konfigurationsprofile gefunden, bitte erstellen Sie eines."
 
@@ -2643,19 +2600,23 @@ msgstr "Keine Konfigurationsprofile gefunden, bitte erstellen Sie eines."
 msgid "No description"
 msgstr "Keine Beschreibung"
 
+#: ../lib/types/smbDomain.inc:107
+msgid "No domains found!"
+msgstr "Keine Domänen gefunden!"
+
 #: ../lib/modules/inetOrgPerson.inc:77
 msgid "No file selected."
 msgstr "Keine Datei gewählt."
 
-#: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixGroup.inc:479 ../lib/modules/posixAccount.inc:74
 msgid "No free ID-Number!"
 msgstr "Keine ID-Nummer mehr frei!"
 
-#: ../templates/lists/listgroups.php:119 ../templates/lists/listgroups.php:125
+#: ../lib/types/group.inc:109
 msgid "No groups found!"
 msgstr "Keine Gruppen gefunden!"
 
-#: ../templates/lists/listhosts.php:119 ../templates/lists/listhosts.php:125
+#: ../lib/types/host.inc:111
 msgid "No hosts found!"
 msgstr "Keine Hosts gefunden!"
 
@@ -2667,11 +2628,15 @@ msgstr "Keine internen Attribute"
 msgid "No logo"
 msgstr "Kein Logo"
 
-#: ../templates/config/confmodules.php:254
+#: ../lib/lists.inc:95
+msgid "No objects found!"
+msgstr "Keine Objekte gefunden!"
+
+#: ../templates/config/confmodules.php:261
 msgid "No or more than one base module selected!"
 msgstr "Es wurde kein oder mehrere Basismodule gewählt!"
 
-#: ../templates/config/confmain.php:97
+#: ../templates/config/confmain.php:91
 msgid "No password was entered!"
 msgstr "Passwort leer!"
 
@@ -2692,7 +2657,7 @@ msgstr "Kein Eintrag gefunden!"
 msgid "No such schema item: \"%s\""
 msgstr "Schema-Objekt existiert nicht: \"%s\""
 
-#: ../templates/lists/listusers.php:148 ../templates/lists/listusers.php:154
+#: ../lib/types/user.inc:121
 msgid "No users found!"
 msgstr "Keine Benutzer gefunden!"
 
@@ -2714,7 +2679,8 @@ msgid "Number of child entries"
 msgstr "Anzahl Untereinträge"
 
 #: ../lib/modules/shadowAccount.inc:154
-msgid "Number of days a user can login even his password has expired. -1=always."
+msgid ""
+"Number of days a user can login even his password has expired. -1=always."
 msgstr ""
 "Anzahl der Tage, in denen sich ein Benutzer anmelden kann, obwohl sein "
 "Passwort bereits abgelaufen ist. -1 = immer."
@@ -2739,27 +2705,23 @@ msgstr ""
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:66 ../templates/ou_edit.php:131
-#: ../templates/ou_edit.php:196 ../templates/ou_edit.php:261
+#: ../templates/ou_edit.php:69
 msgid "OU already exists!"
 msgstr "OU besteht schon!"
 
-#: ../templates/ou_edit.php:77 ../templates/ou_edit.php:142
-#: ../templates/ou_edit.php:207 ../templates/ou_edit.php:272
+#: ../templates/ou_edit.php:80
 msgid "OU deleted successfully."
 msgstr "OU erfolgreich gelöscht."
 
-#: ../templates/tools.php:76
+#: ../templates/ou_edit.php:151 ../templates/tools.php:68
 msgid "OU editor"
 msgstr "OU-Editor"
 
-#: ../templates/ou_edit.php:70 ../templates/ou_edit.php:135
-#: ../templates/ou_edit.php:200 ../templates/ou_edit.php:265
+#: ../templates/ou_edit.php:73
 msgid "OU is invalid!"
 msgstr "OU ist ungültig!"
 
-#: ../templates/ou_edit.php:107 ../templates/ou_edit.php:172
-#: ../templates/ou_edit.php:237 ../templates/ou_edit.php:302
+#: ../templates/ou_edit.php:110
 msgid "OU is not empty or invalid!"
 msgstr "OU ist nicht leer oder ungültig!"
 
@@ -2772,7 +2734,7 @@ msgstr "OU-Editor"
 msgid "Object classes"
 msgstr "Objektklassen"
 
-#: ../lib/modules.inc:1085 ../lib/modules.inc:1123 ../lib/modules.inc:1220
+#: ../lib/modules.inc:1080 ../lib/modules.inc:1118 ../lib/modules.inc:1215
 #, php-format
 msgid "ObjectClass %s required but not defined in LDAP."
 msgstr "Objektklasse %s wird benötigt, wurde aber nicht in LDAP gefunden."
@@ -2781,7 +2743,7 @@ msgstr "Objektklasse %s wird benötigt, wurde aber nicht in LDAP gefunden."
 msgid "Obsolete"
 msgstr "Veraltet"
 
-#: ../templates/config/conflogin.php:134 ../templates/config/conflogin.php:135
+#: ../templates/config/conflogin.php:122 ../templates/config/conflogin.php:123
 msgid "Ok"
 msgstr "Ok"
 
@@ -2810,12 +2772,11 @@ msgstr "Sortierung"
 msgid "Organizational unit"
 msgstr "Organizational Unit"
 
-#: ../templates/tools.php:83
+#: ../templates/tools.php:75
 msgid "PDF editor"
 msgstr "PDF-Editor"
 
-#: ../templates/lists/listhosts.php:227 ../templates/lists/listgroups.php:242
-#: ../templates/lists/listusers.php:287 ../templates/pdfedit/pdfpage.php:450
+#: ../templates/pdfedit/pdfpage.php:450 ../lib/lists.inc:491
 msgid "PDF structure"
 msgstr "PDF-Struktur"
 
@@ -2841,8 +2802,8 @@ msgstr "Elter von"
 
 #: ../templates/login.php:221 ../lib/modules/posixGroup.inc:182
 #: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixGroup.inc:274
-#: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixGroup.inc:468
-#: ../lib/modules/posixGroup.inc:469 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:475
+#: ../lib/modules/posixGroup.inc:476 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:217
 #: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
 #: ../lib/modules/sambaSamAccount.inc:277 ../lib/modules/posixAccount.inc:78
@@ -2856,11 +2817,11 @@ msgstr "Elter von"
 msgid "Password"
 msgstr "Passwort"
 
-#: ../templates/config/confsave.php:246
+#: ../templates/config/confsave.php:186
 msgid "Password changed!"
 msgstr "Passwort geändert!"
 
-#: ../lib/modules/posixGroup.inc:468 ../lib/modules/sambaAccount.inc:75
+#: ../lib/modules/posixGroup.inc:475 ../lib/modules/sambaAccount.inc:75
 #: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:88
 #: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:79
 #: ../lib/modules/posixAccount.inc:81 ../lib/modules/inetOrgPerson.inc:75
@@ -2892,7 +2853,7 @@ msgstr "Passwortablauf"
 msgid "Password expiration must be are natural number or -1."
 msgstr "Passwortablauf muss eine natürliche Zahl oder -1 sein."
 
-#: ../lib/modules/posixGroup.inc:320 ../lib/modules/posixGroup.inc:433
+#: ../lib/modules/posixGroup.inc:320 ../lib/modules/posixGroup.inc:440
 #: ../lib/modules/posixAccount.inc:155 ../lib/modules/posixAccount.inc:316
 msgid "Password hash type"
 msgstr "Passwort-Hash"
@@ -2935,7 +2896,7 @@ msgstr "Passwortwarnung"
 msgid "Password warning must be are natural number."
 msgstr "Passwortwarnung muss eine natürliche Zahl sein."
 
-#: ../templates/config/confsave.php:240
+#: ../templates/config/confsave.php:180
 msgid "Passwords are different!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
@@ -2948,7 +2909,7 @@ msgstr ""
 "\\Freigabe) sein. $user und $group werden durch Benutzer- und Gruppenname "
 "ersetzt."
 
-#: ../templates/config/confmain.php:426 ../lib/config.inc:369
+#: ../templates/config/confmain.php:345
 msgid "Path to external script"
 msgstr "Pfad zum externen Script"
 
@@ -2970,7 +2931,8 @@ msgstr "Fotodatei (JPG-Format)"
 
 #: ../lib/modules/ldapPublicKey.inc:59
 msgid "Please a comma separated list of your public SSH keys."
-msgstr "Bitte geben Sie eine Liste von SSH-Schlüsseln, getrennt durch Kommata, ein."
+msgstr ""
+"Bitte geben Sie eine Liste von SSH-Schlüsseln, getrennt durch Kommata, ein."
 
 #: ../templates/delete.php:80
 msgid "Please confirm:"
@@ -2978,7 +2940,8 @@ msgstr "Bitte bestätigen:"
 
 #: ../lib/modules/sambaSamAccount.inc:90
 msgid "Please enter a RID number or the name of a special account!"
-msgstr "Bitte geben Sie eine RID-Nummer oder den Namen eines Spezialaccounts ein!"
+msgstr ""
+"Bitte geben Sie eine RID-Nummer oder den Namen eines Spezialaccounts ein!"
 
 #: ../lib/modules/inetOrgPerson.inc:336
 msgid ""
@@ -3066,7 +3029,7 @@ msgstr "Bitte geben Sie einen gültigen Straßennamen ein!"
 msgid "Please enter a valid telephone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein!"
 
-#: ../lib/modules/posixGroup.inc:597 ../lib/modules/posixAccount.inc:655
+#: ../lib/modules/posixGroup.inc:604 ../lib/modules/posixAccount.inc:655
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "Bitte geben Sie einen Wert zwischen %s und %s ein!"
@@ -3076,11 +3039,11 @@ msgstr "Bitte geben Sie einen Wert zwischen %s und %s ein!"
 msgid "Please enter an email address on this page: %s"
 msgstr "Bitte geben Sie eine e-mail Adresse auf dieser Seite ein: %s"
 
-#: ../templates/config/conflogin.php:98
+#: ../templates/config/conflogin.php:86
 msgid "Please enter password to change preferences:"
 msgstr "Bitte Profilpasswort eingeben:"
 
-#: ../lib/modules.inc:889
+#: ../lib/modules.inc:883
 msgid "Please enter the account information on the other pages first."
 msgstr "Bitte geben Sie erst auf den anderen Seiten die Accountdaten ein."
 
@@ -3141,7 +3104,7 @@ msgstr ""
 msgid "Please enter the same password in both password fields."
 msgstr "Bitte geben Sie das selbe Passwort in beide Felder ein."
 
-#: ../lib/modules/posixGroup.inc:467 ../lib/modules/sambaAccount.inc:74
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaSamAccount.inc:87
 msgid "Please enter the same password in both password-fields."
 msgstr "Bitte geben Sie das selbe Passwort in beide Felder ein."
@@ -3150,7 +3113,7 @@ msgstr "Bitte geben Sie das selbe Passwort in beide Felder ein."
 msgid "Please enter your public SSH key."
 msgstr "Bitte geben Sie Ihren SSH-Schlüssel ein."
 
-#: ../templates/masscreate.php:120
+#: ../templates/masscreate.php:121
 msgid ""
 "Please provide a CSV formated file with your account data. The cells in the "
 "first row must be filled with the column identifiers. The following rows "
@@ -3162,23 +3125,26 @@ msgstr ""
 
 #: ../lib/status.inc:66
 msgid ""
-"Please report this error to the Bug-Tracker at {link=http://lam.sf.net}LDAP "
-"Account Manager Development Team{endlink}. The error number is {bold}0001:"
-"Invalid/Missing Message type.{endbold} Thank you."
+"Please report this error to the Bug-Tracker at {link=http://lam.sourceforge."
+"net}LDAP Account Manager Development Team{endlink}. The error number is "
+"{bold}0001:Invalid/Missing Message type.{endbold} Thank you."
 msgstr ""
 "Bitte melden Sie dieses Problem an den Bug-Tracker des {link=http://lam.sf."
 "net}LDAP Account Manager Entwickler-Teams{endlink}. Die Fehlernummer ist "
 "{bold}0001:Fehlerhafter/Fehlender Nachrichtentyp.{endbold} Danke."
 
 #: ../lib/modules/inetOrgPerson.inc:344
-msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
-msgstr "Bitte wählen Sie ein Foto zum Hochladen. Es muss im JPG-Format (.jpg/.jpeg) vorliegen."
+msgid ""
+"Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
+msgstr ""
+"Bitte wählen Sie ein Foto zum Hochladen. Es muss im JPG-Format (.jpg/.jpeg) "
+"vorliegen."
 
-#: ../lib/modules.inc:939
+#: ../lib/modules.inc:934
 msgid "Please select page:"
 msgstr "Bitte Seite wählen:"
 
-#: ../templates/masscreate.php:89
+#: ../templates/masscreate.php:93
 msgid "Please select your account type:"
 msgstr "Bitte Accounttyp wählen:"
 
@@ -3186,7 +3152,7 @@ msgstr "Bitte Accounttyp wählen:"
 msgid "Please select your user name and enter your password to log in"
 msgstr "Bitte wählen Sie Ihren Benutzernamen und geben das Passwort ein"
 
-#: ../lib/modules.inc:931
+#: ../lib/modules.inc:926
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "Bitte setzen Sie alle erforderlichen Werte auf der Seite: %s"
@@ -3205,7 +3171,7 @@ msgstr "Regelliste hat ungültiges Format!"
 msgid "Position"
 msgstr "Position"
 
-#: ../templates/masscreate.php:163 ../templates/masscreate.php:302
+#: ../templates/masscreate.php:164 ../templates/masscreate.php:302
 #: ../lib/modules/sambaGroupMapping.inc:368
 msgid "Possible values"
 msgstr "Mögliche Werte"
@@ -3240,7 +3206,7 @@ msgstr "Vordefinierte Werte"
 msgid "President"
 msgstr "Präsident"
 
-#: ../lib/modules/posixGroup.inc:483 ../lib/modules/posixAccount.inc:201
+#: ../lib/modules/posixGroup.inc:490 ../lib/modules/posixAccount.inc:201
 #: ../lib/modules/posixAccount.inc:268 ../lib/modules/posixAccount.inc:324
 #: ../lib/modules/posixAccount.inc:349 ../lib/modules/posixAccount.inc:395
 #: ../lib/modules/posixAccount.inc:881 ../lib/modules/posixAccount.inc:1029
@@ -3252,7 +3218,7 @@ msgstr "Primäre Gruppe"
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: ../templates/tools.php:53
+#: ../templates/tools.php:54
 msgid "Profile editor"
 msgstr "Profileditor"
 
@@ -3302,7 +3268,7 @@ msgstr "Profilpfad"
 msgid "Profile path is invalid!"
 msgstr "Profilpfad ist ungültig!"
 
-#: ../templates/profedit/profilepage.php:119
+#: ../templates/profedit/profilepage.php:120
 msgid "Profile was saved."
 msgstr "Profil wurde gespeichert."
 
@@ -3322,15 +3288,21 @@ msgstr "Quota haben falsches Format!"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:155 ../templates/profedit/profilepage.php:198
-#: ../lib/modules.inc:1036 ../help/help.inc:134
+#: ../templates/masscreate.php:156 ../templates/profedit/profilepage.php:198
+#: ../lib/modules.inc:1031 ../help/help.inc:134
 msgid "RDN identifier"
 msgstr "RDN-Bezeichner"
 
-#: ../lib/lists.inc:328
+#: ../lib/types/host.inc:82
 msgid "RID (Windows UID)"
 msgstr "RID (Windows UID)"
 
+#: ../lib/modules/sambaDomain.inc:79 ../lib/modules/sambaDomain.inc:100
+#: ../lib/modules/sambaDomain.inc:246 ../lib/modules/sambaDomain.inc:252
+#: ../lib/modules/sambaDomain.inc:420
+msgid "RID base"
+msgstr "RID-Basis"
+
 #: ../templates/tree/templates/creation/new_ou_template.php:99
 msgid "Really create this new OU?"
 msgstr "Soll diese neue OU erstellt werden?"
@@ -3343,8 +3315,8 @@ msgstr "Dieses Attribut wirklich löschen?"
 msgid "Recipient"
 msgstr "Empfänger"
 
-#: ../lib/modules/nisMailAlias.inc:70 ../lib/modules/nisMailAlias.inc:84
-#: ../lib/modules/nisMailAlias.inc:326
+#: ../lib/types/mailAlias.inc:81 ../lib/modules/nisMailAlias.inc:70
+#: ../lib/modules/nisMailAlias.inc:84 ../lib/modules/nisMailAlias.inc:326
 msgid "Recipient list"
 msgstr "Empfängerliste"
 
@@ -3352,7 +3324,7 @@ msgstr "Empfängerliste"
 msgid "Recursive delete progress"
 msgstr "Fortschritt des Löschvorgangs"
 
-#: ../templates/config/confmain.php:468
+#: ../templates/config/confmain.php:387
 msgid "Reenter Password"
 msgstr "Passwort nochmal eingeben"
 
@@ -3366,7 +3338,7 @@ msgid "Reenter profile password"
 msgstr "Profilpasswort erneut eingeben"
 
 #: ../templates/tree/edit.php:100 ../lib/tree.inc:64 ../lib/tree.inc:65
-#: ../lib/lists.inc:150
+#: ../lib/lists.inc:271
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -3386,6 +3358,10 @@ msgstr "Relativer eindeutiger Name"
 msgid "Remove"
 msgstr "Löschen"
 
+#: ../templates/config/conftypes.php:195
+msgid "Remove this account type"
+msgstr "Diesen Accounttyp entfernen"
+
 #: ../templates/config/profmanage.php:224 ../help/help.inc:115
 msgid "Rename profile"
 msgstr "Profil umbenennen"
@@ -3415,12 +3391,12 @@ msgstr "Erforderliches Attribut für Objektklasse(n) %s"
 msgid "Required attributes"
 msgstr "Vorgeschriebene Attribute"
 
-#: ../templates/domain.php:222 ../templates/config/confmain.php:483
+#: ../templates/config/confmain.php:402
 #: ../templates/profedit/profilepage.php:249
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../lib/modules.inc:942 ../lib/modules.inc:970
+#: ../lib/modules.inc:937 ../lib/modules.inc:965
 msgid "Reset changes"
 msgstr "Änderungen zurücksetzen"
 
@@ -3456,17 +3432,13 @@ msgstr "Samba 2"
 msgid "Samba 3"
 msgstr "Samba 3"
 
-#: ../templates/domain.php:279
+#: ../lib/modules/sambaDomain.inc:138 ../lib/modules/sambaDomain.inc:139
 msgid "Samba 3 domain SID is invalid!"
 msgstr "Samba 3 Domänen-SID ist ungültig!"
 
-#: ../templates/tools.php:61
-msgid "Samba 3 domains"
-msgstr "Samba 3 Domänen"
-
-#: ../templates/ou_edit.php:418
-msgid "Samba Hosts"
-msgstr "Samba Hosts"
+#: ../lib/types/smbDomain.inc:51
+msgid "Samba 3 domain entries"
+msgstr "Samba 3 Domäneneinträge"
 
 #: ../lib/modules/sambaSamAccount.inc:238
 #: ../lib/modules/sambaSamAccount.inc:242
@@ -3484,10 +3456,18 @@ msgstr "Samba RID-Nummer"
 msgid "Samba display name"
 msgstr "Samba Anzeigename"
 
+#: ../lib/modules/sambaDomain.inc:47
+msgid "Samba domain"
+msgstr "Samba-Domäne"
+
 #: ../lib/modules/sambaGroupMapping.inc:252
 msgid "Samba domain name"
 msgstr "Samba Domänenname"
 
+#: ../lib/types/smbDomain.inc:42
+msgid "Samba domains"
+msgstr "Samba-Domänen"
+
 #: ../lib/modules/sambaGroupMapping.inc:272
 #: ../lib/modules/sambaGroupMapping.inc:299
 #: ../lib/modules/sambaGroupMapping.inc:317
@@ -3530,24 +3510,11 @@ msgstr "Account speichern"
 msgid "Save as file"
 msgstr "Als Datei speichern"
 
-#: ../templates/config/confsave.php:177
-msgid "Saving group modules failed!"
-msgstr "Speichern der Gruppenmodule fehlgeschlagen!"
-
-#: ../templates/config/confsave.php:183
-msgid "Saving host modules failed!"
-msgstr "Speichern der Hostmodule fehlgeschlagen!"
-
-#: ../templates/config/confsave.php:171
-msgid "Saving user modules failed!"
-msgstr "Speichern der Benutzermodule fehlgeschlagen!"
-
-#: ../templates/tools.php:90
+#: ../templates/tools.php:82
 msgid "Schema browser"
 msgstr "Schema-Browser"
 
 #: ../templates/pdfedit/pdfdelete.php:56 ../templates/pdfedit/pdfdelete.php:59
-#: ../templates/pdfedit/pdfdelete.php:78
 msgid "Scope"
 msgstr "Typ"
 
@@ -3555,7 +3522,7 @@ msgstr "Typ"
 msgid "Script path"
 msgstr "Scriptpfad"
 
-#: ../templates/config/confsave.php:159
+#: ../templates/config/confsave.php:114
 msgid "Script path is invalid!"
 msgstr "Scriptpfad ist ungültig!"
 
@@ -3563,11 +3530,11 @@ msgstr "Scriptpfad ist ungültig!"
 msgid "Script server"
 msgstr "Scriptserver"
 
-#: ../templates/config/confsave.php:165
+#: ../templates/config/confsave.php:120
 msgid "Script server is invalid!"
 msgstr "Scriptserver ist ungültig!"
 
-#: ../templates/config/confmain.php:413
+#: ../templates/config/confmain.php:332
 msgid "Script settings"
 msgstr "Scripteinstellungen"
 
@@ -3585,12 +3552,11 @@ msgstr "Suchbereich"
 msgid "Section"
 msgstr "Abschnitt"
 
-#: ../templates/config/confmain.php:441
+#: ../templates/config/confmain.php:360
 msgid "Security settings"
 msgstr "Sicherheitseinstellungen"
 
-#: ../templates/lists/listhosts.php:104 ../templates/lists/listgroups.php:104
-#: ../templates/lists/listdomains.php:121 ../templates/lists/listusers.php:131
+#: ../lib/lists.inc:625
 msgid "See README.openldap.txt to solve this problem."
 msgstr "Bitte lesen Sie README.openldap.txt um dieses Problem zu lösen."
 
@@ -3602,8 +3568,7 @@ msgstr "Siehe auch"
 msgid "Select a template for the creation process"
 msgstr "Wählen Sie eine Vorlage für den Anlegevorgang"
 
-#: ../templates/lists/listhosts.php:200 ../templates/lists/listgroups.php:217
-#: ../templates/lists/listusers.php:247
+#: ../lib/types/group.inc:180 ../lib/types/user.inc:216 ../lib/lists.inc:395
 msgid "Select all"
 msgstr "Alle auswählen"
 
@@ -3611,7 +3576,7 @@ msgstr "Alle auswählen"
 msgid "Selected groups"
 msgstr "Gewählte Gruppen"
 
-#: ../templates/config/confmodules.php:169
+#: ../templates/config/confmodules.php:176
 msgid "Selected modules"
 msgstr "Ausgewählte Module"
 
@@ -3619,20 +3584,19 @@ msgstr "Ausgewählte Module"
 msgid "Selected users"
 msgstr "Ausgewählte Benutzer"
 
-#: ../templates/config/confsave.php:92
+#: ../templates/config/confsave.php:82
 msgid "Server Address is empty!"
 msgstr "Die Server Addresse ist nicht gesetzt!"
 
-#: ../templates/config/confmain.php:161 ../lib/config.inc:357
-#: ../help/help.inc:47
+#: ../templates/config/confmain.php:155 ../help/help.inc:47
 msgid "Server address"
 msgstr "Serveraddresse"
 
-#: ../templates/config/confmain.php:417 ../lib/config.inc:370
+#: ../templates/config/confmain.php:336
 msgid "Server of external script"
 msgstr "Server mit externem Script"
 
-#: ../templates/config/confmain.php:158
+#: ../templates/config/confmain.php:152
 msgid "Server settings"
 msgstr "Servereinstellungen"
 
@@ -3696,7 +3660,7 @@ msgstr "weiches Inode-Limit"
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "Einige Attribute (%s) wurden geändert und sind nun hervorgehoben."
 
-#: ../lib/modules.inc:930
+#: ../lib/modules.inc:925
 msgid "Some required information is missing"
 msgstr "Einige benötigte Informationen fehlen noch"
 
@@ -3760,16 +3724,16 @@ msgstr "Name der Struktur"
 msgid "Sub (entire subtree)"
 msgstr "Unterhalb (kompletter Baum unter Basis-DN)"
 
-#: ../templates/tree/export_form.php:164 ../templates/ou_edit.php:102
-#: ../templates/ou_edit.php:167 ../templates/ou_edit.php:232
-#: ../templates/ou_edit.php:297 ../templates/ou_edit.php:488
-#: ../templates/domain.php:221 ../templates/config/profmanage.php:403
-#: ../templates/config/confmodules.php:98
-#: ../templates/config/confmodules.php:101
-#: ../templates/config/confmain.php:481 ../templates/pdfedit/pdfdelete.php:81
-#: ../templates/pdfedit/pdfpage.php:735 ../templates/pdfedit/pdfmain.php:152
-#: ../templates/profedit/profiledelete.php:84
-#: ../templates/profedit/profilemain.php:157 ../lib/modules/posixGroup.inc:283
+#: ../templates/tree/export_form.php:164 ../templates/ou_edit.php:105
+#: ../templates/ou_edit.php:192 ../templates/masscreate.php:106
+#: ../templates/config/profmanage.php:403
+#: ../templates/config/confmodules.php:104
+#: ../templates/config/confmodules.php:107
+#: ../templates/config/confmain.php:400 ../templates/config/conftypes.php:207
+#: ../templates/pdfedit/pdfdelete.php:90 ../templates/pdfedit/pdfpage.php:735
+#: ../templates/pdfedit/pdfmain.php:152
+#: ../templates/profedit/profiledelete.php:81
+#: ../templates/profedit/profilemain.php:164 ../lib/modules/posixGroup.inc:283
 #: ../lib/modules/sambaAccount.inc:802 ../lib/modules/sambaSamAccount.inc:903
 #: ../lib/modules/sambaSamAccount.inc:989 ../lib/modules/posixAccount.inc:1012
 #: ../lib/modules/inetOrgPerson.inc:711
@@ -3784,8 +3748,7 @@ msgstr "Substring-Regel"
 msgid "Success"
 msgstr "Erfolg"
 
-#: ../templates/domain.php:189 ../lib/lists.inc:349 ../lib/modules.inc:1023
-#: ../help/help.inc:159
+#: ../lib/lists.inc:465 ../lib/modules.inc:1018
 msgid "Suffix"
 msgstr "Suffix"
 
@@ -3832,12 +3795,13 @@ msgid "Text for user PDF"
 msgstr "Text für Benutzer-PDF"
 
 #: ../lib/modules/kolabUser.inc:159
-msgid "The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
+msgid ""
+"The Cyrus mail quota for users in MBytes, leave blank for unlimited space."
 msgstr ""
 "Das Cyrus-Mailquota für Benutzer in MBytes, leer heißt unbegrenzter "
 "Speicherplatz."
 
-#: ../help/help.inc:162
+#: ../lib/modules/sambaDomain.inc:64
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "Die Domänen-SID des Samba-Servers. Auszulesen mit \"net getlocalsid\"."
 
@@ -3855,26 +3819,20 @@ msgstr ""
 #: ../templates/tree/templates/creation/custom.php:99
 #, php-format
 msgid "The container you specified (%s) does not exist. Please try again."
-msgstr "Der angegebene Container (%s) existiert nicht. Bitte versuchen Sie es erneut."
+msgstr ""
+"Der angegebene Container (%s) existiert nicht. Bitte versuchen Sie es erneut."
 
 #: ../lib/modules/kolabUser.inc:147
 msgid "The country name of the user."
 msgstr "Der Ländername des Benutzers."
 
-#: ../help/help.inc:160
-msgid "The domain entry will be saved under this suffix."
-msgstr "Der Domäneneintrag wird unter diesem Suffix gespeichert."
-
 #: ../lib/modules/shadowAccount.inc:55
 msgid "The expiration date is invalid."
 msgstr "Das Ablaufdatum ist ungültig."
 
-#: ../templates/config/confsave.php:252
-msgid "The following settings were saved to profile:"
-msgstr "Die folgenden Einstellungen wurden gespeichert:"
-
 #: ../templates/initsuff.php:178
-msgid "The following suffix(es) are missing in LDAP. LAM can create them for you."
+msgid ""
+"The following suffix(es) are missing in LDAP. LAM can create them for you."
 msgstr "Folgende Suffixe fehlen in LDAP. LAM kann sie für Sie erstellen."
 
 #: ../lib/modules/sambaSamAccount.inc:103
@@ -3888,7 +3846,7 @@ msgstr ""
 "Die Überschrift für einen neuen Abschnitt muss mindestens ein Zeichen "
 "enthalten."
 
-#: ../lib/modules.inc:888
+#: ../lib/modules.inc:882
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "Das Modul %s ist noch nicht bereit."
@@ -3906,7 +3864,7 @@ msgstr ""
 msgid "The name of the server where the mailbox is located."
 msgstr "Der Name des Servers, auf dem sich das Postfach befindet."
 
-#: ../help/help.inc:158
+#: ../lib/modules/sambaDomain.inc:60
 msgid "The name of your Windows domain or workgroup."
 msgstr "Der Name ihrer Windows-Domäne oder Arbeitsgruppe."
 
@@ -3914,7 +3872,7 @@ msgstr "Der Name ihrer Windows-Domäne oder Arbeitsgruppe."
 msgid "The new account will be saved under this LDAP suffix."
 msgstr "Der neue Account wird unter diesem LDAP-Suffix gespeichert."
 
-#: ../templates/config/confmain.php:110
+#: ../templates/config/confmain.php:104
 msgid "The password is invalid! Please try again."
 msgstr "Das Passwort ist falsch! Bitte erneut eingeben."
 
@@ -3942,7 +3900,7 @@ msgstr "Der statische Text muss mindestens ein Zeichen enthalten."
 msgid "There are new required attributes which need to be set."
 msgstr "Es gibt neue erforderliche Attribute, die gefüllt werden müssen."
 
-#: ../lib/modules/posixGroup.inc:483
+#: ../lib/modules/posixGroup.inc:490
 msgid "There are still users who have this group as their primary group."
 msgstr "Es gibt noch Benutzer, deren primäre Gruppe diese Gruppe ist."
 
@@ -3954,7 +3912,7 @@ msgstr "Es kann nur eine Gruppe diesen Typs geben."
 msgid "There were errors while uploading:"
 msgstr "Beim Upload traten Fehler auf:"
 
-#: ../lib/modules/posixGroup.inc:430
+#: ../lib/modules/posixGroup.inc:437
 msgid ""
 "These are the minimum and maximum numbers to use for group IDs when creating "
 "new group accounts. New group accounts will always get the highest number in "
@@ -3987,15 +3945,12 @@ msgstr ""
 "plus 1."
 
 #: ../lib/modules/posixAccount.inc:94
-msgid "This GID number is invalid! Please provide either a number or a group name."
+msgid ""
+"This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
 "Diese GID-Nummer ist ungültig! Bitte geben Sie eine Nummer ein oder einen "
 "Gruppennamen."
 
-#: ../templates/domain.php:282
-msgid "This Samba 3 domain is already present!"
-msgstr "Diese Samba3-Domäne ist bereits vorhanden!"
-
 #: ../lib/modules/kolabUser.inc:304
 msgid "This account is marked for deletion."
 msgstr "Dieser Account wurde zum Löschen markiert."
@@ -4004,7 +3959,8 @@ msgstr "Dieser Account wurde zum Löschen markiert."
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
-msgstr "Hier können Sie spezielle Accounts definieren, z.B. Administrator oder Gast."
+msgstr ""
+"Hier können Sie spezielle Accounts definieren, z.B. Administrator oder Gast."
 
 #: ../help/help.inc:120
 msgid "This changes the password of the selected profile."
@@ -4015,7 +3971,8 @@ msgid "This changes the profile which is selected by default at login."
 msgstr "Damit ändern Sie das Standardprofil am Login."
 
 #: ../templates/massBuildAccounts.php:148
-msgid "This column is defined to include unique entries but duplicates were found:"
+msgid ""
+"This column is defined to include unique entries but duplicates were found:"
 msgstr "Diese Spalte darf keine doppelten Einträge enthalten:"
 
 #: ../help/help.inc:94
@@ -4118,7 +4075,8 @@ msgstr ""
 msgid ""
 "This is the MAC address of the network card of the device (e.g. 00:01:02:DE:"
 "EF:18)."
-msgstr "Dies ist die MAC-Adresse der Netzwerkkarte im Gerät (z.B. 00:01:02:DE:EF:18)."
+msgstr ""
+"Dies ist die MAC-Adresse der Netzwerkkarte im Gerät (z.B. 00:01:02:DE:EF:18)."
 
 #: ../lib/modules/sambaAccount.inc:392
 msgid "This is the RID of the user's primary Windows group."
@@ -4322,7 +4280,7 @@ msgstr "Damit speichern Sie den Account in der LDAP-Datenbank."
 msgid "This text will appear on top of every user PDF file."
 msgstr "Dieser Text erscheint am Anfang jedes Benutzer-PDFs."
 
-#: ../templates/tools.php:84
+#: ../templates/tools.php:76
 msgid "This tool allows you to customize the PDF pages."
 msgstr "Dieses Werkzeug erlaubt die Anpassung der PDF-Seiten."
 
@@ -4341,16 +4299,18 @@ msgstr "Dieser Wert darf nur \\\"true\\\" oder \\\"false\\\" sein!"
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"."
 msgstr "Dieser Wert darf nur \\\"true\\\" oder \\\"false\\\" sein."
 
-#: ../lib/modules/posixGroup.inc:482
+#: ../lib/modules/posixGroup.inc:489
 msgid "This value must be a list of user names separated by semicolons."
-msgstr "Dieser Wert muss eine Liste von Benutzernamen, getrennt duch Kommata, sein."
+msgstr ""
+"Dieser Wert muss eine Liste von Benutzernamen, getrennt duch Kommata, sein."
 
 #: ../help/help.inc:154
 msgid "This will create a new organizational unit under the selected one."
 msgstr "Dies erzeugt eine neue Organizational Unit unterhalb der markierten."
 
 #: ../help/help.inc:156
-msgid "This will delete the selected organizational unit. The OU has to be empty."
+msgid ""
+"This will delete the selected organizational unit. The OU has to be empty."
 msgstr "Dies löscht die markierte Organizational Unit. Die OU muss leer sein."
 
 #: ../help/help.inc:118
@@ -4369,8 +4329,9 @@ msgstr ""
 "Damit wird der Account für Kolabd als löschbar gekennzeichnet. Verwenden Sie "
 "dies um Kolab-Accounts sauber zu löschen (löscht z.B. das Postfach)."
 
-#: ../lib/modules/posixAccount.inc:370
-msgid "This will set an invalid password which prevents logins with this account."
+#: ../lib/modules/posixGroup.inc:433 ../lib/modules/posixAccount.inc:370
+msgid ""
+"This will set an invalid password which prevents logins with this account."
 msgstr ""
 "Wenn Sie dieses Kästchen anwählen, dann setzt LAM ein ungültiges Passwort "
 "für den Account. Dadurch kann sich niemand mit diesem Account anmelden."
@@ -4391,7 +4352,7 @@ msgstr ""
 "Verwenden Sie /bin/false um den Login zu deaktivieren. Die Shellliste wird "
 "von lam/config/shells gelesen."
 
-#: ../templates/main_header.php:61
+#: ../templates/main_header.php:59
 msgid "Tools"
 msgstr "Werkzeuge"
 
@@ -4399,23 +4360,19 @@ msgstr "Werkzeuge"
 msgid "Total entries"
 msgstr "Anzahl der Listeneinträge"
 
-#: ../templates/lists/listusers.php:270
+#: ../lib/types/user.inc:232
 msgid "Translate GID number to group name"
 msgstr "GID-Nummer als Gruppenname darstellen"
 
-#: ../help/help.inc:65
+#: ../templates/config/confmain.php:171 ../help/help.inc:65
 msgid "Tree suffix"
 msgstr "Baumansicht"
 
-#: ../templates/main_header.php:80
+#: ../templates/main_header.php:78
 msgid "Tree view"
 msgstr "Baumansicht"
 
-#: ../templates/config/confmain.php:217 ../lib/config.inc:363
-msgid "TreeSuffix"
-msgstr "BaumSuffix"
-
-#: ../templates/config/confsave.php:127
+#: ../templates/config/confsave.php:97
 msgid "TreeSuffix is invalid!"
 msgstr "BaumSuffix ist ungültig!"
 
@@ -4433,7 +4390,8 @@ msgstr "Benutzer ID"
 
 #: ../lib/modules/posixAccount.inc:82
 msgid "UID has changed. Do you want to change home directory?"
-msgstr "UID-Nummer wurde geändert. Soll das Heimatverzeichnis angepasst werden?"
+msgstr ""
+"UID-Nummer wurde geändert. Soll das Heimatverzeichnis angepasst werden?"
 
 #: ../lib/modules/posixAccount.inc:77
 msgid ""
@@ -4443,11 +4401,11 @@ msgstr ""
 "UID muss eine Zahl sein. Sie muss sich innerhalb des Bereiches befinden der "
 "in Ihrem Konfigurationsprofil festgelegt ist."
 
+#: ../lib/types/host.inc:84 ../lib/types/user.inc:81
 #: ../lib/modules/posixAccount.inc:53 ../lib/modules/posixAccount.inc:195
 #: ../lib/modules/posixAccount.inc:262 ../lib/modules/posixAccount.inc:308
 #: ../lib/modules/posixAccount.inc:312 ../lib/modules/posixAccount.inc:320
 #: ../lib/modules/posixAccount.inc:873 ../lib/modules/posixAccount.inc:1109
-#: ../lib/lists.inc:303 ../lib/lists.inc:330
 msgid "UID number"
 msgstr "UID Nummer"
 
@@ -4473,8 +4431,7 @@ msgstr ""
 "UNC-Pfad (\\\\Server\\Freigabe) des Heimatverzeichnisses. $user und $group "
 "werden durch Benutzer- und Gruppenname ersetzt."
 
-#: ../templates/ou_edit.php:63 ../templates/ou_edit.php:128
-#: ../templates/ou_edit.php:193 ../templates/ou_edit.php:258
+#: ../templates/ou_edit.php:66
 msgid "Unable to create new OU!"
 msgstr "Kann neue OU nicht erstellen!"
 
@@ -4482,8 +4439,7 @@ msgstr "Kann neue OU nicht erstellen!"
 msgid "Unable to create new profile!"
 msgstr "Kann das Profil nicht erstellen!"
 
-#: ../templates/ou_edit.php:80 ../templates/ou_edit.php:145
-#: ../templates/ou_edit.php:210 ../templates/ou_edit.php:275
+#: ../templates/ou_edit.php:83
 msgid "Unable to delete OU!"
 msgstr "Kann OU nicht löschen!"
 
@@ -4491,10 +4447,6 @@ msgstr "Kann OU nicht löschen!"
 msgid "Unable to delete PDF structure!"
 msgstr "Kann die PDF-Struktur nicht löschen!"
 
-#: ../templates/domain.php:349
-msgid "Unable to delete domain!"
-msgstr "Kann Domäne nicht löschen!"
-
 #: ../templates/config/profmanage.php:108
 #: ../templates/profedit/profiledelete.php:60
 msgid "Unable to delete profile!"
@@ -4504,7 +4456,7 @@ msgstr "Kann das Profil nicht löschen!"
 msgid "Unable to find group in LDAP."
 msgstr "Kann Gruppe nicht im LDAP-Baum finden."
 
-#: ../templates/config/confmain.php:398
+#: ../templates/config/confmain.php:317
 msgid ""
 "Unable to load available languages. Setting English as default language. For "
 "further instructions please contact the Admin of this site."
@@ -4522,7 +4474,7 @@ msgstr "Kann das Profil nicht laden!"
 msgid "Unable to retrieve schema!"
 msgstr "Konnte Schema nicht auslesen!"
 
-#: ../templates/profedit/profilepage.php:124
+#: ../templates/profedit/profilepage.php:125
 msgid "Unable to save profile!"
 msgstr "Kann das Profil nicht speichern!"
 
@@ -4540,7 +4492,7 @@ msgstr "Arbeitsstationen"
 msgid "Unix workstations are invalid!"
 msgstr "Unix-Arbeitsstationen sind ungültig!"
 
-#: ../templates/config/confmodules.php:226
+#: ../templates/config/confmodules.php:233
 msgid "Unsolved dependency:"
 msgstr "Ungelöste Abhängigkeit:"
 
@@ -4552,11 +4504,11 @@ msgstr "Hoch"
 msgid "Upload accounts to LDAP"
 msgstr "Accounts in LDAP anlegen"
 
-#: ../templates/masscreate.php:128
+#: ../templates/masscreate.php:129
 msgid "Upload file and create accounts"
 msgstr "Datei hochladen und Accounts erstellen"
 
-#: ../lib/modules.inc:476
+#: ../lib/modules.inc:472
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "Upload wurde nach Fehlern im Modul %s gestoppt!"
@@ -4617,7 +4569,7 @@ msgstr "Benutzt von Attributen"
 msgid "Used by object classes"
 msgstr "Benutzt von Objektklassen"
 
-#: ../help/help.inc:170
+#: ../lib/modules/sambaDomain.inc:80
 msgid "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgstr ""
 "Wird für die Berechnung der RIDs aus UID/GID verwendet. Nicht ändern, wenn "
@@ -4635,10 +4587,14 @@ msgstr "Benutze Inodes (Dateien)"
 msgid "User"
 msgstr "Benutzer"
 
-#: ../lib/lists.inc:302
+#: ../lib/types/user.inc:80
 msgid "User ID"
 msgstr "Benutzer ID"
 
+#: ../lib/types/user.inc:51
+msgid "User accounts (e.g. Unix, Samba and Kolab)"
+msgstr "Benutzeraccounts (z.B. Unix, Samba und Kolab)"
+
 #: ../lib/modules/sambaAccount.inc:255 ../lib/modules/sambaAccount.inc:365
 #: ../lib/modules/sambaAccount.inc:731 ../lib/modules/sambaSamAccount.inc:206
 #: ../lib/modules/sambaSamAccount.inc:315
@@ -4654,19 +4610,10 @@ msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 
-#: ../templates/config/confsave.php:132
-msgid "User list attributes are invalid!"
-msgstr "Attribute der Benutzerliste sind ungültig!"
-
 #: ../templates/schema/schema.php:208
 msgid "User modification"
 msgstr "Vom Benutzer änderbar"
 
-#: ../templates/config/confmodules.php:79 ../templates/config/confmain.php:256
-#: ../lib/config.inc:372
-msgid "User modules"
-msgstr "Benutzermodule"
-
 #: ../lib/modules/sambaAccount.inc:262 ../lib/modules/sambaAccount.inc:367
 #: ../lib/modules/sambaAccount.inc:739 ../lib/modules/sambaSamAccount.inc:208
 #: ../lib/modules/sambaSamAccount.inc:322
@@ -4674,17 +4621,17 @@ msgstr "Benutzermodule"
 msgid "User must change password"
 msgstr "Benutzer muss Passwort ändern"
 
-#: ../templates/login.php:200 ../lib/modules/account.inc:90
-#: ../lib/modules/account.inc:110 ../lib/modules/account.inc:112
-#: ../lib/modules/account.inc:113 ../lib/modules/account.inc:205
-#: ../lib/modules/account.inc:226 ../lib/modules/sambaSamAccount.inc:1189
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:181
-#: ../lib/modules/posixAccount.inc:341 ../lib/modules/posixAccount.inc:865
-#: ../lib/modules/posixAccount.inc:1107 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:225 ../lib/modules/inetOrgPerson.inc:331
-#: ../lib/modules/inetOrgPerson.inc:527 ../lib/modules/inetOrgPerson.inc:780
-#: ../lib/lists.inc:305
+#: ../templates/login.php:200 ../lib/types/user.inc:83
+#: ../lib/modules/account.inc:90 ../lib/modules/account.inc:110
+#: ../lib/modules/account.inc:112 ../lib/modules/account.inc:113
+#: ../lib/modules/account.inc:205 ../lib/modules/account.inc:226
+#: ../lib/modules/sambaSamAccount.inc:1189 ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:181 ../lib/modules/posixAccount.inc:341
+#: ../lib/modules/posixAccount.inc:865 ../lib/modules/posixAccount.inc:1107
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:225
+#: ../lib/modules/inetOrgPerson.inc:331 ../lib/modules/inetOrgPerson.inc:527
+#: ../lib/modules/inetOrgPerson.inc:780
 msgid "User name"
 msgstr "Benutzername"
 
@@ -4727,26 +4674,13 @@ msgstr ""
 "als 8 Zeichen. Sie können sich bei Windows nicht anmelden wenn Sie mehr als "
 "16 Zeichen verwenden."
 
-#: ../templates/profedit/profilemain.php:45
-msgid "User profiles"
-msgstr "Benutzerprofile"
-
 #: ../help/help.inc:59
 msgid "User/Group/Host suffix"
 msgstr "Benutzer-/Gruppen-/Hostsuffix"
 
-#: ../templates/config/confmain.php:177 ../lib/config.inc:359
-msgid "UserSuffix"
-msgstr "Benutzersuffix"
-
-#: ../templates/config/confsave.php:107
-msgid "UserSuffix is invalid!"
-msgstr "UserSuffix ist ungültig!"
-
-#: ../templates/ou_edit.php:344 ../templates/main_header.php:83
-#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:137
-#: ../help/help.inc:78
+#: ../lib/types/user.inc:42 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:137 ../help/help.inc:78
 msgid "Users"
 msgstr "Benutzer"
 
@@ -4770,30 +4704,30 @@ msgstr "Verwendete Vorlage:"
 msgid "Valid users"
 msgstr "Berechtigte Benutzer"
 
-#: ../templates/delete.php:187 ../lib/modules.inc:1572
+#: ../templates/delete.php:187 ../lib/modules.inc:1568
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "Konnte keine Attribute zum DN hinzufügen: %s."
 
-#: ../lib/modules.inc:1521 ../lib/modules.inc:1533
+#: ../lib/modules.inc:1517 ../lib/modules.inc:1529
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "Konnte DN nicht erstellen: %s."
 
 #: ../templates/tree/delete.php:109 ../templates/delete.php:278
-#: ../templates/delete.php:283 ../lib/modules.inc:1516
+#: ../templates/delete.php:283 ../lib/modules.inc:1512
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "Konnte DN nicht löschen: %s."
 
 #: ../templates/tree/update.php:105 ../templates/tree/add_oclass.php:89
 #: ../templates/tree/add_oclass_form.php:158 ../templates/delete.php:179
-#: ../lib/modules.inc:1564
+#: ../lib/modules.inc:1560
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht ändern: %s."
 
-#: ../templates/delete.php:195 ../lib/modules.inc:1580
+#: ../templates/delete.php:195 ../lib/modules.inc:1576
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht löschen: %s."
@@ -4848,10 +4782,9 @@ msgstr "Primäre Windows-Gruppen-SID"
 msgid "Windows-Domain name of group."
 msgstr "Windows-Domänenname der Gruppe."
 
-#: ../templates/pdfedit/pdfdelete.php:89
-#: ../templates/profedit/profiledelete.php:92
-msgid "Wrong or missing type!"
-msgstr "Falscher oder fehlender Typ!"
+#: ../lib/modules/sambaDomain.inc:88
+msgid "Workgroup"
+msgstr "Arbeitsgruppe"
 
 #: ../templates/login.php:382
 msgid "Wrong password/user name combination. Please try again."
@@ -4862,7 +4795,7 @@ msgstr "Falsche Benutzername/Passwort-Kombination. Bitte erneut eingeben."
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/modules/posixGroup.inc:478
+#: ../lib/modules/posixGroup.inc:485
 msgid ""
 "You are using a capital letters. This can cause problems because Windows "
 "isn't case-sensitive."
@@ -4883,7 +4816,7 @@ msgstr ""
 msgid "You cannot use these password options at the same time."
 msgstr "Sie können diese Passwortoptionen nicht gleichzeitig verwenden."
 
-#: ../lib/modules/posixGroup.inc:469
+#: ../lib/modules/posixGroup.inc:476
 msgid "You cannot use this password options at the same time."
 msgstr "Sie können diese Passwortoptionen nicht gleichzeitig verwenden."
 
@@ -4920,6 +4853,10 @@ msgstr ""
 "Ihre PHP-Konfiguration erlaubt keine Dateiuploads. Bitte prüfen Sie Ihre php."
 "ini."
 
+#: ../lib/config.inc:335
+msgid "Your settings were successfully saved."
+msgstr "Ihre Einstellungen wurden erfolgreich gespeichert."
+
 #: ../templates/tree/update_confirm.php:188
 #: ../templates/tree/update_confirm.php:200
 msgid "[attribute deleted]"
@@ -4983,7 +4920,7 @@ msgstr "gruppe01,gruppe02"
 msgid "hours"
 msgstr "Stunden"
 
-#: ../lib/tree.inc:1161
+#: ../lib/tree.inc:1163
 msgid "jpegPhoto contains errors"
 msgstr "JPEG-Bild enthält Fehler"
 
@@ -4991,7 +4928,8 @@ msgstr "JPEG-Bild enthält Fehler"
 msgid ""
 "ldap://localhost:389 connects to localhost using a standard LDAP connection "
 "on port 389"
-msgstr "ldaps://141.40.146.133 baut eine einfache Verbindung zu 141.40.146.133 auf."
+msgstr ""
+"ldaps://141.40.146.133 baut eine einfache Verbindung zu 141.40.146.133 auf."
 
 #: ../help/help.inc:54
 msgid ""
@@ -5057,12 +4995,12 @@ msgstr "pc01,Raum 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:241 ../templates/config/confmain.php:494
-#: ../lib/modules.inc:1066
+#: ../templates/tree/edit.php:241 ../templates/config/confmain.php:413
+#: ../lib/modules.inc:1061
 msgid "required"
 msgstr "erforderlich"
 
-#: ../templates/config/confmain.php:495
+#: ../templates/config/confmain.php:414
 msgid "required for Samba 3 accounts"
 msgstr "erforderlich für Samba 3 Accounts"
 
@@ -5095,4 +5033,3 @@ msgstr "benutzer@firma.de"
 #: ../lib/modules/posixAccount.inc:203
 msgid "users"
 msgstr "Benutzer"
-