From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 19 Dec 2006 10:35:34 +0000 (+0000)
Subject: Added Translation Strings.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad16b7f5202b63700a41e8b51f57765811efb666;p=gosa.git

Added Translation Strings.
Added German Translation.


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

diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index 7b6843e89..86d557c55 100644
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index e146240d6..c121e723f 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 08:32+0100\n"
-"PO-Revision-Date: 2006-12-18 08:37+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
+"PO-Revision-Date: 2006-12-19 14:14+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "Zusätzliches"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -365,6 +365,7 @@ msgstr "Speichern"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -737,7 +738,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -849,7 +850,7 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1301,7 +1302,7 @@ msgstr "Passwort ändern"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
@@ -1405,7 +1406,7 @@ msgid "User must change password on first login"
 msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort ändern"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "Passwort läuft ab am"
 
@@ -1531,115 +1532,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Januar"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Februar"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "März"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "April"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mai"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Juni"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Juli"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "August"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "September"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Oktober"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "November"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Dezember"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1803,40 +1804,20 @@ msgstr "Speichern des Netatalk-Kontos ist fehlgeschlagen"
 msgid "Removing Netatalk account failed"
 msgstr "Entfernen des Netatalk-Kontos ist fehlgeschlagen"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Samba-Basisverzeichnis"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Domäne"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Anmeldeskript"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Zugriffsoptionen"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Domäne"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Terminal-Server"
@@ -1862,17 +1843,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Verbinden"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Trennen"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "Leerlauf"
 
@@ -1909,6 +1890,18 @@ msgstr "Bei Trennung oder abgelaufenem Zeitlimit"
 msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Zugriffsoptionen"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Der Benutzer darf das Passwort vom Client aus ändern"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
@@ -1925,10 +1918,26 @@ msgstr "Limitiere Logoff Zeit"
 msgid "Account expires after"
 msgstr "Konto läuft ab am"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Samba logon times"
+msgstr "Samba-Anmeldezeiten"
+
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Edit settings..."
+msgstr "Einstellungen bearbeiten..."
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Samba-Basisverzeichnis"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Vorübergehende Deaktivierung des Samba-Zugriffs"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
@@ -1941,15 +1950,43 @@ msgstr "Wählen Sie die hinzuzufügenden Arbeitsstationen"
 msgid "Display workstations of department"
 msgstr "Zeige die Arbeitsstationen der Abteilung"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+msgid "Monday"
+msgstr "Montag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+msgid "Friday"
+msgstr "Freitag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+msgid "Saturday"
+msgstr "Samstag"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto besitzt keine Samba-Erweiterungen."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Samba-Konto entfernen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1957,12 +1994,12 @@ msgstr ""
 "Dieses Konto besitzt aktivierte Samba-Erweiterungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Samba-Konto erstellen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1970,7 +2007,7 @@ msgstr ""
 "Dieses Konto besitzt deaktivierte Samba-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1979,48 +2016,48 @@ msgstr ""
 "aktivieren werden UNIX-Erweiterungen benötigt. Diese müssen zuerst aktiviert "
 "werden."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "trennen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr "Entfernen des Samba-Kontos ist fehlgeschlagen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Der als '%s' angegebene Wert enhält ungültige Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -2028,7 +2065,7 @@ msgstr ""
 "Die Zeitlimitoption '%s' ist ausgewählt, das entsprechende Feld enthält "
 "ungültige oder keine Zeichen!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -2036,7 +2073,7 @@ msgstr ""
 "Die Benutzerverwaltung von Windows erlaubt nur acht Clients. Sie haben mehr "
 "als acht angegeben."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -2044,7 +2081,7 @@ msgstr ""
 "Achtung: Diesem Konto ist eine unbekannte Samba-SID zugeordnet. GOsa kann "
 "dieses Problem nicht beheben!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2052,10 +2089,37 @@ msgstr ""
 "Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, daher "
 "kann keine Umwandlung in eine Samba-Gruppe vorgenommen werden!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr "Speichern des Samba-Kontos fehlgeschlagen"
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Wählen Sie die Stunden, in denen sich der Benutzer anmelden darf"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
+msgstr "Stunde"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Anwenden"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "Die Umgebungs-Erweiterung ist zur Zeit deaktiviert."
@@ -2479,24 +2543,6 @@ msgstr "Skript kann vom Benutzer ausgetauscht werden"
 msgid "Logon script"
 msgstr "Anmelde-Skript"
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Anwenden"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6838,6 +6884,18 @@ msgstr "Speichern der ACL-Informationen fehlgeschlagen"
 msgid "All fields are writeable"
 msgstr "Alle Felder sind änderbar"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Anwendungsoptionen"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Diese 'dn' hat keine Anwendungs-Informationen"
@@ -6946,18 +7004,6 @@ msgstr ""
 "Der Release-Name '%s' kann nicht aufgelöst werden. Nehme '%s' als neuen "
 "Release-Namen an."
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Anwendungsoptionen"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -11070,7 +11116,8 @@ msgstr "Upload war nicht erfolgreich."
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
 #, php-format
 msgid "Missing directory '%s/glpi/' to store glpi uploads."
-msgstr "Das Verzeichnis '%s/glpi/' zum Speichern von GLPI-Uploads wurde nicht "
+msgstr ""
+"Das Verzeichnis '%s/glpi/' zum Speichern von GLPI-Uploads wurde nicht "
 "gefunden."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -13275,14 +13322,6 @@ msgstr ""
 "Benutzer und/oder Gruppe konnte nicht erstellt werden, bitte überprüfen Sie "
 "Ihre Konfiguration!"
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-"Fehler: Der angeforderte Unterbaum besitzt eine Inkonsistenz in der DN-"
-"Kodierung. Prüfen Sie den LDAP!"
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr "Kann SHA nicht benutzen (fehlende Funktion mhash / sha1 / crypt)"
@@ -13383,90 +13422,13 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - keine Information "
 "gefunden."
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-"Der LDAP-Server antwortet sehr langsam (%.2fs für die letzte Anfrage), dies "
-"könnte die Ursache für Leistungseinbrüche sein."
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-"Der LDAP-Server antwortet sehr langsam (%.2f), dies könnte die Ursache für "
-"Leistungseinbrüche sein."
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Erstelle Kopie von %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr "Verarbeite"
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr "unbekannter FAI-Status %s"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-"Die Referral-URL '%s' fehlt in der LDAP-Basis. Sie sollte ungefähr so "
-"aussehen 'ldap://server:port/basis'."
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
-"unterstützt. Bitte melden Sie dies an das Entwicklerteam."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "während der Arbeit auf LDAP-Server '%s'"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
-"'dn:...' beginnen in Zeile %s"
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
-"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
-"Zeile %s!"
+"Fehler: Der angeforderte Unterbaum besitzt eine Inkonsistenz in der DN-"
+"Kodierung. Prüfen Sie den LDAP!"
 
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
@@ -13763,6 +13725,91 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+"Der LDAP-Server antwortet sehr langsam (%.2fs für die letzte Anfrage), dies "
+"könnte die Ursache für Leistungseinbrüche sein."
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+"Der LDAP-Server antwortet sehr langsam (%.2f), dies könnte die Ursache für "
+"Leistungseinbrüche sein."
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Erstelle Kopie von %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr "Verarbeite"
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fehler beim Abrufen des Quell-DN, der Vorgang wurde abgebrochen!"
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "unbekannter FAI-Status %s"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+"Die Referral-URL '%s' fehlt in der LDAP-Basis. Sie sollte ungefähr so "
+"aussehen 'ldap://server:port/basis'."
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Das automatische Erzeugen des Objekt-Typs '%s' wird momentan nicht "
+"unterstützt. Bitte melden Sie dies an das Entwicklerteam."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "während der Arbeit auf LDAP-Server '%s'"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
+"'dn:...' beginnen in Zeile %s"
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "Der DN: '%s' (aus Zeile %s) existiert bereits in der LDAP-Datenbank."
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
+"Zeile %s!"
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/es/LC_MESSAGES/messages.mo b/locale/es/LC_MESSAGES/messages.mo
index 5a63adb92..e7b3e3ac0 100644
Binary files a/locale/es/LC_MESSAGES/messages.mo and b/locale/es/LC_MESSAGES/messages.mo differ
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 4d7129520..c3bf8217d 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
 "PO-Revision-Date: 2006-06-12 19:27GMT\n"
 "Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
 "Language-Team: Español\n"
@@ -32,7 +32,7 @@ msgstr "Agregados"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -361,6 +361,7 @@ msgstr "Guardar"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -734,7 +735,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -846,7 +847,7 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1286,7 +1287,7 @@ msgstr "Cambiar contraseña"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -1391,7 +1392,7 @@ msgstr ""
 "Los usuarios deben cambiar su contraseña en el próximo inicio de sesión"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
@@ -1519,115 +1520,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Enero"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Febrero"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Marzo"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Abril"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mayo"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Junio"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Julio"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Agosto"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Septiembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Octubre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Noviembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Diciembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1789,40 +1790,20 @@ msgstr "Ha fallado la grabación de la cuenta Netatalk"
 msgid "Removing Netatalk account failed"
 msgstr "Ha fallado la eliminación de la cuenta Netatalk"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Directorio Samba"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Dominio"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Opciones de acceso"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Permitir al usuario cambiar las opciones desde el cliente"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "El inicio de sesión en window no requiere contraseña"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Desactivar temporalmente la cuenta samba"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Dominio"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
@@ -1848,17 +1829,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1895,6 +1876,18 @@ msgstr "Desconexión o tiempo excedido"
 msgid "Reconnect if disconnected"
 msgstr "Reconexión si se ha desconectado"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Opciones de acceso"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Permitir al usuario cambiar las opciones desde el cliente"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "El inicio de sesión en window no requiere contraseña"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
@@ -1911,10 +1904,28 @@ msgstr "Tiempo de salida límite"
 msgid "Account expires after"
 msgstr "La cuenta expirará después de"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Directorio Samba"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "Parámetros de correo"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Directorio Samba"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Desactivar temporalmente la cuenta samba"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Parametros de samba"
@@ -1927,15 +1938,49 @@ msgstr "Selecciones estaciones de trabajo para añadir"
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "día"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "día"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "día"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "horas"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "día"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Estrategia"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1943,12 +1988,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1956,7 +2001,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1965,48 +2010,48 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor especificado como '%s' contiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -2014,7 +2059,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y contiene "
 "caracteres no validos o no caracteres!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -2022,7 +2067,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -2030,7 +2075,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2038,10 +2083,39 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "hora"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Aplicar"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -2455,24 +2529,6 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Aplicar"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6726,6 +6782,18 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr "Todos los campos son rellenarles."
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
@@ -6832,18 +6900,6 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -12989,12 +13045,6 @@ msgstr ""
 "No puedo conectar a la base de datos especificada, por favor compruebe la "
 "configuración de GLPI."
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -13091,84 +13141,11 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Creando copia de %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr ""
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr "Ha habido un error mientras se accedía al dn origen - ¡Abortado!"
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr "Estado FAI desconocido %s"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
-"favor, informe de esto al equipo de desarrollo de GOsa."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr ""
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "Mientras se conectaba al servidor LDAP '%s'"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
 
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
@@ -13450,6 +13427,85 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Creando copia de %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr "Ha habido un error mientras se accedía al dn origen - ¡Abortado!"
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "Estado FAI desconocido %s"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
+"favor, informe de esto al equipo de desarrollo de GOsa."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "Mientras se conectaba al servidor LDAP '%s'"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
+"el LDIF desde la linea %s en adelante!"
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/fr/LC_MESSAGES/messages.mo b/locale/fr/LC_MESSAGES/messages.mo
index 1796ce23a..cc670a1dd 100644
Binary files a/locale/fr/LC_MESSAGES/messages.mo and b/locale/fr/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 18332dc60..ec7564a41 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/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: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
 "PO-Revision-Date: 2006-12-18 12:40+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -32,7 +32,7 @@ msgstr "Extensions"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -361,6 +361,7 @@ msgstr "Enregistrer"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -734,7 +735,7 @@ msgstr "Utilisateur dont on montre les adresses"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -846,7 +847,7 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -911,7 +912,8 @@ msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
 #: plugins/personal/mail/generic.tpl:75
