From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 2 Oct 2009 12:29:15 +0000 (+0000)
Subject: Updated samba locales
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4c173e50bf02b0f631acb50effd53317d9c2f821;p=gosa.git

Updated samba locales


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14479 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
index 5b821ba6b..b377de09f 100644
--- a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2009-06-22 15:55+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
@@ -48,8 +48,8 @@ msgstr "Netzwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -75,12 +75,12 @@ msgid "Generic"
 msgstr "Allgemein"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Domäne"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Anmeldeskript"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
@@ -102,11 +102,11 @@ msgstr "Profil-Pfad"
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
@@ -122,18 +122,18 @@ msgstr "Arbeitsverzeichnis"
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Verbinden"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "Leerlauf"
 
@@ -173,44 +173,48 @@ msgstr "Wiederherstellen falls unterbrochen"
 msgid "Access options"
 msgstr "Zugriffsoptionen"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+msgid "The password never expires"
+msgstr "Passwort läuft nie ab"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr "Samba Anmeldezeiten"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr "Einstellungen bearbeiten..."
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 msgid "Used by all users"
 msgstr "Verwendet von allen Benutzern"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr "Verwendet von einigen Benutzern"
 
@@ -231,14 +235,14 @@ msgid "Temporary disable samba account"
 msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -246,302 +250,316 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "Fehler"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Please select an entry!"
 msgstr "Bitte wählen Sie einen Eintrag!"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "trennen"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Das Passwort ist aufgrund der Domänen-Richtline seit %s abgelaufen."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Das Passwort ist aufgrund der Benutzer-Richtline bis %s gültig."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr "Das Passwort ist aufgrund der Domänen-Richtline bis %s gültig."
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "default"
 msgstr "Standard"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr "Aus"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 msgid "On"
 msgstr "An"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr "Sekunden"
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 msgid "minutes"
 msgstr "Minuten"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 msgid "forever"
 msgstr "dauerhaft"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "off"
 msgstr "aus"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 msgid "on"
 msgstr "an"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 msgid "unset"
 msgstr "nicht gesetzt"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr "sofort"
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 msgid "days"
 msgstr "Tage"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 msgid "hours"
 msgstr "Stunden"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 msgid "Domain attributes"
 msgstr "Eigenschaften der Domäne"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 msgid "Min password length"
 msgstr "Minimale Passwort-Länge"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 msgid "Password history"
 msgstr "Passwort-Historie"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 msgid "Force password change"
 msgstr "Erzwinge Änderung des Passwortes"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 msgid "Maximum password age"
 msgstr "Maximales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 msgid "Minimum password age"
 msgstr "Minimales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 msgid "Lockout duration"
 msgstr "Dauer der Sperre"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr "Aussperren nach Anzahl fehlgeschlagener Anmeldungen"
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 msgid "Disconnect time"
 msgstr "Zeit bis automatische Trennung"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 msgid "Refuse machine password change"
 msgstr "Verweigere Änderung der Passwörter für Computerkonten"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 msgid "User attributes"
 msgstr "Eigenschaften des Benutzers"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 msgid "Last failed login"
 msgstr "Letzter Fehlschlag der Anmeldung"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 msgid "Logon attempts"
 msgstr "Anmeldeversuche"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 msgid "Last password update"
 msgstr "Letzte Passwortänderung"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 msgid "Last logon"
 msgstr "Letztes Login"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 msgid "Last logoff"
 msgstr "Letzte Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 msgid "Automatic logoff"
 msgstr "Automatische Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr "Passwort läuft ab"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "nein"
+
+#: personal/samba/class_sambaAccount.inc:932
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr ""
+"Das Passwort läuft am %s ab, aber ablaufende Passwörter sind deaktiviert."
+
+#: personal/samba/class_sambaAccount.inc:938
 msgid "Password change available"
 msgstr "Passwort-Änderung möglich"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 msgid "Home drive"
 msgstr "Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 msgid "Home path"
 msgstr "Basis-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Die Benutzerverwaltung von Windows erlaubt höchstens acht Clients!"
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem "
 "manuell!"
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kann primäre Gruppe nicht in Samba-Gruppe überführen: die Gruppe kann nicht "
 "identifiziert werden!"
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr "Allgemeines Basisverzeichnis"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr "Allgemeines Samba Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr "Allgemeiner Skript-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr "Allgemeiner Profil-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr "Benutzer darf sein Passwort ändern"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+msgid "Password never expires"
+msgstr "Passwort läuft nie ab"
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr "Konto läuft ab"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Limitiere Logon Zeit"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Limitiere Logoff Zeit"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr "Erlaube Verbindung von"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
index 1b08bf625..d08c4dc2d 100644
--- a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2008-12-08 17:37+0100\n"
 "Last-Translator: Alejandro Escanero Blanco <aescanero@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -46,8 +46,8 @@ msgstr "red"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -73,12 +73,12 @@ msgid "Generic"
 msgstr "Genérico"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Dominio"
 
@@ -92,8 +92,8 @@ msgid "Script path"
 msgstr "Ruta del Script"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -101,11 +101,11 @@ msgstr "Ruta del Perfil"
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Permitir inicio de sesión en el servidor de terminal"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Configuración predeterminada de cliente"
 
