diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo
index 1ccceb89..3fe61368 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 023655c9..4e484259 100644
--- a/lam/locale/de_DE/LC_MESSAGES/messages.po
+++ b/lam/locale/de_DE/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ 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-09-13 19:34+0200\n"
+"PO-Revision-Date: 2005-10-08 13:44+0200\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team: Deutsch <lam-i18n@lists.sourceforge.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,11 +84,11 @@ msgstr ""
 #: ../templates/profedit/profiledelete.php:85
 #: ../templates/profedit/profilepage.php:246
 #: ../templates/profedit/profilemain.php:157
-#: ../lib/modules/sambaSamAccount.inc:977
+#: ../lib/modules/sambaSamAccount.inc:1017
 msgid "Abort"
 msgstr "Abbrechen"
 
-#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "Abu Dhabi, Muscat, Baku"
 
@@ -110,16 +110,20 @@ msgstr "Account"
 #: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
 #: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaAccount.inc:86
 #: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaAccount.inc:88
-#: ../lib/modules/sambaAccount.inc:89 ../lib/modules/sambaSamAccount.inc:61
-#: ../lib/modules/sambaSamAccount.inc:64 ../lib/modules/sambaSamAccount.inc:67
-#: ../lib/modules/sambaSamAccount.inc:69 ../lib/modules/sambaSamAccount.inc:72
-#: ../lib/modules/sambaSamAccount.inc:75 ../lib/modules/sambaSamAccount.inc:76
-#: ../lib/modules/sambaSamAccount.inc:77 ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:80 ../lib/modules/sambaSamAccount.inc:81
-#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:84 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:89 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:89 ../lib/modules/sambaSamAccount.inc:78
+#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:86 ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:92 ../lib/modules/sambaSamAccount.inc:93
+#: ../lib/modules/sambaSamAccount.inc:94 ../lib/modules/sambaSamAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:97 ../lib/modules/sambaSamAccount.inc:98
+#: ../lib/modules/sambaSamAccount.inc:99
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:102
+#: ../lib/modules/sambaSamAccount.inc:103
+#: ../lib/modules/sambaSamAccount.inc:104
+#: ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/sambaSamAccount.inc:107 ../lib/modules/posixAccount.inc:73
 #: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:81
 #: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:92
@@ -129,8 +133,8 @@ msgstr "Account"
 #: ../lib/modules/kolabUser.inc:223 ../lib/modules/kolabUser.inc:225
 #: ../lib/modules/kolabUser.inc:227 ../lib/modules/kolabUser.inc:229
 #: ../lib/modules/kolabUser.inc:231 ../lib/modules/kolabUser.inc:233
-#: ../lib/modules/kolabUser.inc:235 ../lib/modules/sambaGroupMapping.inc:357
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/kolabUser.inc:235 ../lib/modules/sambaGroupMapping.inc:366
+#: ../lib/modules/sambaGroupMapping.inc:367
 #: ../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
@@ -159,21 +163,26 @@ msgstr "Erstellung von Accounts mittels Dateiupload"
 msgid "Account deactivated"
 msgstr "Account deaktiviert"
 
-#: ../lib/modules/shadowAccount.inc:166
-msgid "Account expiration date. Format: DD-MM-YYYY"
-msgstr "Account-Ablaufdatum im Format: TT-MM-JJJJ"
+#: ../lib/modules/sambaSamAccount.inc:267
+#: ../lib/modules/sambaSamAccount.inc:342
+#: ../lib/modules/sambaSamAccount.inc:828
+#: ../lib/modules/sambaSamAccount.inc:1067 ../lib/modules/shadowAccount.inc:99
+#: ../lib/modules/shadowAccount.inc:165 ../lib/modules/shadowAccount.inc:197
+#: ../lib/modules/shadowAccount.inc:289
+msgid "Account expiration date"
+msgstr "Ablaufdatum"
 
-#: ../lib/modules/shadowAccount.inc:318
+#: ../lib/modules/shadowAccount.inc:309
 msgid "Account inactive"
 msgstr "Account ist deaktiviert"
 
 #: ../lib/modules/sambaAccount.inc:132 ../lib/modules/sambaAccount.inc:249
 #: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
-#: ../lib/modules/sambaAccount.inc:731 ../lib/modules/sambaSamAccount.inc:185
-#: ../lib/modules/sambaSamAccount.inc:188
-#: ../lib/modules/sambaSamAccount.inc:300
-#: ../lib/modules/sambaSamAccount.inc:785
-#: ../lib/modules/sambaSamAccount.inc:1016
+#: ../lib/modules/sambaAccount.inc:727 ../lib/modules/sambaSamAccount.inc:202
+#: ../lib/modules/sambaSamAccount.inc:205
+#: ../lib/modules/sambaSamAccount.inc:320
+#: ../lib/modules/sambaSamAccount.inc:806
+#: ../lib/modules/sambaSamAccount.inc:1055
 msgid "Account is deactivated"
 msgstr "Account deaktiviert"
 
@@ -208,11 +217,11 @@ msgstr ""
 #: ../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:153
-#: ../lib/modules/kolabUser.inc:374 ../lib/modules/kolabUser.inc:391
-#: ../lib/modules/kolabUser.inc:417
-#: ../lib/modules/inetLocalMailRecipient.inc:215
-#: ../lib/modules/nisMailAlias.inc:187
+#: ../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/inetLocalMailRecipient.inc:208
+#: ../lib/modules/nisMailAlias.inc:180
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -240,9 +249,9 @@ msgid "Adding attribute failed!"
 msgstr "Das Hinzufügen des Attributs ist fehlgeschlagen!"
 
 #: ../lib/modules/posixAccount.inc:208 ../lib/modules/posixAccount.inc:328
-#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:936
-#: ../lib/modules/posixAccount.inc:1020 ../lib/modules/posixAccount.inc:1082
-#: ../lib/modules/posixAccount.inc:1161
+#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:927
+#: ../lib/modules/posixAccount.inc:1011 ../lib/modules/posixAccount.inc:1073
+#: ../lib/modules/posixAccount.inc:1152
 msgid "Additional groups"
 msgstr "Zusätzliche Gruppen"
 
@@ -254,7 +263,7 @@ msgstr "Zusätzliche Aufgaben des Moduls:"
 msgid "Administrators group"
 msgstr "Administratoren"
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "Alaska"
 msgstr "Alaska"
 
@@ -267,7 +276,7 @@ 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:172 ../lib/modules/nisMailAlias.inc:328
+#: ../lib/modules/nisMailAlias.inc:165 ../lib/modules/nisMailAlias.inc:321
 msgid "Alias name"
 msgstr "Alias"
 
@@ -283,13 +292,13 @@ msgstr "Alle Änderungen waren erfolgreich."
 msgid "Allowed hosts"
 msgstr "Erlaubte PCs"
 
-#: ../lib/modules/sambaAccount.inc:829 ../lib/modules/sambaAccount.inc:830
-#: ../lib/modules/sambaSamAccount.inc:892
-#: ../lib/modules/sambaSamAccount.inc:893
+#: ../lib/modules/sambaAccount.inc:825 ../lib/modules/sambaAccount.inc:826
+#: ../lib/modules/sambaSamAccount.inc:929
+#: ../lib/modules/sambaSamAccount.inc:930
 msgid "Allowed workstations"
 msgstr "Erlaubte PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "Almaty, Dhaka, Colombo"
 msgstr "Almaty, Dhaka, Colombo"
 
@@ -306,7 +315,7 @@ msgstr "Immer ablehnen"
 msgid "An attribute (%s) was modified and is highlighted below."
 msgstr "Ein Attribut (%s) wurde geändert und ist nun hervorgehoben."
 
-#: ../lib/modules/kolabUser.inc:356 ../lib/modules/kolabUser.inc:810
+#: ../lib/modules/kolabUser.inc:349 ../lib/modules/kolabUser.inc:803
 msgid "Anyone"
 msgstr "Jeder"
 
@@ -318,7 +327,7 @@ msgstr "Ok"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "Soll dieses Objekt gelöscht werden?"
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "Atlantic time (Canada), Caracas"
 msgstr "Atlantic time (Kanada), Caracas"
 
@@ -342,7 +351,7 @@ msgstr "Attributnamen in der Hostliste"
 msgid "Attributes in User List"
 msgstr "Attributnamen in der Benutzerliste"
 
-#: ../lib/modules/sambaSamAccount.inc:245
+#: ../lib/modules/sambaSamAccount.inc:262
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "Auckland, Fiji, Kamchatka"
 
@@ -350,7 +359,7 @@ msgstr "Auckland, Fiji, Kamchatka"
 msgid "Available PDF fields"
 msgstr "Verfügbare PDF-Felder"
 
-#: ../lib/modules/posixAccount.inc:1032
+#: ../lib/modules/posixAccount.inc:1023
 msgid "Available groups"
 msgstr "Verfügbare Gruppen"
 
@@ -362,18 +371,18 @@ msgstr "Verfügbare Module"
 msgid "Available users"
 msgstr "Verfügbare Benutzer"
 
-#: ../lib/modules/sambaAccount.inc:835 ../lib/modules/sambaSamAccount.inc:898
+#: ../lib/modules/sambaAccount.inc:831 ../lib/modules/sambaSamAccount.inc:935
 msgid "Available workstations"
 msgstr "Verfügbare PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid "Azores, Cape Verde Islands"
 msgstr "Azoren, Kap Verde Inseln"
 
 #: ../templates/tree/update_confirm.php:251 ../lib/modules/posixGroup.inc:262
-#: ../lib/modules/posixGroup.inc:286 ../lib/modules/sambaAccount.inc:840
-#: ../lib/modules/sambaSamAccount.inc:902 ../lib/modules/posixAccount.inc:1038
-#: ../lib/modules/posixAccount.inc:1062 ../lib/modules/inetOrgPerson.inc:679
+#: ../lib/modules/posixGroup.inc:286 ../lib/modules/sambaAccount.inc:836
+#: ../lib/modules/sambaSamAccount.inc:939 ../lib/modules/posixAccount.inc:1029
+#: ../lib/modules/posixAccount.inc:1053 ../lib/modules/inetOrgPerson.inc:670
 msgid "Back"
 msgstr "Zurück"
 
@@ -431,11 +440,11 @@ msgstr "Zurück zu den Einstellungen"
 msgid "Back to profile login"
 msgstr "Zurück zum Konfigurationslogin"
 
-#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "Baghdad, Riyadh, Moskau"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "Bangkok, Hanoi, Jakarta"
 
@@ -455,7 +464,7 @@ msgstr "Basismodul"
 msgid "Beginning"
 msgstr "Anfang"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:260
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing, Perth, Singapur"
 
@@ -495,7 +504,7 @@ msgstr ""
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "Weiches Block-Quota muss kleiner sein als hartes Block-Quota."
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "Brazil, Buenos Aires"
 msgstr "Brasilien, Buenos Aires"
 
@@ -519,11 +528,11 @@ msgstr "Cache Zeitbegrenzung ist ungültig!"
 #: ../lib/modules/posixGroup.inc:415 ../lib/modules/sambaAccount.inc:376
 #: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaAccount.inc:382
 #: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:400
-#: ../lib/modules/sambaSamAccount.inc:200
-#: ../lib/modules/sambaSamAccount.inc:203
-#: ../lib/modules/sambaSamAccount.inc:206
-#: ../lib/modules/sambaSamAccount.inc:212 ../lib/modules/posixAccount.inc:378
-#: ../lib/modules/sambaGroupMapping.inc:287
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaSamAccount.inc:229 ../lib/modules/posixAccount.inc:378
+#: ../lib/modules/sambaGroupMapping.inc:296
 #: ../lib/modules/shadowAccount.inc:150 ../lib/modules/shadowAccount.inc:154
 #: ../lib/modules/shadowAccount.inc:158 ../lib/modules/shadowAccount.inc:162
 msgid "Can be left empty."
@@ -533,11 +542,11 @@ msgstr "Kann leer bleiben."
 #: ../templates/tree/delete_form.php:118 ../templates/tree/delete_form.php:167
 #: ../templates/domain.php:223 ../templates/domain.php:254
 #: ../templates/delete.php:107 ../templates/initsuff.php:188
-#: ../lib/modules/kolabUser.inc:603
+#: ../lib/modules/kolabUser.inc:596
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../templates/login.php:336 ../templates/login.php:341
+#: ../templates/login.php:341 ../templates/login.php:346
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "Kann keine Verbindung zum LDAP-Server aufbauen. Bitte erneut versuchen."
 
@@ -545,16 +554,16 @@ msgstr "Kann keine Verbindung zum LDAP-Server aufbauen. Bitte erneut versuchen."
 msgid "Cannot open config file!"
 msgstr "Kann Konfigurationsdatei nicht öffnen!"
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:258
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "Mitteleuropäische Zeit, Paris, Berlin"
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:255
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "Central Time (USA & Kanada), Mexiko Stadt"
 
 #: ../templates/pdfedit/pdfpage.php:498 ../templates/pdfedit/pdfpage.php:504
-#: ../lib/modules/sambaSamAccount.inc:982
+#: ../lib/modules/sambaSamAccount.inc:1022
 msgid "Change"
 msgstr "Ändern"
 
@@ -570,12 +579,12 @@ msgstr "Standardprofil wechseln"
 msgid "Change master password"
 msgstr "Hauptpasswort ändern"
 
-#: ../lib/modules/posixGroup.inc:193 ../lib/modules/posixAccount.inc:962
-#: ../lib/modules/inetOrgPerson.inc:560 ../help/help.inc:105
+#: ../lib/modules/posixGroup.inc:193 ../lib/modules/posixAccount.inc:953
+#: ../lib/modules/inetOrgPerson.inc:551 ../help/help.inc:105
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../templates/login.php:272
+#: ../templates/login.php:277
 msgid "Change profile"
 msgstr "Profil ändern"
 