-msgid "Select to automatically response with the vacation message defined below"
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Indiquez la réponse automatique en remplissant le message d'absence ci-"
 "dessous"
@@ -1054,7 +1056,8 @@ msgstr ""
 "l'activer en cliquant sur le bouton ci-dessous."
 
 #: plugins/personal/mail/class_mailAccount.inc:318
-msgid "You're trying to add an invalid email address to the list of forwarders."
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
 "renvoi."
@@ -1088,7 +1091,8 @@ msgid "Saving mail account failed"
 msgstr "La sauvegarde du compte de messagerie à échoué"
 
 #: plugins/personal/mail/class_mailAccount.inc:840
-msgid "There is no valid mailserver specified, please add one in the system setup."
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 "Il n'y a pas de serveur de messagerie valide spécifié, veuillez en ajouter "
 "un dans la configuration système."
@@ -1121,7 +1125,8 @@ msgstr "La valeur dans le champ 'Taille du quota' n'est pas valide."
 #: plugins/personal/mail/class_mailAccount.inc:874
 #: plugins/admin/groups/class_groupMail.inc:863
 msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Veuillez indiquer une taille valide pour les messages devant être rejetés."
+msgstr ""
+"Veuillez indiquer une taille valide pour les messages devant être rejetés."
 
 #: plugins/personal/mail/class_mailAccount.inc:884
 #: plugins/admin/groups/class_groupMail.inc:871
@@ -1269,7 +1274,8 @@ msgstr ""
 #: plugins/personal/password/main.inc:49 plugins/personal/generic/main.inc:89
 #: plugins/admin/users/class_userManagement.inc:231
 msgid "The password you've entered as 'New password' is empty."
-msgstr "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+msgstr ""
+"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
 
 #: plugins/personal/password/main.inc:57
 msgid "The password used as new and current are too similar."
@@ -1285,7 +1291,8 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: plugins/personal/password/main.inc:87
 msgid "External password changer reported a problem: "
-msgstr "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
+msgstr ""
+"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
 #: plugins/personal/password/main.inc:118
 #: plugins/admin/users/class_divListUsers.inc:138
@@ -1295,7 +1302,7 @@ msgstr "Modifier le mot de passe"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Répertoire Home"
 
@@ -1396,10 +1403,11 @@ msgstr "Utilisateur dont on montre les groupes"
 
 #: plugins/personal/posix/posix_shadow.tpl:5
 msgid "User must change password on first login"
-msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
@@ -1528,115 +1536,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Janvier"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Février"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Mars"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Avril"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mai"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Juin"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Juillet"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Aôut"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Septembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Octobre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Novembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Décembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1669,7 +1677,8 @@ msgstr "Le champ obligatoire 'Répertoire Home' n'est pas renseigné."
 
 #: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Please enter a valid path in 'Home directory' field."
-msgstr "Veuillez indiquer un chemin d'accès valide dans le champ 'Répertoire Home'."
+msgstr ""
+"Veuillez indiquer un chemin d'accès valide dans le champ 'Répertoire Home'."
 
 #: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'UID' is not valid."
@@ -1697,7 +1706,8 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:938
 msgid "Value specified as 'shadowMax' is not valid."
-msgstr "La valeur ' Le mot de passe doit être changé après x jours' n'est pas valide."
+msgstr ""
+"La valeur ' Le mot de passe doit être changé après x jours' n'est pas valide."
 
 #: plugins/personal/posix/class_posixAccount.inc:943
 msgid "Value specified as 'shadowWarning' is not valid."
@@ -1815,42 +1825,20 @@ msgstr "La sauvegarde du compte Netatalk à échoué"
 msgid "Removing Netatalk account failed"
 msgstr "La suppression du compte netatalk à échoué"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Répertoire de l'utilisateur samba"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Domaine"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Chemin du Script"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Options d'accès"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr ""
-"Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
-"cliente"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "L'identification sur une station windows ne nécessite pas de mot de passe"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Désactiver temporairement le compte Samba"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Domaine"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
@@ -1876,17 +1864,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Connexion"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Déconnexion"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "En attente"
 
@@ -1923,6 +1911,21 @@ msgstr "Sur interrompu ou temps d'attente dépassé"
 msgid "Reconnect if disconnected"
 msgstr "Reconnexion si déconnecté"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Options d'accès"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr ""
+"Autoriser les utilisateurs à changer de mot de passe à partir d'une station "
+"cliente"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr ""
+"L'identification sur une station windows ne nécessite pas de mot de passe"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
@@ -1939,10 +1942,28 @@ msgstr "Limiter les heures de deconnections"
 msgid "Account expires after"
 msgstr "Le compte expire après"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Répertoire de l'utilisateur samba"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "Paramètres de messagerie"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Répertoire de l'utilisateur samba"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Désactiver temporairement le compte Samba"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Configuration Samba"
@@ -1955,15 +1976,49 @@ msgstr "Sélectionner les stations à ajouter"
 msgid "Display workstations of department"
 msgstr "Afficher les stations d'un département"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "jour"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "jour"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "jour"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "heures"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "jour"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Stratégie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "Aucune extension samba pour cet utilisateur."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Supprimer le compte Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1971,12 +2026,12 @@ msgstr ""
 "Une extension samba existe pour cet utilisateur. Vous pouvez la supprimer en "
 "cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Créer un compte Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1984,7 +2039,7 @@ msgstr ""
 "Aucune extension samba n'existe pour cet utilisateur. Vous pouvez en créer "
 "un en cliquant sur le bouton ci-dessous."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1992,55 +2047,56 @@ msgstr ""
 "La création d'un compte samba nécessite, au préalable, que l'utilisateur "
 "possède un compte Posix."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "entrée activée, notification activée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "entrée activée, notification désactivée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "entrée désactivée, notification activée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "entrée désactivée, notification désactivée"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "remise à zéro"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "de n'importe quel client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr "La suppression du compte Samba à échoué"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "La valeur spécifiée comme '%s' contient des caractères invalides!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
-msgid "The timeout property '%s' is checked and contains invalid or no characters!"
+msgid ""
+"The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 "La propriété temps d'attente '%s' est activée et contient des caractères "
 "invalides ou ne contient rien!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -2048,7 +2104,7 @@ msgstr ""
 "Le gestionnaire d'utilisateurs windows accepte seulement huit clients. Vous "
 "en avez spécifiés plus de huit."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -2056,7 +2112,7 @@ msgstr ""
 "Attention: Ce compte possède un samba SID non assigné: Le problème ne peut "
 "pas être fixé par GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2064,10 +2120,39 @@ msgstr ""
 "Erreur: Impossible d'identifier le groupe principal de l'utilisateur - la "
 "transformation vers un groupe samba est impossible!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr "La sauvegarde du compte Samba à échoué"
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Indiquez le serveur de messagerie de l'utilisateur"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "heure"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Appliquer"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "L'extension d'environnement est actuellement désactivée."
@@ -2234,7 +2319,8 @@ msgstr ""
 
 #: plugins/personal/environment/class_hotplugDialog.inc:140
 msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
-msgstr "Veuillez indiquer une identification produit valide. (2 bytes comme 'OxFFFF')"
+msgstr ""
+"Veuillez indiquer une identification produit valide. (2 bytes comme 'OxFFFF')"
 
 #: plugins/personal/environment/class_hotplugDialog.inc:145
 msgid "An Entry with this name already exists."
@@ -2277,7 +2363,8 @@ msgstr "Afficher les utilisateurs correspondants"
 
 #: plugins/personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
-msgstr "Expression régulière concordant avec les noms des périphériques hotplug"
+msgstr ""
+"Expression régulière concordant avec les noms des périphériques hotplug"
 
 #: plugins/personal/environment/class_environment.inc:187
 msgid "auto"
@@ -2424,7 +2511,8 @@ msgstr "Expression régulière concordant avec les noms des imprimantes"
 
 #: plugins/personal/environment/class_logonManagementDialog.inc:100
 msgid "Specified name should only consist of uper-/lowercase characters."
-msgstr "Le nom utilisé ne peut être composé que de caractères miniscules/majuscuales."
+msgstr ""
+"Le nom utilisé ne peut être composé que de caractères miniscules/majuscuales."
 
 #: plugins/personal/environment/class_logonManagementDialog.inc:104
 msgid "Please specify a valid script name."
@@ -2490,24 +2578,6 @@ msgstr "Le script peut être remplacé par l'utilisateur"
 msgid "Logon script"
 msgstr "Script de démarrage"
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Appliquer"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -2521,7 +2591,8 @@ msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr "Impossible d'effacer '%s'. L'erreur est: le fichier n'existe pas."
 
 #: plugins/personal/environment/class_kioskManagementDialog.inc:139
-msgid "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 "La variable KIOSPATH n'est pas définie dans votre gosa.conf. Impossible de "
 "gérer des profiles kiosk!"
@@ -2664,7 +2735,8 @@ msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
 
 #: plugins/personal/generic/class_user.inc:1014
 msgid "You have no permissions to create a user on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
+msgstr ""
+"Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
 
 #: plugins/personal/generic/class_user.inc:1019
 msgid "You have no permissions to move a user from the original 'Base'."
@@ -3392,7 +3464,8 @@ msgid "Kolab"
 msgstr "Kolab"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:123
-msgid "You're trying to add an invalid email address to the list of delegations."
+msgid ""
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
 "délégations."
@@ -3432,7 +3505,8 @@ msgstr "Anonyme"
 #: plugins/personal/connectivity/class_kolabAccount.inc:273
 #, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
-msgstr "La suppression du compte/ de l'utilisateur Kolab avec le dn '%s' à échoué."
+msgstr ""
+"La suppression du compte/ de l'utilisateur Kolab avec le dn '%s' à échoué."
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:284
 msgid "The value specified as Free Busy future needs to be an integer."
@@ -3442,7 +3516,8 @@ msgstr ""
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:289
 msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "La valeur spécifiée comme information de disponibilité future est invalide."
+msgstr ""
+"La valeur spécifiée comme information de disponibilité future est invalide."
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:303
 #, php-format
@@ -3459,7 +3534,8 @@ msgstr ""
 #: plugins/personal/connectivity/class_kolabAccount.inc:390
 #, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
-msgstr "La sauvegarde du compte/de l'utilisateur Kolab avec le dn '%s' à échoué."
+msgstr ""
+"La sauvegarde du compte/de l'utilisateur Kolab avec le dn '%s' à échoué."
 
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
@@ -3618,7 +3694,8 @@ msgstr "Type"
 
 #: plugins/gofax/blocklists/generic.tpl:39
 msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
+msgstr ""
+"Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
 
 #: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
@@ -3663,7 +3740,8 @@ msgstr "La suppression de l'objet blocklist à échoué"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
+msgstr ""
+"Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:232
@@ -3680,7 +3758,8 @@ msgstr "Le nom spécifié est déjà utilisé."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 msgid "No permission to create a blocklist on this base."
-msgstr "Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
+msgstr ""
+"Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
@@ -4055,7 +4134,8 @@ msgstr "Veuillez entrer un numéro de téléphone valide dans le champ 'Fax'."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
 msgid "Mail delivery is checked, but no address has been specified."