@@ -121,18 +121,18 @@ msgstr "Directorio de trabajo"
 msgid "Timeout settings (in minutes)"
 msgstr "Tiempo de desconexión (en minutos)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Conexión"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -172,44 +172,49 @@ msgstr "Conectar si se desconecta"
 msgid "Access options"
 msgstr "Opciones de acceso"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "La contraseña expira en"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en windows no necesita contraseña"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Permitir al usuario cambiar contraseñas desde el cliente"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "La contraseña caduca en"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "La cuenta caducará después de"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr "Intentos de inicio de sesión de Samba"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr "Editar configuración..."
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 msgid "Used by all users"
 msgstr "Usado por todos los usuarios"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr "Usado por algunos usuarios"
 
@@ -231,14 +236,14 @@ msgid "Temporary disable samba account"
 msgstr "Desactivar temporalmente la cuenta samba"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -246,330 +251,345 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "Error"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Please select an entry!"
 msgstr "¡Por favor seleccione una entrada!"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "entrada activada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "entrada activada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "entrada desactivada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "entrada desactivada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "desconectar"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "Borrar"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "desde cualquier cliente"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 "El valor indicado como diferencias mínimas de la contraseña no es un valor "
 "numérico."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "eliminar"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr "Off"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 msgid "On"
 msgstr "On"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "Impresora"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "Servidor"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "off"
 msgstr "Off"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "Abajo"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "Borrar"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "Domingo"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "Hora"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "Seguridad de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "Almacén de claves"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Contraseña de administrador"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Localización"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Desconexión"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Atributo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "Repita la nueva contraseña"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 msgid "Last logon"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "Automatico"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr "La contraseña expira en"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "No"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "No se ha asignado ningún valor al campo 'Nueva contraseña'."
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 msgid "Home drive"
 msgstr "Unidad inicial"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 msgid "Home path"
 msgstr "Ruta inicial"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "¡El administrador de usuarios de windows solo permite ocho clientes como "
 "máximo!"
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Información"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema "
 "manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "No se puede convertir un grupo primario a grupo samba: ¡El grupo no puede "
 "ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr "Directorio predeterminado de usuario"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr "Unidad predeterminada de usuario samba"
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr "Ruta predeterminada del Script"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr "Ruta predeterminada del Perfil"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr "Permitir al usuario cambiar su contraseña"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "La contraseña expira en"
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr "La cuenta expirará después de"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Tiempo máximo de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Tiempo máximo de cierre de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 msgid "Logon hours"
 msgstr "Horario de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr "Permitir la conexión desde"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
index c76925468..5e9ee8127 100644
--- a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2009-06-30 11:31+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -42,8 +42,8 @@ msgstr "réseau"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -69,12 +69,12 @@ msgid "Generic"
 msgstr "Informations"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Répertoire Home"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Domaine"
 
@@ -87,8 +87,8 @@ msgid "Script path"
 msgstr "Chemin du Script"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
@@ -96,11 +96,11 @@ msgstr "Chemin du Profile"
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
@@ -116,18 +116,18 @@ msgstr "Répertoire de travail"
 msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Connexion"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Déconnexion"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "En attente"
 
@@ -167,46 +167,52 @@ msgstr "Reconnexion si déconnecté"
 msgid "Access options"
 msgstr "Options d'accès"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "Le mot de passe expirera le"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
-msgstr "L'identification sur une station windows ne nécessite pas de mot de passe"
+msgstr ""
+"L'identification sur une station windows ne nécessite pas de mot de passe"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr ""
 "Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
 "cliente"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "Le compte expire après"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr "Heures d'accès à Samba"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr "Editer les paramètres..."
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 msgid "Used by all users"
 msgstr "Utilisé par tout les utilisateurs"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr "Utilisé par certains utilisateurs"
 
@@ -227,14 +233,14 @@ msgid "Temporary disable samba account"
 msgstr "Désactiver temporairement le compte Samba"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr ""
 
@@ -242,301 +248,321 @@ msgstr ""
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr "UNIX"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "Erreur"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Please select an entry!"
 msgstr "Veuillez sélectionner une entrée !"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "désactivé"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "entrée activée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "entrée activée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "entrée désactivée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "entrée désactivée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "remise à zéro"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "de n'importe quel client"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
-msgstr "Le mot de passe est trop vieux depuis %s selon à la politique du domaine."
+msgstr ""
+"Le mot de passe est trop vieux depuis %s selon à la politique du domaine."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, php-format
 msgid "The password is valid till %s, by user policy."