@@ -608,7 +617,7 @@ msgstr "Gemeinsam"
 msgid "Columns:"
 msgstr "Spalten:"
 
-#: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaSamAccount.inc:229
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -621,10 +630,10 @@ msgid "Commit"
 msgstr "Bestätigen"
 
 #: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:189
-#: ../lib/modules/posixAccount.inc:381 ../lib/modules/posixAccount.inc:916
-#: ../lib/modules/posixAccount.inc:1156 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/posixAccount.inc:381 ../lib/modules/posixAccount.inc:907
+#: ../lib/modules/posixAccount.inc:1147 ../lib/modules/inetOrgPerson.inc:68
 #: ../lib/modules/inetOrgPerson.inc:217 ../lib/modules/inetOrgPerson.inc:326
-#: ../lib/modules/inetOrgPerson.inc:531 ../lib/modules/inetOrgPerson.inc:705
+#: ../lib/modules/inetOrgPerson.inc:522 ../lib/modules/inetOrgPerson.inc:696
 msgid "Common name"
 msgstr "Allgemeiner Name"
 
@@ -632,7 +641,7 @@ msgstr "Allgemeiner Name"
 msgid "Configuration login"
 msgstr "Login für die Einstellungen"
 
-#: ../templates/login.php:254
+#: ../templates/login.php:259
 msgid "Configuration profile"
 msgstr "Einstellungsprofil"
 
@@ -670,8 +679,8 @@ msgid "Could not save PDF profile, access denied."
 msgstr "Konnte PDF-Profil nicht speichern, Zugriff verweigert."
 
 #: ../lib/modules/kolabUser.inc:83 ../lib/modules/kolabUser.inc:146
-#: ../lib/modules/kolabUser.inc:175 ../lib/modules/kolabUser.inc:316
-#: ../lib/modules/kolabUser.inc:786
+#: ../lib/modules/kolabUser.inc:175 ../lib/modules/kolabUser.inc:309
+#: ../lib/modules/kolabUser.inc:779
 msgid "Country"
 msgstr "Land"
 
@@ -738,7 +747,7 @@ msgstr "Weiteren Account anlegen"
 msgid "Create group accounts"
 msgstr "Gruppen-Accounts anlegen"
 
-#: ../lib/modules/posixAccount.inc:945
+#: ../lib/modules/posixAccount.inc:936
 msgid "Create home directory"
 msgstr "Heimatverzeichnis anlegen"
 
@@ -782,7 +791,7 @@ 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:1605
 msgid "DN"
 msgstr "DN"
 
@@ -803,11 +812,11 @@ msgstr "DSML-Export für: %s"
 msgid "Data field for RDN is empty!"
 msgstr "Datenfeld für RDN ist leer!"
 
-#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:192
+#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:209
 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"
 
-#: ../lib/modules/sambaAccount.inc:370 ../lib/modules/sambaSamAccount.inc:194
+#: ../lib/modules/sambaAccount.inc:370 ../lib/modules/sambaSamAccount.inc:211
 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"
 
@@ -824,13 +833,13 @@ msgstr ""
 msgid "Default language"
 msgstr "Standardsprache"
 
-#: ../templates/masscreate.php:151 ../templates/masscreate.php:309
+#: ../templates/masscreate.php:151 ../templates/masscreate.php:310
 msgid "Default value"
 msgstr "Standardwert"
 
 #: ../lib/modules/kolabUser.inc:130 ../lib/modules/kolabUser.inc:134
-#: ../lib/modules/kolabUser.inc:194 ../lib/modules/kolabUser.inc:420
-#: ../lib/modules/kolabUser.inc:824
+#: ../lib/modules/kolabUser.inc:194 ../lib/modules/kolabUser.inc:413
+#: ../lib/modules/kolabUser.inc:817
 msgid "Delegates"
 msgstr "Vollmachten"
 
@@ -865,7 +874,7 @@ msgstr "Lösche Gruppe(n)"
 msgid "Delete Host(s)"
 msgstr "Lösche Host(s)"
 
-#: ../lib/modules/kolabUser.inc:429
+#: ../lib/modules/kolabUser.inc:422
 msgid "Delete Kolab account"
 msgstr "Lösche Kolab-Account"
 
@@ -882,7 +891,7 @@ msgstr "Alle %s-Objekte löschen"
 msgid "Delete domain(s)"
 msgstr "Lösche Domäne(n)"
 
-#: ../lib/modules/posixAccount.inc:991
+#: ../lib/modules/posixAccount.inc:982
 msgid "Delete home directory"
 msgstr "Heimatverzeichnis löschen"
 
@@ -936,28 +945,28 @@ 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:97 ../lib/modules/account.inc:220
-#: ../lib/modules/account.inc:233 ../lib/modules/posixGroup.inc:173
+#: ../lib/modules/account.inc:97 ../lib/modules/account.inc:211
+#: ../lib/modules/account.inc:224 ../lib/modules/posixGroup.inc:173
 #: ../lib/modules/posixGroup.inc:410 ../lib/modules/posixGroup.inc:453
-#: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:1138
+#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:1207
 #: ../lib/modules/posixAccount.inc:287 ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/sambaGroupMapping.inc:308
-#: ../lib/modules/shadowAccount.inc:320 ../lib/modules/inetOrgPerson.inc:140
-#: ../lib/modules/inetOrgPerson.inc:270 ../lib/modules/inetOrgPerson.inc:536
-#: ../lib/modules/inetOrgPerson.inc:690 ../lib/lists.inc:312
+#: ../lib/modules/sambaGroupMapping.inc:317
+#: ../lib/modules/shadowAccount.inc:311 ../lib/modules/inetOrgPerson.inc:140
+#: ../lib/modules/inetOrgPerson.inc:270 ../lib/modules/inetOrgPerson.inc:527
+#: ../lib/modules/inetOrgPerson.inc:681 ../lib/lists.inc:312
 msgid "Description"
 msgstr "Beschreibung"
 
 #: ../lib/modules/sambaAccount.inc:80 ../lib/modules/sambaAccount.inc:213
-#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaAccount.inc:699
-#: ../lib/modules/sambaAccount.inc:852 ../lib/modules/sambaSamAccount.inc:78
-#: ../lib/modules/sambaSamAccount.inc:158
-#: ../lib/modules/sambaSamAccount.inc:264
-#: ../lib/modules/sambaSamAccount.inc:758
-#: ../lib/modules/sambaSamAccount.inc:1130
-#: ../lib/modules/sambaGroupMapping.inc:169
-#: ../lib/modules/sambaGroupMapping.inc:274
-#: ../lib/modules/sambaGroupMapping.inc:306
+#: ../lib/modules/sambaAccount.inc:334 ../lib/modules/sambaAccount.inc:695
+#: ../lib/modules/sambaAccount.inc:848 ../lib/modules/sambaSamAccount.inc:95
+#: ../lib/modules/sambaSamAccount.inc:175
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:774
+#: ../lib/modules/sambaSamAccount.inc:1199
+#: ../lib/modules/sambaGroupMapping.inc:187
+#: ../lib/modules/sambaGroupMapping.inc:283
+#: ../lib/modules/sambaGroupMapping.inc:315
 msgid "Display name"
 msgstr "Anzeigename"
 
@@ -986,7 +995,7 @@ msgstr "Soll diese PDF-Struktur gelöscht werden?"
 msgid "Do you really want to delete this profile?"
 msgstr "Soll dieses Profil gelöscht werden?"
 
-#: ../lib/modules/kolabUser.inc:598
+#: ../lib/modules/kolabUser.inc:591
 msgid "Do you really want to mark this account for deletion?"
 msgstr "Soll dieser Account wirklich zum Löschen markiert werden?"
 
@@ -1000,61 +1009,61 @@ msgstr "Wollen Sie die Änderungen übernehmen?"
 
 #: ../lib/modules/sambaAccount.inc:171 ../lib/modules/sambaAccount.inc:315
 #: ../lib/modules/sambaAccount.inc:325 ../lib/modules/sambaAccount.inc:399
-#: ../lib/modules/sambaAccount.inc:802 ../lib/modules/sambaAccount.inc:858
-#: ../lib/modules/sambaSamAccount.inc:230
-#: ../lib/modules/sambaSamAccount.inc:257
-#: ../lib/modules/sambaSamAccount.inc:376
-#: ../lib/modules/sambaSamAccount.inc:857
-#: ../lib/modules/sambaSamAccount.inc:1059
-#: ../lib/modules/sambaSamAccount.inc:1078
-#: ../lib/modules/sambaSamAccount.inc:1137
+#: ../lib/modules/sambaAccount.inc:798 ../lib/modules/sambaAccount.inc:854
+#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:277
+#: ../lib/modules/sambaSamAccount.inc:403
+#: ../lib/modules/sambaSamAccount.inc:894
+#: ../lib/modules/sambaSamAccount.inc:1115
+#: ../lib/modules/sambaSamAccount.inc:1134
+#: ../lib/modules/sambaSamAccount.inc:1206
 #: ../lib/modules/sambaGroupMapping.inc:68
-#: ../lib/modules/sambaGroupMapping.inc:197
-#: ../lib/modules/sambaGroupMapping.inc:286
-#: ../lib/modules/sambaGroupMapping.inc:328
+#: ../lib/modules/sambaGroupMapping.inc:215
+#: ../lib/modules/sambaGroupMapping.inc:295
+#: ../lib/modules/sambaGroupMapping.inc:337
 msgid "Domain"
 msgstr "Domäne"
 
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaAccount.inc:310
-#: ../lib/modules/sambaSamAccount.inc:48
+#: ../lib/modules/sambaSamAccount.inc:65
 #: ../lib/modules/sambaGroupMapping.inc:55
-#: ../lib/modules/sambaGroupMapping.inc:259
+#: ../lib/modules/sambaGroupMapping.inc:268
 msgid "Domain Admins"
 msgstr "Domänenadministratoren"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
 #: ../lib/modules/sambaGroupMapping.inc:60
 msgid "Domain Certificate Admins"
 msgstr "Domänen-Zertifikats-Administratoren"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:547
-#: ../lib/modules/sambaSamAccount.inc:49
-#: ../lib/modules/sambaSamAccount.inc:547
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:543
+#: ../lib/modules/sambaSamAccount.inc:66
+#: ../lib/modules/sambaSamAccount.inc:561
 #: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain Computers"
 msgstr "Domänen-PCs"
 
-#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:49
+#: ../lib/modules/sambaAccount.inc:50 ../lib/modules/sambaSamAccount.inc:66
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain Controllers"
 msgstr "Domänencontroller"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
 #: ../lib/modules/sambaGroupMapping.inc:62
 msgid "Domain Enterprise Admins"
 msgstr "Domänen-Unternehmens-Administratoren"
 
 #: ../lib/modules/sambaGroupMapping.inc:67
-#: ../lib/modules/sambaGroupMapping.inc:189
+#: ../lib/modules/sambaGroupMapping.inc:207
 msgid "Domain Group"
 msgstr "Domänengruppe"
 
-#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:48
+#: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaSamAccount.inc:65
 #: ../lib/modules/sambaGroupMapping.inc:57
 msgid "Domain Guests"
 msgstr "Domänengäste"
 
-#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaAccount.inc:52 ../lib/modules/sambaSamAccount.inc:67
 #: ../lib/modules/sambaGroupMapping.inc:63
 msgid "Domain Policy Admins"
 msgstr "Domänen-Policy-Administratoren"
@@ -1064,7 +1073,7 @@ msgstr "Domänen-Policy-Administratoren"
 msgid "Domain SID"
 msgstr "Domänen-SID"
 
-#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:50
+#: ../lib/modules/sambaAccount.inc:51 ../lib/modules/sambaSamAccount.inc:67
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain Schema Admins"
 msgstr "Domänen-Schema-Administratoren"
@@ -1073,13 +1082,13 @@ msgstr "Domänen-Schema-Administratoren"
 msgid "Domain Settings"
 msgstr "Domäneneinstellungen"
 
-#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:48
-#: ../lib/modules/sambaSamAccount.inc:1381
+#: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
+#: ../lib/modules/sambaSamAccount.inc:1463
 #: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain Users"
 msgstr "Domänenbenutzer"
 
-#: ../lib/modules/sambaGroupMapping.inc:253
+#: ../lib/modules/sambaGroupMapping.inc:262
 msgid "Domain administrators"
 msgstr "Domänenadministratoren"
 
@@ -1124,11 +1133,11 @@ msgstr "Domänen"
 msgid "Down"
 msgstr "nach unten"
 
-#: ../templates/masscreate.php:263
+#: ../templates/masscreate.php:264
 msgid "Download sample CSV file"
 msgstr "Beispiel-CSV-Datei runterladen"
 
-#: ../lib/modules/sambaAccount.inc:373 ../lib/modules/sambaSamAccount.inc:197
+#: ../lib/modules/sambaAccount.inc:373 ../lib/modules/sambaSamAccount.inc:214
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr "Laufwerksbuchstabe, der als Heimatverzeichnis zugewiesen wird."
 
@@ -1156,20 +1165,20 @@ msgstr "EMail-Aliasliste"
 msgid "EMail alias list has invalid format!"
 msgstr "EMail-Aliasliste hat ungültiges Format!"
 
-#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:394
-#: ../lib/modules/kolabUser.inc:820
+#: ../lib/modules/kolabUser.inc:188 ../lib/modules/kolabUser.inc:387
+#: ../lib/modules/kolabUser.inc:813
 msgid "EMail aliases"
 msgstr "EMail-Aliase"
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:261
 msgid "East Australian Standard, Guam"
 msgstr "Ostaustralien, Guam"
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:258
 msgid "Eastern Europe Time, South Africa"
 msgstr "Osteuropäische Zeit, Südafrika"
 