-msgstr "La livraison par messagerie est activée, mais aucune adresse est spécifiée."
+msgstr ""
+"La livraison par messagerie est activée, mais aucune adresse est spécifiée."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
 msgid "The mail address you've entered is invalid."
@@ -4211,7 +4291,8 @@ msgstr ""
 #: plugins/addons/logview/class_logview.inc:71
 #: plugins/gofon/fonreports/class_fonreport.inc:160
 msgid "There is no mysql extension available, please check your php setup."
-msgstr "Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
+msgstr ""
+"Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
 
 #: plugins/gofax/faxreports/class_faxreport.inc:116
 msgid "Can't connect to fax database, no reports can be shown!"
@@ -4227,7 +4308,8 @@ msgstr ""
 
 #: plugins/gofax/faxreports/class_faxreport.inc:125
 msgid "Can't query fax table 'faxlog' for report generation!"
-msgstr "Impossible d'interroger la table 'faxlog' pour la génération de rapports!"
+msgstr ""
+"Impossible d'interroger la table 'faxlog' pour la génération de rapports!"
 
 #: plugins/gofax/faxreports/class_faxreport.inc:148
 #: plugins/gofax/faxreports/class_faxreport.inc:266
@@ -4327,7 +4409,8 @@ msgstr "Afficher les entrées de l'organisation"
 
 #: plugins/addons/addressbook/contents.tpl:69
 msgid "Select to see users in addressbook"
-msgstr "Sélectionner pour afficher les utilisateurs présent dans le carnet d'adresse"
+msgstr ""
+"Sélectionner pour afficher les utilisateurs présent dans le carnet d'adresse"
 
 #: plugins/addons/addressbook/contents.tpl:69
 msgid "Show addressbook entries"
@@ -4508,13 +4591,15 @@ msgid "User ID"
 msgstr "ID de l'utilisateur"
 
 #: plugins/addons/addressbook/class_addressbook.inc:606
-msgid "Cannot create a unique DN for your entry. Please fill more formular fields."
+msgid ""
+"Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Impossible de créer un DN unique pour cette entrée. Veuillez remplir plus de "
 "champs."
 
 #: plugins/addons/addressbook/class_addressbook.inc:614
-msgid "You have no permissions to create or modify a global address book entry."
+msgid ""
+"You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer ou modifier une entrée "
 "dans le carnet d'adresse général."
@@ -4752,7 +4837,8 @@ msgid "Mail queue"
 msgstr "Queue du serveur de messagerie"
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:58
-msgid "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
+msgid ""
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 "Veuillez vérifier votre fichier 'gosa.conf' il n'y a pas de "
 "'MAILQUEUESCRIPTPATH' spécifiée."
@@ -4762,7 +4848,8 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
 #: plugins/addons/mailqueue/class_mailqueue.inc:198
 #, php-format
-msgid "You do not have permission to execute the command '%s' on the mailqueue."
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
 msgstr ""
 "Vous n'avez pas l'autorisation pour exécuter la commande '%s' sur la queue "
 "de messagerie."
@@ -4856,11 +4943,13 @@ msgstr "Exportation réussie"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the complete LDAP database to a xls file"
-msgstr "Cliquez ici pour sauvegarder l'arbre LDAP  au complet dans un fichier xls"
+msgstr ""
+"Cliquez ici pour sauvegarder l'arbre LDAP  au complet dans un fichier xls"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the LDAP Export to a xls file"
-msgstr "Cliquez ici pour exporter un morceau de l'arbre LDAP comme un fichier xls"
+msgstr ""
+"Cliquez ici pour exporter un morceau de l'arbre LDAP comme un fichier xls"
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
@@ -4869,7 +4958,8 @@ msgstr "Exportation LDIF"
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:101
 msgid "You've no permission to do CSV imports."
-msgstr "Vous n'avez pas les droits nécessaires pour effectuer des importations CSV."
+msgstr ""
+"Vous n'avez pas les droits nécessaires pour effectuer des importations CSV."
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:161
 msgid "Need 'sn','givenName' and 'uid' to create user."
@@ -4987,7 +5077,8 @@ msgstr "Importer un fichier XLS"
 #: plugins/addons/ldapmanager/class_exportxls.inc:39
 #: plugins/addons/ldapmanager/class_export.inc:38
 msgid "You've no permission to do LDAP exports."
-msgstr "Vous n'avez pas les droits nécessaires pour effectuer des exportations LDAP."
+msgstr ""
+"Vous n'avez pas les droits nécessaires pour effectuer des exportations LDAP."
 
 #: plugins/addons/ldapmanager/class_exportxls.inc:89
 #: plugins/addons/ldapmanager/class_export.inc:83
@@ -4996,7 +5087,8 @@ msgstr "Une erreur s'est produite lors de l'exportation!"
 
 #: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
-msgstr "Vous n'avez pas les droits nécessaires pour effectuer des importations LDAP."
+msgstr ""
+"Vous n'avez pas les droits nécessaires pour effectuer des importations LDAP."
 
 #: plugins/addons/ldapmanager/class_import.inc:108
 msgid "Unknown Error"
@@ -5281,7 +5373,8 @@ msgid "Please enter your search string here"
 msgstr "Veuillez indiquer une chaîne de caractères a chercher"
 
 #: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid "This list displays all assigned package names for this repository settings."
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr "Cette liste affiche tout les paquets assigné à ce dépôt."
 
 #: plugins/admin/fai/class_faiPackageEntry.inc:124
@@ -5425,7 +5518,8 @@ msgstr "Liste des paquets"
 #: plugins/admin/fai/class_faiSummaryTab.inc:170
 #: plugins/admin/systems/class_servRepository.inc:91
 msgid "You can't use this plugin until FAI is activated."
-msgstr "Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
 
 #: plugins/admin/fai/class_faiSummaryTab.inc:209
 msgid "This object has no FAI classes assigned."
@@ -5731,7 +5825,8 @@ msgstr "Veuillez entrer une dimension valide pour la partition %s."
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:404
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
-msgstr "Veuillez entrer une dimension valide pour la taille de la partition %s."
+msgstr ""
+"Veuillez entrer une dimension valide pour la taille de la partition %s."
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
 msgid ""
@@ -5788,7 +5883,8 @@ msgstr ""
 "miroirs peuvent être changés."
 
 #: plugins/admin/fai/faiPackageNew.tpl:14
-msgid "First select the preferred release, then the section and finally the mirror."
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
 msgstr ""
 "Choisissez en premier lieu votre version préférée, ensuite la section et "
 "finalement le miroir."
@@ -6420,7 +6516,8 @@ msgstr "Adresse de messagerie principale pour ce répertoire partagé"
 
 #: plugins/admin/groups/mail.tpl:16
 msgid "Select mail server to place user on"
-msgstr "Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
+msgstr ""
+"Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
 
 #: plugins/admin/groups/mail.tpl:63
 msgid "IMAP shared folders"
@@ -6504,7 +6601,8 @@ msgstr "! identifiant inconnu"
 
 #: plugins/admin/groups/class_groupGeneric.inc:480
 #, php-format
-msgid "Your search method returned more than '%s' users, only '%s' users are shown."
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 "'%s' utilisateurs ont été trouvé grâce à votre recherche, les '%s' premiers "
 "seront montrés."
@@ -6585,7 +6683,8 @@ msgstr "Afficher les groupes Samba"
 
 #: plugins/admin/groups/class_divListGroup.inc:56
 msgid "Select to see groups that have applications configured"
-msgstr "Sélectionnez afin d'afficher les groupes ayant des applications configurées"
+msgstr ""
+"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
 
 #: plugins/admin/groups/class_divListGroup.inc:56
 msgid "Show application groups"
@@ -6727,7 +6826,8 @@ msgstr ""
 "principale'."
 
 #: plugins/admin/groups/class_groupMail.inc:875
-msgid "Please choose valid permission settings. Default permission can't be emtpy."
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Veuillez choisir des permissions valables. Les permissions par défaut ne "
 "peuvent pas être vides."
@@ -6838,6 +6938,18 @@ msgstr "La sauvegarde des informations ACL à échoué"
 msgid "All fields are writeable"
 msgstr "Tous les champs sont modifiables"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Options des applications"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Afficher les adresses du département"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Afficher les adresses correspondantes"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Ce 'dn' n'est pas un groupe d'applications."
@@ -6876,7 +6988,8 @@ msgstr "Le catégorie indiquée existe déjà."
 
 #: plugins/admin/groups/class_groupApplication.inc:522
 msgid "The selected application name is not uniq. Please check your LDAP."
-msgstr "Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
+msgstr ""
+"Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
 
 #: plugins/admin/groups/class_groupApplication.inc:558
 msgid "The selected application has no options."
@@ -6944,18 +7057,6 @@ msgstr ""
 "Impossible de trouver la version '%s', le nom sera '%s'. Probablement que "
 "les objets de base ont changés."
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Options des applications"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Afficher les adresses du département"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Afficher les adresses correspondantes"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -6987,7 +7088,8 @@ msgstr "Utilisateurs"
 #: plugins/admin/users/class_userManagement.inc:204
 #: plugins/admin/users/class_userManagement.inc:280
 msgid "You are not allowed to set this users password!"
-msgstr "Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
+msgstr ""
+"Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
 
 #: plugins/admin/users/class_userManagement.inc:319
 #, php-format
@@ -7063,7 +7165,8 @@ msgstr "Sélectionnez afin d'afficher les modèles des pseudo utilisateurs"
 
 #: plugins/admin/users/class_divListUsers.inc:55
 msgid "Select to see users that have only a GOsa object"
-msgstr "Sélectionnez afin d'afficher les utilisateurs qui ont seulement un objet GOsa"
+msgstr ""
+"Sélectionnez afin d'afficher les utilisateurs qui ont seulement un objet GOsa"
 
 #: plugins/admin/users/class_divListUsers.inc:55
 msgid "Show functional users"
@@ -7079,7 +7182,8 @@ msgstr "Afficher les utilisateurs Unix"
 
 #: plugins/admin/users/class_divListUsers.inc:57
 msgid "Select to see users that have mail settings"
-msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte de messagerie"
+msgstr ""
+"Sélectionnez afin d'afficher les utilisateurs ayant un compte de messagerie"
 
 #: plugins/admin/users/class_divListUsers.inc:57
 msgid "Show mail users"
@@ -7274,7 +7378,8 @@ msgid "Create options"
 msgstr "Créer des options"
 
 #: plugins/admin/applications/class_applicationParameters.inc:58
-msgid "This application has options disabled. You can enable them by clicking below."
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
 msgstr ""
 "Cette application a des options désactivées. Vous pouvez les activer en "
 "cliquant en-dessous."
@@ -7502,7 +7607,8 @@ msgstr "La suppression du département à échoué"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:218
 msgid "You have no permissions to create a department on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
+msgstr ""
+"Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:225
 #: plugins/admin/departments/class_departmentGeneric.inc:227
@@ -7515,8 +7621,10 @@ msgstr "Le champ obligatoire 'Description' n'est pas rempli."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:239
 #, php-format
-msgid "The field 'Name' contains the reserved word '%s'. Please choose another name."
-msgstr "Le champ 'Nom' contient le mot réservé '%s'. Veuillez choisir un autre nom."
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
+msgstr ""
+"Le champ 'Nom' contient le mot réservé '%s'. Veuillez choisir un autre nom."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:285
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
@@ -7616,7 +7724,8 @@ msgstr "Ce 'dn' n'a pas d'extension de terminaux."
 
 #: plugins/admin/systems/class_terminalInfo.inc:74
 msgid "There is no php snmp module installed, can't gather any informations."