-msgstr "Le mot de passe est valide jusqu'au %s, suivant la politique utilisateur."
+msgstr ""
+"Le mot de passe est valide jusqu'au %s, suivant la politique utilisateur."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr "Le mot de passe est valide jusqu'au %s, selon la politique du domaine."
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "default"
 msgstr "défaut"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr "Eteint"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 msgid "On"
 msgstr "Ouvert"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr "secondes"
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 msgid "forever"
 msgstr "indéfiniment"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "off"
 msgstr "Éteint"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 msgid "on"
 msgstr "Allumé"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 msgid "unset"
 msgstr "non configuré"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr "immédiatement"
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 msgid "days"
 msgstr "jours"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 msgid "hours"
 msgstr "heures"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 msgid "Domain attributes"
 msgstr "Attributs domaines"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 msgid "Min password length"
 msgstr "Taille minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 msgid "Password history"
 msgstr "Historique des mots de passe"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 msgid "Force password change"
 msgstr "Forcer le changement de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 msgid "Maximum password age"
 msgstr "Durée de vie maximale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 msgid "Minimum password age"
 msgstr "Durée de vie minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 msgid "Lockout duration"
 msgstr "La durée de blocage"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr "Nombre de tentatives avant blocage"
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 msgid "Disconnect time"
 msgstr "Forcer la déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 msgid "Refuse machine password change"
 msgstr "Refuser le changement de mot de passe de la machine"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 msgid "User attributes"
 msgstr "Attributs de l'utilisateur"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 msgid "Last failed login"
 msgstr "Dernière connexion ayant échouée"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 msgid "Logon attempts"
 msgstr "Nombre de tentative de connexion"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 msgid "Last password update"
 msgstr "Dernière mise à jour du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 msgid "Last logon"
 msgstr "Dernière connexion"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 msgid "Last logoff"
 msgstr "Dernière déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 msgid "Automatic logoff"
 msgstr "Déconnexion Automatique"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr "Le mot de passe expirera le"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "Non"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr ""
+"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+
+#: personal/samba/class_sambaAccount.inc:938
 msgid "Password change available"
 msgstr "Le changement du mot est disponible"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 msgid "Home drive"
 msgstr "Répertoire Home"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 msgid "Home path"
 msgstr "Chemin du répertoire personnel"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Le gestionnaire d'utilisateurs windows accepte seulement huit clients. Vous "
 "en avez spécifiés plus de huit."
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
+msgstr ""
+"Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
 
-#: personal/samba/class_sambaAccount.inc:1297
-msgid "Cannot convert primary group to samba group: group cannot be identified!"
+#: personal/samba/class_sambaAccount.inc:1252
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Impossible de convertir le groupe primaire en un groupe primaire samba : le "
 "groupe ne peut être identifié !"
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Configuration Samba"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr "Répertoire Home de base"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr "Lecteur réseau par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr "Chemin du script par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr "Chemin par défaut du profil"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr "Autoriser les utilisateurs à changer de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "Le mot de passe expirera le"
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr "Le compte expire"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Limiter les temps d'accès"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Limiter les heures de déconnections"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 msgid "Logon hours"
 msgstr "Heure de connexions"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr "Permettre la connexion depuis"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -563,4 +589,3 @@ msgstr "Sélectionner le département où sera effectuée la recherche"
 #: personal/samba/samba3_workstations.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Expression régulière pour sélectionner les adresses correspondantes"
-
diff --git a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
index 121ed1f8b..fc079cca5 100644
--- a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -46,8 +46,8 @@ msgstr "Aggiungi contatto"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -77,12 +77,12 @@ msgid "Generic"
 msgstr "Generale"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Home directory"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Dominio"
 
@@ -96,8 +96,8 @@ msgid "Script path"
 msgstr "Script path"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Path del profilo"
 
@@ -105,11 +105,11 @@ msgstr "Path del profilo"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Permetti la connessione al Terminal Server"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Eredita la configurazione del client"
 
@@ -125,18 +125,18 @@ msgstr "Cartella di lavoro"
 msgid "Timeout settings (in minutes)"
 msgstr "Timeout (in minuti)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Connessione"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Disconnessione "
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr ""
 
@@ -177,47 +177,52 @@ msgstr ""
 msgid "Access options"
 msgstr "Opzioni di accesso"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "La password spira il"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "L'accesso ai client Windows non richiede password"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Blocca l'account samba"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "La password spira il"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "L'account spira dopo"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Gruppo Samba"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 #, fuzzy
 msgid "Used by all users"
 msgstr "Utenti di Dominio"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr ""
 
@@ -240,14 +245,14 @@ msgid "Temporary disable samba account"
 msgstr "Disabilita temporaneamente l'account Samba"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -255,334 +260,350 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "disabilitato"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "input on, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "input on, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "input off, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "input off, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "disconnetti"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "reset"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "da qualsiasi client "
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "solo dal client precedente"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "elimina"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "On"
 msgstr "Opzioni"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "Stampante"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "Dominio"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "Giugno"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "giorno"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Password dell'amministratore"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Località"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Disconnessione "
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "Nuova password"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 #, fuzzy
 msgid "Last logon"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatico"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 #, fuzzy
 msgid "Password expires"
 msgstr "La password spira il"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+#, fuzzy
+msgid "No"
+msgstr "nessuno"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "La password immessa come 'Nuova password' è vuota"
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 #, fuzzy
 msgid "Home drive"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 #, fuzzy
 msgid "Home path"
 msgstr "Telefono privato"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Informazioni"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Attenzione"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Impostazioni Samba"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Identità"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 #, fuzzy
 msgid "Generic script path"
 msgstr "Script path"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Path del profilo"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Permetti all'utente di cambiare la propria password da un client"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "La password spira il"
+
+#: personal/samba/class_sambaAccount.inc:1490
 #, fuzzy
 msgid "Account expires"
 msgstr "L'account spira dopo"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Limita il tempo per la connessione"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Limita il tempo per la disconnessione"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 #, fuzzy
 msgid "Logon hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permetti la connessione solo da queste workstation"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/messages.po b/gosa-plugins/samba/locale/messages.po