-#: ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaSamAccount.inc:255
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "Eastern Time (USA & Kanada), Bogota"
 
@@ -1182,11 +1191,11 @@ msgstr "Editieren"
 msgid "Edit PDF structure"
 msgstr "PDF-Struktur ändern"
 
-#: ../lib/modules/posixAccount.inc:937
+#: ../lib/modules/posixAccount.inc:928
 msgid "Edit groups"
 msgstr "Gruppen ändern"
 
-#: ../lib/modules/sambaSamAccount.inc:863
+#: ../lib/modules/sambaSamAccount.inc:900
 msgid "Edit logon hours"
 msgstr "Anmeldezeiten ändern"
 
@@ -1202,13 +1211,13 @@ msgstr "Module ändern"
 msgid "Edit profile"
 msgstr "Profil ändern"
 
-#: ../lib/modules/sambaAccount.inc:767 ../lib/modules/sambaSamAccount.inc:821
+#: ../lib/modules/sambaAccount.inc:763 ../lib/modules/sambaSamAccount.inc:856
 msgid "Edit workstations"
 msgstr "Arbeitsstationen ändern"
 
 #: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:105
 #: ../lib/modules/inetOrgPerson.inc:152 ../lib/modules/inetOrgPerson.inc:286
-#: ../lib/modules/inetOrgPerson.inc:605 ../lib/modules/inetOrgPerson.inc:695
+#: ../lib/modules/inetOrgPerson.inc:596 ../lib/modules/inetOrgPerson.inc:686
 msgid "Employee type"
 msgstr "Angestelltentyp"
 
@@ -1216,7 +1225,7 @@ msgstr "Angestelltentyp"
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "Angestelltentyp: Angestellter, Extern, Aushilfskraft, ..."
 
-#: ../templates/login.php:309
+#: ../templates/login.php:314
 msgid "Empty password submitted. Please try again."
 msgstr "Das Passwort war leer. Bitte erneut eingeben."
 
@@ -1224,7 +1233,7 @@ msgstr "Das Passwort war leer. Bitte erneut eingeben."
 msgid "Encountered an error while performing search."
 msgstr "Die LDAP-Suche ist fehlgeschlagen."
 
-#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "Eniwetok, Kwajalein"
 msgstr "Eniwetok, Kwajalein"
 
@@ -1268,7 +1277,7 @@ msgid "Example"
 msgstr "Beispiel"
 
 #: ../templates/masscreate.php:150 ../templates/masscreate.php:164
-#: ../templates/masscreate.php:305
+#: ../templates/masscreate.php:306
 msgid "Example value"
 msgstr "Beispielwert"
 
@@ -1276,11 +1285,6 @@ msgstr "Beispielwert"
 msgid "Examples"
 msgstr "Beispiele"
 
-#: ../lib/modules/shadowAccount.inc:99 ../lib/modules/shadowAccount.inc:165
-#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/shadowAccount.inc:298
-msgid "Expiration date"
-msgstr "Ablaufdatum"
-
 #: ../templates/tree/edit.php:116 ../templates/tree/export_form.php:87
 #: ../templates/tree/export_form.php:95
 msgid "Export"
@@ -1314,11 +1318,11 @@ msgstr "Konnte Domäne nicht ändern!"
 
 #: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:200
 #: ../lib/modules/inetOrgPerson.inc:318 ../lib/modules/inetOrgPerson.inc:319
-#: ../lib/modules/inetOrgPerson.inc:590 ../lib/modules/inetOrgPerson.inc:703
+#: ../lib/modules/inetOrgPerson.inc:581 ../lib/modules/inetOrgPerson.inc:694
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: ../lib/modules/sambaSamAccount.inc:206
+#: ../lib/modules/sambaSamAccount.inc:223
 msgid ""
 "File name and path relative to netlogon-share which should be executed on "
 "logon. $user and $group are replaced with user and group name."
@@ -1349,8 +1353,8 @@ msgid "Filter"
 msgstr "Filtern"
 
 #: ../lib/modules/inetOrgPerson.inc:46 ../lib/modules/inetOrgPerson.inc:127
-#: ../lib/modules/inetOrgPerson.inc:278 ../lib/modules/inetOrgPerson.inc:522
-#: ../lib/modules/inetOrgPerson.inc:693 ../lib/lists.inc:307
+#: ../lib/modules/inetOrgPerson.inc:278 ../lib/modules/inetOrgPerson.inc:513
+#: ../lib/modules/inetOrgPerson.inc:684 ../lib/lists.inc:307
 msgid "First name"
 msgstr "Vorname"
 
@@ -1367,8 +1371,8 @@ msgid "For automatic invitation handling."
 msgstr "Regelt automatische Einladungen."
 
 #: ../lib/modules/kolabUser.inc:87 ../lib/modules/kolabUser.inc:154
-#: ../lib/modules/kolabUser.inc:200 ../lib/modules/kolabUser.inc:339
-#: ../lib/modules/kolabUser.inc:798
+#: ../lib/modules/kolabUser.inc:200 ../lib/modules/kolabUser.inc:332
+#: ../lib/modules/kolabUser.inc:791
 msgid "Free/Busy interval"
 msgstr "Frei/Besetzt-Intervall"
 
@@ -1376,15 +1380,15 @@ msgstr "Frei/Besetzt-Intervall"
 msgid "Free/Busy interval must be a number!"
 msgstr "Frei/Besetzt-Intervall muss eine Nummer sein!"
 
-#: ../lib/modules/sambaSamAccount.inc:917
+#: ../lib/modules/sambaSamAccount.inc:954
 msgid "Friday"
 msgstr "Freitag"
 
 #: ../lib/modules/posixGroup.inc:169 ../lib/modules/posixGroup.inc:376
 #: ../lib/modules/posixGroup.inc:406 ../lib/modules/posixGroup.inc:431
 #: ../lib/modules/posixGroup.inc:451 ../lib/modules/posixGroup.inc:471
-#: ../lib/modules/posixAccount.inc:48 ../lib/modules/posixAccount.inc:1158
-#: ../lib/modules/sambaGroupMapping.inc:304 ../lib/lists.inc:304
+#: ../lib/modules/posixAccount.inc:48 ../lib/modules/posixAccount.inc:1149
+#: ../lib/modules/sambaGroupMapping.inc:313 ../lib/lists.inc:304
 #: ../lib/lists.inc:318 ../lib/lists.inc:331
 msgid "GID number"
 msgstr "GID Nummer"
@@ -1417,12 +1421,12 @@ msgstr "GID-Bereiche für Unix-Gruppen"
 
 #: ../lib/modules/account.inc:73 ../lib/modules/posixAccount.inc:243
 #: ../lib/modules/posixAccount.inc:275 ../lib/modules/posixAccount.inc:345
-#: ../lib/modules/posixAccount.inc:391 ../lib/modules/posixAccount.inc:925
-#: ../lib/modules/posixAccount.inc:1159
+#: ../lib/modules/posixAccount.inc:391 ../lib/modules/posixAccount.inc:916
+#: ../lib/modules/posixAccount.inc:1150
 msgid "Gecos"
 msgstr "Gecos"
 
-#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:953
+#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:944
 msgid "Generate password"
 msgstr "Passwort generieren"
 
@@ -1435,7 +1439,7 @@ msgstr "Deutschland"
 msgid "Go"
 msgstr "Weiter"
 
-#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:323
+#: ../lib/modules/quota.inc:102 ../lib/modules/quota.inc:306
 msgid "Grace block period"
 msgstr "Block-Frist"
 
@@ -1449,7 +1453,7 @@ msgid ""
 "days."
 msgstr "Inode-Frist. Viele Dateisysteme verwenden ein festes Maximum von 7 Tagen."
 
-#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:327
+#: ../lib/modules/quota.inc:118 ../lib/modules/quota.inc:310
 msgid "Grace inode period"
 msgstr "Inode-Frist"
 
@@ -1528,7 +1532,7 @@ msgstr "Gruppenpasswort"
 msgid "Group profiles"
 msgstr "Gruppenprofile"
 
-#: ../lib/modules/sambaGroupMapping.inc:194
+#: ../lib/modules/sambaGroupMapping.inc:212
 msgid "Group type"
 msgstr "Gruppentyp"
 
@@ -1545,16 +1549,16 @@ msgstr "GruppenSuffix ist ungültig!"
 msgid "Groups"
 msgstr "Gruppen"
 
-#: ../lib/modules/quota.inc:457
+#: ../lib/modules/quota.inc:440
 msgid "Hard block"
 msgstr "hartes Block-Limit"
 
 #: ../lib/modules/quota.inc:98 ../lib/modules/quota.inc:99
-#: ../lib/modules/quota.inc:322 ../lib/modules/quota.inc:379
+#: ../lib/modules/quota.inc:305 ../lib/modules/quota.inc:362
 msgid "Hard block limit"
 msgstr "hartes Block-Limit"
 
-#: ../lib/modules/quota.inc:459
+#: ../lib/modules/quota.inc:442
 msgid "Hard inode"
 msgstr "hartes Inode-Limit"
 
@@ -1562,12 +1566,12 @@ msgstr "hartes Inode-Limit"
 msgid "Hard inode (files) limit"
 msgstr "Hartes Inode-Limit (Datein)"
 
-#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:326
-#: ../lib/modules/quota.inc:381
+#: ../lib/modules/quota.inc:114 ../lib/modules/quota.inc:309
+#: ../lib/modules/quota.inc:364
 msgid "Hard inode limit"
 msgstr "hartes Inode-Limit"
 
-#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "Hawaii"
 msgstr "Hawaii"
 
@@ -1583,7 +1587,7 @@ msgstr "Überschrift"
 #: ../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:292
+#: ../templates/masscreate.php:158 ../templates/masscreate.php:293
 #: ../templates/config/profmanage.php:183
 #: ../templates/config/profmanage.php:235
 #: ../templates/config/profmanage.php:265
@@ -1676,9 +1680,9 @@ 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:762
-#: ../lib/modules/posixAccount.inc:940 ../lib/modules/posixAccount.inc:1087
-#: ../lib/modules/posixAccount.inc:1162 ../lib/lists.inc:309
+#: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:753
+#: ../lib/modules/posixAccount.inc:931 ../lib/modules/posixAccount.inc:1078
+#: ../lib/modules/posixAccount.inc:1153 ../lib/lists.inc:309
 msgid "Home directory"
 msgstr "Heimatverzeichnis"
 
@@ -1692,30 +1696,30 @@ msgstr ""
 "Benutzer ausführen um das alte Verzeichnis zu ändern: 'mv %s %s'"
 
 #: ../lib/modules/sambaAccount.inc:140 ../lib/modules/sambaAccount.inc:271
-#: ../lib/modules/sambaAccount.inc:372 ../lib/modules/sambaAccount.inc:754
-#: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:322
-#: ../lib/modules/sambaSamAccount.inc:808
-#: ../lib/modules/sambaSamAccount.inc:1024
-#: ../lib/modules/sambaSamAccount.inc:1133
+#: ../lib/modules/sambaAccount.inc:372 ../lib/modules/sambaAccount.inc:750
+#: ../lib/modules/sambaAccount.inc:850 ../lib/modules/sambaSamAccount.inc:213
+#: ../lib/modules/sambaSamAccount.inc:349
+#: ../lib/modules/sambaSamAccount.inc:843
+#: ../lib/modules/sambaSamAccount.inc:1080
+#: ../lib/modules/sambaSamAccount.inc:1202
 msgid "Home drive"
 msgstr "Heimatlaufwerk"
 
 #: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaAccount.inc:62
 #: ../lib/modules/sambaAccount.inc:146 ../lib/modules/sambaAccount.inc:277
-#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaAccount.inc:757
-#: ../lib/modules/sambaAccount.inc:853 ../lib/modules/sambaSamAccount.inc:59
-#: ../lib/modules/sambaSamAccount.inc:60
-#: ../lib/modules/sambaSamAccount.inc:199
-#: ../lib/modules/sambaSamAccount.inc:328
-#: ../lib/modules/sambaSamAccount.inc:811
-#: ../lib/modules/sambaSamAccount.inc:1030
-#: ../lib/modules/sambaSamAccount.inc:1132
+#: ../lib/modules/sambaAccount.inc:375 ../lib/modules/sambaAccount.inc:753
+#: ../lib/modules/sambaAccount.inc:849 ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:77
+#: ../lib/modules/sambaSamAccount.inc:216
+#: ../lib/modules/sambaSamAccount.inc:355
+#: ../lib/modules/sambaSamAccount.inc:846
+#: ../lib/modules/sambaSamAccount.inc:1086
+#: ../lib/modules/sambaSamAccount.inc:1201
 msgid "Home path"
 msgstr "Heimatverzeichnis"
 
-#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:59
-#: ../lib/modules/sambaSamAccount.inc:61
+#: ../lib/modules/sambaAccount.inc:61 ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:78
 msgid "Home path is invalid."
 msgstr "Heimatverzeichnis ist ungültig."
 
@@ -1813,25 +1817,25 @@ msgstr "Hostsuffix ist ungültig!"
 msgid "Hosts"
 msgstr "Hosts"
 
-#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:612
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:709
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:602
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:700
 msgid "ID is already in use"
 msgstr "ID wird bereits verwendet"
 
 #: ../lib/modules/posixGroup.inc:472 ../lib/modules/posixGroup.inc:473
-#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:608
-#: ../lib/modules/posixGroup.inc:612 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixGroup.inc:598
+#: ../lib/modules/posixGroup.inc:602 ../lib/modules/posixAccount.inc:74
 #: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:705 ../lib/modules/posixAccount.inc:709
+#: ../lib/modules/posixAccount.inc:696 ../lib/modules/posixAccount.inc:700
 msgid "ID-Number"
 msgstr "ID-Nummer"
 
 #: ../templates/masscreate.php:149 ../templates/masscreate.php:162