-msgstr "Le module php snmp n'est pas installé, impossible d'obtenir les informations."
+msgstr ""
+"Le module php snmp n'est pas installé, impossible d'obtenir les informations."
 
 #: plugins/admin/systems/class_terminalInfo.inc:80
 #: plugins/admin/systems/class_terminalInfo.inc:174
@@ -8278,12 +8387,15 @@ msgstr ""
 
 #: plugins/admin/systems/class_workstationStartup.inc:1085
 msgid "Saving workstation startup settings failed"
-msgstr "La sauvegarde des paramètres de démarrage pour la station de travail à échoué"
+msgstr ""
+"La sauvegarde des paramètres de démarrage pour la station de travail à échoué"
 
 #: plugins/admin/systems/class_workstationStartup.inc:1135
 #, php-format
-msgid "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
-msgstr "Impossible d'exécuter REPOSITORY_HOOK '%s' veuillez vérifier votre gosa.conf."
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr ""
+"Impossible d'exécuter REPOSITORY_HOOK '%s' veuillez vérifier votre gosa.conf."
 
 #: plugins/admin/systems/class_workstationStartup.inc:1137
 #: plugins/admin/systems/class_servRepositorySetup.inc:189
@@ -8298,7 +8410,8 @@ msgstr ""
 #: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
-msgstr "Impossible d'ouvrir '%s', les paramètres du fichier ppd on été réinitialisés."
+msgstr ""
+"Impossible d'ouvrir '%s', les paramètres du fichier ppd on été réinitialisés."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:87
 msgid "Can't get ppd informations."
@@ -8327,7 +8440,8 @@ msgstr "Impossible d'ouvrir '%s', le fichier PPD n'est pas lisible"
 #: plugins/admin/systems/class_printerPPDDialog.inc:275
 #, php-format
 msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr "impossible de créer le répertoire '%s' pour sauvegarder le fichier ppd."
+msgstr ""
+"impossible de créer le répertoire '%s' pour sauvegarder le fichier ppd."
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:211
 #, php-format
@@ -8397,7 +8511,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:494
 #, php-format
-msgid "Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
 msgstr ""
 "Impossible d'enlever l'ancien fichier ppd '%s'. Le fichier n'existe pas ou "
 "n'est pas accessible."
@@ -8483,7 +8598,8 @@ msgid "List of devices"
 msgstr "Liste des périphériques"
 
 #: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid "This dialog allows you to attach a device to your currently edited computer."
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 "Ce menu vous permet d'attacher un périphérique à votre ordinateur en cours "
 "d'édition."
@@ -8547,12 +8663,14 @@ msgstr ""
 msgid ""
 "Can't rename given printer type to '%s', because this type name already "
 "exists."
-msgstr "Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
+msgstr ""
+"Impossible de renommer le type d'imprimante en '%s', ce type existe déjà."
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:278
 #, php-format
 msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr "Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
+msgstr ""
+"Impossible d'effacer ce type d'imprimante, il est encore utilisé par '%s'"
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:611
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:626
@@ -8678,7 +8796,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_workstationGeneric.inc:348
 msgid "The required field 'Workstation name' is not set."
-msgstr "Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
+msgstr ""
+"Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
 
 #: plugins/admin/systems/class_workstationGeneric.inc:366
 #: plugins/admin/systems/class_componentGeneric.inc:166
@@ -8914,12 +9033,14 @@ msgstr ""
 #: plugins/admin/systems/class_goVirusServer.inc:151
 #, php-format
 msgid "Removing of server services/anti virus with dn '%s' failed."
-msgstr "La suppression du service antivirus du serveur avec le dn '%s' à échoué."
+msgstr ""
+"La suppression du service antivirus du serveur avec le dn '%s' à échoué."
 
 #: plugins/admin/systems/class_goVirusServer.inc:196
 #, php-format
 msgid "Saving of server services/anti virus with dn '%s' failed."
-msgstr "La sauvegarde du service antivirus du serveur avec le dn '%s' à échoué."
+msgstr ""
+"La sauvegarde du service antivirus du serveur avec le dn '%s' à échoué."
 
 #: plugins/admin/systems/class_goVirusServer.inc:204
 msgid "Maximum directory recursions"
@@ -8957,7 +9078,8 @@ msgstr "Le valeur spécifiée pour '%s' doit être une numérique."
 #: plugins/admin/systems/class_goVirusServer.inc:305
 #: plugins/admin/systems/class_goSpamServer.inc:451
 #, php-format
-msgid "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le ACTION_HOOK de l'extension '%s' n'existe "
 "pas."
@@ -8965,7 +9087,8 @@ msgstr ""
 #: plugins/admin/systems/class_goVirusServer.inc:329
 #, php-format
 msgid "Set status flag for server services/anti virus with dn '%s' failed."
-msgstr "L'activation du statut pour le service antivirus avec le dn '%s' à échoué."
+msgstr ""
+"L'activation du statut pour le service antivirus avec le dn '%s' à échoué."
 
 #: plugins/admin/systems/class_servDB.inc:136
 #: plugins/admin/systems/class_servDB.inc:145
@@ -9028,8 +9151,8 @@ msgstr "Option"
 #, php-format
 msgid "The file '%s/encodings' does not exist, can't get supported charsets."
 msgstr ""
-"Le fichier '%s/encodings' n'existe pas, impossible d'obtenir la liste "
-"des jeux de caractères supportés."
+"Le fichier '%s/encodings' n'existe pas, impossible d'obtenir la liste des "
+"jeux de caractères supportés."
 
 #: plugins/admin/systems/class_servNfs.inc:49
 #, php-format
@@ -9154,7 +9277,8 @@ msgstr "Accepter le courrier électronique venant d'internet"
 
 #: plugins/admin/systems/servkolab.tpl:195
 msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
+msgstr ""
+"Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
 
 #: plugins/admin/systems/phone.tpl:6
 msgid "Phone name"
@@ -9412,11 +9536,13 @@ msgstr "Cette fonctionnalité n'est pas encore implémentée."
 
 #: plugins/admin/systems/class_glpiAccount.inc:292
 msgid "Adding new sytem type failed, this system type name is already used."
-msgstr "L'ajout d'un nouveau type de système à échoué, le nom est déjà utilisé."
+msgstr ""
+"L'ajout d'un nouveau type de système à échoué, le nom est déjà utilisé."
 
 #: plugins/admin/systems/class_glpiAccount.inc:312
 #, php-format
-msgid "You can't delete this system type, it is still in use by these system(s) '%s'"
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 "Vous ne pouvez pas effacer ce type de système, il est utilisé actuellement "
 "par les sytème(s) '%s'"
@@ -9486,7 +9612,8 @@ msgstr "type mime"
 
 #: plugins/admin/systems/class_termDNS.inc:132
 #, php-format
-msgid "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 "Impossible d'exécuter la commande spécifiée AUTO_NETWORK_HOOK '%s' veuillez "
 "vérifier votre gosa.conf."
@@ -9534,7 +9661,8 @@ msgstr ""
 #: plugins/admin/systems/class_servDNSeditZone.inc:409
 #, php-format
 msgid "Only lowercase is allowed, please check your '%ss'."
-msgstr "Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
+msgstr ""
+"Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
 
 #: plugins/admin/systems/class_termDNS.inc:442
 msgid "Saving terminal to DNS object failed"
@@ -9558,7 +9686,8 @@ msgstr "Score requis"
 
 #: plugins/admin/systems/goSpamServer.tpl:19
 msgid "Select required score to tag mail as spam"
-msgstr "Sélectionner le score requis pour marquer ce message comme étant un spam"
+msgstr ""
+"Sélectionner le score requis pour marquer ce message comme étant un spam"
 
 #: plugins/admin/systems/goSpamServer.tpl:56
 msgid "Enable use of bayes filtering"
@@ -9620,7 +9749,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:204
 #, php-format
-msgid "Be careful editing this release, it is still used by these workstations [%s]."
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 "Soyez prudent en éditant cette version, elle est toujours par ces système(s) "
 "[%s]. "
@@ -9642,7 +9772,8 @@ msgstr "Ajouter un dépôt"
 
 #: plugins/admin/systems/servRepository.tpl:31
 msgid "This menu allows you to create, delete and edit repository settings."
-msgstr "Ce menu vous permet créer, effacer et éditer des classes des dépôts FAI."
+msgstr ""
+"Ce menu vous permet créer, effacer et éditer des classes des dépôts FAI."
 
 #: plugins/admin/systems/goVirusServer.tpl:5
 msgid "Generic virus filtering"
@@ -9783,7 +9914,8 @@ msgid "Reload list"
 msgstr "Recharger la liste"
 
 #: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid "This dialog allows you to select a user as technical responsible person."
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
 "Ce dialogue vous permet de désigner un utilisateur comme personne "
 "responsable."
@@ -9973,7 +10105,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_servService.inc:113
 msgid "Please correct the share-/profile settings of these users"
-msgstr "Veuillez corriger les paramètres du partage /profil de ces utilisateurs"
+msgstr ""
+"Veuillez corriger les paramètres du partage /profil de ces utilisateurs"
 
 #: plugins/admin/systems/class_servService.inc:337
 msgid "Terminal server, must have fontpath specified."
@@ -10133,7 +10266,8 @@ msgstr "Impossible de détecter le nom de l'objet."
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:138
 #, php-format
-msgid "You can't delete this device, it is still in use by these system(s) '%s'"
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
 msgstr ""
 "Vous ne pouvez pas effacer ce périphérique, il est utilisé actuellement par "
 "ces système(s) '%s'"
@@ -10455,7 +10589,8 @@ msgstr "Le nom '%s' doit être écrit en minuscule."
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
 #, php-format
 msgid "The record type '%s' is a unique type and can't be defined twice."
-msgstr "Le type d'enregistrement '%s' est unique et ne peut être défini deux fois."
+msgstr ""
+"Le type d'enregistrement '%s' est unique et ne peut être défini deux fois."
 
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
 #, php-format
@@ -10482,7 +10617,8 @@ msgstr "La création de l'image à échoué. veuillez lire le rapport ci dessous
 #: plugins/admin/systems/class_systemManagement.inc:299
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
+msgstr ""
+"La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
 
 #: plugins/admin/systems/class_systemManagement.inc:330
 msgid "Passwords entered as new and repeated do not match!"
@@ -10630,7 +10766,8 @@ msgstr "Suppression du service DNS"
 
 #: plugins/admin/systems/class_servDNS.inc:68
 #: plugins/admin/systems/class_inventory.inc:37
-msgid "This server has DNS features enabled. You can disable them by clicking below."
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "Ce serveur à l'option DNS activée. Vous pouvez le désactiver en cliquant sur "
 "le bouton ci-dessous."
@@ -10642,7 +10779,8 @@ msgstr "Ajouter un service DNS"
 
 #: plugins/admin/systems/class_servDNS.inc:71
 #: plugins/admin/systems/class_inventory.inc:40
-msgid "This server has DNS features disabled. You can enable them by clicking below."
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
@@ -10719,7 +10857,8 @@ msgstr "Veuillez choisir une zone reverse valide."
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:367
 msgid "Primary dns server must end with '.' to be a valid entry."
-msgstr "Le serveur dns primaire doit se terminer par '.' pour être une entrée valide."
+msgstr ""
+"Le serveur dns primaire doit se terminer par '.' pour être une entrée valide."
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:371
 msgid "Your specified mail address must end with '.' to be a valid record."
@@ -10786,7 +10925,8 @@ msgstr ""
 
 #: plugins/admin/systems/class_printGeneric.inc:262
 msgid "This is a workstation template, printer tab is disabled."
-msgstr "Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
+msgstr ""
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
 #: plugins/admin/systems/class_printGeneric.inc:267
 msgid "This is a terminal template, printer tab is disabled."