index 79af02fcb..755c8401b 100644
--- a/gosa-plugins/samba/locale/messages.po
+++ b/gosa-plugins/samba/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,8 +44,8 @@ msgstr ""
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 msgid "LDAP error"
 msgstr ""
 
@@ -71,12 +71,12 @@ msgid "Generic"
 msgstr ""
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr ""
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgid "Script path"
 msgstr ""
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr ""
 
@@ -98,11 +98,11 @@ msgstr ""
 msgid "Terminal Server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr ""
 
@@ -118,18 +118,18 @@ msgstr ""
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr ""
 
@@ -169,44 +169,48 @@ msgstr ""
 msgid "Access options"
 msgstr ""
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+msgid "The password never expires"
+msgstr ""
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr ""
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr ""
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr ""
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr ""
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr ""
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr ""
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr ""
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 msgid "Used by all users"
 msgstr ""
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr ""
 
@@ -227,14 +231,14 @@ msgid "Temporary disable samba account"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr ""
 
@@ -242,298 +246,312 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Please select an entry!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "default"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 msgid "On"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 msgid "forever"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 msgid "on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 msgid "unset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 msgid "days"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 msgid "hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 msgid "Domain attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 msgid "Min password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 msgid "Password history"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 msgid "Force password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 msgid "Disconnect time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 msgid "Refuse machine password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 msgid "User attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 msgid "Last failed login"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 msgid "Logon attempts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 msgid "Last password update"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 msgid "Last logon"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 msgid "Last logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 msgid "Automatic logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:932
+#, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:938
 msgid "Password change available"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+msgid "Password never expires"
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 msgid "Logon hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
index 9cbc69b1e..6ccf510b2 100644
--- a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2008-06-09 17:22+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -47,8 +47,8 @@ msgstr "netwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -74,12 +74,12 @@ msgid "Generic"
 msgstr "Algemeen"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Domein"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Inlogscript"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Profielpad"
 
@@ -102,11 +102,11 @@ msgstr "Profielpad"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Sta inloggen op de Terminal Server toe"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Client configuratie voor initieel programma overnemen"
 
@@ -122,18 +122,18 @@ msgstr "Werkmap"
 msgid "Timeout settings (in minutes)"
 msgstr "Terminal Service timeouts (in minuten)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Max. verbindingsduur"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "Max. inactiviteitsduur"
 
@@ -173,44 +173,49 @@ msgstr "Herstel sessie indien verbroken"
 msgid "Access options"
 msgstr "Toegangsopties"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "Algemeen profielpad"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Blokkeer Samba/Windows account"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "Het account verloopt op"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr "Samba inlog tijdstippen"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr "Instellingen bewerken..."
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 msgid "Used by all users"
 msgstr "Gebruikt door alle gebruikers"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr "Gebruikt door sommige gebruikers"
 
@@ -231,14 +236,14 @@ msgid "Temporary disable samba account"
 msgstr "Schakel het Samba/Windows account tijdelijk uit"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -246,331 +251,346 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "FOUT"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Please select an entry!"
 msgstr "Selecteer a.u.b. een regel!"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "geen invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "geen invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "verbreken"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "vanaf elke client"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "alleen vanaf vorige client"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "Verwijder"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "On"
 msgstr "Open"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "Printer"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "Omlaag"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "Uur"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Beheerders wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Plaats"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "Nieuw wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 #, fuzzy
 msgid "Last logon"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatisch"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "Nee"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "Het nieuw ingevoerde wachtwoord is leeg."
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 #, fuzzy
 msgid "Home drive"
 msgstr "Persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 #, fuzzy
 msgid "Home path"
 msgstr "Telefoon Privé"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Het Windows gebruikersbeheer programma staat slechts acht clients toe!"
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Informatie"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. "
 "handmatig!"
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kan primaire groep niet in een samba groep omzetten: group kan niet "
 "geidentificeerd worden"
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba Instellingen"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr "Algemene persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr "Algemeen persoonlijk schijfstation"
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr "Algemeen scriptpad"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr "Windows werkstation"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr "Gebruiker mag het wachtwoord wijzigen"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "Algemeen profielpad"
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr "Account verloopt op"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Stel laatste inlogtijd in op"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Stel laatste uitlogtijd in op"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 msgid "Logon hours"
 msgstr "Inlog tijden"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr "Sta verbinding toe vanaf"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
index bccd6b780..ecc13c1a2 100644
--- a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -43,8 +43,8 @@ msgstr "Dodaj inwentarz"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -74,12 +74,12 @@ msgid "Generic"
 msgstr "Ogólne"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Domena"
 
@@ -93,8 +93,8 @@ msgid "Script path"
 msgstr "Ścieżka do skryptu"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Ścieżka do profilu"
 
@@ -102,11 +102,11 @@ msgstr "Ścieżka do profilu"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Zezwól na logowanie do serwera terminali"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Odziedzicz konfigurację klienta"
 
@@ -122,18 +122,18 @@ msgstr "Katalog roboczy"
 msgid "Timeout settings (in minutes)"
 msgstr "Ustawienia Timeoutu (w minutach)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Połączenie"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Rozłączenie"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "BEZCZYNNY"
 