-#: ../templates/masscreate.php:297
+#: ../templates/masscreate.php:298
 msgid "Identifier"
 msgstr "Bezeichner"
 
-#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:168
+#: ../lib/modules/sambaAccount.inc:344 ../lib/modules/sambaSamAccount.inc:185
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "Falls aktiviert wird das Unix-Passwort auch als Samba-Passwort verwendet."
 
@@ -1843,16 +1847,16 @@ msgstr ""
 "Falls angekreuzt wird der Account deaktiviert (es wird ein \"!\" vor das "
 "verschlüsselte Passwort gesetzt)."
 
-#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:186
+#: ../lib/modules/sambaAccount.inc:362 ../lib/modules/sambaSamAccount.inc:203
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr "Falls angekreuzt wird der Account deaktiviert. (D-Flag wird gesetzt)"
 
 #: ../lib/modules/posixGroup.inc:427 ../lib/modules/sambaAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:174 ../lib/modules/posixAccount.inc:362
+#: ../lib/modules/sambaSamAccount.inc:191 ../lib/modules/posixAccount.inc:362
 msgid "If checked no password will be used."
 msgstr "Falls angekreuzt wird kein Passwort verwendet."
 
-#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:180
+#: ../lib/modules/sambaAccount.inc:356 ../lib/modules/sambaSamAccount.inc:197
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "Falls angekreuzt läuft das Passwort nicht aus. (X-Flag wird gesetzt)"
 
@@ -1868,29 +1872,29 @@ msgstr ""
 msgid "If empty UID number will be generated automaticly."
 msgstr "Falls leer wird die UID-Nummer automatisch generiert."
 
-#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:171
+#: ../lib/modules/sambaAccount.inc:347 ../lib/modules/sambaSamAccount.inc:188
 msgid "If set to \"true\" Unix password will also be used as Samba password."
 msgstr ""
 "Falls auf \"true\" gesetzt wird das Unix-Passwort auch als Samba-Passwort "
 "verwendet."
 
-#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:189
+#: ../lib/modules/sambaAccount.inc:365 ../lib/modules/sambaSamAccount.inc:206
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "Falls auf \"true\" gesetzt wird der Account deaktiviert. (D-Flag wird "
 "gesetzt)"
 
-#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:177
+#: ../lib/modules/sambaAccount.inc:353 ../lib/modules/sambaSamAccount.inc:194
 msgid "If set to \"true\" no password will be used."
 msgstr "Falls auf \"true\" gesetzt wird kein Passwort verwendet."
 
-#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:183
+#: ../lib/modules/sambaAccount.inc:359 ../lib/modules/sambaSamAccount.inc:200
 msgid "If set to \"true\" password does not expire. (Setting X-Flag)"
 msgstr ""
 "Falls auf \"true\" gesetzt läuft das Passwort nicht aus. (X-Flag wird "
 "gesetzt)"
 
-#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:242
 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 "
@@ -1915,7 +1919,7 @@ msgstr ""
 "möchten verwenden Sie bitte diese Option."
 
 #: ../lib/modules/sambaAccount.inc:391
-#: ../lib/modules/sambaGroupMapping.inc:279
+#: ../lib/modules/sambaGroupMapping.inc:288
 msgid "If you want to use a well known RID you can selcet a well known group."
 msgstr ""
 "Wenn Sie eine vordefinierte RID verwenden wollen, wählen Sie eine der "
@@ -1966,16 +1970,16 @@ msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "Das weiche Inode-Quota muss kleiner sein als das harte Inode-Quota."
 
 #: ../lib/modules/sambaAccount.inc:62 ../lib/modules/sambaAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:60
+#: ../lib/modules/sambaSamAccount.inc:77
 msgid "Inserted user or group name in home path."
 msgstr "Benutzer- oder Gruppenname wurde in Heimatverzeichnis eingefügt."
 
-#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:66
+#: ../lib/modules/sambaAccount.inc:68 ../lib/modules/sambaSamAccount.inc:83
 msgid "Inserted user or group name in logon script."
 msgstr "Benutzer- oder Gruppenname wurde in Anmeldeskript eingefügt."
 
 #: ../lib/modules/sambaAccount.inc:65 ../lib/modules/sambaAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:63
+#: ../lib/modules/sambaSamAccount.inc:80
 msgid "Inserted user or group name in profile path."
 msgstr "Benutzer- oder Gruppenname wurde in Profilpfad eingefügt."
 
@@ -1988,7 +1992,7 @@ msgid "Invalid RDN attribute!"
 msgstr "Ungültiges RDN-Attribut!"
 
 #: ../lib/modules/posixGroup.inc:200 ../lib/modules/posixAccount.inc:369
-#: ../lib/modules/posixAccount.inc:969
+#: ../lib/modules/posixAccount.inc:960
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
@@ -1997,7 +2001,7 @@ msgid "Invalid/Missing Message type"
 msgstr "Ungültiger/Fehlender Nachrichtentyp"
 
 #: ../lib/modules/kolabUser.inc:122 ../lib/modules/kolabUser.inc:169
-#: ../lib/modules/kolabUser.inc:377 ../lib/modules/kolabUser.inc:810
+#: ../lib/modules/kolabUser.inc:370 ../lib/modules/kolabUser.inc:803
 msgid "Invitation policy"
 msgstr "Einladungsregeln"
 
@@ -2005,7 +2009,7 @@ msgstr "Einladungsregeln"
 msgid "Invitation policy list"
 msgstr "Liste der Einladungsregeln"
 
-#: ../lib/modules/sambaSamAccount.inc:242
+#: ../lib/modules/sambaSamAccount.inc:259
 msgid "Islamabad, Karachi"
 msgstr "Islamabad, Karachi"
 
@@ -2022,7 +2026,7 @@ msgstr ""
 
 #: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:101
 #: ../lib/modules/inetOrgPerson.inc:146 ../lib/modules/inetOrgPerson.inc:274
-#: ../lib/modules/inetOrgPerson.inc:601 ../lib/modules/inetOrgPerson.inc:692
+#: ../lib/modules/inetOrgPerson.inc:592 ../lib/modules/inetOrgPerson.inc:683
 msgid "Job title"
 msgstr "Berufsbezeichnung"
 
@@ -2082,11 +2086,11 @@ msgstr ""
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM konnte den Account %s nicht anlegen! Ein LDAP-Fehler trat auf."
 
-#: ../lib/modules/sambaGroupMapping.inc:357
+#: ../lib/modules/sambaGroupMapping.inc:366
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAM konnte keine Samba 3 Domäne mit diesem Namen finden!"
 
-#: ../lib/modules/sambaSamAccount.inc:86
+#: ../lib/modules/sambaSamAccount.inc:104
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM konnte keine Domäne mit diesem Namen finden!"
 
@@ -2094,7 +2098,7 @@ msgstr "LAM konnte keine Domäne mit diesem Namen finden!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM konnte keine Gruppe mit diesem Namen finden!"
 
-#: ../lib/modules/posixAccount.inc:1521
+#: ../lib/modules/posixAccount.inc:1512
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM konnte die Gruppenzugehörigkeiten für Gruppe %s nicht ändern."
@@ -2117,7 +2121,7 @@ msgstr "LDAP Listeneinstellungen"
 msgid "LDAP Search failed! Please check your preferences."
 msgstr "LDAP Suche fehlgeschlagen! Bitte überprüfen Sie die Einstellungen."
 
-#: ../templates/login.php:351
+#: ../templates/login.php:356
 msgid "LDAP error, server says:"
 msgstr "LDAP-Fehler, der Server meldet:"
 
@@ -2125,7 +2129,7 @@ msgstr "LDAP-Fehler, der Server meldet:"
 msgid "LDAP operation successful."
 msgstr "LDAP-Operation war erfolgreich."
 
-#: ../templates/login.php:246
+#: ../templates/login.php:251
 msgid "LDAP server"
 msgstr "LDAP-Server"
 
@@ -2153,7 +2157,7 @@ msgstr "LDAP-Upload läuft. Bitte warten."
 msgid "LDIF Export for: %s"
 msgstr "LDIF-Export für: %s"
 
-#: ../templates/login.php:195
+#: ../templates/login.php:200
 msgid "Language"
 msgstr "Sprache"
 
@@ -2166,8 +2170,8 @@ msgid "Language settings"
 msgstr "Spacheinstellungen"
 
 #: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:133
-#: ../lib/modules/inetOrgPerson.inc:282 ../lib/modules/inetOrgPerson.inc:526
-#: ../lib/modules/inetOrgPerson.inc:694 ../lib/lists.inc:308
+#: ../lib/modules/inetOrgPerson.inc:282 ../lib/modules/inetOrgPerson.inc:517
+#: ../lib/modules/inetOrgPerson.inc:685 ../lib/lists.inc:308
 msgid "Last name"
 msgstr "Nachname"
 
@@ -2179,7 +2183,7 @@ msgstr "Nachname enthält ungültige Zeichen!"
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "Nachname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
 
-#: ../lib/modules/shadowAccount.inc:316
+#: ../lib/modules/shadowAccount.inc:307
 msgid "Last password change"
 msgstr "Letzte Passwortänderung"
 
@@ -2191,7 +2195,7 @@ msgstr "Zeilenenden"
 msgid "List attributes"
 msgstr "Attribute der Listen"
 
-#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:209
+#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:226
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -2220,29 +2224,29 @@ msgid "Local Group"
 msgstr "Lokale Gruppe"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:60
-#: ../lib/modules/inetLocalMailRecipient.inc:206
+#: ../lib/modules/inetLocalMailRecipient.inc:199
 msgid "Local address"
 msgstr "Lokale Adresse"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:64
 #: ../lib/modules/inetLocalMailRecipient.inc:97
-#: ../lib/modules/inetLocalMailRecipient.inc:366
+#: ../lib/modules/inetLocalMailRecipient.inc:359
 msgid "Local address list"
 msgstr "Liste von lokalen Adressen"
 
 #: ../lib/modules/posixGroup.inc:205 ../lib/modules/posixAccount.inc:235
-#: ../lib/modules/posixAccount.inc:974 ../lib/modules/posixAccount.inc:1099
+#: ../lib/modules/posixAccount.inc:965 ../lib/modules/posixAccount.inc:1090
 msgid "Lock password"
 msgstr "Passwort deaktivieren"
 
-#: ../templates/login.php:221 ../templates/config/conflogin.php:68
+#: ../templates/login.php:226 ../templates/config/conflogin.php:68
 #: ../help/help.inc:45
 msgid "Login"
 msgstr "Login"
 
 #: ../lib/modules/posixAccount.inc:221 ../lib/modules/posixAccount.inc:373
-#: ../lib/modules/posixAccount.inc:980 ../lib/modules/posixAccount.inc:1091
-#: ../lib/modules/posixAccount.inc:1164 ../lib/lists.inc:310
+#: ../lib/modules/posixAccount.inc:971 ../lib/modules/posixAccount.inc:1082
+#: ../lib/modules/posixAccount.inc:1155 ../lib/lists.inc:310
 msgid "Login shell"
 msgstr "Login Shell"
 
@@ -2250,30 +2254,30 @@ msgstr "Login Shell"
 msgid "Logo"
 msgstr "Logo"
 
-#: ../lib/modules/sambaSamAccount.inc:87
-#: ../lib/modules/sambaSamAccount.inc:233
-#: ../lib/modules/sambaSamAccount.inc:247
-#: ../lib/modules/sambaSamAccount.inc:366
-#: ../lib/modules/sambaSamAccount.inc:862
-#: ../lib/modules/sambaSamAccount.inc:1065
+#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:264
+#: ../lib/modules/sambaSamAccount.inc:393
+#: ../lib/modules/sambaSamAccount.inc:899
+#: ../lib/modules/sambaSamAccount.inc:1121
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:68
 #: ../lib/modules/sambaAccount.inc:158 ../lib/modules/sambaAccount.inc:289
-#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:763
-#: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:65
-#: ../lib/modules/sambaSamAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:205
-#: ../lib/modules/sambaSamAccount.inc:340
-#: ../lib/modules/sambaSamAccount.inc:817
-#: ../lib/modules/sambaSamAccount.inc:1042
-#: ../lib/modules/sambaSamAccount.inc:1134
+#: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:759
+#: ../lib/modules/sambaAccount.inc:851 ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaSamAccount.inc:83
+#: ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:367
+#: ../lib/modules/sambaSamAccount.inc:852
+#: ../lib/modules/sambaSamAccount.inc:1098
+#: ../lib/modules/sambaSamAccount.inc:1203
 msgid "Logon script"
 msgstr "Anmeldeskript"
 
 #: ../lib/modules/sambaAccount.inc:67 ../lib/modules/sambaAccount.inc:69
-#: ../lib/modules/sambaSamAccount.inc:65 ../lib/modules/sambaSamAccount.inc:67
+#: ../lib/modules/sambaSamAccount.inc:82 ../lib/modules/sambaSamAccount.inc:84
 msgid "Logon script is invalid!"
 msgstr "Anmeldeskript ist ungültig!"
 
@@ -2282,7 +2286,7 @@ msgid "Logout"
 msgstr "Abmelden"
 
 #: ../lib/modules/ieee802device.inc:50 ../lib/modules/ieee802device.inc:56
-#: ../lib/modules/ieee802device.inc:67 ../lib/modules/ieee802device.inc:144
+#: ../lib/modules/ieee802device.inc:67 ../lib/modules/ieee802device.inc:137
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -2290,11 +2294,11 @@ msgstr "MAC-Adresse"
 msgid "MAC address list"
 msgstr "Liste von MAC-Adressen"
 
-#: ../lib/modules/ieee802device.inc:259
+#: ../lib/modules/ieee802device.inc:252
 msgid "MAC address(es)"
 msgstr "MAC-Adresse(n)"
 