@@ -10872,7 +11012,8 @@ msgstr "La suppression de l'imprimante à échoué"
 
 #: plugins/admin/systems/class_printGeneric.inc:634
 msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
+msgstr ""
+"Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
 
 #: plugins/admin/systems/class_printGeneric.inc:811
 msgid "Saving printer failed"
@@ -10893,7 +11034,8 @@ msgstr "Impossible d'ajouter '%s' à la liste des membres, il est déjà utilis
 #: plugins/admin/systems/class_printGeneric.inc:887
 #, php-format
 msgid "Can't add '%s' to list of members, it is not reachable."
-msgstr "Impossible d'ajouter '%s' à la liste des membres, il n'est pas accessible."
+msgstr ""
+"Impossible d'ajouter '%s' à la liste des membres, il n'est pas accessible."
 
 #: plugins/admin/systems/class_baseSelectDialog.inc:23
 msgid "Choose a base"
@@ -11003,7 +11145,8 @@ msgstr "Vous êtes sur le point de supprimer le composant glpi '%s'."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:112
 #, php-format
-msgid "You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 "Impossible d'effacer ce fichier attaché, tant qu'il est utilisé par ce(s) "
 "système(s) '%s'."
@@ -11150,7 +11293,8 @@ msgstr "Veuillez spécifier un nom valide pour 'url'."
 
 #: plugins/admin/systems/class_servRepositorySetup.inc:187
 #, php-format
-msgid "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 "Impossible d'exécuter la commande spécifiée REPOSITORY_HOOK '%s'. Veuillez "
 "vérifier votre gosaconf."
@@ -11316,7 +11460,8 @@ msgstr "Le score requis doit être un nombre positif."
 #: plugins/admin/systems/class_goSpamServer.inc:475
 #, php-format
 msgid "Set status flag for server services/spamassassin with dn '%s' failed."
-msgstr "L'activation du statut pour le service spamassassin avec le dn '%s' à échoué."
+msgstr ""
+"L'activation du statut pour le service spamassassin avec le dn '%s' à échoué."
 
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
 #, php-format
@@ -11642,7 +11787,8 @@ msgstr "Afficher les groupes contenant des serveurs"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:62
 msgid "Select to see groups containing workstations"
-msgstr "Sélectionner pour afficher les groupes contenant des stations de travail"
+msgstr ""
+"Sélectionner pour afficher les groupes contenant des stations de travail"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:62
 msgid "Show groups containing workstations"
@@ -11759,13 +11905,15 @@ msgstr ""
 "données."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:41
-msgid "This group has mail features enabled. You can disable them by clicking below."
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 "L'extension messagerie est activée pour ce groupe, vous pouvez la désactiver "
 "en cliquant sur le bouton ci-dessous."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "This group has mail features disabled. You can enable them by clicking below."
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 "L'extension de messagerie est désactivée pour ce groupe, vous pouvez "
 "l'activer en cliquant sur le bouton ci-dessous."
@@ -11807,7 +11955,8 @@ msgid "Remove the phone queue from this Account"
 msgstr "Supprimer la queue téléphonique de ce compte"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:114
-msgid "Phone queue is enabled for this group. You can disable it by clicking below."
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 "Une queue téléphonique existe pour ce groupe. Vous pouvez la désactiver en "
 "cliquant sur le bouton ci-dessous."
@@ -11845,7 +11994,8 @@ msgid "There must be least one queue number defined."
 msgstr "Il doit y avoir au moins un numéro de queue définie."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:227
-msgid "There is currently no asterisk server defined. Your settings can't be saved."
+msgid ""
+"There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 "Il n'y a actuellement aucun serveur asterisk indiqué. Vos paramètres ne "
 "peuvent pas être sauvés."
@@ -11877,7 +12027,8 @@ msgstr "Impossible de sélectionner la base de données %s située sur %s."
 #: plugins/admin/ogroups/class_phonequeue.inc:661
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
-msgstr "Impossible d'effacer dans la base de données %s située sur le serveur %s."
+msgstr ""
+"Impossible d'effacer dans la base de données %s située sur le serveur %s."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:525
 #: plugins/admin/ogroups/class_phonequeue.inc:527
@@ -12130,7 +12281,8 @@ msgstr "Le cn indiqué '%s' existe déjà."
 
 #: plugins/gofon/macro/class_gofonMacro.inc:393
 msgid "You must specify the 'Display Name' in order to save this macro"
-msgstr "Vous devez spécifier le 'Nom d'affichage' pour pouvoir sauver cette macro"
+msgstr ""
+"Vous devez spécifier le 'Nom d'affichage' pour pouvoir sauver cette macro"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:397
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
@@ -12567,7 +12719,8 @@ msgstr ""
 #: include/class_mail-methods-cyrus.inc:151
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
+msgstr ""
+"Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
 
 #: include/class_mail-methods-cyrus.inc:170
 #, php-format
@@ -12611,7 +12764,8 @@ msgstr "Impossible d'envoyer un script à sieve. Le serveur répond '%s'."
 #: include/class_mail-methods-cyrus.inc:352
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
+msgstr ""
+"Impossible d'activer les scripts sieve de GOsa. Le serveur répond '%s'."
 
 #: include/class_debconfTemplate.inc:260
 msgid "This package has no debconf options."
@@ -12619,26 +12773,31 @@ msgstr "Ce paquet n'a pas d'options debconf."
 
 #: include/class_plugin.inc:404
 #, php-format
-msgid "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
-msgstr "La commande '%s', utilisée dans le CHECK de l'extension '%s' n'existe pas."
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgstr ""
+"La commande '%s', utilisée dans le CHECK de l'extension '%s' n'existe pas."
 
 #: include/class_plugin.inc:550
 #, php-format
-msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
 "pas."
 
 #: include/class_plugin.inc:584 include/class_password-methods.inc:183
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
 #: include/class_plugin.inc:618
 #, php-format
-msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
 "pas."
@@ -12670,7 +12829,8 @@ msgstr ""
 "s'."
 
 #: include/class_password-methods.inc:204
-msgid "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 "La configuration de SMBHASH dans gosa.conf est incorrecte ! Impossible de "
 "changer le mot de passe Samba."
@@ -12692,7 +12852,8 @@ msgstr ""
 
 #: include/functions_setup.inc:103
 #, php-format
-msgid "Optional objectclass '%s' required by plugin '%s' does not have version %s"
+msgid ""
+"Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 "l'objectCLass optionnel '%s' requis par l'extension '%s' nécessite la "
 "version %s"
@@ -12746,7 +12907,8 @@ msgstr "Le support de WEBDAV est activé"
 
 #: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
-msgstr "Le support de phpgroupware est désactivé, aucun schéma ne semble installé"
+msgstr ""
+"Le support de phpgroupware est désactivé, aucun schéma ne semble installé"
 
 #: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
@@ -12754,7 +12916,8 @@ msgstr "Le support de phpgroupware est activé"
 
 #: include/functions_setup.inc:184
 msgid "Support for trustAccount disabled, no schema seems to be installed"
-msgstr "Le support du trustAccount est désactivé, aucun schéma ne semble installé"
+msgstr ""
+"Le support du trustAccount est désactivé, aucun schéma ne semble installé"
 
 #: include/functions_setup.inc:189
 msgid "Support for trustAccount enabled"
@@ -12863,7 +13026,8 @@ msgstr "Vérification du module LDAP"
 
 #: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
-msgstr "Ce module est le module de base utilisé par GOsa et est donc indispensable."
+msgstr ""
+"Ce module est le module de base utilisé par GOsa et est donc indispensable."
 
 #: include/functions_setup.inc:294
 msgid "Checking for XML functions"
@@ -12975,7 +13139,8 @@ msgid "Checking for snmp Module"
 msgstr "Vérification du module snmp"
 
 #: include/functions_setup.inc:331
-msgid "Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgid ""
+"Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr "Le protocole SNMP est nécessaire pour pouvoir surveiller les clients."
 
 #: include/functions_setup.inc:368
@@ -13050,7 +13215,8 @@ msgstr ""
 
 #: include/functions_setup.inc:428
 msgid "Checking for a way to generate LM/NT password hashes"
-msgstr "Vérification de la possibilité de générer des mots de passe au format LM/NT"
+msgstr ""
+"Vérification de la possibilité de générer des mots de passe au format LM/NT"
 
 #: include/functions_setup.inc:429
 msgid ""
@@ -13192,14 +13358,6 @@ msgstr ""
 "Impossible de créer l'utilisateur/groupe, veuillez vérifier votre "
 "configuration ! "
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-"Erreur: Le sous arbre demandé à un encodage du DN inconstant, veuillez "
-"vérifier votre arbre LDAP!"
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -13298,90 +13456,13 @@ msgstr "La sélection multiple n'est pas encore supportée!"
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "La lecture du fichier PPD %s à échoué - pas de données."
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-"Le serveur LDAP répond très lentement (%.2f lors de la dernière requête). "
-"Ceci peut être responsable des problèmes de performances."
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-"Le serveur ldap répond très lentement (%.2f), ceci peut être responsable des "
-"problèmes de performances."
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Création d'un copie de %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr "Traitement en cours"
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt!"
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr "Statut FAI inconnu %s"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-"Il manque la base de l'arbre ldap dans l'url pour les refferal '%s'. L'url "
-"doit ressembler à ceci 'ldap://server:port/base'."
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
-"rapport à l'équipe de GOsa."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "lors de l'opération sur le serveur LDAP '%s'"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
-"avec 'dn: ...' à la ligne %s"
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
-"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
-"votre fichier LDIF à partir de la ligne %s!"
+"Erreur: Le sous arbre demandé à un encodage du DN inconstant, veuillez "
+"vérifier votre arbre LDAP!"
 
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
@@ -13623,7 +13704,8 @@ msgstr "L'effacement à été interrompu par l'extension '%s': %s"
 
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr "Impossible d'utiliser ssha pour le cryptage (Fonction mhash / sha1 manquante)"
+msgstr ""
+"Impossible d'utiliser ssha pour le cryptage (Fonction mhash / sha1 manquante)"
 
 #: include/class_pluglist.inc:115
 msgid ""
@@ -13676,6 +13758,91 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+"Le serveur LDAP répond très lentement (%.2f lors de la dernière requête). "
+"Ceci peut être responsable des problèmes de performances."
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+"Le serveur ldap répond très lentement (%.2f), ceci peut être responsable des "
+"problèmes de performances."
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Création d'un copie de %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr "Traitement en cours"
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt!"
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "Statut FAI inconnu %s"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+"Il manque la base de l'arbre ldap dans l'url pour les refferal '%s'. L'url "
+"doit ressembler à ceci 'ldap://server:port/base'."
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"La création automatique du type '%s' n'est pas supportée. Veuillez faire un "
+"rapport à l'équipe de GOsa."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "lors de l'opération sur le serveur LDAP '%s'"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
+"avec 'dn: ...' à la ligne %s"
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
+"votre fichier LDIF à partir de la ligne %s!"
+
 #: html/setup.php:89
 #, php-format
 msgid ""
@@ -13687,7 +13854,8 @@ msgstr ""
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr "Erreur: getvcard.php nécessite un paramètre pour exporter au format vcard!"
+msgstr ""
+"Erreur: getvcard.php nécessite un paramètre pour exporter au format vcard!"
 
 #: html/helpviewer.php:67
 msgid "Help browser"
@@ -13842,7 +14010,8 @@ msgstr ""
 "vous assurez qu'il puisse les obtenir."
 
 #: html/index.php:227
-msgid "Your ldap setup contains old schema definitions. Please re-run the setup."
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Votre installation LDAP contient de vieux schémas. Veuillez recommencer "
 "l'installation."