@@ -173,47 +173,52 @@ msgstr "Połącz jeśli rozłączono"
 msgid "Access options"
 msgstr "Opcje dostępu"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "Hasło wygasa"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "Logowanie z klienta windows nie wymaga hasła"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "Hasło wygasa"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "Konto wygasa po"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Typ grupy Samba"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Ustawienia pocztowe"
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Zezwól na połączenia tylko z tych stacji"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 #, fuzzy
 msgid "Used by all users"
 msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr ""
 
@@ -236,14 +241,14 @@ msgid "Temporary disable samba account"
 msgstr "Tymczasowo wyłącz konto samba"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -251,331 +256,346 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
-msgstr ""
+msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "Błąd"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Proszę wybrać prawidłowy plik"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "wyłączone"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "input tak, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "input tak, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "input nie, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "rozłącz"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "resetuj"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "z każdego klienta"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "tylko z poprzedniego klienta"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Port sieve musi być liczbą."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "Usuń"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "On"
 msgstr "Otwórz"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "Drukarka"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "Serwer"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "W dół"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "Czerwiec"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "dzień"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "godzina"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Hasło Administratora"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Lokalizacja"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Rozłączenie"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "Nowe hasło"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 #, fuzzy
 msgid "Last logon"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatyczne"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 msgid "Password expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "Nie"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "Hasło które podano jako 'Nowe hasło' jest puste."
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 #, fuzzy
 msgid "Home drive"
 msgstr "Katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 #, fuzzy
 msgid "Home path"
 msgstr "Telefon domowy"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "User manager w windows zezwala tylko na 8 klientów. Podano więcej niż 8."
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Informacja"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Ustawienia Samba"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 msgid "Generic home directory"
 msgstr "Ogólny katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr "Podstawowy dysk domowy samba"
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 msgid "Generic script path"
 msgstr "Ogólna ścieżka do skryptu"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 msgid "Generic profile path"
 msgstr "Ogólna ścieżka do profilu"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 msgid "Allow user to change password"
 msgstr "Zezwól użytkownikowi na zmianę hasła"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "Hasło wygasa"
+
+#: personal/samba/class_sambaAccount.inc:1490
 msgid "Account expires"
 msgstr "Konto wygasa"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "Ogranicz czas logowania"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "Ogranicz czas wylogowania"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 #, fuzzy
 msgid "Logon hours"
 msgstr "jedna godzina"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 msgid "Allow connection from"
 msgstr "Zezwól na połączenia z"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
index c1ee35445..f2e39aa77 100644
--- a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -45,8 +45,8 @@ msgstr "Добавить объект"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -76,12 +76,12 @@ msgid "Generic"
 msgstr "Общее"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "Домен"
 
@@ -95,8 +95,8 @@ msgid "Script path"
 msgstr "Путь к сценариям"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Путь к профилю"
 
@@ -104,11 +104,11 @@ msgstr "Путь к профилю"
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
@@ -124,18 +124,18 @@ msgstr "Рабочий каталог"
 msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "Подключение"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "Отключение"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "Простой"
 
@@ -175,49 +175,54 @@ msgstr "В"
 msgid "Access options"
 msgstr "Параметры доступа"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "Срок действия пароля истекает"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 #, fuzzy
 msgid "Account expires after"
 msgstr "Учетная запись"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Группа Samba"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Почтовые настройки пользователя"
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 #, fuzzy
 msgid "Used by all users"
 msgstr "Пользователи домена"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr ""
 
@@ -240,14 +245,14 @@ msgid "Temporary disable samba account"
 msgstr "Временно отключить учетную запись Samba"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -255,339 +260,355 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "Введите корректный серийный номер"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "отключен"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "отключиться"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "сброс"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Новый пароль слишком короткий."
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "Удалить"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "On"
 msgstr "Параметры"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "Принтер"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "Сервер"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "Домен"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "Июнь"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "день"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "час"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Пароль администратора"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Местоположение"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Отключение"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "Новый пароль"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 #, fuzzy
 msgid "Last logon"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "автоматически"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 #, fuzzy
 msgid "Password expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+#, fuzzy
+msgid "No"
+msgstr "нет"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "Вы не указали новый пароль."
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 #, fuzzy
 msgid "Home drive"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 #, fuzzy
 msgid "Home path"
 msgstr "Домашний телефон"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "Информация"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Настройки Samba"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 #, fuzzy
 msgid "Generic script path"
 msgstr "Путь к сценариям"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Путь к профилю"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Разрешить пользователям менять пароль с клиента"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "Срок действия пароля истекает"
+
+#: personal/samba/class_sambaAccount.inc:1490
 #, fuzzy
 msgid "Account expires"
 msgstr "Учетная запись"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 #, fuzzy
 msgid "Logon hours"
 msgstr "один час"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
index c601e3aed..d70847028 100644
--- a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-30 09:58+0200\n"
+"POT-Creation-Date: 2009-10-02 14:39+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -45,8 +45,8 @@ msgstr "添加清单(inventory)"
 
 #: admin/systems/samba/class_winGeneric.inc:170
 #: admin/systems/samba/class_winGeneric.inc:293
-#: personal/samba/class_sambaAccount.inc:1034
-#: personal/samba/class_sambaAccount.inc:1407
+#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:1373
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -76,12 +76,12 @@ msgid "Generic"
 msgstr "通用配置"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:107