-#: ../lib/modules/sambaSamAccount.inc:245
+#: ../lib/modules/sambaSamAccount.inc:262
 msgid "Magadan, Solomon Islands"
 msgstr "Magadan, Solomon-Inseln"
 
@@ -2303,8 +2307,8 @@ msgid "Mail aliases"
 msgstr "Mail-Aliase"
 
 #: ../lib/modules/kolabUser.inc:91 ../lib/modules/kolabUser.inc:158
-#: ../lib/modules/kolabUser.inc:206 ../lib/modules/kolabUser.inc:334
-#: ../lib/modules/kolabUser.inc:794
+#: ../lib/modules/kolabUser.inc:206 ../lib/modules/kolabUser.inc:327
+#: ../lib/modules/kolabUser.inc:787
 msgid "Mail quota"
 msgstr "Mail-Quota"
 
@@ -2320,14 +2324,14 @@ msgstr "Mail-Routing"
 #: ../lib/modules/inetLocalMailRecipient.inc:68
 #: ../lib/modules/inetLocalMailRecipient.inc:74
 #: ../lib/modules/inetLocalMailRecipient.inc:103
-#: ../lib/modules/inetLocalMailRecipient.inc:200
-#: ../lib/modules/inetLocalMailRecipient.inc:369
+#: ../lib/modules/inetLocalMailRecipient.inc:193
+#: ../lib/modules/inetLocalMailRecipient.inc:362
 msgid "Mail server"
 msgstr "Mailserver"
 
 #: ../lib/modules/kolabUser.inc:150 ../lib/modules/kolabUser.inc:181
-#: ../lib/modules/kolabUser.inc:322 ../lib/modules/kolabUser.inc:328
-#: ../lib/modules/kolabUser.inc:790
+#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:321
+#: ../lib/modules/kolabUser.inc:783
 msgid "Mailbox home server"
 msgstr "Mailserver"
 
@@ -2353,7 +2357,7 @@ msgid "Manage profiles"
 msgstr "Profile verwalten"
 
 #: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:632 ../lib/modules/inetOrgPerson.inc:696
+#: ../lib/modules/inetOrgPerson.inc:623 ../lib/modules/inetOrgPerson.inc:687
 msgid "Manager"
 msgstr "Vorgesetzter"
 
@@ -2373,7 +2377,7 @@ msgstr "Manuell"
 msgid "Manual if conflicts"
 msgstr "Manuell bei Konflikten"
 
-#: ../lib/modules/kolabUser.inc:426 ../lib/modules/kolabUser.inc:602
+#: ../lib/modules/kolabUser.inc:419 ../lib/modules/kolabUser.inc:595
 msgid "Mark account for deletion"
 msgstr "Account als gelöscht markieren"
 
@@ -2463,15 +2467,15 @@ msgid "Maximum list entries"
 msgstr "Maximale Listeneinträge"
 
 #: ../lib/modules/shadowAccount.inc:94 ../lib/modules/shadowAccount.inc:161
-#: ../lib/modules/shadowAccount.inc:191 ../lib/modules/shadowAccount.inc:291
+#: ../lib/modules/shadowAccount.inc:191 ../lib/modules/shadowAccount.inc:282
 msgid "Maximum password age"
 msgstr "Maximales Passwortalter"
 
-#: ../lib/modules/sambaSamAccount.inc:239
+#: ../lib/modules/sambaSamAccount.inc:256
 msgid "Mid-Atlantic"
 msgstr "Mittelatlantik"
 
-#: ../lib/modules/sambaSamAccount.inc:236
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid "Midway Island, Samoa"
 msgstr "Midway Island, Samoa"
 
@@ -2509,13 +2513,13 @@ msgid "Minimum UID number is invalid!"
 msgstr "Minimale UID-Nummer ist ungültig!"
 
 #: ../lib/modules/shadowAccount.inc:89 ../lib/modules/shadowAccount.inc:157
-#: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:288
+#: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:279
 msgid "Minimum password age"
 msgstr "Minimales Passwortalter"
 
 #: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:194
 #: ../lib/modules/inetOrgPerson.inc:314 ../lib/modules/inetOrgPerson.inc:315
-#: ../lib/modules/inetOrgPerson.inc:586 ../lib/modules/inetOrgPerson.inc:702
+#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:693
 msgid "Mobile number"
 msgstr "Mobil"
 
@@ -2531,16 +2535,16 @@ msgstr "Modulauswahl"
 msgid "Module settings"
 msgstr "Moduleinstellungen"
 
-#: ../lib/modules/sambaSamAccount.inc:916
+#: ../lib/modules/sambaSamAccount.inc:953
 msgid "Monday"
 msgstr "Montag"
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "Mountain Time (US & Canada)"
 msgstr "Mountain Time (USA & Kanada)"
 
-#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:319
-#: ../lib/modules/quota.inc:377 ../lib/modules/quota.inc:455
+#: ../lib/modules/quota.inc:86 ../lib/modules/quota.inc:302
+#: ../lib/modules/quota.inc:360 ../lib/modules/quota.inc:438
 msgid "Mountpoint"
 msgstr "Mountpunkt"
 
@@ -2584,7 +2588,7 @@ msgstr "Neue Gruppe"
 msgid "New Host"
 msgstr "Neuer Host"
 
-#: ../lib/modules/ieee802device.inc:151
+#: ../lib/modules/ieee802device.inc:144
 msgid "New MAC address"
 msgstr "Neue MAC-Adresse"
 
@@ -2601,7 +2605,7 @@ msgstr "Neues Passwort"
 msgid "New default profile set successfully."
 msgstr "Neues Standardprofil wurde erfolgreich gesetzt."
 
-#: ../lib/modules/inetLocalMailRecipient.inc:213
+#: ../lib/modules/inetLocalMailRecipient.inc:206
 msgid "New local address"
 msgstr "Neue lokale Adresse"
 
@@ -2624,7 +2628,7 @@ msgstr "Neue Organizational Unit"
 msgid "New password set successfully."
 msgstr "Neues Passwort wurde erfolgreich gesetzt."
 
-#: ../lib/modules/nisMailAlias.inc:185
+#: ../lib/modules/nisMailAlias.inc:178
 msgid "New recipient"
 msgstr "Neuer Empfänger"
 
@@ -2687,14 +2691,23 @@ msgstr "Nächste Benutzer-RID ist keine Zahl!"
 msgid "No"
 msgstr "Nein"
 
+#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:511
+#: ../lib/modules/sambaSamAccount.inc:757
+#: ../lib/modules/sambaGroupMapping.inc:88
+#: ../lib/modules/sambaGroupMapping.inc:173
+#: ../lib/modules/sambaGroupMapping.inc:398
+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:415 ../lib/modules/posixAccount.inc:629
-#: ../lib/modules/posixAccount.inc:906
+#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:620
+#: ../lib/modules/posixAccount.inc:897
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "Keine Unix-Gruppen gefunden, bitte erstellen Sie eine."
 
@@ -2831,7 +2844,7 @@ msgstr "OU-Editor"
 msgid "Object classes"
 msgstr "Objektklassen"
 
-#: ../lib/modules.inc:1085 ../lib/modules.inc:1123 ../lib/modules.inc:1241
+#: ../lib/modules.inc:1085 ../lib/modules.inc:1123 ../lib/modules.inc:1220
 #, php-format
 msgid "ObjectClass %s required but not defined in LDAP."
 msgstr "Objektklasse %s wird benötigt, wurde aber nicht in LDAP gefunden."
@@ -2890,7 +2903,7 @@ msgstr "PDF-Strukturen"
 msgid "PDF-structure name not valid"
 msgstr "PDF-Strukturname ist nicht gültig"
 
-#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "Pacific Time (US & Canada)"
 msgstr "Pacific Time (USA & Kanada)"
 
@@ -2902,20 +2915,20 @@ msgstr "Seiteneinstellungen"
 msgid "Parent to"
 msgstr "Elter von"
 
-#: ../templates/login.php:185 ../lib/modules/posixGroup.inc:182
+#: ../templates/login.php:190 ../lib/modules/posixGroup.inc:182
 #: ../lib/modules/posixGroup.inc:192 ../lib/modules/posixGroup.inc:276
 #: ../lib/modules/posixGroup.inc:468 ../lib/modules/posixGroup.inc:469
 #: ../lib/modules/posixGroup.inc:470 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:70 ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:270 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:290 ../lib/modules/posixAccount.inc:78
 #: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
 #: ../lib/modules/posixAccount.inc:229 ../lib/modules/posixAccount.inc:357
-#: ../lib/modules/posixAccount.inc:951 ../lib/modules/posixAccount.inc:961
-#: ../lib/modules/posixAccount.inc:1052 ../lib/modules/posixAccount.inc:1163
+#: ../lib/modules/posixAccount.inc:942 ../lib/modules/posixAccount.inc:952
+#: ../lib/modules/posixAccount.inc:1043 ../lib/modules/posixAccount.inc:1154
 #: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
-#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:548
-#: ../lib/modules/inetOrgPerson.inc:559 ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:539
+#: ../lib/modules/inetOrgPerson.inc:550 ../lib/modules/inetOrgPerson.inc:660
 msgid "Password"
 msgstr "Passwort"
 
@@ -2924,8 +2937,8 @@ msgid "Password changed!"
 msgstr "Passwort geändert!"
 
 #: ../lib/modules/posixGroup.inc:469 ../lib/modules/sambaAccount.inc:75
-#: ../lib/modules/sambaAccount.inc:76 ../lib/modules/sambaSamAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:72 ../lib/modules/posixAccount.inc:79
+#: ../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
 #: ../lib/modules/inetOrgPerson.inc:76
 msgid ""
@@ -2937,17 +2950,17 @@ msgstr ""
 
 #: ../lib/modules/sambaAccount.inc:126 ../lib/modules/sambaAccount.inc:241
 #: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaAccount.inc:358
-#: ../lib/modules/sambaAccount.inc:728 ../lib/modules/sambaSamAccount.inc:179
-#: ../lib/modules/sambaSamAccount.inc:182
-#: ../lib/modules/sambaSamAccount.inc:292
-#: ../lib/modules/sambaSamAccount.inc:782
-#: ../lib/modules/sambaSamAccount.inc:1010
+#: ../lib/modules/sambaAccount.inc:724 ../lib/modules/sambaSamAccount.inc:196
+#: ../lib/modules/sambaSamAccount.inc:199
+#: ../lib/modules/sambaSamAccount.inc:312
+#: ../lib/modules/sambaSamAccount.inc:803
+#: ../lib/modules/sambaSamAccount.inc:1061
 msgid "Password does not expire"
 msgstr "Passwort läuft nicht ab"
 
 #: ../lib/modules/shadowAccount.inc:49 ../lib/modules/shadowAccount.inc:84
 #: ../lib/modules/shadowAccount.inc:153 ../lib/modules/shadowAccount.inc:179
-#: ../lib/modules/shadowAccount.inc:285 ../lib/modules/shadowAccount.inc:319
+#: ../lib/modules/shadowAccount.inc:276 ../lib/modules/shadowAccount.inc:310
 msgid "Password expiration"
 msgstr "Passwortablauf"
 
@@ -2990,7 +3003,7 @@ msgstr "Minimales Passwortalter muss eine natürliche Zahl sein."
 
 #: ../lib/modules/shadowAccount.inc:51 ../lib/modules/shadowAccount.inc:79
 #: ../lib/modules/shadowAccount.inc:149 ../lib/modules/shadowAccount.inc:173
-#: ../lib/modules/shadowAccount.inc:282 ../lib/modules/shadowAccount.inc:317
+#: ../lib/modules/shadowAccount.inc:273 ../lib/modules/shadowAccount.inc:308
 msgid "Password warning"
 msgstr "Passwortwarnung"
 
@@ -3002,7 +3015,7 @@ msgstr "Passwortwarnung muss eine natürliche Zahl sein."
 msgid "Passwords are different!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
-#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:203
+#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:220
 msgid ""
 "Path of the user profile. Can be a local absolute path or a UNC-path (\\"
 "\\server\\share). $user and $group are replaced with user and group name."
@@ -3027,7 +3040,7 @@ msgstr "Persönlich"
 msgid "Please confirm:"
 msgstr "Bitte bestätigen:"
 
-#: ../lib/modules/sambaSamAccount.inc:75
+#: ../lib/modules/sambaSamAccount.inc:92
 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!"
 
@@ -3040,11 +3053,11 @@ msgstr ""
 "anmelden darf. Kann leer sein."
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:71
-#: ../lib/modules/sambaSamAccount.inc:68 ../lib/modules/sambaSamAccount.inc:69
+#: ../lib/modules/sambaSamAccount.inc:85 ../lib/modules/sambaSamAccount.inc:86
 msgid "Please enter a comma separated list of host names!"
 msgstr "Bitte geben Sie eine Liste von Hostnamen, getrennt durch Kommata, ein!"
 
-#: ../lib/modules/kolabUser.inc:298 ../lib/modules/kolabUser.inc:301
+#: ../lib/modules/kolabUser.inc:291 ../lib/modules/kolabUser.inc:294
 #, php-format
 msgid "Please enter a user password on this page: %s"
 msgstr "Bitte geben Sie ein Passwort auf dieser Seite ein: %s"
@@ -3055,16 +3068,18 @@ msgid "Please enter a valid common name!"
 msgstr "Bitte geben Sie einen gültigen allgemeinen Namen ein!"
 
 #: ../lib/modules/sambaAccount.inc:85 ../lib/modules/sambaAccount.inc:86
-#: ../lib/modules/sambaSamAccount.inc:83 ../lib/modules/sambaSamAccount.inc:84
+#: ../lib/modules/sambaSamAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:101
+#: ../lib/modules/sambaSamAccount.inc:102
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "Bitte geben Sie ein gültiges Datum im Format TT-MM-JJJJ ein."
 
 #: ../lib/modules/sambaAccount.inc:79 ../lib/modules/sambaAccount.inc:80