@@ -13923,7 +14092,8 @@ msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s'!"
 
 #: html/main.php:356
 msgid "Your password is about to expire, please change your password"
-msgstr "Votre mot de passe va bientôt expiré, veuillez changer votre mot de passe"
+msgstr ""
+"Votre mot de passe va bientôt expiré, veuillez changer votre mot de passe"
 
 #: html/main.php:380
 msgid ""
@@ -13942,7 +14112,8 @@ msgstr ""
 "a pas d'extension mysql disponible dans votre configuration php."
 
 #: html/get_attachment.php:55
-msgid "Can't connect to specified database, please check your glpi configuration."
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
 msgstr ""
 "Impossible de se connecter à la base de données spécifiée. Veuillez vérifier "
 "la configuration de glpi."
@@ -14486,4 +14657,3 @@ msgstr ""
 "GOsa peut provoquer des erreurs PHP, particulièrement dans le cas des "
 "versions Beta. Dans certains cas il peut être intéressant d'activer "
 "l'affichage des erreurs."
-
diff --git a/locale/it/LC_MESSAGES/messages.mo b/locale/it/LC_MESSAGES/messages.mo
index a94d3332d..7b6803ba1 100644
Binary files a/locale/it/LC_MESSAGES/messages.mo and b/locale/it/LC_MESSAGES/messages.mo differ
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 7597b8b5e..6f676463a 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/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: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -33,7 +33,7 @@ msgstr "Extra"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -364,6 +364,7 @@ msgstr "Salva"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -754,7 +755,7 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -866,7 +867,7 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1297,7 +1298,7 @@ msgstr "Cambia la password"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Home directory"
 
@@ -1401,7 +1402,7 @@ msgid "User must change password on first login"
 msgstr "L'utente deve cambiare la password alla prima connessione"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "La password spira il"
 
@@ -1530,115 +1531,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avvisa l'utente %s giorni prima che la password spiri"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Gennaio"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Febbraio"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Marzo"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Aprile"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Maggio"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Giugno"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Luglio"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Agosto"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Settembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Ottobre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Novembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Dicembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1804,40 +1805,20 @@ msgstr "Crea estensioni telefoniche"
 msgid "Removing Netatalk account failed"
 msgstr "Rimuovi le estensioni di posta"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Home di Samba"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Dominio"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Script path"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Path del profilo"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Opzioni di accesso"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Permetti all'utente di cambiare la propria password da un client"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "L'accesso ai client Windows non richiede password"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Disabilita temporaneamente l'account Samba"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Dominio"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Terminal Server"
@@ -1863,17 +1844,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Timeout (in minuti)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Connessione"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Disconnessione "
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr ""
 
@@ -1910,6 +1891,18 @@ msgstr ""
 msgid "Reconnect if disconnected"
 msgstr ""
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Opzioni di accesso"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Permetti all'utente di cambiare la propria password da un client"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "L'accesso ai client Windows non richiede password"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Blocca l'account samba"
@@ -1926,10 +1919,28 @@ msgstr "Limita il tempo per la disconnessione"
 msgid "Account expires after"
 msgstr "L'account spira dopo"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Home di Samba"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Home di Samba"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Disabilita temporaneamente l'account Samba"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Impostazioni Samba"
@@ -1942,32 +1953,66 @@ msgstr "Selezione le workstation da aggiungere"
 msgid "Display workstations of department"
 msgstr "Mostra le workstation del dipartimento"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "giorno"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "giorno"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "giorno"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "ora"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "giorno"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Stato"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "Questa identità non possiede estensioni Samba."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Elimina estensioni Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr "Questa identià possiede estensioni Samba."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Crea estensioni Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr "Questa identità non possiede estensioni Samba."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1975,76 +2020,105 @@ msgstr ""
 "Questa identità non possiede estensioni Samba. Per poterle creare occorre "
 "creare prima le estensioni Unix."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "input on, notifica on"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "input on, notifica off"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "input off, notifica on"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "input off, notifica off"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "disconnetti"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "reset"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "da qualsiasi client "
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "solo dal client precedente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 #, fuzzy
 msgid "Removing Samba account failed"
 msgstr "Elimina estensioni Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Specifica il server di posta per l'utente"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "ora"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Applica"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -2499,24 +2573,6 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Applica"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6895,6 +6951,18 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr "Tutti i campi sono scrivibili"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opzioni applicazione"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostra l'indirizzo del dipartimento"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostra gli indirizzi che corrispondono"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -7004,18 +7072,6 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opzioni applicazione"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostra l'indirizzo del dipartimento"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostra gli indirizzi che corrispondono"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -13304,12 +13360,6 @@ msgid ""
 "twice !"
 msgstr "Impossibile connettersi al server del database!"
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -13402,77 +13452,10 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:456
-#, fuzzy, php-format
-msgid "Creating copy of %s"
-msgstr "Lista degli utenti di %s su %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr ""
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr ""
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr ""
-
-#: include/class_ldap.inc:803
-#, fuzzy, php-format
-msgid "while operating on LDAP server %s"
-msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
 #: include/class_certificate.inc:35
@@ -13736,6 +13719,79 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:456
+#, fuzzy, php-format
+msgid "Creating copy of %s"
+msgstr "Lista degli utenti di %s su %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr ""
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:803
+#, fuzzy, php-format
+msgid "while operating on LDAP server %s"
+msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/messages.po b/locale/messages.po
index bc8e5e88d..b3690438d 100644
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\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"
@@ -34,7 +34,7 @@ msgstr ""
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -363,6 +363,7 @@ msgstr ""
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -728,7 +729,7 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -840,7 +841,7 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1249,7 +1250,7 @@ msgstr ""
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr ""
 
@@ -1353,7 +1354,7 @@ msgid "User must change password on first login"
 msgstr ""
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr ""
 
@@ -1472,115 +1473,115 @@ msgid "Warn user %s days before password expiery"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1734,40 +1735,20 @@ msgstr ""
 msgid "Removing Netatalk account failed"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr ""
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr ""
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr ""
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr ""
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr ""
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr ""
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr ""
@@ -1793,17 +1774,17 @@ msgid "Timeout settings (in minutes)"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr ""
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr ""
 
@@ -1840,6 +1821,18 @@ msgstr ""
 msgid "Reconnect if disconnected"
 msgstr ""
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr ""
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr ""
@@ -1856,10 +1849,26 @@ msgstr ""
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Samba logon times"
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:320
+msgid "Edit settings..."
+msgstr ""
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr ""
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr ""
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr ""
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr ""
@@ -1872,106 +1881,161 @@ msgstr ""
 msgid "Display workstations of department"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+msgid "Sunday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+msgid "Monday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+msgid "Tuesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+msgid "Thursday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+msgid "Friday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+msgid "Saturday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+msgid "Specify the hours this user is allowed to log in"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+msgid "Hour"
+msgstr ""
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr ""
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -2374,24 +2438,6 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr ""
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6520,6 +6566,18 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr ""
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr ""
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr ""
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -6620,18 +6678,6 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr ""
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr ""
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -12455,12 +12501,6 @@ msgid ""
 "twice !"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -12553,77 +12593,10 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr ""
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr ""
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr ""
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr ""
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr ""
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
 #: include/class_certificate.inc:35
@@ -12879,6 +12852,79 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr ""
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr ""
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr ""
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/nl/LC_MESSAGES/messages.mo b/locale/nl/LC_MESSAGES/messages.mo
index a4feb8b3e..8057aa388 100644
Binary files a/locale/nl/LC_MESSAGES/messages.mo and b/locale/nl/LC_MESSAGES/messages.mo differ
diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index b6c103e51..d5891c43a 100644
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/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: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -37,7 +37,7 @@ msgstr "Plugins"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -366,6 +366,7 @@ msgstr "Opslaan"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -738,7 +739,7 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -850,7 +851,7 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1292,7 +1293,7 @@ msgstr "Verander wachtwoord"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
@@ -1396,7 +1397,7 @@ msgid "User must change password on first login"
 msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
@@ -1524,115 +1525,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Januari"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Februari"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Maart"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "April"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mei"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Juni"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Juli"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Augustus"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "September"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Oktober"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "November"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "December"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1794,40 +1795,20 @@ msgstr "Het opslaan van het Netatalk account is mislukt"
 msgid "Removing Netatalk account failed"
 msgstr "Het verwijderen van het Netatalk account is mislukt"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Samba home"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Domein"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Inlogscript"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Profielpad"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Toegangsopties"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Schakel het Samba/Windows account tijdelijk uit"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Domein"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Terminal Server"
@@ -1853,17 +1834,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Terminal Service timeouts (in minuten)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Max. verbindingsduur"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Max. verbrekingsduur"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "Max. inactiviteitsduur"
 
@@ -1900,6 +1881,18 @@ msgstr "Bij verbroken verbinding of timeout"
 msgid "Reconnect if disconnected"
 msgstr "Herstel sessie indien verbroken"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Toegangsopties"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Blokkeer het Samba/Windows account"
@@ -1916,10 +1909,28 @@ msgstr "Stel laatste uitlogtijd in op"
 msgid "Account expires after"
 msgstr "Het account verloopt op"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Samba home"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "E-mail instellingen"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Samba home"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Schakel het Samba/Windows account tijdelijk uit"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Samba Instellingen"
@@ -1932,15 +1943,49 @@ msgstr "Selecteer de toe te voegen werkstations"
 msgid "Display workstations of department"
 msgstr "Toon werkstations van afdeling"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "dag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "dag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "dag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "uren"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "dag"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Strategie"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "Dit account heeft geen samba extensies."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Samba account verwijderen"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1948,12 +1993,12 @@ msgstr ""
 "De samba mogelijkheden zijn ingeschakeld voor dit account. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Samba account aanmaken"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1961,7 +2006,7 @@ msgstr ""
 "De samba mogelijkheden zijn uitgeschakeld voor dit account. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1969,55 +2014,55 @@ msgstr ""
 "De samba mogelijkheden zijn uitgeschakeld voor dit account. Posix "
 "mogelijkheden zijn noodzakelijk voor samba accounts. Schakel deze eerst in."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "invoer met notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "invoer zonder notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "geen invoer met notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "geen invoer zonder notificatie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "verbreken"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "sluiten"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "vanaf elke client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "alleen vanaf vorige client"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr "Het verwijderen van het Samba account is mislukt"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "De waarde gespecificeerd als '%s' bevat ongeldige karakters!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 "De timeout optie '%s' is geselecteerd en bevat geen of ongeldige karakters!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -2025,7 +2070,7 @@ msgstr ""
 "Het Windows gebruikersbeheer programma staat slechts acht clients toe. U "
 "heeft er meer dan acht opgegeven."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -2033,7 +2078,7 @@ msgstr ""
 "Waarschuwing: Dit account heeft een ongedefiniëerd Samba SID toegewezen "
 "gekregen. Dit probleem kan niet door GOsa opgelost wordt"
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2041,10 +2086,39 @@ msgstr ""
 "Waarschuwing: Kan de primaire groep van de gebruiker niet identificeren - Er "
 "is geen conversie naar een Samba groep mogelijk!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr "Het opslaan van het Samba account is mislukt"
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "uur"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Toepassen"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "De omgevings extensie is momenteel uitgeschakeld."
@@ -2465,24 +2539,6 @@ msgstr "Script kan vervangen worden door gebruiker"
 msgid "Logon script"
 msgstr "Login script"
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Toepassen"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6803,6 +6859,18 @@ msgstr "Het opslaan van de ACL informatie is mislukt"
 msgid "All fields are writeable"
 msgstr "Alle velden zijn aanpasbaar"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Programma opties"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Toon adressen van afdeling"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Toon overeenkomende adressen"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Deze 'dn' is geen programmagroep"