-#: personal/samba/class_sambaAccount.inc:1059
-#: personal/samba/class_sambaAccount.inc:1567
+#: personal/samba/class_sambaAccount.inc:1005
+#: personal/samba/class_sambaAccount.inc:1534
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1515
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1481
 msgid "Domain"
 msgstr "域"
 
@@ -95,8 +95,8 @@ msgid "Script path"
 msgstr "脚本路径"
 
 #: personal/samba/samba3.tpl:53 personal/samba/samba3.tpl:120
-#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1060
-#: personal/samba/class_sambaAccount.inc:1568
+#: personal/samba/samba2.tpl:45 personal/samba/class_sambaAccount.inc:1006
+#: personal/samba/class_sambaAccount.inc:1535
 msgid "Profile path"
 msgstr "Profile path"
 
@@ -104,11 +104,11 @@ msgstr "Profile path"
 msgid "Terminal Server"
 msgstr "终端服务器"
 
-#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1518
+#: personal/samba/samba3.tpl:104 personal/samba/class_sambaAccount.inc:1484
 msgid "Allow login on terminal server"
 msgstr "允许登录到终端服务器"
 
-#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1519
+#: personal/samba/samba3.tpl:141 personal/samba/class_sambaAccount.inc:1485
 msgid "Inherit client config"
 msgstr "继承客户配置"
 
@@ -124,18 +124,18 @@ msgstr "工作目录"
 msgid "Timeout settings (in minutes)"
 msgstr "超时设置（分钟）"
 
-#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1067
-#: personal/samba/class_sambaAccount.inc:1575
+#: personal/samba/samba3.tpl:185 personal/samba/class_sambaAccount.inc:1013
+#: personal/samba/class_sambaAccount.inc:1542
 msgid "Connection"
 msgstr "连接"
 
-#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1068
-#: personal/samba/class_sambaAccount.inc:1576
+#: personal/samba/samba3.tpl:199 personal/samba/class_sambaAccount.inc:1014
+#: personal/samba/class_sambaAccount.inc:1543
 msgid "Disconnection"
 msgstr "断开"
 
-#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1069
-#: personal/samba/class_sambaAccount.inc:1577
+#: personal/samba/samba3.tpl:213 personal/samba/class_sambaAccount.inc:1015
+#: personal/samba/class_sambaAccount.inc:1544
 msgid "IDLE"
 msgstr "闲"
 
@@ -176,45 +176,50 @@ msgstr "断线重连"
 msgid "Access options"
 msgstr "访问选项"
 
-#: personal/samba/samba3.tpl:317 personal/samba/samba2.tpl:72
-#: personal/samba/class_sambaAccount.inc:1521
+#: personal/samba/samba3.tpl:317
+#, fuzzy
+msgid "The password never expires"
+msgstr "口令过期截止日"
+
+#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:72
+#: personal/samba/class_sambaAccount.inc:1487
 msgid "Login from windows client requires no password"
 msgstr "从 Windows 客户端登录不需要口令"
 
-#: personal/samba/samba3.tpl:325 personal/samba/samba2.tpl:67
+#: personal/samba/samba3.tpl:333 personal/samba/samba2.tpl:67
 msgid "Allow user to change password from client"
 msgstr "允许用户从客户端修改口令"
 
-#: personal/samba/samba3.tpl:333 personal/samba/class_sambaAccount.inc:1522
+#: personal/samba/samba3.tpl:341 personal/samba/class_sambaAccount.inc:1489
 msgid "Lock samba account"
 msgstr "锁定 samba 账号"
 
-#: personal/samba/samba3.tpl:342 personal/samba/samba2.tpl:87
+#: personal/samba/samba3.tpl:350 personal/samba/samba2.tpl:87
 msgid "Password expires on"
 msgstr "口令过期截止日"
 
-#: personal/samba/samba3.tpl:374
+#: personal/samba/samba3.tpl:377
 msgid "Account expires after"
 msgstr "账号过期于"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Samba logon times"
 msgstr "Samba 登录次数"
 
-#: personal/samba/samba3.tpl:403
+#: personal/samba/samba3.tpl:398
 msgid "Edit settings..."
 msgstr "编辑设置..."
 
-#: personal/samba/samba3.tpl:415
+#: personal/samba/samba3.tpl:410
 msgid "Allow connection from these workstations only"
 msgstr "只允许从这些工作站建立连接"
 
-#: personal/samba/samba3.tpl:426
+#: personal/samba/samba3.tpl:421
 #, fuzzy
 msgid "Used by all users"
 msgstr "域用户"
 
-#: personal/samba/samba3.tpl:429
+#: personal/samba/samba3.tpl:424
 msgid "Used by some users"
 msgstr ""
 
@@ -235,14 +240,14 @@ msgid "Temporary disable samba account"
 msgstr "临时禁用 samba 账号"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:218
-#: personal/samba/class_sambaAccount.inc:230
-#: personal/samba/class_sambaAccount.inc:231
-#: personal/samba/class_sambaAccount.inc:240
-#: personal/samba/class_sambaAccount.inc:241
-#: personal/samba/class_sambaAccount.inc:243
-#: personal/samba/class_sambaAccount.inc:244
-#: personal/samba/class_sambaAccount.inc:1502
+#: personal/samba/class_sambaAccount.inc:224
+#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:237
+#: personal/samba/class_sambaAccount.inc:246
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:249
+#: personal/samba/class_sambaAccount.inc:250
+#: personal/samba/class_sambaAccount.inc:1468
 msgid "Samba"
 msgstr "Samba"
 