-#: ../lib/modules/sambaSamAccount.inc:77 ../lib/modules/sambaSamAccount.inc:78
+#: ../lib/modules/sambaSamAccount.inc:94 ../lib/modules/sambaSamAccount.inc:95
 msgid "Please enter a valid display name!"
 msgstr "Bitte geben Sie einen gültigen Anzeigenamen ein!"
 
-#: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaAccount.inc:87 ../lib/modules/sambaSamAccount.inc:103
 msgid "Please enter a valid drive letter."
 msgstr "Bitte geben Sie einen gültigen Laufwerksbuchstaben ein."
 
@@ -3084,7 +3099,7 @@ msgstr "Bitte geben Sie eine gültige Faxnummer ein!"
 msgid "Please enter a valid group RID."
 msgstr "Bitte geben Sie eine gültige Gruppen-RID ein."
 
-#: ../lib/modules/sambaSamAccount.inc:89
+#: ../lib/modules/sambaSamAccount.inc:107
 msgid "Please enter a valid group name!"
 msgstr "Bitte geben Sie einen gültigen Gruppennamen ein!"
 
@@ -3116,12 +3131,12 @@ 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:608 ../lib/modules/posixAccount.inc:705
+#: ../lib/modules/posixGroup.inc:598 ../lib/modules/posixAccount.inc:696
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "Bitte geben Sie einen Wert zwischen %s und %s ein!"
 
-#: ../lib/modules/kolabUser.inc:305
+#: ../lib/modules/kolabUser.inc:298
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "Bitte geben Sie eine e-mail Adresse auf dieser Seite ein: %s"
@@ -3192,7 +3207,7 @@ 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:468 ../lib/modules/sambaAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:70
+#: ../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."
 
@@ -3224,7 +3239,7 @@ msgstr "Bitte Seite wählen:"
 msgid "Please select your account type:"
 msgstr "Bitte Accounttyp wählen:"
 
-#: ../templates/login.php:158
+#: ../templates/login.php:163
 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"
 
@@ -3247,20 +3262,20 @@ msgstr "Regelliste hat ungültiges Format!"
 msgid "Position"
 msgstr "Position"
 
-#: ../templates/masscreate.php:163 ../templates/masscreate.php:301
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../templates/masscreate.php:163 ../templates/masscreate.php:302
+#: ../lib/modules/sambaGroupMapping.inc:367
 msgid "Possible values"
 msgstr "Mögliche Werte"
 
 #: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:298
-#: ../lib/modules/inetOrgPerson.inc:299 ../lib/modules/inetOrgPerson.inc:570
-#: ../lib/modules/inetOrgPerson.inc:698
+#: ../lib/modules/inetOrgPerson.inc:299 ../lib/modules/inetOrgPerson.inc:561
+#: ../lib/modules/inetOrgPerson.inc:689
 msgid "Post office box"
 msgstr "Postfach"
 
 #: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:176
-#: ../lib/modules/inetOrgPerson.inc:306 ../lib/modules/inetOrgPerson.inc:578
-#: ../lib/modules/inetOrgPerson.inc:700
+#: ../lib/modules/inetOrgPerson.inc:306 ../lib/modules/inetOrgPerson.inc:569
+#: ../lib/modules/inetOrgPerson.inc:691
 msgid "Postal address"
 msgstr "Anschrift"
 
@@ -3270,7 +3285,7 @@ msgstr "Bitte geben Sie hier die Anschrift ein."
 
 #: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:170
 #: ../lib/modules/inetOrgPerson.inc:302 ../lib/modules/inetOrgPerson.inc:303
-#: ../lib/modules/inetOrgPerson.inc:574 ../lib/modules/inetOrgPerson.inc:699
+#: ../lib/modules/inetOrgPerson.inc:565 ../lib/modules/inetOrgPerson.inc:690
 msgid "Postal code"
 msgstr "Postleitzahl"
 
@@ -3285,8 +3300,8 @@ msgstr "Präsident"
 #: ../lib/modules/posixGroup.inc:484 ../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:930 ../lib/modules/posixAccount.inc:1078
-#: ../lib/modules/posixAccount.inc:1106 ../lib/modules/posixAccount.inc:1160
+#: ../lib/modules/posixAccount.inc:921 ../lib/modules/posixAccount.inc:1069
+#: ../lib/modules/posixAccount.inc:1097 ../lib/modules/posixAccount.inc:1151
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
@@ -3328,19 +3343,19 @@ msgstr "Die Passwörter stimmen nicht überein!"
 
 #: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaAccount.inc:65
 #: ../lib/modules/sambaAccount.inc:152 ../lib/modules/sambaAccount.inc:283
-#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:760
-#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:62
-#: ../lib/modules/sambaSamAccount.inc:63
-#: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:334
-#: ../lib/modules/sambaSamAccount.inc:814
-#: ../lib/modules/sambaSamAccount.inc:1036
-#: ../lib/modules/sambaSamAccount.inc:1135
+#: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:756
+#: ../lib/modules/sambaAccount.inc:852 ../lib/modules/sambaSamAccount.inc:79
+#: ../lib/modules/sambaSamAccount.inc:80
+#: ../lib/modules/sambaSamAccount.inc:219
+#: ../lib/modules/sambaSamAccount.inc:361
+#: ../lib/modules/sambaSamAccount.inc:849
+#: ../lib/modules/sambaSamAccount.inc:1092
+#: ../lib/modules/sambaSamAccount.inc:1204
 msgid "Profile path"
 msgstr "Profilpfad"
 
-#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:62
-#: ../lib/modules/sambaSamAccount.inc:64
+#: ../lib/modules/sambaAccount.inc:64 ../lib/modules/sambaSamAccount.inc:79
+#: ../lib/modules/sambaSamAccount.inc:81
 msgid "Profile path is invalid!"
 msgstr "Profilpfad ist ungültig!"
 
@@ -3352,7 +3367,7 @@ msgstr "Profil wurde gespeichert."
 msgid "Quota"
 msgstr "Quota"
 
-#: ../lib/modules/quota.inc:500
+#: ../lib/modules/quota.inc:486
 msgid "Quota for:"
 msgstr "Quota für:"
 
@@ -3381,12 +3396,12 @@ msgstr "Soll diese neue OU erstellt werden?"
 msgid "Really delete attribute?"
 msgstr "Dieses Attribut wirklich löschen?"
 
-#: ../lib/modules/nisMailAlias.inc:66 ../lib/modules/nisMailAlias.inc:178
+#: ../lib/modules/nisMailAlias.inc:66 ../lib/modules/nisMailAlias.inc:171
 msgid "Recipient"
 msgstr "Empfänger"
 
 #: ../lib/modules/nisMailAlias.inc:70 ../lib/modules/nisMailAlias.inc:84
-#: ../lib/modules/nisMailAlias.inc:331
+#: ../lib/modules/nisMailAlias.inc:324
 msgid "Recipient list"
 msgstr "Empfängerliste"
 
@@ -3420,11 +3435,11 @@ msgstr "Ablehnen bei Konflikten"
 msgid "Relative distinguished name"
 msgstr "Relativer eindeutiger Name"
 
-#: ../templates/pdfedit/pdfpage.php:474 ../lib/modules/ieee802device.inc:146
-#: ../lib/modules/kolabUser.inc:366 ../lib/modules/kolabUser.inc:385
-#: ../lib/modules/kolabUser.inc:411
-#: ../lib/modules/inetLocalMailRecipient.inc:208
-#: ../lib/modules/nisMailAlias.inc:180
+#: ../templates/pdfedit/pdfpage.php:474 ../lib/modules/ieee802device.inc:139
+#: ../lib/modules/kolabUser.inc:359 ../lib/modules/kolabUser.inc:378
+#: ../lib/modules/kolabUser.inc:404
+#: ../lib/modules/inetLocalMailRecipient.inc:201
+#: ../lib/modules/nisMailAlias.inc:173
 msgid "Remove"
 msgstr "Löschen"
 
@@ -3437,13 +3452,13 @@ msgid "Renamed profile."
 msgstr "Profil umbenannt."
 
 #: ../lib/modules/posixGroup.inc:186 ../lib/modules/posixGroup.inc:280
-#: ../lib/modules/sambaAccount.inc:717 ../lib/modules/sambaSamAccount.inc:771
-#: ../lib/modules/posixAccount.inc:955 ../lib/modules/posixAccount.inc:1056
-#: ../lib/modules/inetOrgPerson.inc:552 ../lib/modules/inetOrgPerson.inc:673
+#: ../lib/modules/sambaAccount.inc:713 ../lib/modules/sambaSamAccount.inc:793
+#: ../lib/modules/posixAccount.inc:946 ../lib/modules/posixAccount.inc:1047
+#: ../lib/modules/inetOrgPerson.inc:543 ../lib/modules/inetOrgPerson.inc:664
 msgid "Repeat password"
 msgstr "Passwort wiederholen"
 
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:762
+#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:753
 msgid "Replaced $user or $group in homedir."
 msgstr "$user und $group wurden im Heimatverzeichnis ersetzt."
 
@@ -3466,16 +3481,16 @@ msgstr "Zurücksetzen"
 msgid "Reset changes"
 msgstr "Änderungen zurücksetzen"
 
-#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:807
-#: ../lib/modules/sambaSamAccount.inc:164
-#: ../lib/modules/sambaSamAccount.inc:869
+#: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:803
+#: ../lib/modules/sambaSamAccount.inc:181
+#: ../lib/modules/sambaSamAccount.inc:906
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
 #: ../lib/modules/inetLocalMailRecipient.inc:56
 #: ../lib/modules/inetLocalMailRecipient.inc:91
-#: ../lib/modules/inetLocalMailRecipient.inc:195
-#: ../lib/modules/inetLocalMailRecipient.inc:363
+#: ../lib/modules/inetLocalMailRecipient.inc:188
+#: ../lib/modules/inetLocalMailRecipient.inc:356
 msgid "Routing address"
 msgstr "Routing-Adresse"
 
@@ -3483,8 +3498,8 @@ msgstr "Routing-Adresse"
 msgid "Samba 2"
 msgstr "Samba 2"
 
-#: ../lib/modules/sambaSamAccount.inc:106
-#: ../lib/modules/sambaGroupMapping.inc:223
+#: ../lib/modules/sambaSamAccount.inc:124
+#: ../lib/modules/sambaGroupMapping.inc:232
 msgid "Samba 3"
 msgstr "Samba 3"
 
@@ -3500,52 +3515,52 @@ msgstr "Samba 3 Domänen"
 msgid "Samba Hosts"
 msgstr "Samba Hosts"
 
-#: ../lib/modules/sambaSamAccount.inc:223
-#: ../lib/modules/sambaSamAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:386
+#: ../lib/modules/sambaSamAccount.inc:410
 msgid "Samba RID"
 msgstr "Samba-RID"
 
-#: ../lib/modules/sambaGroupMapping.inc:257
-#: ../lib/modules/sambaGroupMapping.inc:282
+#: ../lib/modules/sambaGroupMapping.inc:266
+#: ../lib/modules/sambaGroupMapping.inc:291
 msgid "Samba RID number"
 msgstr "Samba RID-Nummer"
 
-#: ../lib/modules/sambaGroupMapping.inc:251
+#: ../lib/modules/sambaGroupMapping.inc:260
 msgid "Samba display name"
 msgstr "Samba Anzeigename"
 
-#: ../lib/modules/sambaGroupMapping.inc:243
+#: ../lib/modules/sambaGroupMapping.inc:252
 msgid "Samba domain name"
 msgstr "Samba Domänenname"
 
-#: ../lib/modules/sambaGroupMapping.inc:263
-#: ../lib/modules/sambaGroupMapping.inc:290
-#: ../lib/modules/sambaGroupMapping.inc:307
+#: ../lib/modules/sambaGroupMapping.inc:272
+#: ../lib/modules/sambaGroupMapping.inc:299
+#: ../lib/modules/sambaGroupMapping.inc:316
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaAccount.inc:714
-#: ../lib/modules/sambaSamAccount.inc:161
-#: ../lib/modules/sambaSamAccount.inc:769
+#: ../lib/modules/sambaAccount.inc:337 ../lib/modules/sambaAccount.inc:710
+#: ../lib/modules/sambaSamAccount.inc:178
+#: ../lib/modules/sambaSamAccount.inc:789
 msgid "Samba password"
 msgstr "Samba-Passwort"
 
 #: ../lib/modules/sambaAccount.inc:70 ../lib/modules/sambaAccount.inc:164
 #: ../lib/modules/sambaAccount.inc:295 ../lib/modules/sambaAccount.inc:384
-#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:766
-#: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:68
-#: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:820
-#: ../lib/modules/sambaSamAccount.inc:1048
-#: ../lib/modules/sambaSamAccount.inc:1136
+#: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:762
+#: ../lib/modules/sambaAccount.inc:853 ../lib/modules/sambaSamAccount.inc:85
+#: ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:373
+#: ../lib/modules/sambaSamAccount.inc:855
+#: ../lib/modules/sambaSamAccount.inc:1104
+#: ../lib/modules/sambaSamAccount.inc:1205
 msgid "Samba workstations"
 msgstr "Samba PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:917
+#: ../lib/modules/sambaSamAccount.inc:954
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -3639,7 +3654,7 @@ msgstr "Wählen Sie eine Vorlage für den Anlegevorgang"
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: ../lib/modules/posixAccount.inc:1022
+#: ../lib/modules/posixAccount.inc:1013
 msgid "Selected groups"
 msgstr "Gewählte Gruppen"
 
@@ -3668,8 +3683,8 @@ msgstr "Server mit externem Script"
 msgid "Server settings"
 msgstr "Servereinstellungen"
 