@@ -6910,18 +6978,6 @@ msgstr ""
 "Kon distributienaam '%s' moet vinden. Distributienaam is ingesteld op '%s'. "
 "De basis van het object is mogelijk gewijzigd."
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Programma opties"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Toon adressen van afdeling"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Toon overeenkomende adressen"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -13206,14 +13262,6 @@ msgstr ""
 "Kan niet verbinden met de opgegeven database. Controleer uw GLPI "
 "configuratie a.u.b."
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-"Fout: De opgevraagde subtree heeft een inconsistente DN codering. Controleer "
-"uw LDAP instellingen!"
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -13313,88 +13361,13 @@ msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 "Het parsen van PPD bestand %s is mislukt - er is geen informatie gevonden."
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-"De LDAP server is traag (%.2fs voor de laatste zoekopdracht). Dit kan "
-"ernstige prestatie verminderingen binnnen uw netwerk tot gevolg hebben."
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-"De LDAP server antwoordt zeer traag (%.2fs). Dit kan ernstige prestatie "
-"verminderingen binnnen uw netwerk tot gevolg hebben."
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Bezig met maken van kopie van %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr "Bezig met verwerken"
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr "Onbekende FAI status %s"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
-"Rapporteer dit a.u.b. aan het GOsa team."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr "bij het bewerken van '%s' op LDAP server '%s'"
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "bij het bewerken van LDAP server %s"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
-"beginnen met 'dn: ...' op regel %s"
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
-"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
-"vanaf regel %s!"
+"Fout: De opgevraagde subtree heeft een inconsistente DN codering. Controleer "
+"uw LDAP instellingen!"
 
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
@@ -13687,6 +13660,89 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+"De LDAP server is traag (%.2fs voor de laatste zoekopdracht). Dit kan "
+"ernstige prestatie verminderingen binnnen uw netwerk tot gevolg hebben."
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+"De LDAP server antwoordt zeer traag (%.2fs). Dit kan ernstige prestatie "
+"verminderingen binnnen uw netwerk tot gevolg hebben."
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Bezig met maken van kopie van %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr "Bezig met verwerken"
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "Onbekende FAI status %s"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
+"Rapporteer dit a.u.b. aan het GOsa team."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr "bij het bewerken van '%s' op LDAP server '%s'"
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "bij het bewerken van LDAP server %s"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
+"beginnen met 'dn: ...' op regel %s"
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
+"vanaf regel %s!"
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/pl/LC_MESSAGES/messages.mo b/locale/pl/LC_MESSAGES/messages.mo
index 990fa1465..60ac336b4 100644
Binary files a/locale/pl/LC_MESSAGES/messages.mo and b/locale/pl/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po
index 98f9ffa1d..2c117f7cd 100644
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/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: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\n"
 "PO-Revision-Date: 2006-06-08 02:33+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -32,7 +32,7 @@ msgstr "Dodatki"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -361,6 +361,7 @@ msgstr "Zapisz"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -730,7 +731,7 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -842,7 +843,7 @@ msgstr "Lista alternatywnych adresów pocztowych"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1265,7 +1266,7 @@ msgstr "Zmień hasło"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Katalog domowy"
 
@@ -1369,7 +1370,7 @@ msgid "User must change password on first login"
 msgstr "Użytkownik musi zmienić hasło przy pierwszym logowaniu"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "Hasło wygasa"
 
@@ -1492,115 +1493,115 @@ msgid "Warn user %s days before password expiery"
 msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Styczeń"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Luty"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Marzec"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Kwiecień"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Maj"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Czerwiec"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Lipiec"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Sierpień"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Wrzesień"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Październik"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Listopad"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Grudzień"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1758,40 +1759,20 @@ msgstr "Zapisywanie konta Netatalk nieudane"
 msgid "Removing Netatalk account failed"
 msgstr "Usuwanie konta Netatalk nieudane"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Katalog domowy Samba"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Domena"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Ścieżka do skryptu"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Ścieżka do profilu"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Opcje dostępu"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "Logowanie z klienta windows nie wymaga hasła"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Tymczasowo wyłącz konto samba"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Domena"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Terminal Server"
@@ -1817,17 +1798,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Ustawienia Timeoutu (w minutach)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Połączenie"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Rozłączenie"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "BEZCZYNNY"
 
@@ -1864,6 +1845,18 @@ msgstr "Przy rozłączeniu lub timeoucie"
 msgid "Reconnect if disconnected"
 msgstr "Połącz jeśli rozłączono"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Opcje dostępu"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "Logowanie z klienta windows nie wymaga hasła"
+
 #: plugins/personal/samba/samba3.tpl:264
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
@@ -1880,10 +1873,28 @@ msgstr "Ogranicz czas wylogowania"
 msgid "Account expires after"
 msgstr "Konto wygasa po"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Katalog domowy Samba"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "Ustawienia pocztowe"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Zezwól na połączenia tylko z tych stacji"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Katalog domowy Samba"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Tymczasowo wyłącz konto samba"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Ustawienia Samba"
@@ -1896,34 +1907,68 @@ msgstr "Wybierz stacje robocze do dodania"
 msgid "Display workstations of department"
 msgstr "Wyświetl stacje robocze departamentu"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "dzień"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "dzień"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "dzień"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "godzin"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "dzień"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Strategia"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "To konto nie posiada rozszerzeń samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Usuń konto samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
 msgstr ""
 "To konto posiada rozszerzenia samba. Można je wyłączyć klikając poniżej."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Stwórz konto samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 "To konto nie posiada rozszerzenia samba. Można he włączyć klikając poniżej."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1931,48 +1976,48 @@ msgstr ""
 "To konto nie posiada rozszerzenia samba. Wymagane są rozszerzenia posix, "
 "które należy włączyć wcześniej."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "input tak, notify tak"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "input tak, notify nie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "input nie, notify nie"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "rozłącz"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "resetuj"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "z każdego klienta"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "tylko z poprzedniego klienta"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "Removing Samba account failed"
 msgstr "Usuwanie konta Samba nieudane"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Wartość podana jako '%s' zawiera niedozwolone znaki!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1980,14 +2025,14 @@ msgstr ""
 "Właściwości timeoutu '%s' są włączone i zawierają nieprawidłowe znaki, lub "
 "są puste!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
 msgstr ""
 "User manager w windows zezwala tylko na 8 klientów. Podano więcej niż 8."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1995,7 +2040,7 @@ msgstr ""
 "Ostrzeżenie: To konto ma przypisany niezdefiniowany samba SID. Ten problem "
 "nie może być naprawiony przez GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2003,10 +2048,39 @@ msgstr ""
 "Ostrzeżenie: Nie można określić podstawowej grupy użytkowników - nie jest "
 "możliwa konwersja do grupy samba!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr "Zapisywanie konta Samba nieudane"
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Wybierz serwer poczty który będzie przechowywał skrzynkę użytkownika"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "godzina"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Zastosuj"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr "Rozszerzenie Środowisko jest obecnie wyłączone"
@@ -2421,24 +2495,6 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
 msgid "Logon script"
 msgstr "Skrypt logowania"
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Zastosuj"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -6707,6 +6763,18 @@ msgstr "Zapisywanie informacji ACL nieudane"
 msgid "All fields are writeable"
 msgstr "Wszystkie pola są zapisywalne"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opcje aplikacji"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Wyświetl adresy departamentu"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Wyświetl adresy pasujące"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Ten 'dn' nie jest grupą aplikacji."
@@ -6811,18 +6879,6 @@ msgstr ""
 "Nie można przetłumaczyć nazwy wydania '%s', ustawiam nazwę na '%s'. "
 "Prawdopodobnie podstawa obiektów została zmieniona."
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opcje aplikacji"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Wyświetl adresy departamentu"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Wyświetl adresy pasujące"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -12968,13 +13024,6 @@ msgstr ""
 "OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
 "parametry konfiguracji."
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-"Błąd: żądanie poddrzewo zawiera niespójne kodowanie w DN, sprawdź LDAP!"
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr "Nie można użyć sha do szyfrowania, brak funkcji sha1 / mhash / crypt"
@@ -13071,86 +13120,12 @@ msgstr "PickMany nie jest jeszcze obsługiwany"
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "Parsowanie pliku PPD %s nieudane - nie znaleziono informacji."
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-"Serwer LDAP odpowiada bardzo wolno (%.2f dla ostatniego zapytania). To może "
-"być przyczyną słabej wydajności."
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-"Serwer LDAP odpowiada bardzo wolno (%.2f), to może być przyczyną słabej "
-"wydajności."
-
-#: include/class_ldap.inc:456
-#, php-format
-msgid "Creating copy of %s"
-msgstr "Tworzenie kopii %s"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr "Przetwarzanie"
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, php-format
-msgid "Unknown FAIstate %s"
-msgstr "Nieznany FAIstate %s"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
-"skontaktować się z zespołem GOsa."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
-
-#: include/class_ldap.inc:803
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "podczas połączenia z serwerem LDAP '%s'"
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
-"To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
-"'dn: ...' w linii %s"
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "dn: '%s' (od linii %s) już istnieje w bazie LDAP"
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
+"Błąd: żądanie poddrzewo zawiera niespójne kodowanie w DN, sprawdź LDAP!"
 
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
@@ -13433,6 +13408,87 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+"Serwer LDAP odpowiada bardzo wolno (%.2f dla ostatniego zapytania). To może "
+"być przyczyną słabej wydajności."
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+"Serwer LDAP odpowiada bardzo wolno (%.2f), to może być przyczyną słabej "
+"wydajności."
+
+#: include/class_ldap.inc:456
+#, php-format
+msgid "Creating copy of %s"
+msgstr "Tworzenie kopii %s"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr "Przetwarzanie"
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, php-format
+msgid "Unknown FAIstate %s"
+msgstr "Nieznany FAIstate %s"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
+"skontaktować się z zespołem GOsa."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
+
+#: include/class_ldap.inc:803
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "podczas połączenia z serwerem LDAP '%s'"
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
+"'dn: ...' w linii %s"
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "dn: '%s' (od linii %s) już istnieje w bazie LDAP"
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
+
 #: html/setup.php:89
 #, php-format
 msgid ""
diff --git a/locale/ru/LC_MESSAGES/messages.mo b/locale/ru/LC_MESSAGES/messages.mo
index 3ddabe573..387431c9b 100644
Binary files a/locale/ru/LC_MESSAGES/messages.mo and b/locale/ru/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index 013f84730..aa74589c1 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/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: 2006-12-18 08:32+0100\n"
+"POT-Creation-Date: 2006-12-19 14:08+0100\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"
@@ -32,7 +32,7 @@ msgstr "Дополнительно"
 #: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
 #: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
@@ -372,6 +372,7 @@ msgstr "Сохранить"
 #: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/samba/sambaLogonHours.tpl:89
 #: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
@@ -766,7 +767,7 @@ msgstr "Имя пользователя, адрес которого показ
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/paste_generic.tpl:63
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:332
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/environment.tpl:119
 #: plugins/personal/environment/environment.tpl:136
@@ -879,7 +880,7 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/posix/paste_generic.tpl:64
-#: plugins/personal/samba/samba3.tpl:332
+#: plugins/personal/samba/samba3.tpl:334
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
@@ -1315,7 +1316,7 @@ msgstr "Сменить пароль"
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:658
+#: plugins/personal/samba/class_sambaAccount.inc:684
 msgid "Home directory"
 msgstr "Домашний каталог"
 