@@ -251,335 +256,350 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "******"
 
-#: personal/samba/class_sambaAccount.inc:244
+#: personal/samba/class_sambaAccount.inc:250
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 msgid "Error"
 msgstr "错误"
 
-#: personal/samba/class_sambaAccount.inc:372
+#: personal/samba/class_sambaAccount.inc:367
 #, fuzzy
 msgid "Please select an entry!"
 msgstr "请选择一个有效文件。"
 
-#: personal/samba/class_sambaAccount.inc:536
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:876
+#: personal/samba/class_sambaAccount.inc:465
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:817
 msgid "disabled"
 msgstr "禁用"
 
-#: personal/samba/class_sambaAccount.inc:537
+#: personal/samba/class_sambaAccount.inc:466
 msgid "input on, notify on"
 msgstr "输入打开，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:538
+#: personal/samba/class_sambaAccount.inc:467
 msgid "input on, notify off"
 msgstr "输入打开，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:539
+#: personal/samba/class_sambaAccount.inc:468
 msgid "input off, notify on"
 msgstr "输入关闭，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:540
+#: personal/samba/class_sambaAccount.inc:469
 msgid "input off, nofify off"
 msgstr "输入关闭，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:542
+#: personal/samba/class_sambaAccount.inc:471
 msgid "disconnect"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:543
+#: personal/samba/class_sambaAccount.inc:472
 msgid "reset"
 msgstr "重置"
 
-#: personal/samba/class_sambaAccount.inc:545
+#: personal/samba/class_sambaAccount.inc:474
 msgid "from any client"
 msgstr "从任意客户"
 
-#: personal/samba/class_sambaAccount.inc:546
+#: personal/samba/class_sambaAccount.inc:475
 msgid "from previous client only"
 msgstr "只从上一个客户"
 
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:646
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "输入的新口令太短了。"
 
-#: personal/samba/class_sambaAccount.inc:714
+#: personal/samba/class_sambaAccount.inc:650
 #, fuzzy, php-format
 msgid "The password is valid till %s, by user policy."
 msgstr "Sieve 端口应为数字。"
 
-#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:653
 #, php-format
 msgid "The password is valid till %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:830
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
-#: personal/samba/class_sambaAccount.inc:850
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:876
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:771
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:799
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:817
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 #, fuzzy
 msgid "default"
 msgstr "删除"
 
-#: personal/samba/class_sambaAccount.inc:836
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:777
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "On"
 msgstr "打开"
 
-#: personal/samba/class_sambaAccount.inc:852
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
+#: personal/samba/class_sambaAccount.inc:801
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
-#: personal/samba/class_sambaAccount.inc:870
-#: personal/samba/class_sambaAccount.inc:966
+#: personal/samba/class_sambaAccount.inc:807
+#: personal/samba/class_sambaAccount.inc:811
+#: personal/samba/class_sambaAccount.inc:903
 #, fuzzy
 msgid "minutes"
 msgstr "打印机"
 
-#: personal/samba/class_sambaAccount.inc:868
+#: personal/samba/class_sambaAccount.inc:809
 #, fuzzy
 msgid "forever"
 msgstr "服务器"
 
-#: personal/samba/class_sambaAccount.inc:882
-#: personal/samba/class_sambaAccount.inc:890
+#: personal/samba/class_sambaAccount.inc:823
+#: personal/samba/class_sambaAccount.inc:831
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:884
-#: personal/samba/class_sambaAccount.inc:892
+#: personal/samba/class_sambaAccount.inc:825
+#: personal/samba/class_sambaAccount.inc:833
 #, fuzzy
 msgid "on"
 msgstr "关闭"
 
-#: personal/samba/class_sambaAccount.inc:900
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:916
-#: personal/samba/class_sambaAccount.inc:924
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:948
-#: personal/samba/class_sambaAccount.inc:956
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:857
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:881
+#: personal/samba/class_sambaAccount.inc:887
+#: personal/samba/class_sambaAccount.inc:893
 #, fuzzy
 msgid "unset"
 msgstr "六月"
 
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:895
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:964
+#: personal/samba/class_sambaAccount.inc:901
 #, fuzzy
 msgid "days"
 msgstr "星期日"
 
-#: personal/samba/class_sambaAccount.inc:965
+#: personal/samba/class_sambaAccount.inc:902
 #, fuzzy
 msgid "hours"
 msgstr "小时"
 
-#: personal/samba/class_sambaAccount.inc:972
+#: personal/samba/class_sambaAccount.inc:909
 #, fuzzy
 msgid "Domain attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:973
-#: personal/samba/class_sambaAccount.inc:974
+#: personal/samba/class_sambaAccount.inc:910
+#: personal/samba/class_sambaAccount.inc:911
 #, fuzzy
 msgid "Min password length"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:975
+#: personal/samba/class_sambaAccount.inc:912
 #, fuzzy
 msgid "Password history"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:976
+#: personal/samba/class_sambaAccount.inc:913
 #, fuzzy
 msgid "Force password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:977
+#: personal/samba/class_sambaAccount.inc:914
 #, fuzzy
 msgid "Maximum password age"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:978