-#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:965
-#: ../lib/modules/posixAccount.inc:1095
+#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:956
+#: ../lib/modules/posixAccount.inc:1086
 msgid "Set no password"
 msgstr "Kein Passwort setzen"
 
@@ -3697,12 +3712,12 @@ msgstr "Interne Attribute anzeigen"
 msgid "Single valued"
 msgstr "Einzelwert"
 
-#: ../lib/modules/quota.inc:456
+#: ../lib/modules/quota.inc:439
 msgid "Soft block"
 msgstr "weiches Block-Limit"
 
-#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:321
-#: ../lib/modules/quota.inc:378
+#: ../lib/modules/quota.inc:94 ../lib/modules/quota.inc:304
+#: ../lib/modules/quota.inc:361
 msgid "Soft block limit"
 msgstr "weiches Block-Limit"
 
@@ -3710,7 +3725,7 @@ msgstr "weiches Block-Limit"
 msgid "Soft block limit."
 msgstr "weiches Block-Limit"
 
-#: ../lib/modules/quota.inc:458
+#: ../lib/modules/quota.inc:441
 msgid "Soft inode"
 msgstr "weiches Inode-Limit"
 
@@ -3718,8 +3733,8 @@ msgstr "weiches Inode-Limit"
 msgid "Soft inode (files) limit."
 msgstr "Weiches Inode-Limit (Dateien)."
 
-#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:325
-#: ../lib/modules/quota.inc:380
+#: ../lib/modules/quota.inc:110 ../lib/modules/quota.inc:308
+#: ../lib/modules/quota.inc:363
 msgid "Soft inode limit"
 msgstr "weiches Inode-Limit"
 
@@ -3748,10 +3763,10 @@ msgstr "Diese Hilfenummer ist leider nicht verfügbar: {bold}%d{endbold}"
 
 #: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaAccount.inc:78
 #: ../lib/modules/sambaAccount.inc:308 ../lib/modules/sambaAccount.inc:396
-#: ../lib/modules/sambaAccount.inc:798 ../lib/modules/sambaSamAccount.inc:73
-#: ../lib/modules/sambaSamAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:853
+#: ../lib/modules/sambaAccount.inc:794 ../lib/modules/sambaSamAccount.inc:90
+#: ../lib/modules/sambaSamAccount.inc:91
+#: ../lib/modules/sambaSamAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:890
 msgid "Special user"
 msgstr "Spezieller Benutzer"
 
@@ -3772,7 +3787,7 @@ msgstr "Schritt 2 von 2: Attribute und Werte"
 msgid "Steve"
 msgstr "Hans"
 
-#: ../lib/modules/sambaAccount.inc:215 ../lib/modules/sambaSamAccount.inc:266
+#: ../lib/modules/sambaAccount.inc:215 ../lib/modules/sambaSamAccount.inc:286
 #: ../lib/modules/posixAccount.inc:191 ../lib/modules/inetOrgPerson.inc:219
 msgid "Steve Miller"
 msgstr "Hans Müller"
@@ -3783,7 +3798,7 @@ msgstr "Hans Müller,Raum 2.14,123-123-1234,123-123-1234"
 
 #: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:164
 #: ../lib/modules/inetOrgPerson.inc:294 ../lib/modules/inetOrgPerson.inc:295
-#: ../lib/modules/inetOrgPerson.inc:566 ../lib/modules/inetOrgPerson.inc:697
+#: ../lib/modules/inetOrgPerson.inc:557 ../lib/modules/inetOrgPerson.inc:688
 msgid "Street"
 msgstr "Straße"
 
@@ -3805,9 +3820,9 @@ msgstr "Unterhalb (kompletter Baum unter Basis-DN)"
 #: ../templates/pdfedit/pdfpage.php:735 ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:84
 #: ../templates/profedit/profilemain.php:156 ../lib/modules/posixGroup.inc:285
-#: ../lib/modules/sambaAccount.inc:808 ../lib/modules/sambaSamAccount.inc:870
-#: ../lib/modules/sambaSamAccount.inc:976 ../lib/modules/posixAccount.inc:1061
-#: ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/sambaAccount.inc:804 ../lib/modules/sambaSamAccount.inc:907
+#: ../lib/modules/sambaSamAccount.inc:1016
+#: ../lib/modules/posixAccount.inc:1052 ../lib/modules/inetOrgPerson.inc:669
 msgid "Submit"
 msgstr "Abschicken"
 
@@ -3824,7 +3839,7 @@ msgstr "Erfolg"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: ../lib/modules/sambaSamAccount.inc:917
+#: ../lib/modules/sambaSamAccount.inc:954
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -3846,7 +3861,7 @@ msgstr "Ziel der Einladungsregel ist ungültig."
 
 #: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:188
 #: ../lib/modules/inetOrgPerson.inc:310 ../lib/modules/inetOrgPerson.inc:311
-#: ../lib/modules/inetOrgPerson.inc:582 ../lib/modules/inetOrgPerson.inc:701
+#: ../lib/modules/inetOrgPerson.inc:573 ../lib/modules/inetOrgPerson.inc:692
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
@@ -3912,7 +3927,8 @@ msgstr "Die folgenden Einstellungen wurden gespeichert:"
 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:87 ../lib/modules/sambaSamAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/sambaSamAccount.inc:106
 msgid "The format of the logon hours field is invalid!"
 msgstr "Das Format der Anmeldezeiten ist ungültig!"
 
@@ -3980,15 +3996,15 @@ msgstr "Es gibt neue erforderliche Attribute, die gefüllt werden müssen."
 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."
 
-#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaSamAccount.inc:73
+#: ../lib/modules/sambaAccount.inc:77 ../lib/modules/sambaSamAccount.inc:90
 msgid "There can be only one administrator per domain."
 msgstr "Es kann nur einen Administrator pro Domäne geben."
 
-#: ../lib/modules/sambaGroupMapping.inc:356
+#: ../lib/modules/sambaGroupMapping.inc:365
 msgid "There can be only one group of this type."
 msgstr "Es kann nur eine Gruppe diesen Typs geben."
 
-#: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaSamAccount.inc:74
+#: ../lib/modules/sambaAccount.inc:78 ../lib/modules/sambaSamAccount.inc:91
 msgid "There can be only one guest per domain."
 msgstr "Es kann nur einen Gast pro Domäne geben."
 
@@ -4038,11 +4054,11 @@ msgstr ""
 msgid "This Samba 3 domain is already present!"
 msgstr "Diese Samba3-Domäne ist bereits vorhanden!"
 
-#: ../lib/modules/kolabUser.inc:311
+#: ../lib/modules/kolabUser.inc:304
 msgid "This account is marked for deletion."
 msgstr "Dieser Account wurde zum Löschen markiert."
 
-#: ../lib/modules/sambaSamAccount.inc:221
+#: ../lib/modules/sambaSamAccount.inc:238
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -4132,11 +4148,11 @@ msgstr ""
 msgid "This is not a valid DN!"
 msgstr "Das ist keine korrekte DN!"
 
-#: ../lib/modules/sambaSamAccount.inc:76
+#: ../lib/modules/sambaSamAccount.inc:93
 msgid "This is not a valid RID number!"
 msgstr "Das ist keine korrekte RID-Nummer!"
 
-#: ../lib/modules/sambaGroupMapping.inc:358
+#: ../lib/modules/sambaGroupMapping.inc:367
 msgid "This is not a valid Samba 3 group type!"
 msgstr "Das ist kein korrekter Samba 3 Gruppentyp!"
 
@@ -4166,7 +4182,7 @@ msgstr "Dies ist die MAC-Adresse der Netzwerkkarte im Gerät (z.B. 00:01:02:DE:E
 msgid "This is the RID of the user's primary Windows group."
 msgstr "Das ist die RID-Nummer der primären Gruppe des Benutzers."
 
-#: ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid "This is the SID of the user's primary Windows group."
 msgstr "Das ist die SID der primären Gruppe des Benutzers."
 
@@ -4178,15 +4194,19 @@ msgstr ""
 "Das ist der absolute Pfad zu einem externen Script, das Quotas und "
 "Heimatverzeichnisse verwaltet."
 
-#: ../lib/modules/sambaAccount.inc:338 ../lib/modules/sambaSamAccount.inc:162
+#: ../lib/modules/sambaAccount.inc:338 ../lib/modules/sambaSamAccount.inc:179
 msgid "This is the account's Windows password."
 msgstr "Das ist das Windows-Passwort für den Account."
 
-#: ../lib/modules/sambaAccount.inc:335 ../lib/modules/sambaSamAccount.inc:159
+#: ../lib/modules/sambaAccount.inc:335 ../lib/modules/sambaSamAccount.inc:176
 msgid "This is the account's full name on Windows systems."
 msgstr "Das ist der Name, der auf Windows-Systemen angezeigt wird."
 
-#: ../lib/modules/sambaGroupMapping.inc:275
+#: ../lib/modules/sambaSamAccount.inc:268 ../lib/modules/shadowAccount.inc:166
+msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
+msgstr "Account-Ablaufdatum im Format: TT-MM-JJJJ"
+
+#: ../lib/modules/sambaGroupMapping.inc:284
 msgid "This is the group name which will be shown in Windows."
 msgstr "Das ist der Gruppenname, der in Windows angezeigt wird."
 
@@ -4240,7 +4260,7 @@ msgstr ""
 "angezeigt wird. Wenn mehr Einträge gefunden werden, wird die Liste auf "
 "mehrere Seiten aufgeteilt."
 
-#: ../lib/modules/sambaGroupMapping.inc:283
+#: ../lib/modules/sambaGroupMapping.inc:292
 msgid ""
 "This is the relative ID (similar to UID on Unix) for Windows accounts. If "
 "you leave this empty LAM will calculate the RID from the UID. This can be "
@@ -4250,7 +4270,7 @@ msgstr ""
 "Accounts. Wenn Sie das Feld leer lassen wird LAM die RID aus der UID "
 "berechnen. Mögliche Werte sind eine Zahl oder eine spezielle Gruppe:"
 
-#: ../lib/modules/sambaSamAccount.inc:224
+#: ../lib/modules/sambaSamAccount.inc:241
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -4258,7 +4278,7 @@ msgstr ""
 "Das ist die relative ID-Nummer für den Windows-Account. Sie können entweder "
 "eine Nummer angeben oder den Namen eines dieser Spezialaccounts: "
 
-#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:245
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -4323,7 +4343,7 @@ msgstr ""
 "Termine abfragen möchten. Wenn Sie das Feld leer lassen wird der "
 "Standardwert (60 Tage) verwendet."
 
-#: ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaSamAccount.inc:232
 msgid "This is the user's primary Windows group."
 msgstr "Das ist die primäre Windows-Gruppe des Benutzers."
 
@@ -4335,11 +4355,11 @@ msgstr "Login-Shell ist ungültig!"
 msgid "This object class is obsolete."
 msgstr "Diese Objektklasse ist veraltet."
 
-#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:251
 msgid "This option defines the allowed logon hours for this account."
 msgstr "Diese Einstellung dient zur Zuweisung der erlaubten Anmeldezeiten."
 
-#: ../lib/modules/sambaSamAccount.inc:248
+#: ../lib/modules/sambaSamAccount.inc:265
 msgid ""
 "This option defines the allowed logon hours for this account. The format is "
 "the same as for the LDAP attribute. The 24*7 hours are represented as 168 "
@@ -4370,8 +4390,8 @@ msgstr "Dieser Benutzer wurde nicht gefunden!"
 
 #: ../lib/modules/sambaAccount.inc:81 ../lib/modules/sambaAccount.inc:82
 #: ../lib/modules/sambaAccount.inc:83 ../lib/modules/sambaAccount.inc:84
-#: ../lib/modules/sambaSamAccount.inc:79 ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaSamAccount.inc:81 ../lib/modules/sambaSamAccount.inc:82
+#: ../lib/modules/sambaSamAccount.inc:96 ../lib/modules/sambaSamAccount.inc:97
+#: ../lib/modules/sambaSamAccount.inc:98 ../lib/modules/sambaSamAccount.inc:99
 msgid "This value can only be \\\"true\\\" or \\\"false\\\"!"
 msgstr "Dieser Wert darf nur \\\"true\\\" oder \\\"false\\\" sein!"
 
@@ -4395,7 +4415,7 @@ msgstr "Dies löscht die markierte Organizational Unit. Die OU muss leer sein."
 msgid "This will delete the selected profile."
 msgstr "Dies löscht das markierte Profil."
 
-#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:165
+#: ../lib/modules/sambaAccount.inc:341 ../lib/modules/sambaSamAccount.inc:182
 msgid "This will reset the host's password to a default value."
 msgstr "Dies setzt das Maschinenpasswort auf den Standardwert zurück."
 
@@ -4413,19 +4433,19 @@ 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."
 
-#: ../lib/modules/sambaSamAccount.inc:916
+#: ../lib/modules/sambaSamAccount.inc:953
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../lib/modules/sambaSamAccount.inc:963
+#: ../lib/modules/sambaSamAccount.inc:1003
 msgid "Time"
 msgstr "Zeit"
 
-#: ../lib/modules/sambaSamAccount.inc:980
+#: ../lib/modules/sambaSamAccount.inc:1020
 msgid "Time zone"
 msgstr "Zeitzone"
 
-#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:252
 msgid "Time zones:"
 msgstr "Zeitzonen:"
 
@@ -4437,7 +4457,7 @@ msgstr ""
 "Verwenden Sie /bin/false um den Login zu deaktivieren. Die Shellliste wird "
 "von lam/config/shells gelesen."
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:261
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "Tokyo, Seoul, Osaka, Yakutsk"
 
@@ -4469,7 +4489,7 @@ msgstr "BaumSuffix"
 msgid "TreeSuffix is invalid!"
 msgstr "BaumSuffix ist ungültig!"
 