@@ -1421,7 +1422,7 @@ msgid "User must change password on first login"
 msgstr "Пользователь должен сменить пароль при первом входе в систему"
 
 #: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/samba/samba3.tpl:267 plugins/personal/samba/samba2.tpl:68
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
@@ -1556,115 +1557,115 @@ msgstr ""
 "(shadowWarning)"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Январь"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Февраль"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Март"
 
 #: plugins/personal/posix/class_posixAccount.inc:473
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/samba/class_sambaAccount.inc:390
+#: plugins/personal/samba/class_sambaAccount.inc:408
+#: plugins/personal/samba/class_sambaAccount.inc:426
+#: plugins/personal/samba/class_sambaAccount.inc:444
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Апрель"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Май"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Июнь"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Июль"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Август"
 
 #: plugins/personal/posix/class_posixAccount.inc:474
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/samba/class_sambaAccount.inc:419
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/samba/class_sambaAccount.inc:427
+#: plugins/personal/samba/class_sambaAccount.inc:445
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Сентябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Октябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Ноябрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:475
-#: plugins/personal/samba/class_sambaAccount.inc:366
-#: plugins/personal/samba/class_sambaAccount.inc:384
-#: plugins/personal/samba/class_sambaAccount.inc:402
-#: plugins/personal/samba/class_sambaAccount.inc:420
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/samba/class_sambaAccount.inc:428
+#: plugins/personal/samba/class_sambaAccount.inc:446
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Декабрь"
 
 #: plugins/personal/posix/class_posixAccount.inc:556
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:488
 #: plugins/admin/systems/class_terminalGeneric.inc:104
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
@@ -1839,40 +1840,20 @@ msgstr "Создать телефонный аккаунт"
 msgid "Removing Netatalk account failed"
 msgstr "Удалить настройки эл. почты"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Домашний каталог Samba"
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Домен"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
 msgid "Script path"
 msgstr "Путь к сценариям"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:659
+#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:104
+#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/class_sambaAccount.inc:685
 msgid "Profile path"
 msgstr "Путь к профилю"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
-msgid "Access options"
-msgstr "Параметры доступа"
-
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
-msgid "Allow user to change password from client"
-msgstr "Разрешить пользователям менять пароль с клиента"
-
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-msgid "Login from windows client requires no password"
-msgstr "Не спрашивать пароль при входе в систему из Windows"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Временно отключить учетную запись Samba"
-
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Домен"
-
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
@@ -1898,17 +1879,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:666
+#: plugins/personal/samba/class_sambaAccount.inc:692
 msgid "Connection"
 msgstr "Подключение"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:667
+#: plugins/personal/samba/class_sambaAccount.inc:693
 msgid "Disconnection"
 msgstr "Отключение"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:668
+#: plugins/personal/samba/class_sambaAccount.inc:694
 msgid "IDLE"
 msgstr "Простой"
 
@@ -1945,6 +1926,18 @@ msgstr "При обрыве или таймауте"
 msgid "Reconnect if disconnected"
 msgstr "В"
 
+#: plugins/personal/samba/samba3.tpl:252 plugins/personal/samba/samba2.tpl:48
+msgid "Access options"
+msgstr "Параметры доступа"
+
+#: plugins/personal/samba/samba3.tpl:258 plugins/personal/samba/samba2.tpl:54
+msgid "Allow user to change password from client"
+msgstr "Разрешить пользователям менять пароль с клиента"
+
+#: plugins/personal/samba/samba3.tpl:261 plugins/personal/samba/samba2.tpl:57
+msgid "Login from windows client requires no password"
+msgstr "Не спрашивать пароль при входе в систему из Windows"
+
 #: plugins/personal/samba/samba3.tpl:264
 #, fuzzy
 msgid "Lock samba account"
@@ -1962,10 +1955,28 @@ msgstr ""
 msgid "Account expires after"
 msgstr ""
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Samba logon times"
+msgstr "Домашний каталог Samba"
+
+#: plugins/personal/samba/samba3.tpl:320
+#, fuzzy
+msgid "Edit settings..."
+msgstr "Почтовые настройки пользователя"
+
+#: plugins/personal/samba/samba3.tpl:326
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Домашний каталог Samba"
+
+#: plugins/personal/samba/samba2.tpl:60
+msgid "Temporary disable samba account"
+msgstr "Временно отключить учетную запись Samba"
+
 #: plugins/personal/samba/main.inc:124
 msgid "Samba settings"
 msgstr "Настройки Samba"
@@ -1978,15 +1989,49 @@ msgstr "Выберите рабочие станции для добавлени
 msgid "Display workstations of department"
 msgstr "Показать рабочие станции подразделения"
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaLogonHours.inc:41
+#, fuzzy
+msgid "Sunday"
+msgstr "день"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:42
+#, fuzzy
+msgid "Monday"
+msgstr "день"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:43
+#, fuzzy
+msgid "Tuesday"
+msgstr "день"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:44
+msgid "Wednesday"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:45
+#, fuzzy
+msgid "Thursday"
+msgstr "час"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:46
+#, fuzzy
+msgid "Friday"
+msgstr "день"
+
+#: plugins/personal/samba/class_sambaLogonHours.inc:47
+#, fuzzy
+msgid "Saturday"
+msgstr "Адм. единица"
+
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid "This account has no samba extensions."
 msgstr "В этой учетной записи нет расширений Samba."
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid "Remove samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:215
+#: plugins/personal/samba/class_sambaAccount.inc:216
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1994,12 +2039,12 @@ msgstr ""
 "В этой учетной записи есть настройки Samba. Вы можете отключить их, щелкнув "
 "ниже."
 
-#: plugins/personal/samba/class_sambaAccount.inc:225
-#: plugins/personal/samba/class_sambaAccount.inc:228
+#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid "Create samba account"
 msgstr "Создать учетную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:226
+#: plugins/personal/samba/class_sambaAccount.inc:227
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -2007,7 +2052,7 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Вы можете включить их, щелкнув "
 "ниже."
 
-#: plugins/personal/samba/class_sambaAccount.inc:229
+#: plugins/personal/samba/class_sambaAccount.inc:230
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -2015,55 +2060,55 @@ msgstr ""
 "В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
 "атрибуты POSIX, включите сначала их использование."
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:489
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:490
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:491
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:492
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: plugins/personal/samba/class_sambaAccount.inc:468
+#: plugins/personal/samba/class_sambaAccount.inc:494
 msgid "disconnect"
 msgstr "отключиться"
 
-#: plugins/personal/samba/class_sambaAccount.inc:469
+#: plugins/personal/samba/class_sambaAccount.inc:495
 msgid "reset"
 msgstr "сброс"
 
-#: plugins/personal/samba/class_sambaAccount.inc:471
+#: plugins/personal/samba/class_sambaAccount.inc:497
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:472
+#: plugins/personal/samba/class_sambaAccount.inc:498
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: plugins/personal/samba/class_sambaAccount.inc:642
+#: plugins/personal/samba/class_sambaAccount.inc:668
 #, fuzzy
 msgid "Removing Samba account failed"
 msgstr "Удалить учетную запись Samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:661
+#: plugins/personal/samba/class_sambaAccount.inc:687
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "Значение '%s' содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:671
+#: plugins/personal/samba/class_sambaAccount.inc:697
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr "Значение таймаута '%s' пустое или содержит недопустимые символы."
 
-#: plugins/personal/samba/class_sambaAccount.inc:677
+#: plugins/personal/samba/class_sambaAccount.inc:703
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -2071,7 +2116,7 @@ msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: plugins/personal/samba/class_sambaAccount.inc:861
+#: plugins/personal/samba/class_sambaAccount.inc:887
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -2079,7 +2124,7 @@ msgstr ""
 "Внимание: этот аккаунт имеет неправильный SID. Это нельзя исправить "
 "средствами GOsa."
 
-#: plugins/personal/samba/class_sambaAccount.inc:885
+#: plugins/personal/samba/class_sambaAccount.inc:911
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -2087,10 +2132,39 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:989
+#: plugins/personal/samba/class_sambaAccount.inc:1015
 msgid "Saving Samba account failed"
 msgstr ""
 
+#: plugins/personal/samba/sambaLogonHours.tpl:21
+#, fuzzy
+msgid "Specify the hours this user is allowed to log in"
+msgstr "Выберите почтовый сервер для учетной записи пользователя"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:27
+#, fuzzy
+msgid "Hour"
+msgstr "час"
+
+#: plugins/personal/samba/sambaLogonHours.tpl:87
+#: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+msgid "Apply"
+msgstr "Применить"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
@@ -2555,24 +2629,6 @@ msgstr ""
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
-#: plugins/admin/fai/faiHookEntry.tpl:70
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/servRepositorySetup.tpl:41
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
-msgid "Apply"
-msgstr "Применить"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:75
 #: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
@@ -7083,6 +7139,18 @@ msgstr ""
 msgid "All fields are writeable"
 msgstr "Все поля доступны для записи"
 
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Параметры приложения"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Показать адреса подразделения"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Показать подходяшие адреса"
+
 #: plugins/admin/groups/class_groupApplication.inc:395
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
@@ -7199,18 +7267,6 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Параметры приложения"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Показать адреса подразделения"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Показать подходяшие адреса"
-
 #: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -13760,12 +13816,6 @@ msgid ""
 "twice !"
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: include/class_MultiSelectWindow.inc:456
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
@@ -13864,79 +13914,10 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_ldap.inc:196
-#, php-format
-msgid ""
-"The LDAP server is slow (%.2fs for the last query). This may be responsible "
-"for performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:230
-#, php-format
-msgid ""
-"The ldapserver is answering very slow (%.2f), this may be responsible for "
-"performance breakdowns."
-msgstr ""
-
-#: include/class_ldap.inc:456
-#, fuzzy, php-format
-msgid "Creating copy of %s"
-msgstr "Список пользователей"
-
-#: include/class_ldap.inc:459
-msgid "Processing"
-msgstr ""
-
-#: include/class_ldap.inc:499
-msgid "Error while fetching source dn - aborted!"
-msgstr ""
-
-#: include/class_ldap.inc:562 include/class_ldap.inc:577
-#, fuzzy, php-format
-msgid "Unknown FAIstate %s"
-msgstr "состояние неизвестно"
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
-msgstr ""
-
-#: include/class_ldap.inc:732
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
-"об этом команде разработчиков GOsa."
-
-#: include/class_ldap.inc:801
-#, php-format
-msgid "while operating on '%s' using LDAP server '%s'"
-msgstr ""
-
-#: include/class_ldap.inc:803
-#, fuzzy, php-format
-msgid "while operating on LDAP server %s"
-msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
-
-#: include/class_ldap.inc:999
-#, php-format
+#: include/class_MultiSelectWindow.inc:456
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-
-#: include/class_ldap.inc:1012
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:1028
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
 msgstr ""
 
 #: include/class_certificate.inc:35
@@ -14222,6 +14203,81 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
+#: include/class_ldap.inc:196
+#, php-format
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:230
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:456
+#, fuzzy, php-format
+msgid "Creating copy of %s"
+msgstr "Список пользователей"
+
+#: include/class_ldap.inc:459
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:499
+msgid "Error while fetching source dn - aborted!"
+msgstr ""
+
+#: include/class_ldap.inc:562 include/class_ldap.inc:577
+#, fuzzy, php-format
+msgid "Unknown FAIstate %s"
+msgstr "состояние неизвестно"
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:732
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
+"об этом команде разработчиков GOsa."
+
+#: include/class_ldap.inc:801
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:803
+#, fuzzy, php-format
+msgid "while operating on LDAP server %s"
+msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
+
+#: include/class_ldap.inc:999
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:1012
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:1028
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
 #: html/setup.php:89
 #, fuzzy, php-format
 msgid ""