+#: personal/samba/class_sambaAccount.inc:915
 #, fuzzy
 msgid "Minimum password age"
 msgstr "管理员口令"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:916
 #, fuzzy
 msgid "Lockout duration"
 msgstr "位置"
 
-#: personal/samba/class_sambaAccount.inc:980
+#: personal/samba/class_sambaAccount.inc:917
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:981
+#: personal/samba/class_sambaAccount.inc:918
 #, fuzzy
 msgid "Disconnect time"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:982
+#: personal/samba/class_sambaAccount.inc:919
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:984
+#: personal/samba/class_sambaAccount.inc:921
 #, fuzzy
 msgid "User attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:985
+#: personal/samba/class_sambaAccount.inc:922
 #, fuzzy
 msgid "Last failed login"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:986
+#: personal/samba/class_sambaAccount.inc:923
 #, fuzzy
 msgid "Logon attempts"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:987
+#: personal/samba/class_sambaAccount.inc:924
 #, fuzzy
 msgid "Last password update"
 msgstr "新口令"
 
-#: personal/samba/class_sambaAccount.inc:988
+#: personal/samba/class_sambaAccount.inc:925
 #, fuzzy
 msgid "Last logon"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:989
+#: personal/samba/class_sambaAccount.inc:926
 #, fuzzy
 msgid "Last logoff"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:990
+#: personal/samba/class_sambaAccount.inc:927
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "自动"
 
-#: personal/samba/class_sambaAccount.inc:991
-#: personal/samba/class_sambaAccount.inc:1524
+#: personal/samba/class_sambaAccount.inc:930
+#: personal/samba/class_sambaAccount.inc:935
+#: personal/samba/class_sambaAccount.inc:1491
 #, fuzzy
 msgid "Password expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/class_sambaAccount.inc:992
+#: personal/samba/class_sambaAccount.inc:930
+msgid "No"
+msgstr "否"
+
+#: personal/samba/class_sambaAccount.inc:932
+#, fuzzy, php-format
+msgid "The password would expire on %s, but the password expiry is disabled."
+msgstr "输入的“新口令”为空。"
+
+#: personal/samba/class_sambaAccount.inc:938
 #, fuzzy
 msgid "Password change available"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:1052
+#: personal/samba/class_sambaAccount.inc:998
 #, fuzzy
 msgid "Home drive"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:1055
+#: personal/samba/class_sambaAccount.inc:1001
 #, fuzzy
 msgid "Home path"
 msgstr "住宅电话"
 
-#: personal/samba/class_sambaAccount.inc:1078
+#: personal/samba/class_sambaAccount.inc:1024
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Windows 用户管理员只允许八个客户。您指定的超过八个。"
 
-#: personal/samba/class_sambaAccount.inc:1097
+#: personal/samba/class_sambaAccount.inc:1043
 msgid "Information"
 msgstr "提示信息"
 
-#: personal/samba/class_sambaAccount.inc:1273
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1228
+#: personal/samba/class_sambaAccount.inc:1252
 msgid "Warning"
 msgstr "警告"
 
-#: personal/samba/class_sambaAccount.inc:1273
+#: personal/samba/class_sambaAccount.inc:1228
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1297
+#: personal/samba/class_sambaAccount.inc:1252
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1503 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1469 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba 设置"
 
-#: personal/samba/class_sambaAccount.inc:1507
+#: personal/samba/class_sambaAccount.inc:1473
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/samba/class_sambaAccount.inc:1513
+#: personal/samba/class_sambaAccount.inc:1479
 #, fuzzy
 msgid "Generic home directory"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:1514
+#: personal/samba/class_sambaAccount.inc:1480
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1516
+#: personal/samba/class_sambaAccount.inc:1482
 #, fuzzy
 msgid "Generic script path"
 msgstr "脚本路径"
 
-#: personal/samba/class_sambaAccount.inc:1517
+#: personal/samba/class_sambaAccount.inc:1483
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Profile path"
 
-#: personal/samba/class_sambaAccount.inc:1520
+#: personal/samba/class_sambaAccount.inc:1486
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "允许用户从客户端修改口令"
 
-#: personal/samba/class_sambaAccount.inc:1523
+#: personal/samba/class_sambaAccount.inc:1488
+#, fuzzy
+msgid "Password never expires"
+msgstr "口令过期截止日"
+
+#: personal/samba/class_sambaAccount.inc:1490
 #, fuzzy
 msgid "Account expires"
 msgstr "账号过期于"
 
-#: personal/samba/class_sambaAccount.inc:1525
+#: personal/samba/class_sambaAccount.inc:1492
 msgid "Limit Logon Time"
 msgstr "限制登录时间"
 
-#: personal/samba/class_sambaAccount.inc:1526
+#: personal/samba/class_sambaAccount.inc:1493
 msgid "Limit Logoff Time"
 msgstr "限制退出时间"
 
-#: personal/samba/class_sambaAccount.inc:1527
+#: personal/samba/class_sambaAccount.inc:1494
 #, fuzzy
 msgid "Logon hours"
 msgstr "1 小时"
 
-#: personal/samba/class_sambaAccount.inc:1528
+#: personal/samba/class_sambaAccount.inc:1495
 #, fuzzy
 msgid "Allow connection from"
 msgstr "只允许从这些工作站建立连接"
 
-#: personal/samba/class_sambaAccount.inc:1587
+#: personal/samba/class_sambaAccount.inc:1554
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."