-#: ../lib/modules/sambaSamAccount.inc:916
+#: ../lib/modules/sambaSamAccount.inc:953
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4496,7 +4516,7 @@ msgstr ""
 #: ../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:920 ../lib/modules/posixAccount.inc:1157
+#: ../lib/modules/posixAccount.inc:911 ../lib/modules/posixAccount.inc:1148
 #: ../lib/lists.inc:303 ../lib/lists.inc:330
 msgid "UID number"
 msgstr "UID Nummer"
@@ -4515,7 +4535,7 @@ msgstr ""
 msgid "UID ranges for Unix accounts"
 msgstr "UID-Bereiche für Unix-Accounts"
 
-#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:200
+#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:217
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -4550,7 +4570,7 @@ msgstr "Kann Domäne nicht löschen!"
 msgid "Unable to delete profile!"
 msgstr "Kann das Profil nicht löschen!"
 
-#: ../lib/modules/posixAccount.inc:1321 ../lib/modules/posixAccount.inc:1538
+#: ../lib/modules/posixAccount.inc:1312 ../lib/modules/posixAccount.inc:1529
 msgid "Unable to find group in LDAP."
 msgstr "Kann Gruppe nicht im LDAP-Baum finden."
 
@@ -4581,8 +4601,8 @@ msgid "Unix"
 msgstr "Unix"
 
 #: ../lib/modules/inetOrgPerson.inc:44 ../lib/modules/inetOrgPerson.inc:236
-#: ../lib/modules/inetOrgPerson.inc:334 ../lib/modules/inetOrgPerson.inc:613
-#: ../lib/modules/inetOrgPerson.inc:691
+#: ../lib/modules/inetOrgPerson.inc:334 ../lib/modules/inetOrgPerson.inc:604
+#: ../lib/modules/inetOrgPerson.inc:682
 msgid "Unix workstations"
 msgstr "Arbeitsstationen"
 
@@ -4617,9 +4637,9 @@ msgstr "Benutzung"
 
 #: ../lib/modules/sambaAccount.inc:114 ../lib/modules/sambaAccount.inc:225
 #: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:346
-#: ../lib/modules/sambaSamAccount.inc:167
-#: ../lib/modules/sambaSamAccount.inc:170
-#: ../lib/modules/sambaSamAccount.inc:276
+#: ../lib/modules/sambaSamAccount.inc:184
+#: ../lib/modules/sambaSamAccount.inc:187
+#: ../lib/modules/sambaSamAccount.inc:296
 msgid "Use Unix password"
 msgstr "Unix-Passwort verwenden"
 
@@ -4637,21 +4657,21 @@ msgstr ""
 
 #: ../lib/modules/posixGroup.inc:426 ../lib/modules/sambaAccount.inc:120
 #: ../lib/modules/sambaAccount.inc:233 ../lib/modules/sambaAccount.inc:349
-#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaAccount.inc:725
-#: ../lib/modules/sambaSamAccount.inc:173
-#: ../lib/modules/sambaSamAccount.inc:176
-#: ../lib/modules/sambaSamAccount.inc:284
-#: ../lib/modules/sambaSamAccount.inc:779
-#: ../lib/modules/sambaSamAccount.inc:1004 ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/sambaAccount.inc:352 ../lib/modules/sambaAccount.inc:721
+#: ../lib/modules/sambaSamAccount.inc:190
+#: ../lib/modules/sambaSamAccount.inc:193
+#: ../lib/modules/sambaSamAccount.inc:304
+#: ../lib/modules/sambaSamAccount.inc:800
+#: ../lib/modules/sambaSamAccount.inc:1049 ../lib/modules/posixAccount.inc:361
 msgid "Use no password"
 msgstr "Kein Passwort setzen"
 
-#: ../lib/modules/sambaAccount.inc:721 ../lib/modules/sambaSamAccount.inc:775
-#: ../lib/modules/sambaSamAccount.inc:998
+#: ../lib/modules/sambaAccount.inc:717 ../lib/modules/sambaSamAccount.inc:796
+#: ../lib/modules/sambaSamAccount.inc:1043
 msgid "Use unix password"
 msgstr "Unix-Passwort verwenden"
 
-#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:320
+#: ../lib/modules/quota.inc:90 ../lib/modules/quota.inc:303
 msgid "Used blocks"
 msgstr "Benutzte Blöcke"
 
@@ -4673,7 +4693,7 @@ msgstr ""
 "Wird für die Berechnung der RIDs aus UID/GID verwendet. Nicht ändern, wenn "
 "Sie nicht sicher sind."
 
-#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:324
+#: ../lib/modules/quota.inc:106 ../lib/modules/quota.inc:307
 msgid "Used inodes"
 msgstr "benutzte Inodes"
 
@@ -4690,9 +4710,9 @@ msgid "User ID"
 msgstr "Benutzer ID"
 
 #: ../lib/modules/sambaAccount.inc:257 ../lib/modules/sambaAccount.inc:367
-#: ../lib/modules/sambaAccount.inc:737 ../lib/modules/sambaSamAccount.inc:191
-#: ../lib/modules/sambaSamAccount.inc:308
-#: ../lib/modules/sambaSamAccount.inc:791
+#: ../lib/modules/sambaAccount.inc:733 ../lib/modules/sambaSamAccount.inc:208
+#: ../lib/modules/sambaSamAccount.inc:328
+#: ../lib/modules/sambaSamAccount.inc:812
 msgid "User can change password"
 msgstr "Benutzer kann Passwort ändern"
 
@@ -4722,22 +4742,22 @@ msgid "User modules"
 msgstr "Benutzermodule"
 
 #: ../lib/modules/sambaAccount.inc:264 ../lib/modules/sambaAccount.inc:369
-#: ../lib/modules/sambaAccount.inc:745 ../lib/modules/sambaSamAccount.inc:193
-#: ../lib/modules/sambaSamAccount.inc:315
-#: ../lib/modules/sambaSamAccount.inc:799
+#: ../lib/modules/sambaAccount.inc:741 ../lib/modules/sambaSamAccount.inc:210
+#: ../lib/modules/sambaSamAccount.inc:335
+#: ../lib/modules/sambaSamAccount.inc:820
 msgid "User must change password"
 msgstr "Benutzer muss Passwort ändern"
 
-#: ../templates/login.php:164 ../lib/modules/account.inc:90
+#: ../templates/login.php:169 ../lib/modules/account.inc:90
 #: ../lib/modules/account.inc:110 ../lib/modules/account.inc:112
-#: ../lib/modules/account.inc:113 ../lib/modules/account.inc:214
-#: ../lib/modules/account.inc:234 ../lib/modules/sambaSamAccount.inc:1131
+#: ../lib/modules/account.inc:113 ../lib/modules/account.inc:205
+#: ../lib/modules/account.inc:225 ../lib/modules/sambaSamAccount.inc:1200
 #: ../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:912
-#: ../lib/modules/posixAccount.inc:1155 ../lib/modules/inetOrgPerson.inc:70
+#: ../lib/modules/posixAccount.inc:341 ../lib/modules/posixAccount.inc:903
+#: ../lib/modules/posixAccount.inc:1146 ../lib/modules/inetOrgPerson.inc:70
 #: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:517 ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:508 ../lib/modules/inetOrgPerson.inc:697
 #: ../lib/lists.inc:305
 msgid "User name"
 msgstr "Benutzername"
@@ -4824,39 +4844,39 @@ msgstr "Verwendete Vorlage:"
 msgid "Valid users"
 msgstr "Berechtigte Benutzer"
 
-#: ../templates/delete.php:184 ../lib/modules.inc:1569
+#: ../templates/delete.php:184 ../lib/modules.inc:1554
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "Konnte keine Attribute zum DN hinzufügen: %s."
 
-#: ../lib/modules.inc:1531 ../lib/modules.inc:1543
+#: ../lib/modules.inc:1516 ../lib/modules.inc:1528
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "Konnte DN nicht erstellen: %s."
 
 #: ../templates/tree/delete.php:109 ../templates/delete.php:221
-#: ../lib/modules.inc:1524
+#: ../lib/modules.inc:1509
 #, 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:175
-#: ../lib/modules.inc:1559
+#: ../lib/modules.inc:1544
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht ändern: %s."
 
-#: ../templates/delete.php:193 ../lib/modules.inc:1579
+#: ../templates/delete.php:193 ../lib/modules.inc:1564
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht löschen: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:916
+#: ../lib/modules/sambaSamAccount.inc:953
 msgid "Wednesday"
 msgstr "Donnerstag"
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid "Western Europe Time, London, Lisbon"
 msgstr "Westeuropäische Zeit, London, Lissabon"
 
@@ -4868,16 +4888,16 @@ msgstr ""
 "Wenn Sie ldaps:// verwenden stellen Sie sicher, dass Sie genau die selbe IP/"
 "Domäne wie in ihrem Zertifikat verwenden!"
 
-#: ../lib/modules/sambaAccount.inc:400 ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaAccount.inc:400 ../lib/modules/sambaSamAccount.inc:248
 msgid "Windows domain name of account."
 msgstr "Windows-Domänenname des Accounts."
 
-#: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:783
-#: ../lib/modules/sambaSamAccount.inc:352
-#: ../lib/modules/sambaSamAccount.inc:835
-#: ../lib/modules/sambaSamAccount.inc:1139
-#: ../lib/modules/sambaGroupMapping.inc:184
-#: ../lib/modules/sambaGroupMapping.inc:305
+#: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:779
+#: ../lib/modules/sambaSamAccount.inc:379
+#: ../lib/modules/sambaSamAccount.inc:872
+#: ../lib/modules/sambaSamAccount.inc:1208
+#: ../lib/modules/sambaGroupMapping.inc:202
+#: ../lib/modules/sambaGroupMapping.inc:314
 msgid "Windows group"
 msgstr "Windows-Gruppe"
 
@@ -4886,23 +4906,23 @@ msgid "Windows group RID"
 msgstr "Windows-Gruppen-RID"
 
 #: ../lib/modules/sambaAccount.inc:390
-#: ../lib/modules/sambaGroupMapping.inc:278
+#: ../lib/modules/sambaGroupMapping.inc:287
 msgid "Windows group name"
 msgstr "Windows-Gruppenname"
 
-#: ../lib/modules/sambaGroupMapping.inc:291
+#: ../lib/modules/sambaGroupMapping.inc:300
 msgid "Windows group type."
 msgstr "Windows-Gruppentyp."
 
-#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:231
 msgid "Windows primary group"
 msgstr "Primäre Windows-Gruppe"
 
-#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:234
 msgid "Windows primary group SID"
 msgstr "Primäre Windows-Gruppen-SID"
 
-#: ../lib/modules/sambaGroupMapping.inc:287
+#: ../lib/modules/sambaGroupMapping.inc:296
 msgid "Windows-Domain name of group."
 msgstr "Windows-Domänenname der Gruppe."
 
@@ -4911,7 +4931,7 @@ msgstr "Windows-Domänenname der Gruppe."
 msgid "Wrong or missing type!"
 msgstr "Falscher oder fehlender Typ!"
 
-#: ../templates/login.php:346
+#: ../templates/login.php:351
 msgid "Wrong password/user name combination. Please try again."
 msgstr "Falsche Benutzername/Passwort-Kombination. Bitte erneut eingeben."
 
@@ -4983,11 +5003,11 @@ msgstr ""
 msgid "[attribute deleted]"
 msgstr "[Attribut gelöscht]"
 
-#: ../lib/modules/sambaAccount.inc:279 ../lib/modules/sambaSamAccount.inc:330
+#: ../lib/modules/sambaAccount.inc:279 ../lib/modules/sambaSamAccount.inc:357
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\hmueller"
 
-#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:336
+#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:363
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profile\\hmueller"
 
@@ -5024,7 +5044,7 @@ msgstr "Wert downloaden"
 
 #: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:206
 #: ../lib/modules/inetOrgPerson.inc:322 ../lib/modules/inetOrgPerson.inc:323
-#: ../lib/modules/inetOrgPerson.inc:594 ../lib/modules/inetOrgPerson.inc:704
+#: ../lib/modules/inetOrgPerson.inc:585 ../lib/modules/inetOrgPerson.inc:695
 msgid "eMail address"
 msgstr "E-Mail Adresse"
 
@@ -5037,7 +5057,7 @@ msgid "group01,group02"
 msgstr "gruppe01,gruppe02"
 
 #: ../lib/modules/quota.inc:146 ../lib/modules/quota.inc:148
-#: ../lib/modules/quota.inc:214 ../lib/modules/quota.inc:216
+#: ../lib/modules/quota.inc:197 ../lib/modules/quota.inc:199
 msgid "hours"
 msgstr "Stunden"
 
@@ -5064,12 +5084,12 @@ msgid "machines"
 msgstr "Hosts"
 
 #: ../lib/modules/sambaAccount.inc:317 ../lib/modules/sambaAccount.inc:327
-#: ../lib/modules/sambaSamAccount.inc:260
-#: ../lib/modules/sambaSamAccount.inc:379
+#: ../lib/modules/sambaSamAccount.inc:280
+#: ../lib/modules/sambaSamAccount.inc:406
 msgid "mydomain"
 msgstr "meineDomaene"
 
-#: ../lib/modules/sambaSamAccount.inc:354
+#: ../lib/modules/sambaSamAccount.inc:381
 msgid "mygroup"
 msgstr "meineGruppe"
 
@@ -5125,7 +5145,7 @@ msgid "required for Samba 3 accounts"
 msgstr "erforderlich für Samba 3 Accounts"
 
 #: ../lib/modules/posixGroup.inc:396 ../lib/modules/sambaAccount.inc:221
-#: ../lib/modules/sambaSamAccount.inc:272 ../lib/modules/posixAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:292 ../lib/modules/posixAccount.inc:231
 msgid "secret"
 msgstr "geheim"